[gardening] Rename files in Formatters group to match the class names (…

…swiftlang#1058)

TestFoundation/TestNSByteCountFormatter.swift → TestFoundation/TestByteCountFormatter.swift

@@ -19,9 +19,9 @@
 
 
 
-class TestNSByteCountFormatter : XCTestCase {
+class TestByteCountFormatter : XCTestCase {
 
-    static var allTests: [(String, (TestNSByteCountFormatter) -> () throws -> Void)] {
+    static var allTests: [(String, (TestByteCountFormatter) -> () throws -> Void)] {
         return [
             ("test_DefaultValues", test_DefaultValues),
             ("test_zeroBytes", test_zeroBytes),

TestFoundation/TestNSDateFormatter.swift → TestFoundation/TestDateFormatter.swift

@@ -15,12 +15,12 @@
     import SwiftXCTest
 #endif
 
-class TestNSDateFormatter: XCTestCase {
+class TestDateFormatter: XCTestCase {
 
     let DEFAULT_LOCALE = "en_US"
     let DEFAULT_TIMEZONE = "GMT"
 
-    static var allTests : [(String, (TestNSDateFormatter) -> () throws -> Void)] {
+    static var allTests : [(String, (TestDateFormatter) -> () throws -> Void)] {
         return [
             ("test_BasicConstruction", test_BasicConstruction),
             ("test_dateStyleShort",    test_dateStyleShort),

TestFoundation/TestNSEnergyFormatter.swift → TestFoundation/TestEnergyFormatter.swift

@@ -15,10 +15,10 @@
     import SwiftXCTest
 #endif
 
-class TestNSEnergyFormatter: XCTestCase {
+class TestEnergyFormatter: XCTestCase {
     let formatter: EnergyFormatter = EnergyFormatter()
 
-    static var allTests: [(String, (TestNSEnergyFormatter) -> () throws -> Void)] {
+    static var allTests: [(String, (TestEnergyFormatter) -> () throws -> Void)] {
         return [
             ("test_stringFromJoulesJoulesRegion", test_stringFromJoulesJoulesRegion),
             ("test_stringFromJoulesCaloriesRegion", test_stringFromJoulesCaloriesRegion),

TestFoundation/TestNSLengthFormatter.swift → TestFoundation/TestLengthFormatter.swift

@@ -15,10 +15,10 @@
     import SwiftXCTest
 #endif
 
-class TestNSLengthFormatter: XCTestCase {
+class TestLengthFormatter: XCTestCase {
     let formatter: LengthFormatter = LengthFormatter()
 
-    static var allTests: [(String, (TestNSLengthFormatter) -> () throws -> Void)] {
+    static var allTests: [(String, (TestLengthFormatter) -> () throws -> Void)] {
         return [
             ("test_stringFromMetersUS", test_stringFromMetersUS),
             ("test_stringFromMetersUSPersonHeight", test_stringFromMetersUSPersonHeight),

TestFoundation/TestNSNumberFormatter.swift → TestFoundation/TestNumberFormatter.swift

@@ -16,9 +16,9 @@
 #endif
 import CoreFoundation
 
-class TestNSNumberFormatter: XCTestCase {
+class TestNumberFormatter: XCTestCase {
 
-    static var allTests: [(String, (TestNSNumberFormatter) -> () throws -> Void)] {
+    static var allTests: [(String, (TestNumberFormatter) -> () throws -> Void)] {
         return [
             ("test_currencyCode", test_currencyCode),
             ("test_decimalSeparator", test_decimalSeparator),

TestFoundation/main.swift

@@ -24,19 +24,19 @@ XCTMain([
     testCase(TestNSAffineTransform.allTests),
     testCase(TestNSArray.allTests),
     testCase(TestBundle.allTests),
-    testCase(TestNSByteCountFormatter.allTests),
+    testCase(TestByteCountFormatter.allTests),
     testCase(TestNSCache.allTests),
     testCase(TestNSCalendar.allTests),
     testCase(TestNSCharacterSet.allTests),
     testCase(TestNSCompoundPredicate.allTests),
     testCase(TestNSData.allTests),
     testCase(TestNSDate.allTests),
     testCase(TestNSDateComponents.allTests),
-    testCase(TestNSDateFormatter.allTests),
+    testCase(TestDateFormatter.allTests),
     testCase(TestNSDecimal.allTests),
     testCase(TestNSDictionary.allTests),
     testCase(TestNSError.allTests),
-    testCase(TestNSEnergyFormatter.allTests),
+    testCase(TestEnergyFormatter.allTests),
     testCase(TestFileManager.allTests),
     testCase(TestNSGeometry.allTests),
     testCase(TestNSHTTPCookie.allTests),
@@ -47,13 +47,13 @@ XCTMain([
     testCase(TestNSJSONSerialization.allTests),
     testCase(TestNSKeyedArchiver.allTests),
     testCase(TestNSKeyedUnarchiver.allTests),
-    testCase(TestNSLengthFormatter.allTests),
+    testCase(TestLengthFormatter.allTests),
     testCase(TestNSLocale.allTests),
     testCase(TestNSNotificationCenter.allTests),
     testCase(TestNSNotificationQueue.allTests),
     testCase(TestNSNull.allTests),
     testCase(TestNSNumber.allTests),
-    testCase(TestNSNumberFormatter.allTests),
+    testCase(TestNumberFormatter.allTests),
     testCase(TestNSOperationQueue.allTests),
     testCase(TestNSOrderedSet.allTests),
     testCase(TestNSPersonNameComponents.allTests),

build.py

@@ -311,7 +311,7 @@
 	'Foundation/NSArray.swift',
 	'Foundation/NSAttributedString.swift',
 	'Foundation/Bundle.swift',
-	'Foundation/NSByteCountFormatter.swift',
+	'Foundation/ByteCountFormatter.swift',
 	'Foundation/NSCache.swift',
 	'Foundation/NSCalendar.swift',
 	'Foundation/NSCFArray.swift',
@@ -327,19 +327,19 @@
 	'Foundation/NSConcreteValue.swift',
 	'Foundation/NSData.swift',
 	'Foundation/NSDate.swift',
-	'Foundation/NSDateComponentsFormatter.swift',
-	'Foundation/NSDateFormatter.swift',
-	'Foundation/NSDateIntervalFormatter.swift',
+	'Foundation/DateComponentsFormatter.swift',
+	'Foundation/DateFormatter.swift',
+	'Foundation/DateIntervalFormatter.swift',
 	'Foundation/NSDecimal.swift',
 	'Foundation/NSDecimalNumber.swift',
 	'Foundation/NSDictionary.swift',
-	'Foundation/NSEnergyFormatter.swift',
+	'Foundation/EnergyFormatter.swift',
 	'Foundation/NSEnumerator.swift',
 	'Foundation/NSError.swift',
 	'Foundation/NSExpression.swift',
 	'Foundation/FileHandle.swift',
 	'Foundation/FileManager.swift',
-	'Foundation/NSFormatter.swift',
+	'Foundation/Formatter.swift',
 	'Foundation/NSGeometry.swift',
 	'Foundation/Host.swift',
 	'Foundation/NSHTTPCookie.swift',
@@ -352,22 +352,22 @@
 	'Foundation/NSKeyedArchiver.swift',
 	'Foundation/NSKeyedArchiverHelpers.swift',
 	'Foundation/NSKeyedUnarchiver.swift',
-	'Foundation/NSLengthFormatter.swift',
+	'Foundation/LengthFormatter.swift',
 	'Foundation/NSLocale.swift',
 	'Foundation/NSLock.swift',
 	'Foundation/NSLog.swift',
-	'Foundation/NSMassFormatter.swift',
+	'Foundation/MassFormatter.swift',
 	'Foundation/NSNotification.swift',
 	'Foundation/NSNotificationQueue.swift',
 	'Foundation/NSNull.swift',
 	'Foundation/NSNumber.swift',
-	'Foundation/NSNumberFormatter.swift',
+	'Foundation/NumberFormatter.swift',
 	'Foundation/NSObjCRuntime.swift',
 	'Foundation/Operation.swift',
 	'Foundation/NSOrderedSet.swift',
 	'Foundation/NSPathUtilities.swift',
 	'Foundation/NSPersonNameComponents.swift',
-	'Foundation/NSPersonNameComponentsFormatter.swift',
+	'Foundation/PersonNameComponentsFormatter.swift',
 	'Foundation/NSPlatform.swift',
 	'Foundation/NSPort.swift',
 	'Foundation/NSPortMessage.swift',
@@ -444,7 +444,7 @@
 	'Foundation/ExtraStringAPIs.swift',
 	'Foundation/Measurement.swift',
 	'Foundation/NSMeasurement.swift',
-	'Foundation/NSMeasurementFormatter.swift',
+	'Foundation/MeasurementFormatter.swift',
 	'Foundation/Unit.swift',
 	'Foundation/TimeZone.swift',
 	'Foundation/Calendar.swift',