Fix imports in UIExplorerUnitTests

javache · Facebook Github Bot · commit 439092742a7f · 2016-11-24T09:58:31.000-08:00
Reviewed By: bestander

Differential Revision: D4231271

fbshipit-source-id: 84f903f6b14256ed1958ad1800f128133590a3dc
diff --git a/Examples/UIExplorer/UIExplorerIntegrationTests/RCTLoggingTests.m b/Examples/UIExplorer/UIExplorerIntegrationTests/RCTLoggingTests.m
@@ -14,9 +14,9 @@
 
 #import <XCTest/XCTest.h>
 
-#import "RCTAssert.h"
-#import "RCTLog.h"
-#import "RCTBridge.h"
+#import <React/RCTAssert.h>
+#import <React/RCTBridge.h>
+#import <React/RCTLog.h>
 
 @interface RCTLoggingTests : XCTestCase
 
diff --git a/Examples/UIExplorer/UIExplorerIntegrationTests/RCTRootViewIntegrationTests.m b/Examples/UIExplorer/UIExplorerIntegrationTests/RCTRootViewIntegrationTests.m
@@ -26,13 +26,10 @@
 #import <UIKit/UIKit.h>
 #import <XCTest/XCTest.h>
 
-#import "RCTAssert.h"
-
-#import "RCTEventDispatcher.h"
-#import "RCTRootView.h"
-#import "RCTRootViewDelegate.h"
-
 #import <RCTTest/RCTTestRunner.h>
+#import <React/RCTEventDispatcher.h>
+#import <React/RCTRootView.h>
+#import <React/RCTRootViewDelegate.h>
 
 #define RCT_TEST_DATA_CONFIGURATION_BLOCK(appName, testType, input, block) \
 - (void)test##appName##_##testType##_##input                               \
diff --git a/Examples/UIExplorer/UIExplorerIntegrationTests/RCTUIManagerScenarioTests.m b/Examples/UIExplorer/UIExplorerIntegrationTests/RCTUIManagerScenarioTests.m
@@ -14,8 +14,9 @@
 
 #import <UIKit/UIKit.h>
 #import <XCTest/XCTest.h>
-#import "RCTUIManager.h"
-#import "UIView+React.h"
+
+#import <React/RCTUIManager.h>
+#import <React/UIView+React.h>
 
 @interface RCTUIManager (Testing)
 
diff --git a/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerIntegrationTests.m b/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerIntegrationTests.m
@@ -12,8 +12,6 @@
 
 #import <RCTTest/RCTTestRunner.h>
 
