* [ios] fix test running problem

libbylg · Dec 29, 2016 · 617c749 · 617c749
1 parent 70de8e2
commit 617c749
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/ios/sdk/WeexSDKTests/WXRootViewTests.m b/ios/sdk/WeexSDKTests/WXRootViewTests.m
@@ -53,8 +53,8 @@ - (void)testInstanceAndWeexRootFrame {
     [instance1 renderView:jsScript options:nil data:nil];
     XCTestExpectation *expectation1 = [self expectationWithDescription:@"instance 1"];
     instance1.renderFinish = ^(UIView *view){
-        XCTAssert(CGRectEqualToRect(view.frame, instanceFrame));
-        XCTAssert(CGRectEqualToRect(view.subviews[0].frame, CGRectMake(0, 0, instanceFrame.size.width, instanceFrame.size.height)));
+        XCTAssert(WXRectApproximateToRect(view.frame, instanceFrame));
+        XCTAssert(WXRectApproximateToRect(view.subviews[0].frame, CGRectMake(0, 0, instanceFrame.size.width, instanceFrame.size.height)));
         [expectation1 fulfill];
     };
 
@@ -65,8 +65,8 @@ - (void)testInstanceAndWeexRootFrame {
     [instance2 renderView:jsScript options:nil data:templateRootFrameData];
     XCTestExpectation *expectation2 = [self expectationWithDescription:@"instance 2"];
     instance2.renderFinish = ^(UIView *view){
-        XCTAssert(CGRectEqualToRect(view.frame, instanceFrame));
-        XCTAssert(CGRectEqualToRect(view.subviews[0].frame,
+        XCTAssert(WXRectApproximateToRect(view.frame, instanceFrame));
+        XCTAssert(WXRectApproximateToRect(view.subviews[0].frame,
                                     CGRectMake(
                                                WXPixelResize(templateRootFrame.origin.x),
                                                WXPixelResize(templateRootFrame.origin.y),
@@ -83,11 +83,11 @@ - (void)testInstanceAndWeexRootFrame {
     XCTestExpectation *expectation3 = [self expectationWithDescription:@"instance 3"];
     XCTestExpectation *expectation31 = [self expectationWithDescription:@"instance 3 onLayoutChange"];
     instance3.renderFinish = ^(UIView *view){
-        XCTAssert(CGRectEqualToRect(view.frame,
+        XCTAssert(WXRectApproximateToRect(view.frame,
                                     CGRectMake(0,0,
                                                WXPixelResize(templateRootFrame.size.width),
                                                WXPixelResize(templateRootFrame.size.height))));
-        XCTAssert(CGRectEqualToRect(view.subviews[0].frame,
+        XCTAssert(WXRectApproximateToRect(view.subviews[0].frame,
                                     CGRectMake(
                                                WXPixelResize(templateRootFrame.origin.x),
                                                WXPixelResize(templateRootFrame.origin.y),
@@ -101,7 +101,7 @@ - (void)testInstanceAndWeexRootFrame {
 
         [instance3 refreshInstance:changedFrameData];
         instance3.onLayoutChange = ^(UIView *view) {
-            XCTAssert(CGRectEqualToRect(view.frame,
+            XCTAssert(WXRectApproximateToRect(view.frame,
                                         CGRectMake(0,0,
                                                    WXPixelResize(templateRootFrame.size.width),
                                                    WXPixelResize(400))));
@@ -115,9 +115,9 @@ - (void)testInstanceAndWeexRootFrame {
     [instance4 renderView:jsScript options:nil data:nil];
     XCTestExpectation *expectation4 = [self expectationWithDescription:@"instance 4"];
     instance4.renderFinish = ^(UIView *view){
-        XCTAssert(CGRectEqualToRect(view.frame,
+        XCTAssert(WXRectApproximateToRect(view.frame,
                                     CGRectMake(0,0,WXPixelResize(100),WXPixelResize(200))));
-        XCTAssert(CGRectEqualToRect(view.subviews[0].frame,
+        XCTAssert(WXRectApproximateToRect(view.subviews[0].frame,
                                     CGRectMake(0,0,WXPixelResize(100),WXPixelResize(200))));
         [expectation4 fulfill];
     };

diff --git a/ios/sdk/WeexSDKTests/WXStreamModuleTests.m b/ios/sdk/WeexSDKTests/WXStreamModuleTests.m
@@ -55,7 +55,7 @@ - (void)sendHttp:(NSDictionary*)options {
         callbackResult = result;
         [_exp fulfill];
     }];
-    [self waitForExpectationsWithTimeout:10 handler:^(NSError * error) {
+    [self waitForExpectationsWithTimeout:20 handler:^(NSError * error) {
         XCTAssertNotNil(callbackResult);
     }];