Clean up headers for unit tests

strongloop-community · Nov 13, 2015 · 281f790 · 281f790
1 parent 375c2f1
commit 281f790
Show file tree

Hide file tree

Showing 27 changed files with 41 additions and 214 deletions.
diff --git a/LoopBack.xcodeproj/project.pbxproj b/LoopBack.xcodeproj/project.pbxproj
diff --git a/LoopBack/LBInstallation.h b/LoopBack/LBInstallation.h
@@ -5,7 +5,8 @@
  * @copyright (c) 2013 StrongLoop. All rights reserved.
  */
 
-#import "LoopBack.h"
+#import "LBPersistedModel.h"
+#import "LBRESTAdapter.h"
 
 @class LBInstallation;
 @class LBInstallationRepository;

diff --git a/LoopBackTests/LBContainerTests.h b/LoopBackTests/LBContainerTests.h
diff --git a/LoopBackTests/LBContainerTests.m b/LoopBackTests/LBContainerTests.m
@@ -6,12 +6,13 @@
 //  Copyright (c) 2014 StrongLoop. All rights reserved.
 //
 
-#import "LBContainerTests.h"
+#import <XCTest/XCTest.h>
 
 #import "LBContainer.h"
 #import "LBRESTAdapter.h"
+#import "SLRemotingTestsUtils.h"
 
-@interface LBContainerTests ()
+@interface LBContainerTests : XCTestCase
 
 @property (nonatomic) LBContainerRepository *repository;
 

diff --git a/LoopBackTests/LBFileTests.h b/LoopBackTests/LBFileTests.h
diff --git a/LoopBackTests/LBFileTests.m b/LoopBackTests/LBFileTests.m
@@ -6,12 +6,13 @@
 //  Copyright (c) 2014 StrongLoop. All rights reserved.
 //
 
-#import "LBFileTests.h"
+#import <XCTest/XCTest.h>
 
 #import "LBFile.h"
 #import "LBRESTAdapter.h"
+#import "SLRemotingTestsUtils.h"
 
-@interface LBFileTests ()
+@interface LBFileTests : XCTestCase
 
 @property (nonatomic) LBFileRepository *repository;
 

diff --git a/LoopBackTests/LBInstallationTests.h b/LoopBackTests/LBInstallationTests.h
diff --git a/LoopBackTests/LBInstallationTests.m b/LoopBackTests/LBInstallationTests.m
@@ -6,17 +6,14 @@
 //  Copyright (c) 2013 StrongLoop. All rights reserved.
 //
 
-#import "LBInstallationTests.h"
+#import <XCTest/XCTest.h>
 
-#import "LBModel.h"
-#import "LBRESTAdapter.h"
 #import "LBInstallation.h"
+#import "SLRemotingTestsUtils.h"
 
 static id lastId = nil;
 
-@interface LBInstallationTests()
-
-+ (id)defaultTestSuite;
+@interface LBInstallationTests : XCTestCase
 
 @property (nonatomic) LBInstallationRepository *repository;
 @property (nonatomic) NSData *testToken;

diff --git a/LoopBackTests/LBModelTests.h b/LoopBackTests/LBModelTests.h
diff --git a/LoopBackTests/LBModelTests.m b/LoopBackTests/LBModelTests.m
@@ -5,12 +5,12 @@
 //  Copyright (c) 2015 StrongLoop. All rights reserved.
 //
 
-#import "LBModelTests.h"
+#import <XCTest/XCTest.h>
 
 #import "LBModel.h"
 #import "LBRESTAdapter.h"
 
-@interface LBModelTests()
+@interface LBModelTests : XCTestCase
 
 @property (nonatomic) LBModelRepository *repository;
 

diff --git a/LoopBackTests/LBPersistedModelSubclassingTests.h b/LoopBackTests/LBPersistedModelSubclassingTests.h
diff --git a/LoopBackTests/LBPersistedModelSubclassingTests.m b/LoopBackTests/LBPersistedModelSubclassingTests.m
@@ -6,10 +6,11 @@
 //  Copyright (c) 2013 StrongLoop. All rights reserved.
 //
 
-#import "LBPersistedModelSubclassingTests.h"
+#import <XCTest/XCTest.h>
 
 #import "LBPersistedModel.h"
 #import "LBRESTAdapter.h"
+#import "SLRemotingTestsUtils.h"
 
 static NSNumber *lastId;
 
