Improve xctool tests.

Author: ExtremeMan

xctool/xctool-tests/LaunchHandlers.m

@@ -34,7 +34,7 @@ BOOL IsSimctlSpawnXctestTask(NSTask *task)
   }
 
   for (NSString *arg in [task arguments]) {
-    if ([arg hasSuffix:@"usr/bin/xctest"]) {
+    if ([arg hasSuffix:@"xctest"]) {
       return YES;
     }
   }

xctool/xctool-tests/RunTestsActionTests.m

@@ -255,8 +255,8 @@ - (void)testRunTestsAction
     tool.arguments = @[@"-project", TEST_DATA @"TestProject-Library/TestProject-Library.xcodeproj",
                        @"-scheme", @"TestProject-Library",
                        @"-configuration", @"Debug",
-                       @"-sdk", @"iphonesimulator6.0",
-                       @"-destination", @"arch=i386",
+                       @"-sdk", @"iphonesimulator",
+                       @"-destination", @"arch=i386,name=iPhone 5s",
                        @"run-tests",
                        @"-reporter", @"plain",
                        ];
@@ -270,8 +270,8 @@ - (void)testRunTestsAction
     assertThat([launchedTasks[0] arguments],
                equalTo(@[
                        @"-configuration", @"Debug",
-                       @"-sdk", @"iphonesimulator6.0",
-                       @"-destination", @"arch=i386",
+                       @"-sdk", @"iphonesimulator6.1",
+                       @"-destination", @"arch=i386,name=iPhone 5s",
                        @"-destination-timeout", @"10",
                        @"PLATFORM_NAME=iphonesimulator",
                        @"-project", TEST_DATA @"TestProject-Library/TestProject-Library.xcodeproj",
@@ -414,7 +414,7 @@ - (void)testRunTestsActionAgainstProjectWithNonExistingTargetInScheme
       @"-scheme", scheme,
       @"-configuration", @"Debug",
       @"-sdk", @"iphonesimulator",
-      @"-destination", @"arch=i386",
+      @"-destination", @"arch=i386,name=iPhone 5",
       @"run-tests",
       @"-reporter", @"plain",
     ];
@@ -428,7 +428,7 @@ - (void)testRunTestsActionAgainstProjectWithNonExistingTargetInScheme
     assertThat([launchedTasks[0] arguments], equalTo(@[
       @"-configuration", @"Debug",
       @"-sdk", @"iphonesimulator6.1",
-      @"-destination", @"arch=i386",
+      @"-destination", @"arch=i386,name=iPhone 5",
       @"-destination-timeout", @"10",
       @"PLATFORM_NAME=iphonesimulator",
       @"-project", projectPath,
@@ -489,8 +489,8 @@ - (void)testRunTestsActionWithListTestsOnlyOption
       @"-project", projectPath,
       @"-scheme", scheme,
       @"-configuration", @"Debug",
-      @"-sdk", @"iphonesimulator6.0",
-      @"-destination", @"arch=i386",
+      @"-sdk", @"iphonesimulator",
+      @"-destination", @"arch=i386,name=iPhone 5s",
       @"run-tests",
       @"listTestsOnly",
       @"-reporter", @"json-stream"
@@ -559,8 +559,8 @@ - (void)testCanRunTestsAgainstDifferentTestSDK
       @"-project", projectPath,
       @"-scheme", scheme,
       @"-configuration", @"Debug",
-      @"-sdk", @"iphonesimulator6.0",
-      @"-destination", @"arch=i386",
+      @"-sdk", @"iphonesimulator",
+      @"-destination", @"arch=i386,name=iPhone 5s",
       @"run-tests", @"-test-sdk", @"iphonesimulator5.0",
       @"-reporter", @"plain",
     ];
@@ -575,7 +575,7 @@ - (void)testCanRunTestsAgainstDifferentTestSDK
     assertThat([launchedTasks[0] arguments], equalTo(@[
       @"-configuration", @"Debug",
       @"-sdk", @"iphonesimulator5.0",
-      @"-destination", @"arch=i386",
+      @"-destination", @"arch=i386,name=iPhone 5s",
       @"-destination-timeout", @"10",
       @"PLATFORM_NAME=iphonesimulator",
       @"-project", projectPath,
@@ -645,8 +645,8 @@ - (void)testCanSelectSpecificTestClassOrTestMethodsWithOnlyAndOmit
         @"-project", projectPath,
         @"-scheme", scheme,
         @"-configuration", @"Debug",
-        @"-sdk", @"iphonesimulator6.0",
-        @"-destination", @"arch=i386",
+        @"-sdk", @"iphonesimulator",
+        @"-destination", @"arch=i386,name=iPhone 5s",
         @"run-tests"
       ] mutableCopy];
       for (NSString *value in values) {
@@ -963,7 +963,7 @@ - (void)testConfigurationIsTakenFromScheme
                        @"-scheme", @"TestProject-Library",
                        @"-sdk", @"iphonesimulator",
                        @"-arch", @"i386",
-                       @"-destination", @"arch=i386",
+                       @"-destination", @"arch=i386,name=iPhone 5s",
                        @"run-tests",
                        @"-reporter", @"plain",
                        ];
@@ -980,7 +980,7 @@ - (void)testConfigurationIsTakenFromScheme
                        @"iphonesimulator6.1",
                        @"-arch",
                        @"i386",
-                       @"-destination", @"arch=i386",
+                       @"-destination", @"arch=i386,name=iPhone 5s",
                        @"-destination-timeout", @"10",
                        @"PLATFORM_NAME=iphonesimulator",
                        @"-project",

xctool/xctool/SimulatorWrapper/SimulatorInfo.m

@@ -198,7 +198,11 @@ - (NSString *)simulatedDeviceInfoName
       break;
 
     case KProductTypeAppleTV:
-      _deviceName = @"Apple TV 1080p";
+      if (ToolchainIsXcode9OrBetter()) {
+        _deviceName = @"Apple TV";
+      } else {
+        _deviceName = @"Apple TV 1080p";
+      }
       break;
   }