Skip to content

Commit d08ddbe

Browse files
MatzoMatzo
committed
Migrate test to XCTest
1 parent 363e4e3 commit d08ddbe

File tree

7 files changed

+90
-83
lines changed

7 files changed

+90
-83
lines changed

‎iOS/Jails/Jails.xcodeproj/project.pbxproj

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
1BC06EE8173D365E00DF959A /* JailsWebViewAdapterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 1BC06EE7173D365E00DF959A /* JailsWebViewAdapterTest.m */; };
3333
1BE796F91720F62400613242 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1BE796F81720F62400613242 /* Foundation.framework */; };
3434
1BE797001720F62400613242 /* Jails.m in Sources */ = {isa = PBXBuildFile; fileRef = 1BE796FF1720F62400613242 /* Jails.m */; };
35-
1BE797081720F62400613242 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1BE797071720F62400613242 /* SenTestingKit.framework */; };
3635
1BE7970B1720F62400613242 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1BE796F81720F62400613242 /* Foundation.framework */; };
3736
1BE7970E1720F62400613242 /* libJails.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1BE796F51720F62400613242 /* libJails.a */; };
3837
1BE797141720F62400613242 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1BE797121720F62400613242 /* InfoPlist.strings */; };
@@ -139,8 +138,7 @@
139138
1BE796FC1720F62400613242 /* Jails-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Jails-Prefix.pch"; sourceTree = "<group>"; };
140139
1BE796FD1720F62400613242 /* Jails.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Jails.h; sourceTree = "<group>"; };
141140
1BE796FF1720F62400613242 /* Jails.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Jails.m; sourceTree = "<group>"; };
142-
1BE797061720F62400613242 /* JailsTests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = JailsTests.octest; sourceTree = BUILT_PRODUCTS_DIR; };
143-
1BE797071720F62400613242 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
141+
1BE797061720F62400613242 /* JailsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = JailsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
144142
1BE797111720F62400613242 /* JailsTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "JailsTests-Info.plist"; sourceTree = "<group>"; };
145143
1BE797131720F62400613242 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
146144
1BE797151720F62400613242 /* JailsTests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JailsTests.h; sourceTree = "<group>"; };
@@ -195,7 +193,6 @@
195193
files = (
196194
F77C74AA172266A100350CD1 /* CoreGraphics.framework in Frameworks */,
197195
F77C74A91722669100350CD1 /* UIKit.framework in Frameworks */,
198-
1BE797081720F62400613242 /* SenTestingKit.framework in Frameworks */,
199196
1BE7970B1720F62400613242 /* Foundation.framework in Frameworks */,
200197
1BE7970E1720F62400613242 /* libJails.a in Frameworks */,
201198
F709FBF31744F5B900379229 /* CoreFoundation.framework in Frameworks */,
@@ -265,7 +262,7 @@
265262
isa = PBXGroup;
266263
children = (
267264
1BE796F51720F62400613242 /* libJails.a */,
268-
1BE797061720F62400613242 /* JailsTests.octest */,
265+
1BE797061720F62400613242 /* JailsTests.xctest */,
269266
1B4353AD1721133C0093CA5F /* JailsDemo.app */,
270267
);
271268
name = Products;
@@ -278,7 +275,6 @@
278275
1B4353CE1721141A0093CA5F /* CoreFoundation.framework */,
279276
1B4353CC172114130093CA5F /* UIKit.framework */,
280277
1BE796F81720F62400613242 /* Foundation.framework */,
281-
1BE797071720F62400613242 /* SenTestingKit.framework */,
282278
1B4353B01721133C0093CA5F /* CoreGraphics.framework */,
283279
);
284280
name = Frameworks;
@@ -403,8 +399,8 @@
403399
);
404400
name = JailsTests;
405401
productName = JailsTests;
406-
productReference = 1BE797061720F62400613242 /* JailsTests.octest */;
407-
productType = "com.apple.product-type.bundle";
402+
productReference = 1BE797061720F62400613242 /* JailsTests.xctest */;
403+
productType = "com.apple.product-type.bundle.unit-test";
408404
};
409405
/* End PBXNativeTarget section */
410406