@@ -43,7 +44,7 @@ + (instancetype)repository {
 
 @end
 
-@interface LBPersistedModelSubclassingTests()
+@interface LBPersistedModelSubclassingTests : XCTestCase
 
 @property (nonatomic) WidgetRepository *repository;
 

diff --git a/LoopBackTests/LBPersistedModelTests.h b/LoopBackTests/LBPersistedModelTests.h
diff --git a/LoopBackTests/LBPersistedModelTests.m b/LoopBackTests/LBPersistedModelTests.m
@@ -6,14 +6,15 @@
 //  Copyright (c) 2013 StrongLoop. All rights reserved.
 //
 
-#import "LBPersistedModelTests.h"
+#import <XCTest/XCTest.h>
 
 #import "LBPersistedModel.h"
 #import "LBRESTAdapter.h"
+#import "SLRemotingTestsUtils.h"
 
 static NSNumber *lastId;
 
-@interface LBPersistedModelTests()
+@interface LBPersistedModelTests : XCTestCase
 
 @property (nonatomic) LBPersistedModelRepository *repository;
 

diff --git a/LoopBackTests/LBUserTests.h b/LoopBackTests/LBUserTests.h
diff --git a/LoopBackTests/LBUserTests.m b/LoopBackTests/LBUserTests.m
@@ -6,10 +6,11 @@
 //  Copyright (c) 2014 StrongLoop. All rights reserved.
 //
 
-#import "LBUserTests.h"
+#import <XCTest/XCTest.h>
 
 #import "LBUser.h"
 #import "LBRESTAdapter.h"
+#import "SLRemotingTestsUtils.h"
 
 static NSString * const DEFAULTS_CURRENT_USER_ID_KEY = @"LBUserRepositoryCurrentUserId";
 static NSString * const USER_EMAIL_DOMAIN = @"@test.com";
@@ -44,7 +45,7 @@ + (instancetype)repository {
 @end
 
 
-@interface LBUserTests ()
+@interface LBUserTests : XCTestCase
 
 @property (nonatomic, strong) LBRESTAdapter *adapter;
 @property (nonatomic, strong) CustomerRepository *repository;

diff --git a/SLRemoting/SLRESTAdapter.h b/SLRemoting/SLRESTAdapter.h
@@ -5,7 +5,6 @@
  * @copyright (c) 2013 StrongLoop. All rights reserved.
  */
 
-#import "SLRemotingUtils.h"
 #import "SLAdapter.h"
 #import "SLRESTContract.h"
 

diff --git a/SLRemoting/SLRemoting.h b/SLRemoting/SLRemoting.h
@@ -8,7 +8,6 @@
 #ifndef __SL_REMOTING_H
 #define __SL_REMOTING_H
 
-#import "SLRemotingUtils.h"
 #import "SLAdapter.h"
 #import "SLRESTAdapter.h"
 #import "SLRESTContract.h"

diff --git a/SLRemoting/SLRemotingUtils.h → SLRemoting/SLRemotingTestsUtils.h b/SLRemoting/SLRemotingUtils.h → SLRemoting/SLRemotingTestsUtils.h
@@ -1,5 +1,5 @@
 /**
- * @file SLRemotingUtils.h
+ * @file SLRemotingTestsUtils.h
  *
  * @author Michael Schoonmaker
  * @copyright (c) 2013 StrongLoop. All rights reserved.
@@ -30,10 +30,3 @@
     XCTFail(@"Test failed: %@", error.description); \
     [expectation fulfill]; \
 }
-
-/**
- * A container for helper methods.
- */
-@interface SLRemotingUtils : NSObject
-
-@end
diff --git a/SLRemoting/SLRemotingUtils.m b/SLRemoting/SLRemotingUtils.m
diff --git a/SLRemotingTests/SLRESTAdapterNonRootTests.h b/SLRemotingTests/SLRESTAdapterNonRootTests.h
diff --git a/SLRemotingTests/SLRESTAdapterNonRootTests.m b/SLRemotingTests/SLRESTAdapterNonRootTests.m
@@ -6,12 +6,13 @@
 //  Copyright (c) 2013 StrongLoop. All rights reserved.
 //
 
-#import "SLRESTAdapterNonRootTests.h"
+#import <XCTest/XCTest.h>
 
 #import "SLRESTAdapter.h"
 #import "SLObject.h"
+#import "SLRemotingTestsUtils.h"
 
-@interface SLRESTAdapterNonRootTests() {
+@interface SLRESTAdapterNonRootTests : XCTestCase {
     SLRESTAdapter *adapter;
 }
 

diff --git a/SLRemotingTests/SLRESTAdapterSSLTests.m b/SLRemotingTests/SLRESTAdapterSSLTests.m
@@ -6,12 +6,13 @@
 //  Copyright (c) 2013 StrongLoop. All rights reserved.
 //
 
-#import "SLRESTAdapterTests.h"
+#import <XCTest/XCTest.h>
 
 #import "SLRESTAdapter.h"
 #import "SLObject.h"
+#import "SLRemotingTestsUtils.h"
 
-@interface SLRESTAdapterSSLTests : SLRESTAdapterTests {
+@interface SLRESTAdapterSSLTests : XCTestCase {
     SLRESTAdapter *adapter;
     SLRepository *TestClass;
 }

diff --git a/SLRemotingTests/SLRESTAdapterTests.h b/SLRemotingTests/SLRESTAdapterTests.h
diff --git a/SLRemotingTests/SLRESTAdapterTests.m b/SLRemotingTests/SLRESTAdapterTests.m
@@ -6,12 +6,13 @@
 //  Copyright (c) 2013 StrongLoop. All rights reserved.
 //
 
-#import "SLRESTAdapterTests.h"
+#import <XCTest/XCTest.h>
 
 #import "SLRESTAdapter.h"
 #import "SLObject.h"
+#import "SLRemotingTestsUtils.h"
 
-@interface SLRESTAdapterTests() {
+@interface SLRESTAdapterTests : XCTestCase {
     SLRESTAdapter *adapter;
     SLRepository *TestClass;
 }

diff --git a/SLRemotingTests/SLRESTContractTests.h b/SLRemotingTests/SLRESTContractTests.h
diff --git a/SLRemotingTests/SLRESTContractTests.m b/SLRemotingTests/SLRESTContractTests.m
@@ -6,14 +6,15 @@
 //  Copyright (c) 2013 StrongLoop. All rights reserved.
 //
 
-#import "SLRESTContractTests.h"
+#import <XCTest/XCTest.h>
 
 #import "SLRESTAdapter.h"
 #import "SLObject.h"
+#import "SLRemotingTestsUtils.h"
 
 static NSString * const SERVER_URL = @"http://localhost:3001";
 
-@interface SLRESTContractTests() {
+@interface SLRESTContractTests : XCTestCase {
     SLRESTAdapter *adapter;
     SLRepository *TestClass;
 }