From 459882ea7e4de7277dd15400cd9b0f017afc2044 Mon Sep 17 00:00:00 2001 From: Tadeu Zagallo Date: Tue, 9 Jun 2015 05:11:40 -0700 Subject: [PATCH] [ReactNative] Fix BUCK file and reenable tests --- Examples/UIExplorer/UIExplorer/AppDelegate.m | 2 +- .../IntegrationTestsTests.m | 12 ++++++------ .../testLayoutExampleSnapshot_1@2x.png | Bin .../testSliderExampleSnapshot_1@2x.png | Bin .../testSwitchExampleSnapshot_1@2x.png | Bin .../testTabBarExampleSnapshot_1@2x.png | Bin .../testTextExampleSnapshot_1@2x.png | Bin .../testViewExampleSnapshot_1@2x.png | Bin .../UIExplorerIntegrationTests.m | 5 +---- 9 files changed, 8 insertions(+), 11 deletions(-) rename Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/{Examples-UIExplorer-UIExplorerApp => Examples-UIExplorer-UIExplorerApp.ios}/testLayoutExampleSnapshot_1@2x.png (100%) rename Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/{Examples-UIExplorer-UIExplorerApp => Examples-UIExplorer-UIExplorerApp.ios}/testSliderExampleSnapshot_1@2x.png (100%) rename Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/{Examples-UIExplorer-UIExplorerApp => Examples-UIExplorer-UIExplorerApp.ios}/testSwitchExampleSnapshot_1@2x.png (100%) rename Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/{Examples-UIExplorer-UIExplorerApp => Examples-UIExplorer-UIExplorerApp.ios}/testTabBarExampleSnapshot_1@2x.png (100%) rename Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/{Examples-UIExplorer-UIExplorerApp => Examples-UIExplorer-UIExplorerApp.ios}/testTextExampleSnapshot_1@2x.png (100%) rename Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/{Examples-UIExplorer-UIExplorerApp => Examples-UIExplorer-UIExplorerApp.ios}/testViewExampleSnapshot_1@2x.png (100%) diff --git a/Examples/UIExplorer/UIExplorer/AppDelegate.m b/Examples/UIExplorer/UIExplorer/AppDelegate.m index 9d3adb2ee..5e707db41 100644 --- a/Examples/UIExplorer/UIExplorer/AppDelegate.m +++ b/Examples/UIExplorer/UIExplorer/AppDelegate.m @@ -36,7 +36,7 @@ * on the same Wi-Fi network. */ - jsCodeLocation = [NSURL URLWithString:@"http://localhost:8081/Examples/UIExplorer/UIExplorerApp.includeRequire.runModule.bundle?dev=true"]; + jsCodeLocation = [NSURL URLWithString:@"http://localhost:8081/Examples/UIExplorer/UIExplorerApp.ios.includeRequire.runModule.bundle?dev=true"]; /** * OPTION 2 diff --git a/Examples/UIExplorer/UIExplorerIntegrationTests/IntegrationTestsTests.m b/Examples/UIExplorer/UIExplorerIntegrationTests/IntegrationTestsTests.m index c9cd16206..75483fa6e 100644 --- a/Examples/UIExplorer/UIExplorerIntegrationTests/IntegrationTestsTests.m +++ b/Examples/UIExplorer/UIExplorerIntegrationTests/IntegrationTestsTests.m @@ -39,12 +39,12 @@ #pragma mark Logic Tests -- (void)DISABLED_testTheTester // #7149037 +- (void)testTheTester { [_runner runTest:_cmd module:@"IntegrationTestHarnessTest"]; } -- (void)DISABLED_testTheTester_waitOneFrame // #7149037 +- (void)testTheTester_waitOneFrame { [_runner runTest:_cmd module:@"IntegrationTestHarnessTest" @@ -61,12 +61,12 @@ expectErrorRegex:@"because shouldThrow"]; } -- (void)DISABLED_testTimers // #7149037 +- (void)testTimers { [_runner runTest:_cmd module:@"TimersTest"]; } -- (void)DISABLED_testAsyncStorage // #7149037 +- (void)testAsyncStorage { [_runner runTest:_cmd module:@"AsyncStorageTest"]; } @@ -76,14 +76,14 @@ [_runner runTest:_cmd module:@"LayoutEventsTest"]; } -- (void)DISABLED_testAppEvents // #7149037 +- (void)testAppEvents { [_runner runTest:_cmd module:@"AppEventsTest"]; } #pragma mark Snapshot Tests -- (void)DISABLED_testSimpleSnapshot // #7149037 +- (void)testSimpleSnapshot { [_runner runTest:_cmd module:@"SimpleSnapshotTest"]; } diff --git a/Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp/testLayoutExampleSnapshot_1@2x.png b/Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp.ios/testLayoutExampleSnapshot_1@2x.png similarity index 100% rename from Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp/testLayoutExampleSnapshot_1@2x.png rename to Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp.ios/testLayoutExampleSnapshot_1@2x.png diff --git a/Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp/testSliderExampleSnapshot_1@2x.png b/Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp.ios/testSliderExampleSnapshot_1@2x.png similarity index 100% rename from Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp/testSliderExampleSnapshot_1@2x.png rename to Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp.ios/testSliderExampleSnapshot_1@2x.png diff --git a/Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp/testSwitchExampleSnapshot_1@2x.png b/Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp.ios/testSwitchExampleSnapshot_1@2x.png similarity index 100% rename from Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp/testSwitchExampleSnapshot_1@2x.png rename to Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp.ios/testSwitchExampleSnapshot_1@2x.png diff --git a/Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp/testTabBarExampleSnapshot_1@2x.png b/Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp.ios/testTabBarExampleSnapshot_1@2x.png similarity index 100% rename from Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp/testTabBarExampleSnapshot_1@2x.png rename to Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp.ios/testTabBarExampleSnapshot_1@2x.png diff --git a/Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp/testTextExampleSnapshot_1@2x.png b/Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp.ios/testTextExampleSnapshot_1@2x.png similarity index 100% rename from Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp/testTextExampleSnapshot_1@2x.png rename to Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp.ios/testTextExampleSnapshot_1@2x.png diff --git a/Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp/testViewExampleSnapshot_1@2x.png b/Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp.ios/testViewExampleSnapshot_1@2x.png similarity index 100% rename from Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp/testViewExampleSnapshot_1@2x.png rename to Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp.ios/testViewExampleSnapshot_1@2x.png diff --git a/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerIntegrationTests.m b/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerIntegrationTests.m index 8328e8457..c1c5e5737 100644 --- a/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerIntegrationTests.m +++ b/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerIntegrationTests.m @@ -39,7 +39,7 @@ #endif NSString *version = [[UIDevice currentDevice] systemVersion]; RCTAssert([version isEqualToString:@"8.3"], @"Snapshot tests should be run on iOS 8.3, found %@", version); - _runner = RCTInitRunnerForApp(@"Examples/UIExplorer/UIExplorerApp"); + _runner = RCTInitRunnerForApp(@"Examples/UIExplorer/UIExplorerApp.ios"); // If tests have changes, set recordMode = YES below and run the affected // tests on an iPhone5, iOS 8.1 simulator. @@ -95,15 +95,12 @@ [_runner runTest:_cmd module:@#name]; \ } -/* -These tests are all disabled due to #7149037. RCT_SNAPSHOT_TEST(ViewExample, NO) RCT_SNAPSHOT_TEST(LayoutExample, NO) RCT_SNAPSHOT_TEST(TextExample, NO) RCT_SNAPSHOT_TEST(SwitchExample, NO) RCT_SNAPSHOT_TEST(SliderExample, NO) RCT_SNAPSHOT_TEST(TabBarExample, NO) -*/ // Make sure this test runs last - (void)testZZZ_NotInRecordMode