[PlaygroundSupport] De-duplicated much of the test files between macOS, iOS, and tvOS, and fixed the build for tests.

PlaygroundSupport and XCPlayground each had a lot of duplication in their test suites, when all that was different was UIView vs. NSView.
This makes each test suite use a single file for the live view-related tests, and also renames the test files to be more functionality-based.

This is in preparation to migrate the PlaygroundSupport project to Swift 4.2.

Author: cwakamo

PlaygroundSupport/PlaygroundSupport.xcodeproj/project.pbxproj

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
+// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See http://swift.org/LICENSE.txt for license information
@@ -13,62 +13,74 @@
 import XCTest
 import PlaygroundSupport
 
-class PlaygroundTests_OSX: XCTestCase {
-    
+#if os(macOS)
+import AppKit
+
+fileprivate typealias ViewType = NSView
+fileprivate typealias ViewControllerType = NSViewController
+#elseif os(iOS) || os(tvOS)
+import UIKit
+
+fileprivate typealias ViewType = UIView
+fileprivate typealias ViewControllerType = UIViewController
+#endif
+
+class LiveViewTests: XCTestCase {
+
     override func setUp() {
         super.setUp()
         // Put setup code here. This method is called before the invocation of each test method in the class.
     }
-    
+
     override func tearDown() {
         PlaygroundPage.current.liveView = nil
         super.tearDown()
     }
-    
+
     func testLiveViewWithView() {
-        let view = NSView()
-        
+        let view = ViewType()
+
         // Test setting to a view
         expectation(forNotification: "PlaygroundPageLiveViewDidChangeNotification", object: PlaygroundPage.current) { (notification) in
-            guard let userInfoView = notification.userInfo?["PlaygroundPageLiveView"] as? NSView else { return false }
+            guard let userInfoView = notification.userInfo?["PlaygroundPageLiveView"] as? ViewType else { return false }
             guard notification.userInfo?["PlaygroundPageLiveViewController"] == nil else { return false }
             XCTAssertEqual(userInfoView, view)
             return true
         }
         PlaygroundPage.current.liveView = view
-        waitForExpectations(withTimeout: 0.1, handler: nil)
-        
+        waitForExpectations(timeout: 0.1, handler: nil)
+
         // Test setting back to nil
         expectation(forNotification: "PlaygroundPageLiveViewDidChangeNotification", object: PlaygroundPage.current) { (notification) in
             guard notification.userInfo?["PlaygroundPageLiveView"] == nil else { return false }
             guard notification.userInfo?["PlaygroundPageLiveViewController"] == nil else { return false }
             return true
         }
         PlaygroundPage.current.liveView = nil
-        waitForExpectations(withTimeout: 0.1, handler: nil)
+        waitForExpectations(timeout: 0.1, handler: nil)
     }
-    
+
     func testLiveViewWithViewController() {
-        let viewController = NSViewController()
-        
+        let viewController = ViewControllerType()
+
         // Test setting to a view controller
         expectation(forNotification: "PlaygroundPageLiveViewDidChangeNotification", object: PlaygroundPage.current) { (notification) in
-            guard let userInfoViewController = notification.userInfo?["PlaygroundPageLiveViewController"] as? NSViewController else { return false }
+            guard let userInfoViewController = notification.userInfo?["PlaygroundPageLiveViewController"] as? ViewControllerType else { return false }
             guard notification.userInfo?["PlaygroundPageLiveView"] == nil else { return false }
             XCTAssertEqual(userInfoViewController, viewController)
             return true
         }
         PlaygroundPage.current.liveView = viewController
-        waitForExpectations(withTimeout: 0.1, handler: nil)
-        
+        waitForExpectations(timeout: 0.1, handler: nil)
+
         // Test setting back to nil
         expectation(forNotification: "PlaygroundPageLiveViewDidChangeNotification", object: PlaygroundPage.current) { (notification) in
             guard notification.userInfo?["PlaygroundPageLiveView"] == nil else { return false }
             guard notification.userInfo?["PlaygroundPageLiveViewController"] == nil else { return false }
             return true
         }
         PlaygroundPage.current.liveView = nil
-        waitForExpectations(withTimeout: 0.1, handler: nil)
+        waitForExpectations(timeout: 0.1, handler: nil)
     }
-    
+
 }

PlaygroundSupport/PlaygroundSupportTests/PlaygroundSupportTests_OSX/PlaygroundSupportTests_OSX.swift renamed to PlaygroundSupport/PlaygroundSupportTests/LiveViewTests.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
+// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See http://swift.org/LICENSE.txt for license information
@@ -13,18 +13,8 @@
 import XCTest
 import XCPlayground
 
-class XCPlaygroundCommonTests: XCTestCase {
-    
-    // MARK:
-    
-    /*
-    func testFinishExecution() {
-        expectation(forNotification: "XCPFinishExecution", object: XCPlaygroundPage.currentPage, handler: nil)
-        XCPlaygroundPage.currentPage.finishExecution()
-        waitForExpectationsWithTimeout(0.1, handler: nil)
-    }
-    */
-    
+class CaptureValueTests: XCTestCase {
+        
     // MARK: Deprected XCPlaygroundPage
 
     func testPlaygroundPageCaptureValue() {
@@ -40,7 +30,7 @@ class XCPlaygroundCommonTests: XCTestCase {
             return true
         }
         XCPlaygroundPage.currentPage.captureValue(value: value, withIdentifier: identifier)
-        waitForExpectations(withTimeout: 0.1, handler: nil)
+        waitForExpectations(timeout: 0.1, handler: nil)
     }
 
     // MARK: Deprecated Functions
@@ -57,7 +47,7 @@ class XCPlaygroundCommonTests: XCTestCase {
             return true
         }
         XCPCaptureValue(identifier: identifier, value: value)
-        waitForExpectations(withTimeout: 0.1, handler: nil)
+        waitForExpectations(timeout: 0.1, handler: nil)
     }
 
     func testXCPExecutionShouldContinueIndefinitely() {