-#import "RCTAssert.h"
-
 #define RCT_TEST(name)                  \
 - (void)test##name                      \
 {                                       \
diff --git a/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerSnapshotTests.m b/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerSnapshotTests.m
@@ -17,10 +17,6 @@
 
 #import <RCTTest/RCTTestRunner.h>
 
-#import "RCTAssert.h"
-#import "RCTRedBox.h"
-#import "RCTRootView.h"
-
 @interface UIExplorerSnapshotTests : XCTestCase
 {
   RCTTestRunner *_runner;
diff --git a/Examples/UIExplorer/UIExplorerUnitTests/OCMock/OCMStubRecorder.h b/Examples/UIExplorer/UIExplorerUnitTests/OCMock/OCMStubRecorder.h
@@ -14,7 +14,7 @@
  *  under the License.
  */
 
-#import <React/OCMRecorder.h>
+#import <OCMock/OCMRecorder.h>
 
 
 @interface OCMStubRecorder : OCMRecorder
diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTAllocationTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTAllocationTests.m
@@ -15,11 +15,11 @@
 #import <Foundation/Foundation.h>
 #import <XCTest/XCTest.h>
 
-#import "RCTBridge.h"
-#import "RCTBridge+Private.h"
-#import "RCTJSCExecutor.h"
-#import "RCTModuleMethod.h"
-#import "RCTRootView.h"
+#import <React/RCTBridge+Private.h>
+#import <React/RCTBridge.h>
+#import <React/RCTJSCExecutor.h>
+#import <React/RCTModuleMethod.h>
+#import <React/RCTRootView.h>
 
 #define RUN_RUNLOOP_WHILE(CONDITION) \
 { \
diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTBridgeTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTBridgeTests.m
@@ -15,11 +15,11 @@
 #import <Foundation/Foundation.h>
 #import <XCTest/XCTest.h>
 
-#import "RCTBridge.h"
-#import "RCTBridge+Private.h"
-#import "RCTBridgeModule.h"
-#import "RCTJavaScriptExecutor.h"
-#import "RCTUtils.h"
+#import <React/RCTBridge+Private.h>
+#import <React/RCTBridge.h>
+#import <React/RCTBridgeModule.h>
+#import <React/RCTJavaScriptExecutor.h>
+#import <React/RCTUtils.h>
 
 #define RUN_RUNLOOP_WHILE(CONDITION) \
 { \
diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTBundleURLProviderTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTBundleURLProviderTests.m
@@ -13,9 +13,8 @@
  */
 #import <XCTest/XCTest.h>
 
-#import "RCTBundleURLProvider.h"
-#import "RCTUtils.h"
-
+#import <React/RCTBundleURLProvider.h>
+#import <React/RCTUtils.h>
 
 static NSString *const testFile = @"test.jsbundle";
 static NSString *const mainBundle = @"main.jsbundle";
diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTComponentPropsTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTComponentPropsTests.m
@@ -14,9 +14,9 @@
 
 #import <XCTest/XCTest.h>
 
-#import "RCTUIManager.h"
-#import "RCTViewManager.h"
-#import "RCTView.h"
+#import <React/RCTUIManager.h>
+#import <React/RCTView.h>
+#import <React/RCTViewManager.h>
 
 #define RUN_RUNLOOP_WHILE(CONDITION) \
 { \
diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTConvert_NSURLTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTConvert_NSURLTests.m
@@ -15,8 +15,7 @@
 #import <XCTest/XCTest.h>
 
 #import <React/RCTConvert.h>
-
-#import "RCTUtils.h"
+#import <React/RCTUtils.h>
 
 @interface RCTConvert_NSURLTests : XCTestCase
 
diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTEventDispatcherTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTEventDispatcherTests.m
@@ -16,8 +16,9 @@
 #import <XCTest/XCTest.h>
 
 #import <OCMock/OCMock.h>
-#import "RCTEventDispatcher.h"
-#import "RCTBridge+Private.h"
+
+#import <React/RCTBridge+Private.h>
+#import <React/RCTEventDispatcher.h>
 
 @interface RCTTestEvent : NSObject <RCTEvent>
 @property (atomic, assign, readwrite) BOOL canCoalesce;
diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTFontTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTFontTests.m
@@ -12,11 +12,10 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#import <CoreText/CoreText.h>
 #import <XCTest/XCTest.h>
 
-#import "RCTFont.h"
-
-#import <CoreText/CoreText.h>
+#import <React/RCTFont.h>
 
 @interface RCTFontTests : XCTestCase
 
diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTGzipTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTGzipTests.m
@@ -13,8 +13,9 @@
  */
 
 #import <XCTest/XCTest.h>
-#import "RCTUtils.h"
-#import "RCTNetworking.h"
+
+#import <React/RCTNetworking.h>
+#import <React/RCTUtils.h>
 
 #define RUN_RUNLOOP_WHILE(CONDITION) \
 { \
diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTImageLoaderTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTImageLoaderTests.m
@@ -14,8 +14,9 @@
 
 #import <XCTest/XCTest.h>
 
-#import "RCTBridge.h"
-#import "RCTImageLoader.h"
+#import <React/RCTBridge.h>
+#import <React/RCTImageLoader.h>
+
 #import "RCTImageLoaderHelpers.h"
 
 unsigned char blackGIF[] = {
diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTImageUtilTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTImageUtilTests.m
@@ -16,7 +16,8 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIView.h>
 #import <XCTest/XCTest.h>
-#import "RCTImageUtils.h"
+
+#import <RCTImage/RCTImageUtils.h>
 
 #define RCTAssertEqualPoints(a, b) { \
 XCTAssertEqual(a.x, b.x); \
diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTJSCExecutorTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTJSCExecutorTests.m
@@ -16,8 +16,8 @@
 
 #import <XCTest/XCTest.h>
 
-#import "RCTJSCExecutor.h"
-#import "RCTUtils.h"
+#import <React/RCTJSCExecutor.h>
+#import <React/RCTUtils.h>
 
 @interface RCTJSCExecutorTests : XCTestCase
 
diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTJSONTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTJSONTests.m
@@ -13,7 +13,8 @@
  */
 
 #import <XCTest/XCTest.h>
-#import "RCTUtils.h"
+
+#import <React/RCTUtils.h>
 
 @interface RCTJSONTests : XCTestCase
 
@@ -53,7 +54,7 @@ - (void)testEncodingNSError
   NSString *jsonString = RCTJSONStringify(jsonObject, NULL);
   NSDictionary<NSString *, id> *json = RCTJSONParse(jsonString, NULL);
   XCTAssertEqualObjects(json[@"code"], @"EDOMAIN68");
-  XCTAssertEqualObjects(json[@"message"], @"The operation couldn’t be completed. (domain error 68.)");
+  XCTAssertEqualObjects(json[@"message"], @"The operation couldn\u2019t be completed. (domain error 68.)");
   XCTAssertEqualObjects(json[@"domain"], @"domain");
   XCTAssertEqualObjects(json[@"userInfo"][@"NSUnderlyingError"][@"code"], @"421");
   XCTAssertEqualObjects(json[@"userInfo"][@"NSUnderlyingError"][@"message"], @"underlying error");
diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTMethodArgumentTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTMethodArgumentTests.m
@@ -15,7 +15,7 @@
 #import <UIKit/UIKit.h>
 #import <XCTest/XCTest.h>
 
-#import "RCTModuleMethod.h"
+#import <React/RCTModuleMethod.h>
 
 @interface RCTMethodArgumentTests : XCTestCase
 
diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTModuleInitNotificationRaceTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTModuleInitNotificationRaceTests.m
@@ -15,13 +15,13 @@
 #import <Foundation/Foundation.h>
 #import <XCTest/XCTest.h>
 
-#import "RCTBridge.h"
-#import "RCTBridge+Private.h"
-#import "RCTBridgeModule.h"
-#import "RCTUtils.h"
-#import "RCTUIManager.h"
-#import "RCTViewManager.h"
-#import "RCTJavaScriptExecutor.h"
+#import <React/RCTBridge+Private.h>
+#import <React/RCTBridge.h>
+#import <React/RCTBridgeModule.h>
+#import <React/RCTJavaScriptExecutor.h>
+#import <React/RCTUIManager.h>
+#import <React/RCTUtils.h>
+#import <React/RCTViewManager.h>
 
 #define RUN_RUNLOOP_WHILE(CONDITION) \
 { \
diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTModuleInitTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTModuleInitTests.m
@@ -15,11 +15,11 @@
 #import <Foundation/Foundation.h>
 #import <XCTest/XCTest.h>
 
-#import "RCTBridge.h"
-#import "RCTBridge+Private.h"
-#import "RCTBridgeModule.h"
-#import "RCTUtils.h"
-#import "RCTJavaScriptExecutor.h"
+#import <React/RCTBridge+Private.h>
+#import <React/RCTBridge.h>
+#import <React/RCTBridgeModule.h>
+#import <React/RCTJavaScriptExecutor.h>
+#import <React/RCTUtils.h>
 
 #define RUN_RUNLOOP_WHILE(CONDITION) \
 { \
diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTModuleMethodTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTModuleMethodTests.m
@@ -15,9 +15,9 @@
 #import <UIKit/UIKit.h>
 #import <XCTest/XCTest.h>
 
-#import "RCTBridgeModule.h"
-#import "RCTModuleMethod.h"
-#import "RCTLog.h"
+#import <React/RCTBridgeModule.h>
+#import <React/RCTLog.h>
+#import <React/RCTModuleMethod.h>
 
 static BOOL RCTLogsError(void (^block)(void))
 {
diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTMultipartStreamReaderTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTMultipartStreamReaderTests.m
@@ -13,8 +13,9 @@
  */
 
 #import <XCTest/XCTest.h>
-#import "RCTUtils.h"
-#import "RCTMultipartStreamReader.h"
+
+#import <React/RCTMultipartStreamReader.h>
+#import <React/RCTUtils.h>
 
 @interface RCTMultipartStreamReaderTests : XCTestCase
 
diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTShadowViewTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTShadowViewTests.m
@@ -14,8 +14,8 @@
 
 #import <XCTest/XCTest.h>
 
-#import "RCTShadowView.h"
-#import "RCTRootShadowView.h"
+#import <React/RCTRootShadowView.h>
+#import <React/RCTShadowView.h>
 
 
 @interface RCTShadowViewTests : XCTestCase
diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTUIManagerTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTUIManagerTests.m
@@ -14,8 +14,8 @@
 
 #import <XCTest/XCTest.h>
 
-#import "RCTUIManager.h"
-#import "UIView+React.h"
+#import <React/RCTUIManager.h>
+#import <React/UIView+React.h>
 
 @interface RCTUIManager (Testing)
 
diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTURLUtilsTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTURLUtilsTests.m
@@ -13,7 +13,8 @@
  */
 
 #import <XCTest/XCTest.h>
-#import "RCTUtils.h"
+
+#import <React/RCTUtils.h>
 
 @interface RCTURLUtilsTests : XCTestCase
 
diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTUnicodeDecodeTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTUnicodeDecodeTests.m
diff --git a/Libraries/Image/RCTImage.xcodeproj/project.pbxproj b/Libraries/Image/RCTImage.xcodeproj/project.pbxproj
diff --git a/Libraries/RCTTest/RCTTest.xcodeproj/project.pbxproj b/Libraries/RCTTest/RCTTest.xcodeproj/project.pbxproj
diff --git a/Libraries/RCTTest/RCTTestRunner.m b/Libraries/RCTTest/RCTTestRunner.m
diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj

Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,6 @@`
`17`	`17`
`18`	`18`	`#import <RCTTest/RCTTestRunner.h>`
`19`	`19`
`20`		`-#import "RCTAssert.h"`
`21`		`-#import "RCTRedBox.h"`
`22`		`-#import "RCTRootView.h"`
`23`		`-`
`24`	`20`	`@interface UIExplorerSnapshotTests : XCTestCase`
`25`	`21`	`{`
`26`	`22`	`RCTTestRunner *_runner;`