55// Created by Abizer Nasir on 22/05/2011.
66//
77
8- #import < SenTestingKit/SenTestingKit.h>
8+ // #import <SenTestingKit/SenTestingKit.h>
9+ #import < XCTest/XCTest.h>
910#import " KSPathUtilities.h"
1011
1112
12- @interface TestKSPathUtilities : SenTestCase {
13+ @interface TestKSPathUtilities : XCTestCase {
1314@private
1415
1516}
@@ -29,7 +30,7 @@ - (void)checkPath:(NSString *)path relativeToDirectory:(NSString *)dirPath again
2930{
3031 NSString *result = [path ks_pathRelativeToDirectory: dirPath];
3132
32- STAssertTrue ([result isEqualToString: expectedResult],
33+ XCTAssertTrue ([result isEqualToString: expectedResult],
3334 @" \' %@ \' relative to \' %@ \' should be \' %@ \' instead of \' %@ \' "
3435 path,
3536 dirPath,
@@ -54,16 +55,16 @@ - (void)checkPath:(NSString *)path relativeToDirectory:(NSString *)dirPath again
5455
5556- (void )testEnumeratePathComponents ;
5657{
57- STAssertEqualObjects ([self componentsOfPath: @" foo/bar" @" foo" @" bar" , nil );
58- STAssertEqualObjects ([self componentsOfPath: @" foo/bar/" @" foo" @" bar" , nil );
59- STAssertEqualObjects ([self componentsOfPath: @" foo//bar/" @" foo" @" bar" , nil );
60-
61- STAssertEqualObjects ([self componentsOfPath: @" /" @" /" , nil );
62- STAssertEqualObjects ([self componentsOfPath: @" //" @" /" , nil );
63- STAssertEqualObjects ([self componentsOfPath: @" /foo/bar" @" /" @" foo" @" bar" , nil );
64- STAssertEqualObjects ([self componentsOfPath: @" /foo/bar/" @" /" @" foo" @" bar" , nil );
65- STAssertEqualObjects ([self componentsOfPath: @" /foo//bar/" @" /" @" foo" @" bar" , nil );
66- STAssertEqualObjects ([self componentsOfPath: @" //foo//bar/" @" /" @" foo" @" bar" , nil );
58+ XCTAssertEqual ([self componentsOfPath: @" foo/bar" @" foo" @" bar"
59+ XCTAssertEqual ([self componentsOfPath: @" foo/bar/" @" foo" @" bar"
60+ XCTAssertEqual ([self componentsOfPath: @" foo//bar/" @" foo" @" bar"
61+
62+ XCTAssertEqual ([self componentsOfPath: @" /" @" /"
63+ XCTAssertEqual ([self componentsOfPath: @" //" @" /"
64+ XCTAssertEqual ([self componentsOfPath: @" /foo/bar" @" /" @" foo" @" bar"
65+ XCTAssertEqual ([self componentsOfPath: @" /foo/bar/" @" /" @" foo" @" bar"
66+ XCTAssertEqual ([self componentsOfPath: @" /foo//bar/" @" /" @" foo" @" bar"
67+ XCTAssertEqual ([self componentsOfPath: @" //foo//bar/" @" /" @" foo" @" bar"
6768}
6869
6970- (NSArray *)componentsOfPath : (NSString *)path ;
@@ -170,34 +171,34 @@ - (void)testPathRelativeToDirectory {
170171
171172- (void )testIsSubpath ;
172173{
173- STAssertTrue ([@" /foo/bar/baz.html" ks_isSubpathOfPath: @" /foo" @" /foo/bar/baz.html is a subpath of of /foo"
174- STAssertTrue ([@" /foo/bar/baz.html" ks_isSubpathOfPath: @" /foo/" @" /foo/bar/baz.html is a subpath of of /foo/"
175- STAssertFalse ([@" /foo/bar/baz.html" ks_isSubpathOfPath: @" /fo" , nil );
174+ XCTAssertTrue ([@" /foo/bar/baz.html" ks_isSubpathOfPath: @" /foo" @" /foo/bar/baz.html is a subpath of of /foo"
175+ XCTAssertTrue ([@" /foo/bar/baz.html" ks_isSubpathOfPath: @" /foo/" @" /foo/bar/baz.html is a subpath of of /foo/"
176+ XCTAssertFalse ([@" /foo/bar/baz.html" ks_isSubpathOfPath: @" /fo"
176177
177178 // Treat items as being subpaths of themselves
178- STAssertTrue ([@" /foo/bar/baz.html" ks_isSubpathOfPath: @" /foo/bar/baz.html" , nil );
179- STAssertTrue ([@" /foo/bar/baz.html" ks_isSubpathOfPath: @" /foo/bar/baz.html/" , nil );
180- STAssertTrue ([@" /foo/bar/baz.html/" ks_isSubpathOfPath: @" /foo/bar/baz.html" , nil );
181- STAssertTrue ([@" /foo/bar/baz.html/" ks_isSubpathOfPath: @" /foo/bar/baz.html/" , nil );
179+ XCTAssertTrue ([@" /foo/bar/baz.html" ks_isSubpathOfPath: @" /foo/bar/baz.html"
180+ XCTAssertTrue ([@" /foo/bar/baz.html" ks_isSubpathOfPath: @" /foo/bar/baz.html/"
181+ XCTAssertTrue ([@" /foo/bar/baz.html/" ks_isSubpathOfPath: @" /foo/bar/baz.html"
182+ XCTAssertTrue ([@" /foo/bar/baz.html/" ks_isSubpathOfPath: @" /foo/bar/baz.html/"
182183
183184 // Make sure similar things aren't mistaken
184- STAssertFalse ([@" /foo/abcdefg" ks_isSubpathOfPath: @" /foo/abcd" , nil );
185- STAssertFalse ([@" /foo/abcd" ks_isSubpathOfPath: @" /foo/abcdefg" , nil );
185+ XCTAssertFalse ([@" /foo/abcdefg" ks_isSubpathOfPath: @" /foo/abcd"
186+ XCTAssertFalse ([@" /foo/abcd" ks_isSubpathOfPath: @" /foo/abcdefg"
186187}
187188
188189- (void )testStringByIncrementingPath ;
189190{
190191 NSString *path = @" foo/bar.png//"
191192 path = [path ks_stringByIncrementingPath ];
192193
193- STAssertTrue ([path isEqualToString: @" foo/bar-2.png"
194+ XCTAssertTrue ([path isEqualToString: @" foo/bar-2.png"
194195 @" Incremented path \' %@ \' should be \' %@ \' "
195196 path,
196197 @" foo/bar-2.png"
197198
198199 path = [path ks_stringByIncrementingPath ];
199200
200- STAssertTrue ([path isEqualToString: @" foo/bar-3.png"
201+ XCTAssertTrue ([path isEqualToString: @" foo/bar-3.png"
201202 @" Incremented path \' %@ \' should be \' %@ \' "
202203 path,
203204 @" foo/bar-3.png"
@@ -207,14 +208,14 @@ - (void)testStringByIncrementingPath;
207208 path = @" foo/bar//"
208209 path = [path ks_stringByIncrementingPath ];
209210
210- STAssertTrue ([path isEqualToString: @" foo/bar-2"
211+ XCTAssertTrue ([path isEqualToString: @" foo/bar-2"
211212 @" Incremented path \' %@ \' should be \' %@ \' "
212213 path,
213214 @" foo/bar-2"
214215
215216 path = [path ks_stringByIncrementingPath ];
216217
217- STAssertTrue ([path isEqualToString: @" foo/bar-3"
218+ XCTAssertTrue ([path isEqualToString: @" foo/bar-3"
218219 @" Incremented path \' %@ \' should be \' %@ \' "
219220 path,
220221 @" foo/bar-3"
0 commit comments