summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Fischer <joeljfischer@gmail.com>2021-01-27 10:55:55 -0500
committerJoel Fischer <joeljfischer@gmail.com>2021-01-27 10:55:55 -0500
commit5970f8b98911eeef191d8ce4bb1f26fb3c14f495 (patch)
tree61931619da221df7fcf01268bce571daa63c8287
parentff81c9bce110f7798520fdfeaed4bbb4d7722911 (diff)
downloadsdl_ios-5970f8b98911eeef191d8ce4bb1f26fb3c14f495.tar.gz
Remove snapshot tests, library is no longer supported
* Update test libs * Fix Xcode not running tests
-rw-r--r--Cartfile.private3
-rw-r--r--Cartfile.resolved5
-rw-r--r--SmartDeviceLink-iOS.xcodeproj/project.pbxproj12
-rw-r--r--SmartDeviceLinkTests/DevAPISpecs/SDLLockScreenViewControllerSnapshotTests.m80
-rw-r--r--carthage-build.sh2
5 files changed, 6 insertions, 96 deletions
diff --git a/Cartfile.private b/Cartfile.private
index 29600768d..cedbbe1a3 100644
--- a/Cartfile.private
+++ b/Cartfile.private
@@ -1,4 +1,3 @@
github "Quick/Quick" ~> 3.0
-github "Quick/Nimble" == 9.0.0-rc.3
+github "Quick/Nimble" ~> 9.0.0
github "erikdoe/ocmock" ~> 3.7
-github "uber/ios-snapshot-test-case" ~> 6.2
diff --git a/Cartfile.resolved b/Cartfile.resolved
index e8652705c..00e581205 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,4 +1,3 @@
-github "Quick/Nimble" "v9.0.0-rc.3"
+github "Quick/Nimble" "v9.0.0"
github "Quick/Quick" "v3.0.0"
-github "erikdoe/ocmock" "v3.7.1"
-github "uber/ios-snapshot-test-case" "6.2.0"
+github "erikdoe/ocmock" "v3.8.1"
diff --git a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
index 6c8b2b74a..12ee30fe0 100644
--- a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
+++ b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
@@ -1446,9 +1446,6 @@
5D43466F1E6F55BD00B639C6 /* SDLLogManagerSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D43466E1E6F55BD00B639C6 /* SDLLogManagerSpec.m */; };
5D4346731E6F617D00B639C6 /* TestLogTarget.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D4346721E6F617D00B639C6 /* TestLogTarget.m */; };
5D59DD471B14FDEE00BE744D /* SDLLockScreenStatusManagerSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D59DD461B14FDEE00BE744D /* SDLLockScreenStatusManagerSpec.m */; };
- 5D5DBF081D48E39C00D4F914 /* FBSnapshotTestCase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D5DBF071D48E39C00D4F914 /* FBSnapshotTestCase.framework */; };
- 5D5DBF091D48E3AC00D4F914 /* FBSnapshotTestCase.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5D5DBF071D48E39C00D4F914 /* FBSnapshotTestCase.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
- 5D5DBF0B1D48E5E600D4F914 /* SDLLockScreenViewControllerSnapshotTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D5DBF0A1D48E5E600D4F914 /* SDLLockScreenViewControllerSnapshotTests.m */; };
5D6035D2202CD46200A429C9 /* SDLSpecUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D6035D1202CD46200A429C9 /* SDLSpecUtilities.m */; };
5D6035D5202CE4A500A429C9 /* TestMultipleRequestsConnectionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D6035D4202CE4A500A429C9 /* TestMultipleRequestsConnectionManager.m */; };
5D6035D8202CF5C900A429C9 /* TestRequestProgressResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D6035D7202CF5C900A429C9 /* TestRequestProgressResponse.m */; };
@@ -1778,7 +1775,6 @@
5DA22CBB1D075DE800245F5F /* Nimble.framework in CopyFiles */,
5DA22CBC1D075DE800245F5F /* OCMock.framework in CopyFiles */,
5DA22CBE1D075DE800245F5F /* Quick.framework in CopyFiles */,
- 5D5DBF091D48E3AC00D4F914 /* FBSnapshotTestCase.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -3277,8 +3273,6 @@
5D4346721E6F617D00B639C6 /* TestLogTarget.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TestLogTarget.m; path = LoggingSpecs/TestLogTarget.m; sourceTree = "<group>"; };
5D4346851E771B5700B639C6 /* SDLLog.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SDLLog.swift; sourceTree = "<group>"; };
5D59DD461B14FDEE00BE744D /* SDLLockScreenStatusManagerSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLLockScreenStatusManagerSpec.m; path = ProxySpecs/SDLLockScreenStatusManagerSpec.m; sourceTree = "<group>"; };
- 5D5DBF071D48E39C00D4F914 /* FBSnapshotTestCase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSnapshotTestCase.framework; path = sdl_ios/Carthage/Build/iOS/FBSnapshotTestCase.framework; sourceTree = "<group>"; };
- 5D5DBF0A1D48E5E600D4F914 /* SDLLockScreenViewControllerSnapshotTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLLockScreenViewControllerSnapshotTests.m; path = DevAPISpecs/SDLLockScreenViewControllerSnapshotTests.m; sourceTree = "<group>"; };
5D6035D0202CD46200A429C9 /* SDLSpecUtilities.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SDLSpecUtilities.h; path = TestUtilities/SDLSpecUtilities.h; sourceTree = "<group>"; };
5D6035D1202CD46200A429C9 /* SDLSpecUtilities.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SDLSpecUtilities.m; path = TestUtilities/SDLSpecUtilities.m; sourceTree = "<group>"; };
5D6035D3202CE4A500A429C9 /* TestMultipleRequestsConnectionManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = TestMultipleRequestsConnectionManager.h; path = TestUtilities/TestMultipleRequestsConnectionManager.h; sourceTree = "<group>"; };
@@ -3576,7 +3570,6 @@
167ED93C1A9BCB8A00797BE5 /* SmartDeviceLink.framework in Frameworks */,
5DA22CB81D075CF200245F5F /* OCMock.framework in Frameworks */,
5DA22CBA1D075CF200245F5F /* Quick.framework in Frameworks */,
- 5D5DBF081D48E39C00D4F914 /* FBSnapshotTestCase.framework in Frameworks */,
5DA22CB71D075CF200245F5F /* Nimble.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -4110,7 +4103,6 @@
167ED9231A9BB86300797BE5 /* Libraries */ = {
isa = PBXGroup;
children = (
- 5D5DBF071D48E39C00D4F914 /* FBSnapshotTestCase.framework */,
5DA22CB31D075CF200245F5F /* Nimble.framework */,
5DA22CB41D075CF200245F5F /* OCMock.framework */,
5DA22CB61D075CF200245F5F /* Quick.framework */,
@@ -6361,7 +6353,6 @@
5DAD5F8120507DE40025624C /* Screen */,
DA8966ED1E5693D100413EAB /* Streaming */,
880E35B62088F77C00181259 /* System Capabilities */,
- 5D5DBF0A1D48E5E600D4F914 /* SDLLockScreenViewControllerSnapshotTests.m */,
);
name = Managers;
sourceTree = "<group>";
@@ -8606,7 +8597,6 @@
162E83161A9BDE8B00906325 /* SDLOnHashChangeSpec.m in Sources */,
8886EB982111F4FA008294A5 /* SDLFileManagerConfigurationSpec.m in Sources */,
162E82FE1A9BDE8B00906325 /* SDLTBTStateSpec.m in Sources */,
- 5D5DBF0B1D48E5E600D4F914 /* SDLLockScreenViewControllerSnapshotTests.m in Sources */,
5DB1BCD41D243A8E002FFC37 /* SDLListFilesOperationSpec.m in Sources */,
8863747E22D650DE00D2671F /* SDLCloseApplicationSpec.m in Sources */,
162E834B1A9BDE8B00906325 /* SDLAlertManeuverResponseSpec.m in Sources */,
@@ -9215,6 +9205,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
+ VALIDATE_WORKSPACE = NO;
};
name = Debug;
};
@@ -9247,6 +9238,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.smartdevicelink.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
+ VALIDATE_WORKSPACE = NO;
};
name = Release;
};
diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLLockScreenViewControllerSnapshotTests.m b/SmartDeviceLinkTests/DevAPISpecs/SDLLockScreenViewControllerSnapshotTests.m
deleted file mode 100644
index 341e10105..000000000
--- a/SmartDeviceLinkTests/DevAPISpecs/SDLLockScreenViewControllerSnapshotTests.m
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// SDLLockScreenViewControllerSnapshotTests.m
-// SmartDeviceLink-iOS
-//
-// Created by Joel Fischer on 7/27/16.
-// Copyright © 2016 smartdevicelink. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import <FBSnapshotTestCase/FBSnapshotTestCase.h>
-
-#import "SDLLockScreenConfiguration.h"
-#import "SDLLockScreenViewController.h"
-
-
-@interface SDLLockScreenViewControllerSnapshotTests : FBSnapshotTestCase
-
-@property (strong, nonatomic) SDLLockScreenViewController *lockScreenViewController;
-
-@end
-
-
-@implementation SDLLockScreenViewControllerSnapshotTests
-
-- (void)setUp {
- [super setUp];
-
- self.lockScreenViewController = [[UIStoryboard storyboardWithName:@"SDLLockScreen" bundle:[NSBundle bundleForClass:[self class]]] instantiateInitialViewController];
- self.lockScreenViewController.view.frame = [[UIScreen mainScreen] bounds];
-
-// self.deviceAgnostic = YES;
-// self.recordMode = YES;
-}
-
-- (void)tearDown {
- // Put teardown code here. This method is called after the invocation of each test method in the class.
- [super tearDown];
-}
-
-- (void)testNoAppNoVehicleIcons {
- self.lockScreenViewController.appIcon = nil;
- self.lockScreenViewController.vehicleIcon = nil;
- self.lockScreenViewController.backgroundColor = [SDLLockScreenConfiguration enabledConfiguration].backgroundColor;
-
- FBSnapshotVerifyView(self.lockScreenViewController.view, nil);
-}
-
-- (void)testOnlyAppIcon {
- self.lockScreenViewController.appIcon = [UIImage imageNamed:@"TestLockScreenAppIcon" inBundle:[NSBundle bundleForClass:[self class]] compatibleWithTraitCollection:nil];
- self.lockScreenViewController.vehicleIcon = nil;
- self.lockScreenViewController.backgroundColor = [SDLLockScreenConfiguration enabledConfiguration].backgroundColor;
-
- FBSnapshotVerifyView(self.lockScreenViewController.view, nil);
-}
-
-- (void)testOnlyVehicleIcon {
- self.lockScreenViewController.appIcon = nil;
- self.lockScreenViewController.vehicleIcon = [UIImage imageNamed:@"testImagePNG" inBundle:[NSBundle bundleForClass:[self class]] compatibleWithTraitCollection:nil];
- self.lockScreenViewController.backgroundColor = [SDLLockScreenConfiguration enabledConfiguration].backgroundColor;
-
- FBSnapshotVerifyView(self.lockScreenViewController.view, nil);
-}
-
-- (void)testAppAndVehicleIcons {
- self.lockScreenViewController.appIcon = [UIImage imageNamed:@"TestLockScreenAppIcon" inBundle:[NSBundle bundleForClass:[self class]] compatibleWithTraitCollection:nil];;
- self.lockScreenViewController.vehicleIcon = [UIImage imageNamed:@"testImagePNG" inBundle:[NSBundle bundleForClass:[self class]] compatibleWithTraitCollection:nil];
- self.lockScreenViewController.backgroundColor = [SDLLockScreenConfiguration enabledConfiguration].backgroundColor;
-
- FBSnapshotVerifyView(self.lockScreenViewController.view, nil);
-}
-
-- (void)testLightBackgroundNoAppNoVehicleIcons {
- self.lockScreenViewController.appIcon = nil;
- self.lockScreenViewController.vehicleIcon = nil;
- self.lockScreenViewController.backgroundColor = [UIColor whiteColor];
-
- FBSnapshotVerifyView(self.lockScreenViewController.view, nil);
-}
-
-@end
diff --git a/carthage-build.sh b/carthage-build.sh
index 0dcdefdee..c50df1cba 100644
--- a/carthage-build.sh
+++ b/carthage-build.sh
@@ -18,4 +18,4 @@ echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x8
echo 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig
export XCODE_XCCONFIG_FILE="$xcconfig"
-carthage build "$@" \ No newline at end of file
+carthage "$@" \ No newline at end of file