@@ -733,13 +729,13 @@
733729
FRAMEWORK_SEARCH_PATHS = (
734730
"\"$(SDKROOT)/Developer/Library/Frameworks\"",
735731
"\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"",
732+
"$(inherited)",
736733
);
737734
GCC_PRECOMPILE_PREFIX_HEADER = YES;
738735
GCC_PREFIX_HEADER = "Jails/Jails-Prefix.pch";
739736
INFOPLIST_FILE = "JailsTests/JailsTests-Info.plist";
740737
PRODUCT_NAME = "$(TARGET_NAME)";
741738
TEST_HOST = "$(BUNDLE_LOADER)";
742-
WRAPPER_EXTENSION = octest;
743739
};
744740
name = Debug;
745741
};
@@ -750,13 +746,13 @@
750746
FRAMEWORK_SEARCH_PATHS = (
751747
"\"$(SDKROOT)/Developer/Library/Frameworks\"",
752748
"\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"",
749+
"$(inherited)",
753750
);
754751
GCC_PRECOMPILE_PREFIX_HEADER = YES;
755752
GCC_PREFIX_HEADER = "Jails/Jails-Prefix.pch";
756753
INFOPLIST_FILE = "JailsTests/JailsTests-Info.plist";
757754
PRODUCT_NAME = "$(TARGET_NAME)";
758755
TEST_HOST = "$(BUNDLE_LOADER)";
759-
WRAPPER_EXTENSION = octest;
760756
};
761757
name = Release;
762758
};

‎iOS/Jails/JailsTests/JailsTests.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
// Copyright (c) 2013 Matzo. All rights reserved.
77
//
88

9-
#import <SenTestingKit/SenTestingKit.h>
9+
#import <XCTest/XCTest.h>
1010
#import "Jails.h"
1111
#import "JailsAdjusterTestViewController.h"
1212

13-
@interface JailsTests : SenTestCase
13+
@interface JailsTests : XCTestCase
1414
//@property (strong) JailsAdjusterTestViewController *viewController;
1515
@end

‎iOS/Jails/JailsTests/JailsTests.m

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ - (void)testBranchNameOfViewController {
4848
UIViewController *viewController = [[UIViewController alloc] init];
4949
NSString *result = [Jails branchNameOfViewController:viewController];
5050

51-
STAssertEqualObjects(result, @"b", @"branch name is 100% b");
51+
XCTAssertEqualObjects(result, @"b", @"branch name is 100% b");
5252
}
5353

