diff --git a/GoogleUtilities.podspec b/GoogleUtilities.podspec index 6dff77f..9ad0be7 100644 --- a/GoogleUtilities.podspec +++ b/GoogleUtilities.podspec @@ -129,8 +129,8 @@ other Google CocoaPods. They're not intended for direct public usage. s.test_spec 'unit' do |unit_tests| # All tests require arc except Tests/Network/third_party/GTMHTTPServer.m unit_tests.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'} - unit_tests.source_files = 'GoogleUtilities/Example/Tests/**/*.[mh]' - unit_tests.requires_arc = 'GoogleUtilities/Example/Tests/*/*.[mh]' + unit_tests.source_files = 'GoogleUtilities/Tests/Unit/**/*.[mh]' + unit_tests.requires_arc = 'GoogleUtilities/Tests/Unit/*/*.[mh]' unit_tests.requires_app_host = true unit_tests.dependency 'OCMock' end diff --git a/GoogleUtilities/Example/Tests/Tests-Info.plist b/GoogleUtilities/Example/Tests/Tests-Info.plist deleted file mode 100644 index 169b6f7..0000000 --- a/GoogleUtilities/Example/Tests/Tests-Info.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - - diff --git a/GoogleUtilities/Example/Tests/Environment/GULAppEnvironmentUtilTest.m b/GoogleUtilities/Tests/Unit/Environment/GULAppEnvironmentUtilTest.m similarity index 98% rename from GoogleUtilities/Example/Tests/Environment/GULAppEnvironmentUtilTest.m rename to GoogleUtilities/Tests/Unit/Environment/GULAppEnvironmentUtilTest.m index 4776d78..0e23b30 100644 --- a/GoogleUtilities/Example/Tests/Environment/GULAppEnvironmentUtilTest.m +++ b/GoogleUtilities/Tests/Unit/Environment/GULAppEnvironmentUtilTest.m @@ -13,8 +13,8 @@ // limitations under the License. #import -#import #import +#import "OCMock.h" #import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" diff --git a/GoogleUtilities/Example/Tests/Environment/GULHeartbeatDateStorageTest.m b/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageTest.m similarity index 100% rename from GoogleUtilities/Example/Tests/Environment/GULHeartbeatDateStorageTest.m rename to GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageTest.m diff --git a/GoogleUtilities/Example/Tests/Environment/GULKeychainStorageTests.m b/GoogleUtilities/Tests/Unit/Environment/GULKeychainStorageTests.m similarity index 98% rename from GoogleUtilities/Example/Tests/Environment/GULKeychainStorageTests.m rename to GoogleUtilities/Tests/Unit/Environment/GULKeychainStorageTests.m index d6a5c7a..6e74351 100644 --- a/GoogleUtilities/Example/Tests/Environment/GULKeychainStorageTests.m +++ b/GoogleUtilities/Tests/Unit/Environment/GULKeychainStorageTests.m @@ -16,9 +16,9 @@ #import -#import #import "FBLPromise+Testing.h" -#import "GoogleUtilities/Example/Tests/Utils/GULTestKeychain.h" +#import "GoogleUtilities/Tests/Unit/Utils/GULTestKeychain.h" +#import "OCMock.h" #import "GoogleUtilities/Environment/Private/GULKeychainStorage.h" diff --git a/GoogleUtilities/Example/Tests/Logger/GULLoggerTest.m b/GoogleUtilities/Tests/Unit/Logger/GULLoggerTest.m similarity index 99% rename from GoogleUtilities/Example/Tests/Logger/GULLoggerTest.m rename to GoogleUtilities/Tests/Unit/Logger/GULLoggerTest.m index 25445ad..8376394 100644 --- a/GoogleUtilities/Example/Tests/Logger/GULLoggerTest.m +++ b/GoogleUtilities/Tests/Unit/Logger/GULLoggerTest.m @@ -15,8 +15,8 @@ #ifdef DEBUG // The tests depend upon library methods only built with #ifdef DEBUG -#import #import +#import "OCMock.h" #import "GoogleUtilities/Logger/Private/GULLogger.h" diff --git a/GoogleUtilities/Example/Tests/Network/GULMutableDictionaryTest.m b/GoogleUtilities/Tests/Unit/Network/GULMutableDictionaryTest.m similarity index 100% rename from GoogleUtilities/Example/Tests/Network/GULMutableDictionaryTest.m rename to GoogleUtilities/Tests/Unit/Network/GULMutableDictionaryTest.m diff --git a/GoogleUtilities/Example/Tests/Network/GULNetworkTest.m b/GoogleUtilities/Tests/Unit/Network/GULNetworkTest.m similarity index 99% rename from GoogleUtilities/Example/Tests/Network/GULNetworkTest.m rename to GoogleUtilities/Tests/Unit/Network/GULNetworkTest.m index 41a1881..7f29043 100644 --- a/GoogleUtilities/Example/Tests/Network/GULNetworkTest.m +++ b/GoogleUtilities/Tests/Unit/Network/GULNetworkTest.m @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "GoogleUtilities/Example/Tests/Network/third_party/GTMHTTPServer.h" +#import "GoogleUtilities/Tests/Unit/Network/third_party/GTMHTTPServer.h" -#import #import +#import "OCMock.h" #import "GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h" #import "GoogleUtilities/Network/Private/GULNetwork.h" diff --git a/GoogleUtilities/Example/Tests/Network/third_party/GTMHTTPServer.h b/GoogleUtilities/Tests/Unit/Network/third_party/GTMHTTPServer.h similarity index 100% rename from GoogleUtilities/Example/Tests/Network/third_party/GTMHTTPServer.h rename to GoogleUtilities/Tests/Unit/Network/third_party/GTMHTTPServer.h diff --git a/GoogleUtilities/Example/Tests/Network/third_party/GTMHTTPServer.m b/GoogleUtilities/Tests/Unit/Network/third_party/GTMHTTPServer.m similarity index 99% rename from GoogleUtilities/Example/Tests/Network/third_party/GTMHTTPServer.m rename to GoogleUtilities/Tests/Unit/Network/third_party/GTMHTTPServer.m index 95adbae..4972645 100644 --- a/GoogleUtilities/Example/Tests/Network/third_party/GTMHTTPServer.m +++ b/GoogleUtilities/Tests/Unit/Network/third_party/GTMHTTPServer.m @@ -51,7 +51,7 @@ #import #define GTMHTTPSERVER_DEFINE_GLOBALS -#import "GoogleUtilities/Example/Tests/Network/third_party/GTMHTTPServer.h" +#import "GoogleUtilities/Tests/Unit/Network/third_party/GTMHTTPServer.h" // avoid some of GTM's promiscuous dependencies #ifndef _GTMDevLog diff --git a/GoogleUtilities/Example/Tests/Network/third_party/LICENSE b/GoogleUtilities/Tests/Unit/Network/third_party/LICENSE similarity index 100% rename from GoogleUtilities/Example/Tests/Network/third_party/LICENSE rename to GoogleUtilities/Tests/Unit/Network/third_party/LICENSE diff --git a/GoogleUtilities/Example/Tests/Reachability/GULReachabilityCheckerTest.m b/GoogleUtilities/Tests/Unit/Reachability/GULReachabilityCheckerTest.m similarity index 100% rename from GoogleUtilities/Example/Tests/Reachability/GULReachabilityCheckerTest.m rename to GoogleUtilities/Tests/Unit/Reachability/GULReachabilityCheckerTest.m diff --git a/GoogleUtilities/Example/Tests/SecureCoding/GULSecureCodingTests.m b/GoogleUtilities/Tests/Unit/SecureCoding/GULSecureCodingTests.m similarity index 100% rename from GoogleUtilities/Example/Tests/SecureCoding/GULSecureCodingTests.m rename to GoogleUtilities/Tests/Unit/SecureCoding/GULSecureCodingTests.m diff --git a/GoogleUtilities/Example/Tests/Swizzler/GULAppDelegateSwizzlerTest.m b/GoogleUtilities/Tests/Unit/Swizzler/GULAppDelegateSwizzlerTest.m similarity index 99% rename from GoogleUtilities/Example/Tests/Swizzler/GULAppDelegateSwizzlerTest.m rename to GoogleUtilities/Tests/Unit/Swizzler/GULAppDelegateSwizzlerTest.m index 5bf585d..d9a02f4 100644 --- a/GoogleUtilities/Example/Tests/Swizzler/GULAppDelegateSwizzlerTest.m +++ b/GoogleUtilities/Tests/Unit/Swizzler/GULAppDelegateSwizzlerTest.m @@ -15,9 +15,9 @@ #import "GoogleUtilities/AppDelegateSwizzler/Internal/GULAppDelegateSwizzler_Private.h" #import "GoogleUtilities/AppDelegateSwizzler/Private/GULAppDelegateSwizzler.h" -#import #import #import +#import "OCMock.h" #if (defined(__IPHONE_9_0) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_9_0)) #define SDK_HAS_USERACTIVITY 1 diff --git a/GoogleUtilities/Example/Tests/Swizzler/GULObjectSwizzlerTest.m b/GoogleUtilities/Tests/Unit/Swizzler/GULObjectSwizzlerTest.m similarity index 100% rename from GoogleUtilities/Example/Tests/Swizzler/GULObjectSwizzlerTest.m rename to GoogleUtilities/Tests/Unit/Swizzler/GULObjectSwizzlerTest.m diff --git a/GoogleUtilities/Example/Tests/Swizzler/GULRuntimeClassDiffTests.m b/GoogleUtilities/Tests/Unit/Swizzler/GULRuntimeClassDiffTests.m similarity index 100% rename from GoogleUtilities/Example/Tests/Swizzler/GULRuntimeClassDiffTests.m rename to GoogleUtilities/Tests/Unit/Swizzler/GULRuntimeClassDiffTests.m diff --git a/GoogleUtilities/Example/Tests/Swizzler/GULRuntimeClassSnapshotTests.m b/GoogleUtilities/Tests/Unit/Swizzler/GULRuntimeClassSnapshotTests.m similarity index 100% rename from GoogleUtilities/Example/Tests/Swizzler/GULRuntimeClassSnapshotTests.m rename to GoogleUtilities/Tests/Unit/Swizzler/GULRuntimeClassSnapshotTests.m diff --git a/GoogleUtilities/Example/Tests/Swizzler/GULRuntimeDiffTests.m b/GoogleUtilities/Tests/Unit/Swizzler/GULRuntimeDiffTests.m similarity index 100% rename from GoogleUtilities/Example/Tests/Swizzler/GULRuntimeDiffTests.m rename to GoogleUtilities/Tests/Unit/Swizzler/GULRuntimeDiffTests.m diff --git a/GoogleUtilities/Example/Tests/Swizzler/GULRuntimeSnapshotTests.m b/GoogleUtilities/Tests/Unit/Swizzler/GULRuntimeSnapshotTests.m similarity index 100% rename from GoogleUtilities/Example/Tests/Swizzler/GULRuntimeSnapshotTests.m rename to GoogleUtilities/Tests/Unit/Swizzler/GULRuntimeSnapshotTests.m diff --git a/GoogleUtilities/Example/Tests/Swizzler/GULRuntimeStateHelperTests.m b/GoogleUtilities/Tests/Unit/Swizzler/GULRuntimeStateHelperTests.m similarity index 100% rename from GoogleUtilities/Example/Tests/Swizzler/GULRuntimeStateHelperTests.m rename to GoogleUtilities/Tests/Unit/Swizzler/GULRuntimeStateHelperTests.m diff --git a/GoogleUtilities/Example/Tests/Swizzler/GULSceneDelegateSwizzlerTest.m b/GoogleUtilities/Tests/Unit/Swizzler/GULSceneDelegateSwizzlerTest.m similarity index 99% rename from GoogleUtilities/Example/Tests/Swizzler/GULSceneDelegateSwizzlerTest.m rename to GoogleUtilities/Tests/Unit/Swizzler/GULSceneDelegateSwizzlerTest.m index e97d675..ba43730 100644 --- a/GoogleUtilities/Example/Tests/Swizzler/GULSceneDelegateSwizzlerTest.m +++ b/GoogleUtilities/Tests/Unit/Swizzler/GULSceneDelegateSwizzlerTest.m @@ -15,9 +15,9 @@ #import "GoogleUtilities/SceneDelegateSwizzler/Internal/GULSceneDelegateSwizzler_Private.h" #import "GoogleUtilities/SceneDelegateSwizzler/Private/GULSceneDelegateSwizzler.h" -#import #import #import +#import "OCMock.h" /** Plist key that allows Firebase developers to disable Scene Delegate Proxying. Source of truth * is the GULAppDelegateSwizzler class. diff --git a/GoogleUtilities/Example/Tests/Swizzler/GULSwizzlerInheritedMethodsSwizzlingTest.m b/GoogleUtilities/Tests/Unit/Swizzler/GULSwizzlerInheritedMethodsSwizzlingTest.m similarity index 100% rename from GoogleUtilities/Example/Tests/Swizzler/GULSwizzlerInheritedMethodsSwizzlingTest.m rename to GoogleUtilities/Tests/Unit/Swizzler/GULSwizzlerInheritedMethodsSwizzlingTest.m diff --git a/GoogleUtilities/Example/Tests/Swizzler/GULSwizzlerTest.m b/GoogleUtilities/Tests/Unit/Swizzler/GULSwizzlerTest.m similarity index 100% rename from GoogleUtilities/Example/Tests/Swizzler/GULSwizzlerTest.m rename to GoogleUtilities/Tests/Unit/Swizzler/GULSwizzlerTest.m diff --git a/GoogleUtilities/Example/Tests/Swizzler/GULSwizzlingCacheTest.m b/GoogleUtilities/Tests/Unit/Swizzler/GULSwizzlingCacheTest.m similarity index 100% rename from GoogleUtilities/Example/Tests/Swizzler/GULSwizzlingCacheTest.m rename to GoogleUtilities/Tests/Unit/Swizzler/GULSwizzlingCacheTest.m diff --git a/GoogleUtilities/Example/Tests/UserDefaults/GULUserDefaultsTests.m b/GoogleUtilities/Tests/Unit/UserDefaults/GULUserDefaultsTests.m similarity index 99% rename from GoogleUtilities/Example/Tests/UserDefaults/GULUserDefaultsTests.m rename to GoogleUtilities/Tests/Unit/UserDefaults/GULUserDefaultsTests.m index 205e308..583a7e6 100644 --- a/GoogleUtilities/Example/Tests/UserDefaults/GULUserDefaultsTests.m +++ b/GoogleUtilities/Tests/Unit/UserDefaults/GULUserDefaultsTests.m @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import #import +#import "OCMock.h" #import "GoogleUtilities/Network/Private/GULMutableDictionary.h" #import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" diff --git a/GoogleUtilities/Example/Tests/Utils/GULTestKeychain.h b/GoogleUtilities/Tests/Unit/Utils/GULTestKeychain.h similarity index 100% rename from GoogleUtilities/Example/Tests/Utils/GULTestKeychain.h rename to GoogleUtilities/Tests/Unit/Utils/GULTestKeychain.h diff --git a/GoogleUtilities/Example/Tests/Utils/GULTestKeychain.m b/GoogleUtilities/Tests/Unit/Utils/GULTestKeychain.m similarity index 96% rename from GoogleUtilities/Example/Tests/Utils/GULTestKeychain.m rename to GoogleUtilities/Tests/Unit/Utils/GULTestKeychain.m index c70e493..27bf4a3 100644 --- a/GoogleUtilities/Example/Tests/Utils/GULTestKeychain.m +++ b/GoogleUtilities/Tests/Unit/Utils/GULTestKeychain.m @@ -16,7 +16,7 @@ #if TARGET_OS_OSX -#import "GoogleUtilities/Example/Tests/Utils/GULTestKeychain.h" +#import "GoogleUtilities/Tests/Unit/Utils/GULTestKeychain.h" #import