Update to support the latest Corelibs XCTest

briancroom · briancroom · commit 6f3443051605 · 2016-03-02T00:51:57.000+01:00
diff --git a/TestFoundation/TestNSAffineTransform.swift b/TestFoundation/TestNSAffineTransform.swift
@@ -21,7 +21,7 @@
 class TestNSAffineTransform : XCTestCase {
     private let accuracyThreshold = 0.001
 
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSAffineTransform -> () throws -> Void)] {
         return [
             ("test_BasicConstruction", test_BasicConstruction),
             ("test_IdentityTransformation", test_IdentityTransformation),
diff --git a/TestFoundation/TestNSArray.swift b/TestFoundation/TestNSArray.swift
@@ -21,7 +21,7 @@ import SwiftXCTest
 
 class TestNSArray : XCTestCase {
     
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSArray -> () throws -> Void)] {
         return [
             ("test_BasicConstruction", test_BasicConstruction),
             ("test_enumeration", test_enumeration),
diff --git a/TestFoundation/TestNSBundle.swift b/TestFoundation/TestNSBundle.swift
@@ -21,7 +21,7 @@
 
 class TestNSBundle : XCTestCase {
     
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSBundle -> () throws -> Void)] {
         return [
             ("test_paths", test_paths),
             ("test_resources", test_resources),
diff --git a/TestFoundation/TestNSByteCountFormatter.swift b/TestFoundation/TestNSByteCountFormatter.swift
@@ -21,7 +21,7 @@
 
 class TestNSByteCountFormatter : XCTestCase {
     
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSByteCountFormatter -> () throws -> Void)] {
         return [
             ("test_DefaultValues", test_DefaultValues)
         ]
diff --git a/TestFoundation/TestNSCalendar.swift b/TestFoundation/TestNSCalendar.swift
@@ -18,7 +18,7 @@ import CoreFoundation
 
 class TestNSCalendar: XCTestCase {
     
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSCalendar -> () throws -> Void)] {
         return [
             ("test_gettingDatesOnGregorianCalendar", test_gettingDatesOnGregorianCalendar ),
             ("test_gettingDatesOnHebrewCalendar", test_gettingDatesOnHebrewCalendar ),
diff --git a/TestFoundation/TestNSCharacterSet.swift b/TestFoundation/TestNSCharacterSet.swift
@@ -21,7 +21,7 @@ import SwiftXCTest
 
 class TestNSCharacterSet : XCTestCase {
     
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSCharacterSet -> () throws -> Void)] {
         return [
             ("test_Predefines", test_Predefines),
             ("test_Range", test_Range),
diff --git a/TestFoundation/TestNSData.swift b/TestFoundation/TestNSData.swift
@@ -17,7 +17,7 @@
 
 class TestNSData: XCTestCase {
     
-    var allTests: [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSData -> () throws -> Void)] {
         return [
             ("test_description", test_description),
             ("test_emptyDescription", test_emptyDescription),
diff --git a/TestFoundation/TestNSDate.swift b/TestFoundation/TestNSDate.swift
@@ -21,7 +21,7 @@
 
 class TestNSDate : XCTestCase {
     
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSDate -> () throws -> Void)] {
         return [
             ("test_BasicConstruction", test_BasicConstruction),
             ("test_InitTimeIntervalSince1970", test_InitTimeIntervalSince1970),
diff --git a/TestFoundation/TestNSDictionary.swift b/TestFoundation/TestNSDictionary.swift
@@ -21,7 +21,7 @@ import SwiftXCTest
 
 class TestNSDictionary : XCTestCase {
     
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSDictionary -> () throws -> Void)] {
         return [
             ("test_BasicConstruction", test_BasicConstruction),
             ("test_ArrayConstruction", test_ArrayConstruction),
diff --git a/TestFoundation/TestNSFileManager.swift b/TestFoundation/TestNSFileManager.swift
@@ -17,7 +17,7 @@
 
 class TestNSFileManger : XCTestCase {
     
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSFileManger -> () throws -> Void)] {
         return [
             ("test_createDirectory", test_createDirectory ),
             ("test_createFile", test_createFile ),
diff --git a/TestFoundation/TestNSGeometry.swift b/TestFoundation/TestNSGeometry.swift
@@ -20,7 +20,7 @@
 
 class TestNSGeometry : XCTestCase {
 
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSGeometry -> () throws -> Void)] {
         return [
             ("test_CGFloat_BasicConstruction", test_CGFloat_BasicConstruction),
             ("test_CGFloat_Equality", test_CGFloat_Equality),
diff --git a/TestFoundation/TestNSHTTPCookie.swift b/TestFoundation/TestNSHTTPCookie.swift
@@ -17,7 +17,7 @@
 
 class TestNSHTTPCookie: XCTestCase {
 
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSHTTPCookie -> () throws -> Void)] {
         return [
             ("test_BasicConstruction", test_BasicConstruction),
             ("test_RequestHeaderFields", test_RequestHeaderFields)
diff --git a/TestFoundation/TestNSIndexPath.swift b/TestFoundation/TestNSIndexPath.swift
@@ -19,7 +19,7 @@
 
 class TestNSIndexPath: XCTestCase {
     
-    var allTests: [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSIndexPath -> () throws -> Void)] {
         return [
            ("test_BasicConstruction", test_BasicConstruction)
         ]
diff --git a/TestFoundation/TestNSIndexSet.swift b/TestFoundation/TestNSIndexSet.swift
@@ -19,7 +19,7 @@ import SwiftXCTest
 
 class TestNSIndexSet : XCTestCase {
     
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSIndexSet -> () throws -> Void)] {
         return [
             ("test_BasicConstruction", test_BasicConstruction),
             ("test_enumeration", test_enumeration),
diff --git a/TestFoundation/TestNSJSONSerialization.swift b/TestFoundation/TestNSJSONSerialization.swift
@@ -25,7 +25,7 @@ class TestNSJSONSerialization : XCTestCase {
         NSUTF32LittleEndianStringEncoding, NSUTF32BigEndianStringEncoding
     ]
 
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSJSONSerialization -> () throws -> Void)] {
         return JSONObjectWithDataTests
             + deserializationTests
             + isValidJSONObjectTests
@@ -36,7 +36,7 @@ class TestNSJSONSerialization : XCTestCase {
 //MARK: - JSONObjectWithData
 extension TestNSJSONSerialization {
 
-    var JSONObjectWithDataTests: [(String, () throws -> Void)] {
+    class var JSONObjectWithDataTests: [(String, TestNSJSONSerialization -> () throws -> Void)] {
         return [
             ("test_JSONObjectWithData_emptyObject", test_JSONObjectWithData_emptyObject),
             ("test_JSONObjectWithData_encodingDetection", test_JSONObjectWithData_encodingDetection),
@@ -84,7 +84,7 @@ extension TestNSJSONSerialization {
 //MARK: - JSONDeserialization
 extension TestNSJSONSerialization {
     
-    var deserializationTests: [(String, () throws -> Void)] {
+    class var deserializationTests: [(String, TestNSJSONSerialization -> () throws -> Void)] {
         return [
             ("test_deserialize_emptyObject", test_deserialize_emptyObject),
             ("test_deserialize_multiStringObject", test_deserialize_multiStringObject),
@@ -456,7 +456,7 @@ extension TestNSJSONSerialization {
 // MARK: - isValidJSONObjectTests
 extension TestNSJSONSerialization {
 
-    var isValidJSONObjectTests: [(String, () throws -> Void)] {
+    class var isValidJSONObjectTests: [(String, TestNSJSONSerialization -> () throws -> Void)] {
         return [
             ("test_isValidJSONObjectTrue", test_isValidJSONObjectTrue),
             ("test_isValidJSONObjectFalse", test_isValidJSONObjectFalse),
diff --git a/TestFoundation/TestNSKeyedArchiver.swift b/TestFoundation/TestNSKeyedArchiver.swift
@@ -51,7 +51,7 @@ public class UserClass : NSObject, NSSecureCoding {
 }
 
 class TestNSKeyedArchiver : XCTestCase {
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSKeyedArchiver -> () throws -> Void)] {
         return [
             ("test_archive_array", test_archive_array),
             ("test_archive_charptr", test_archive_charptr),
diff --git a/TestFoundation/TestNSKeyedUnarchiver.swift b/TestFoundation/TestNSKeyedUnarchiver.swift
@@ -18,7 +18,7 @@
 
 
 class TestNSKeyedUnarchiver : XCTestCase {
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSKeyedUnarchiver -> () throws -> Void)] {
         return [
             ("test_unarchive_array", test_unarchive_array),
             ("test_unarchive_complex", test_unarchive_complex),
diff --git a/TestFoundation/TestNSLocale.swift b/TestFoundation/TestNSLocale.swift
@@ -16,7 +16,7 @@
 #endif
 
 class TestNSLocale : XCTestCase {
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSLocale -> () throws -> Void)] {
         return [
             ("test_constants", test_constants),
         ]
diff --git a/TestFoundation/TestNSNotificationCenter.swift b/TestFoundation/TestNSNotificationCenter.swift
@@ -18,7 +18,7 @@
 
 
 class TestNSNotificationCenter : XCTestCase {
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSNotificationCenter -> () throws -> Void)] {
         return [
             ("test_defaultCenter", test_defaultCenter),
             ("test_postNotification", test_postNotification),
diff --git a/TestFoundation/TestNSNotificationQueue.swift b/TestFoundation/TestNSNotificationQueue.swift
@@ -17,7 +17,7 @@
 
 
 class TestNSNotificationQueue : XCTestCase {
-    var allTests : [(String, () throws -> ())] {
+    static var allTests : [(String, TestNSNotificationQueue -> () throws -> Void)] {
         return [
             ("test_defaultQueue", test_defaultQueue),
             ("test_postNowToDefaultQueueWithoutCoalescing", test_postNowToDefaultQueueWithoutCoalescing),
diff --git a/TestFoundation/TestNSNull.swift b/TestFoundation/TestNSNull.swift
@@ -21,7 +21,7 @@
 
 class TestNSNull : XCTestCase {
     
-    var allTests: [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSNull -> () throws -> Void)] {
         return [
             ("test_alwaysEqual", test_alwaysEqual)
         ]
diff --git a/TestFoundation/TestNSNumber.swift b/TestFoundation/TestNSNumber.swift
@@ -18,7 +18,7 @@ import SwiftXCTest
 
 
 class TestNSNumber : XCTestCase {
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSNumber -> () throws -> Void)] {
         return [
             ("test_NumberWithBool", test_NumberWithBool ),
             ("test_numberWithChar", test_numberWithChar ),
diff --git a/TestFoundation/TestNSNumberFormatter.swift b/TestFoundation/TestNSNumberFormatter.swift
@@ -18,7 +18,7 @@ import CoreFoundation
 
 class TestNSNumberFormatter: XCTestCase {
 
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSNumberFormatter -> () throws -> Void)] {
         return [
             ("test_currencyCode", test_currencyCode),
             ("test_decimalSeparator", test_decimalSeparator),
diff --git a/TestFoundation/TestNSOrderedSet.swift b/TestFoundation/TestNSOrderedSet.swift
@@ -21,7 +21,7 @@
 
 class TestNSOrderedSet : XCTestCase {
 
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSOrderedSet -> () throws -> Void)] {
         return [
             ("test_BasicConstruction", test_BasicConstruction),
             ("test_Enumeration", test_Enumeration),
diff --git a/TestFoundation/TestNSPipe.swift b/TestFoundation/TestNSPipe.swift
@@ -19,7 +19,7 @@ import SwiftXCTest
 
 class TestNSPipe : XCTestCase {
     
-    var allTests: [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSPipe -> () throws -> Void)] {
         return [
             // Currently disabled until NSString implements dataUsingEncoding
             // ("test_NSPipe", test_NSPipe)
diff --git a/TestFoundation/TestNSProcessInfo.swift b/TestFoundation/TestNSProcessInfo.swift
@@ -19,7 +19,7 @@
 
 class TestNSProcessInfo : XCTestCase {
     
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSProcessInfo -> () throws -> Void)] {
         return [
             ("test_operatingSystemVersion", test_operatingSystemVersion ),
             ("test_processName", test_processName ),
diff --git a/TestFoundation/TestNSPropertyList.swift b/TestFoundation/TestNSPropertyList.swift
@@ -19,7 +19,7 @@ import SwiftXCTest
 
 
 class TestNSPropertyList : XCTestCase {
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSPropertyList -> () throws -> Void)] {
         return [
             ("test_BasicConstruction", test_BasicConstruction ),
             ("test_decode", test_decode ),
diff --git a/TestFoundation/TestNSRange.swift b/TestFoundation/TestNSRange.swift
@@ -19,7 +19,7 @@ import SwiftXCTest
 
 class TestNSRange : XCTestCase {
     
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSRange -> () throws -> Void)] {
         return [
             // currently disabled due to pending requirements for NSString
             // ("test_NSRangeFromString", test_NSRangeFromString ),
diff --git a/TestFoundation/TestNSRegularExpression.swift b/TestFoundation/TestNSRegularExpression.swift
@@ -21,7 +21,7 @@ import SwiftXCTest
 
 class TestNSRegularExpression : XCTestCase {
     
-    var allTests : [(String, () throws -> ())] {
+    static var allTests : [(String, TestNSRegularExpression -> () throws -> Void)] {
         return [
             ("test_simpleRegularExpressions", test_simpleRegularExpressions),
             ("test_regularExpressionReplacement", test_regularExpressionReplacement)
diff --git a/TestFoundation/TestNSRunLoop.swift b/TestFoundation/TestNSRunLoop.swift
@@ -17,7 +17,7 @@
 
 
 class TestNSRunLoop : XCTestCase {
-    var allTests : [(String, () throws -> ())] {
+    static var allTests : [(String, TestNSRunLoop -> () throws -> Void)] {
         return [
             ("test_constants", test_constants),
             ("test_runLoopInit", test_runLoopInit),
diff --git a/TestFoundation/TestNSScanner.swift b/TestFoundation/TestNSScanner.swift
@@ -21,7 +21,7 @@
 
 class TestNSScanner : XCTestCase {
 
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSScanner -> () throws -> Void)] {
         return [
             ("test_scanInteger", test_scanInteger),
         ]
diff --git a/TestFoundation/TestNSSet.swift b/TestFoundation/TestNSSet.swift
@@ -21,7 +21,7 @@ import SwiftXCTest
 
 class TestNSSet : XCTestCase {
     
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSSet -> () throws -> Void)] {
         return [
             ("test_BasicConstruction", test_BasicConstruction),
             ("testInitWithSet", testInitWithSet),
diff --git a/TestFoundation/TestNSString.swift b/TestFoundation/TestNSString.swift
@@ -38,7 +38,7 @@ internal let kCFStringEncodingUTF32LE =  CFStringBuiltInEncodings.UTF32LE.rawVal
 
 class TestNSString : XCTestCase {
     
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSString -> () throws -> Void)] {
         return [
             ("test_boolValue", test_boolValue ),
             ("test_BridgeConstruction", test_BridgeConstruction ),
@@ -81,7 +81,7 @@ class TestNSString : XCTestCase {
             ("test_ExternalRepresentation", test_ExternalRepresentation),
             ("test_mutableStringConstructor", test_mutableStringConstructor),
             ("test_PrefixSuffix", test_PrefixSuffix),
-            ("test_reflection", test_reflection),
+            ("test_reflection", { _ in test_reflection }),
         ]
     }
 
diff --git a/TestFoundation/TestNSTask.swift b/TestFoundation/TestNSTask.swift
@@ -17,7 +17,7 @@
 import CoreFoundation
 
 class TestNSTask : XCTestCase {
-    var allTests: [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSTask -> () throws -> Void)] {
         return [("test_exit0" , test_exit0),
                 ("test_exit1" , test_exit1),
                 ("test_exit100" , test_exit100),
diff --git a/TestFoundation/TestNSThread.swift b/TestFoundation/TestNSThread.swift
@@ -18,7 +18,7 @@
 
 
 class TestNSThread : XCTestCase {
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSThread -> () throws -> Void)] {
         return [
             ("test_currentThread", test_currentThread ),
             ("test_threadStart", test_threadStart),
diff --git a/TestFoundation/TestNSTimeZone.swift b/TestFoundation/TestNSTimeZone.swift
@@ -21,7 +21,7 @@
 
 class TestNSTimeZone: XCTestCase {
 
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSTimeZone -> () throws -> Void)] {
         return [
             // Disabled see https://bugs.swift.org/browse/SR-300
             // ("test_abbreviation", test_abbreviation),
diff --git a/TestFoundation/TestNSTimer.swift b/TestFoundation/TestNSTimer.swift
@@ -18,7 +18,7 @@
 
 
 class TestNSTimer : XCTestCase {
-    var allTests : [(String, () throws -> ())] {
+    static var allTests : [(String, TestNSTimer -> () throws -> Void)] {
         return [
             ("test_timerInit", test_timerInit),
             ("test_timerTickOnce", test_timerTickOnce),
diff --git a/TestFoundation/TestNSURL.swift b/TestFoundation/TestNSURL.swift
@@ -53,7 +53,7 @@ private func getTestData() -> [Any]? {
 }
 
 class TestNSURL : XCTestCase {
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSURL -> () throws -> Void)] {
         return [
             ("test_URLStrings", test_URLStrings),
             ("test_fileURLWithPath_relativeToURL", test_fileURLWithPath_relativeToURL ),
@@ -420,7 +420,7 @@ class TestNSURL : XCTestCase {
 }
     
 class TestNSURLComponents : XCTestCase {
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSURLComponents -> () throws -> Void)] {
         return [
             ("test_string", test_string),
         ]
diff --git a/TestFoundation/TestNSURLRequest.swift b/TestFoundation/TestNSURLRequest.swift
@@ -18,7 +18,7 @@
 
 class TestNSURLRequest : XCTestCase {
     
-    var allTests : [(String, () throws -> Void)] {
+    static var allTests: [(String, TestNSURLRequest -> () throws -> Void)] {
         return [
             ("test_construction", test_construction),
             ("test_mutableConstruction", test_mutableConstruction),
diff --git a/TestFoundation/TestNSURLResponse.swift b/TestFoundation/TestNSURLResponse.swift
diff --git a/TestFoundation/TestNSUUID.swift b/TestFoundation/TestNSUUID.swift
diff --git a/TestFoundation/TestNSUserDefaults.swift b/TestFoundation/TestNSUserDefaults.swift
diff --git a/TestFoundation/TestNSValue.swift b/TestFoundation/TestNSValue.swift
diff --git a/TestFoundation/TestNSXMLDocument.swift b/TestFoundation/TestNSXMLDocument.swift
diff --git a/TestFoundation/TestNSXMLParser.swift b/TestFoundation/TestNSXMLParser.swift
diff --git a/TestFoundation/main.swift b/TestFoundation/main.swift

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`
`22`	`22`	`class TestNSByteCountFormatter : XCTestCase {`
`23`	`23`
`24`		`- var allTests : [(String, () throws -> Void)] {`
	`24`	`+ static var allTests: [(String, TestNSByteCountFormatter -> () throws -> Void)] {`
`25`	`25`	`return [`
`26`	`26`	`("test_DefaultValues", test_DefaultValues)`
`27`	`27`	`]`