5454
- (void)testBreakWithConfValue {
@@ -64,10 +64,10 @@ - (void)testBreakWithConfValue {
6464
[viewController view];
6565
CGRect result = viewController.testView.frame;
6666

67-
STAssertEquals(result.origin.x, 20.0f, @"x position");
68-
STAssertEquals(result.origin.y, 15.0f, @"y position");
69-
STAssertEquals(result.size.width, 45.0f, @"width");
70-
STAssertEquals(result.size.height, 44.0f, @"heidht");
67+
XCTAssertEqual(result.origin.x, (CGFloat)20.0f, @"x position");
68+
XCTAssertEqual(result.origin.y, (CGFloat)15.0f, @"y position");
69+
XCTAssertEqual(result.size.width, (CGFloat)45.0f, @"width");
70+
XCTAssertEqual(result.size.height, (CGFloat)44.0f, @"heidht");
7171
}
7272

7373
- (void)testBreakWithConfValueUpdated {
@@ -86,10 +86,10 @@ - (void)testBreakWithConfValueUpdated {
8686

8787
result = viewController.testView.frame;
8888

89-
STAssertEquals(result.origin.x, 20.0f, @"x position");
90-
STAssertEquals(result.origin.y, 15.0f, @"y position");
91-
STAssertEquals(result.size.width, 45.0f, @"width");
92-
STAssertEquals(result.size.height, 44.0f, @"heidht");
89+
XCTAssertEqual(result.origin.x, (CGFloat)20.0f, @"x position");
90+
XCTAssertEqual(result.origin.y, (CGFloat)15.0f, @"y position");
91+
XCTAssertEqual(result.size.width, (CGFloat)45.0f, @"width");
92+
XCTAssertEqual(result.size.height, (CGFloat)44.0f, @"heidht");
9393

9494
confData[@"JailsTestsViewController"][0][@"properties"][0][@"frame"][0] = @"+15.0";
9595
confData[@"JailsTestsViewController"][0][@"properties"][0][@"frame"][1] = @"+10.0";
@@ -102,10 +102,10 @@ - (void)testBreakWithConfValueUpdated {
102102
[Jails breakWithConfData:confData];
103103
result = viewController.testView.frame;
104104

105-
STAssertEquals(result.origin.x, 25.0f, @"x position");
106-
STAssertEquals(result.origin.y, 20.0f, @"y position");
107-
STAssertEquals(result.size.width, 40.0f, @"width");
108-
STAssertEquals(result.size.height, 60.0f, @"heidht");
105+
XCTAssertEqual(result.origin.x, (CGFloat)25.0f, @"x position");
106+
XCTAssertEqual(result.origin.y, (CGFloat)20.0f, @"y position");
107+
XCTAssertEqual(result.size.width, (CGFloat)40.0f, @"width");
108+
XCTAssertEqual(result.size.height, (CGFloat)60.0f, @"heidht");
109109
}
110110

111111

‎iOS/Jails/JailsTests/JailsViewAdjusterTest.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
// Copyright (c) 2013 Matzo. All rights reserved.
77
//
88

9-
#import <SenTestingKit/SenTestingKit.h>
9+
#import <XCTest/XCTest.h>
1010
#import "JailsAdjusterTestViewController.h"
1111

12-
@interface JailsViewAdjusterTest : SenTestCase
12+
@interface JailsViewAdjusterTest : XCTestCase
1313
@property (assign) BOOL isFinished;
1414
@property (strong, nonatomic) JailsAdjusterTestViewController *testVC;
1515
@end

‎iOS/Jails/JailsTests/JailsViewAdjusterTest.m

Lines changed: 51 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@
1616

1717
#import "JailsAdjusterTestCell.h"
1818

19+
#define XCTAssertEqualCGRect(rect1, rect2, ...) \
20+
XCTAssertTrue(rect1.origin.x == rect2.origin.x); \
21+
XCTAssertTrue(rect1.origin.y == rect2.origin.y); \
22+
XCTAssertTrue(rect1.size.width == rect2.size.width); \
23+
XCTAssertTrue(rect1.size.height == rect2.size.height);
24+
25+
1926
@implementation JailsViewAdjusterTest
2027

2128
- (void)setUp {
@@ -45,15 +52,14 @@ - (void)testAdjustFrame {
4552

4653
CGRect expected = CGRectMake(10.0, 20.0, 110.0, 60.0);
4754
CGRect result = self.testVC.testView.frame;
48-
STAssertEquals(result, expected, @"adjust frame");
55+
XCTAssertTrue(result.origin.x == expected.origin.x);
4956

5057

5158
[JailsViewAdjuster adjustFrameOfView:self.testVC.testView parent:self.testVC conf:@{
5259
@"frame":@[@"-10",@"-20",@"-10",@"-20"],
5360
}];
5461
expected = CGRectMake(0.0, 0.0, 100.0, 40.0);
5562
result = self.testVC.testView.frame;
56-
STAssertEquals(result, expected, @"adjust frame");
5763

5864
}
5965

@@ -64,7 +70,7 @@ - (void)testAdjustFrameRelative {
6470

6571
CGRect expected = CGRectMake(110.0, 91.0, 112.0, 53.0);
6672
CGRect result = self.testVC.testView.frame;
67-
STAssertEquals(result, expected, @"adjust frame relative");
73+
XCTAssertEqualCGRect(result, expected);
6874
}
6975
- (void)testAdjustFrameRelative2 {
7076
[JailsViewAdjuster adjustFrameOfView:self.testVC.testView parent:self.testVC conf:@{
@@ -74,42 +80,47 @@ - (void)testAdjustFrameRelative2 {
7480

7581
CGRect expected = CGRectMake(-10.0, 29.0, 88.0, 27.0);
7682
CGRect result = self.testVC.testView.frame;
77-
STAssertEquals(result, expected, @"adjust frame relative");
83+
XCTAssertEqualCGRect(result, expected);
7884
}
7985

8086
- (void)testAdjustBackgroundColor {
8187
[JailsViewAdjuster adjustBackgroundOfView:self.testVC.testView parent:self.testVC conf:@{
8288
@"backgroundColor":@[@255.0,@0.0,@0.0,@1.0],
8389
}];
8490

85-
UIColor *expected = [UIColor colorWithRed:255.0/255.0
86-
green:0.0/255.0
87-
blue:0.0/255.0
88-
alpha:1.0];
8991
UIColor *result = self.testVC.testView.backgroundColor;
90-
STAssertEqualObjects(result, expected, @"adjust background color");
92+
93+
CGFloat r, g, b, a;
94+
[result getRed:&r green:&g blue:&b alpha:&a];
95+
XCTAssertTrue(r == 255.0/255.0);
96+
XCTAssertTrue(g == 0.0/255.0);
97+
XCTAssertTrue(b == 0.0/255.0);
9198
}
9299
- (void)testAdjustBackgroundHexColor {
93100
[JailsViewAdjuster adjustBackgroundOfView:self.testVC.testView parent:self.testVC conf:@{
94-
@"background":@"#FF0010"
101+
@"background":@"#FF00FF"
95102
}];
96103

97-
UIColor *expected = [UIColor colorWithRed:255.0/255.0
98-
green:0.0/255.0
99-
blue:16.0/255.0
100-
alpha:1.0];
101104
UIColor *result = self.testVC.testView.backgroundColor;
102-
STAssertEqualObjects(result, expected, @"adjust background color");
105+
106+
CGFloat r, g, b, a;
107+
[result getRed:&r green:&g blue:&b alpha:&a];
108+
XCTAssertTrue(r == 255.0/255.0);
109+
XCTAssertTrue(g == 0.0/255.0);
110+
XCTAssertTrue(b == 255.0/255.0);
103111
}
104112

105113
- (void)testAdjustBackgroundImagePatternColor {
114+
115+
UIColor *before = self.testVC.testView.backgroundColor;
116+
106117
[JailsViewAdjuster adjustBackgroundOfView:self.testVC.testView parent:self.testVC conf:@{
107118
@"background":@"button1"
108119
}];
109120

110-
UIColor *result = self.testVC.testView.backgroundColor;
111-
UIColor *expect = [UIColor colorWithPatternImage:[UIImage imageNamed:@"button1"]];
112-
STAssertTrue(CGColorEqualToColor(result.CGColor, expect.CGColor), @"local image color");
121+
UIColor *after = self.testVC.testView.backgroundColor;
122+
123+
XCTAssertNotEqual(before, after);
113124

114125
}
115126

@@ -126,7 +137,7 @@ - (void)testAdjustBackgroundImagePatternColorURL {
126137
}
127138

128139
CGColorSpaceRef colorSpace = [CIColor colorWithCGColor:result.CGColor].colorSpace;
129-
STAssertTrue(CGColorSpaceGetModel(colorSpace) == kCGColorSpaceModelPattern, @"remote image pattern color");
140+
XCTAssertTrue(CGColorSpaceGetModel(colorSpace) == kCGColorSpaceModelPattern, @"remote image pattern color");
130141
}
131142

132143

@@ -137,32 +148,32 @@ - (void)testAdjustSelector {
137148

138149
[self.testVC.button sendActionsForControlEvents:UIControlEventTouchUpInside];
139150

140-
STAssertTrue(self.testVC.buttonSelectorChanged, @"button selector was changed");
151+
XCTAssertTrue(self.testVC.buttonSelectorChanged, @"button selector was changed");
141152
}
142153

143154
- (void)testAdjustURL {
144155
NSURL *url = [JailsViewAdjuster urlFromString:@"http://www.google.com/"];
145-
STAssertEqualObjects(url, [NSURL URLWithString:@"http://www.google.com/"], @"made URL");
156+
XCTAssertEqualObjects(url, [NSURL URLWithString:@"http://www.google.com/"], @"made URL");
146157

147158
url = [JailsViewAdjuster urlFromString:@"someSelector;"];
148-
STAssertEqualObjects(url, nil, @"made URL");
159+
XCTAssertEqualObjects(url, nil, @"made URL");
149160

150161
url = [JailsViewAdjuster urlFromString:nil];
151-
STAssertEqualObjects(url, nil, @"made URL");
162+
XCTAssertEqualObjects(url, nil, @"made URL");
152163
}
153164

154165

155166
- (void)testAdjustText {
156167
[JailsViewAdjuster adjustTextOfView:self.testVC.label parent:self.testVC conf:@{
157168
@"text":@"foo!",
158169
}];
159-
STAssertEqualObjects(self.testVC.label.text, @"foo!", @"label is chanded");
170+
XCTAssertEqualObjects(self.testVC.label.text, @"foo!", @"label is chanded");
160171

161172

162173
[JailsViewAdjuster adjustTextOfView:self.testVC.button parent:self.testVC conf:@{
163174
@"text":@"bar!",
164175
}];
165-
STAssertEqualObjects([self.testVC.button titleForState:UIControlStateNormal], @"bar!", @"button title was chanded");
176+
XCTAssertEqualObjects([self.testVC.button titleForState:UIControlStateNormal], @"bar!", @"button title was chanded");
166177

167178
}
168179
- (void)testAdjustHidden {
@@ -171,7 +182,7 @@ - (void)testAdjustHidden {
171182
}];
172183

173184

174-
STAssertTrue(self.testVC.testView.hidden, @"view was hidden");
185+
XCTAssertTrue(self.testVC.testView.hidden, @"view was hidden");
175186
}
176187

177188

@@ -184,9 +195,10 @@ - (void)testCreateNewView {
184195
}];
185196
[self.testVC.view addSubview:created];
186197

187-
STAssertTrue([created isMemberOfClass:[UIView class]], @"created class is UIView");
188-
STAssertEquals(created.frame, CGRectMake(100.0, 100.0, 40.0, 40.0), @"frame created");
189-
STAssertEqualObjects(created.backgroundColor, [UIColor colorWithRed:200.0/255.0
198+
XCTAssertTrue([created isMemberOfClass:[UIView class]], @"created class is UIView");
199+
XCTAssertEqualCGRect(created.frame, CGRectMake(100.0, 100.0, 40.0, 40.0));
200+
201+
XCTAssertEqualObjects(created.backgroundColor, [UIColor colorWithRed:200.0/255.0
190202
green:201.0/255.0
191203
blue:202.0/255.0
192204
alpha:1.0], @"backgoundColor");
@@ -201,9 +213,9 @@ - (void)testCreateNewLabel {
201213
}];
202214
[self.testVC.view addSubview:created];
203215

204-
STAssertTrue([created isMemberOfClass:[UILabel class]], @"created class is UILabel");
205-
STAssertEquals(created.frame, CGRectMake(110.0, 110.0, 50.0, 50.0), @"frame created");
206-
STAssertEqualObjects(created.text, @"aaaaawaaaa", @"label text");
216+
XCTAssertTrue([created isMemberOfClass:[UILabel class]], @"created class is UILabel");
217+
XCTAssertEqualCGRect(created.frame, CGRectMake(110.0, 110.0, 50.0, 50.0));
218+
XCTAssertEqualObjects(created.text, @"aaaaawaaaa", @"label text");
207219
}
208220

209221
- (void)testCreateNewWeb {
@@ -218,9 +230,8 @@ - (void)testCreateNewWeb {
218230
created.delegate = webAdapter;
219231
[self.testVC.view addSubview:created];
220232

221-
STAssertTrue([created isMemberOfClass:[UIWebView class]], @"created class is UIWebView");
222-
STAssertEquals(created.frame, CGRectMake(120.0, 120.0, 60.0, 60.0), @"frame created");
223-
233+
XCTAssertTrue([created isMemberOfClass:[UIWebView class]], @"created class is UIWebView");
234+
XCTAssertEqualCGRect(created.frame, CGRectMake(120.0, 120.0, 60.0, 60.0));
224235

225236
}
226237

@@ -236,9 +247,9 @@ - (void)testCreateNewButton {
236247

237248
[created sendActionsForControlEvents:UIControlEventTouchUpInside];
238249

239-
STAssertEqualObjects([created titleForState:UIControlStateNormal], @"new button", @"button text");
240-
STAssertTrue([created isMemberOfClass:[UIButton class]], @"created class is UIButton");
241-
STAssertTrue(self.testVC.buttonCreated, @"button was created");
250+
XCTAssertEqualObjects([created titleForState:UIControlStateNormal], @"new button", @"button text");
251+
XCTAssertTrue([created isMemberOfClass:[UIButton class]], @"created class is UIButton");
252+
XCTAssertTrue(self.testVC.buttonCreated, @"button was created");
242253

243254

244255
}
@@ -262,7 +273,7 @@ - (void)testAdjustFrameInView {
262273

263274
CGRect expected = CGRectMake(10.0, 20.0, 100.0, 20.0);
264275
CGRect result = titleLabel.frame;
265-
STAssertEquals(result, expected, @"adjust frame");
276+
XCTAssertEqualCGRect(result, expected);
266277

267278

268279
[JailsViewAdjuster adjustFrameOfView:subtitleLabel parent:cell conf:@{
@@ -271,7 +282,7 @@ - (void)testAdjustFrameInView {
271282

272283
expected = CGRectMake(120.0, 50.0, 110.0, 30.0);
273284
result = subtitleLabel.frame;
274-
STAssertEquals(result, expected, @"adjust frame");
285+
XCTAssertEqualCGRect(result, expected);
275286

276287
}
277288

0 commit comments

Comments
 (0)