Skip to content

Commit 8fc71a5

Browse files
ikesyophausler
authored andcommitted
[gardening] Rename files in Formatters group to match the class names (swiftlang#1058)
1 parent 8863ea2 commit 8fc71a5

19 files changed

+109
-109
lines changed

Foundation.xcodeproj/project.pbxproj

+83-83
Large diffs are not rendered by default.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

TestFoundation/TestNSByteCountFormatter.swift TestFoundation/TestByteCountFormatter.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020

2121

22-
class TestNSByteCountFormatter : XCTestCase {
22+
class TestByteCountFormatter : XCTestCase {
2323

24-
static var allTests: [(String, (TestNSByteCountFormatter) -> () throws -> Void)] {
24+
static var allTests: [(String, (TestByteCountFormatter) -> () throws -> Void)] {
2525
return [
2626
("test_DefaultValues", test_DefaultValues),
2727
("test_zeroBytes", test_zeroBytes),

TestFoundation/TestNSDateFormatter.swift TestFoundation/TestDateFormatter.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
import SwiftXCTest
1616
#endif
1717

18-
class TestNSDateFormatter: XCTestCase {
18+
class TestDateFormatter: XCTestCase {
1919

2020
let DEFAULT_LOCALE = "en_US"
2121
let DEFAULT_TIMEZONE = "GMT"
2222

23-
static var allTests : [(String, (TestNSDateFormatter) -> () throws -> Void)] {
23+
static var allTests : [(String, (TestDateFormatter) -> () throws -> Void)] {
2424
return [
2525
("test_BasicConstruction", test_BasicConstruction),
2626
("test_dateStyleShort", test_dateStyleShort),

TestFoundation/TestNSEnergyFormatter.swift TestFoundation/TestEnergyFormatter.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
import SwiftXCTest
1616
#endif
1717

18-
class TestNSEnergyFormatter: XCTestCase {
18+
class TestEnergyFormatter: XCTestCase {
1919
let formatter: EnergyFormatter = EnergyFormatter()
2020

21-
static var allTests: [(String, (TestNSEnergyFormatter) -> () throws -> Void)] {
21+
static var allTests: [(String, (TestEnergyFormatter) -> () throws -> Void)] {
2222
return [
2323
("test_stringFromJoulesJoulesRegion", test_stringFromJoulesJoulesRegion),
2424
("test_stringFromJoulesCaloriesRegion", test_stringFromJoulesCaloriesRegion),

TestFoundation/TestNSLengthFormatter.swift TestFoundation/TestLengthFormatter.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
import SwiftXCTest
1616
#endif
1717

18-
class TestNSLengthFormatter: XCTestCase {
18+
class TestLengthFormatter: XCTestCase {
1919
let formatter: LengthFormatter = LengthFormatter()
2020

21-
static var allTests: [(String, (TestNSLengthFormatter) -> () throws -> Void)] {
21+
static var allTests: [(String, (TestLengthFormatter) -> () throws -> Void)] {
2222
return [
2323
("test_stringFromMetersUS", test_stringFromMetersUS),
2424
("test_stringFromMetersUSPersonHeight", test_stringFromMetersUSPersonHeight),

TestFoundation/TestNSNumberFormatter.swift TestFoundation/TestNumberFormatter.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
#endif
1717
import CoreFoundation
1818

19-
class TestNSNumberFormatter: XCTestCase {
19+
class TestNumberFormatter: XCTestCase {
2020

21-
static var allTests: [(String, (TestNSNumberFormatter) -> () throws -> Void)] {
21+
static var allTests: [(String, (TestNumberFormatter) -> () throws -> Void)] {
2222
return [
2323
("test_currencyCode", test_currencyCode),
2424
("test_decimalSeparator", test_decimalSeparator),

TestFoundation/main.swift

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ XCTMain([
2424
testCase(TestNSAffineTransform.allTests),
2525
testCase(TestNSArray.allTests),
2626
testCase(TestBundle.allTests),
27-
testCase(TestNSByteCountFormatter.allTests),
27+
testCase(TestByteCountFormatter.allTests),
2828
testCase(TestNSCache.allTests),
2929
testCase(TestNSCalendar.allTests),
3030
testCase(TestNSCharacterSet.allTests),
3131
testCase(TestNSCompoundPredicate.allTests),
3232
testCase(TestNSData.allTests),
3333
testCase(TestNSDate.allTests),
3434
testCase(TestNSDateComponents.allTests),
35-
testCase(TestNSDateFormatter.allTests),
35+
testCase(TestDateFormatter.allTests),
3636
testCase(TestNSDecimal.allTests),
3737
testCase(TestNSDictionary.allTests),
3838
testCase(TestNSError.allTests),
39-
testCase(TestNSEnergyFormatter.allTests),
39+
testCase(TestEnergyFormatter.allTests),
4040
testCase(TestFileManager.allTests),
4141
testCase(TestNSGeometry.allTests),
4242
testCase(TestNSHTTPCookie.allTests),
@@ -47,13 +47,13 @@ XCTMain([
4747
testCase(TestNSJSONSerialization.allTests),
4848
testCase(TestNSKeyedArchiver.allTests),
4949
testCase(TestNSKeyedUnarchiver.allTests),
50-
testCase(TestNSLengthFormatter.allTests),
50+
testCase(TestLengthFormatter.allTests),
5151
testCase(TestNSLocale.allTests),
5252
testCase(TestNSNotificationCenter.allTests),
5353
testCase(TestNSNotificationQueue.allTests),
5454
testCase(TestNSNull.allTests),
5555
testCase(TestNSNumber.allTests),
56-
testCase(TestNSNumberFormatter.allTests),
56+
testCase(TestNumberFormatter.allTests),
5757
testCase(TestNSOperationQueue.allTests),
5858
testCase(TestNSOrderedSet.allTests),
5959
testCase(TestNSPersonNameComponents.allTests),

build.py

+11-11
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@
311311
'Foundation/NSArray.swift',
312312
'Foundation/NSAttributedString.swift',
313313
'Foundation/Bundle.swift',
314-
'Foundation/NSByteCountFormatter.swift',
314+
'Foundation/ByteCountFormatter.swift',
315315
'Foundation/NSCache.swift',
316316
'Foundation/NSCalendar.swift',
317317
'Foundation/NSCFArray.swift',
@@ -327,19 +327,19 @@
327327
'Foundation/NSConcreteValue.swift',
328328
'Foundation/NSData.swift',
329329
'Foundation/NSDate.swift',
330-
'Foundation/NSDateComponentsFormatter.swift',
331-
'Foundation/NSDateFormatter.swift',
332-
'Foundation/NSDateIntervalFormatter.swift',
330+
'Foundation/DateComponentsFormatter.swift',
331+
'Foundation/DateFormatter.swift',
332+
'Foundation/DateIntervalFormatter.swift',
333333
'Foundation/NSDecimal.swift',
334334
'Foundation/NSDecimalNumber.swift',
335335
'Foundation/NSDictionary.swift',
336-
'Foundation/NSEnergyFormatter.swift',
336+
'Foundation/EnergyFormatter.swift',
337337
'Foundation/NSEnumerator.swift',
338338
'Foundation/NSError.swift',
339339
'Foundation/NSExpression.swift',
340340
'Foundation/FileHandle.swift',
341341
'Foundation/FileManager.swift',
342-
'Foundation/NSFormatter.swift',
342+
'Foundation/Formatter.swift',
343343
'Foundation/NSGeometry.swift',
344344
'Foundation/Host.swift',
345345
'Foundation/NSHTTPCookie.swift',
@@ -352,22 +352,22 @@
352352
'Foundation/NSKeyedArchiver.swift',
353353
'Foundation/NSKeyedArchiverHelpers.swift',
354354
'Foundation/NSKeyedUnarchiver.swift',
355-
'Foundation/NSLengthFormatter.swift',
355+
'Foundation/LengthFormatter.swift',
356356
'Foundation/NSLocale.swift',
357357
'Foundation/NSLock.swift',
358358
'Foundation/NSLog.swift',
359-
'Foundation/NSMassFormatter.swift',
359+
'Foundation/MassFormatter.swift',
360360
'Foundation/NSNotification.swift',
361361
'Foundation/NSNotificationQueue.swift',
362362
'Foundation/NSNull.swift',
363363
'Foundation/NSNumber.swift',
364-
'Foundation/NSNumberFormatter.swift',
364+
'Foundation/NumberFormatter.swift',
365365
'Foundation/NSObjCRuntime.swift',
366366
'Foundation/Operation.swift',
367367
'Foundation/NSOrderedSet.swift',
368368
'Foundation/NSPathUtilities.swift',
369369
'Foundation/NSPersonNameComponents.swift',
370-
'Foundation/NSPersonNameComponentsFormatter.swift',
370+
'Foundation/PersonNameComponentsFormatter.swift',
371371
'Foundation/NSPlatform.swift',
372372
'Foundation/NSPort.swift',
373373
'Foundation/NSPortMessage.swift',
@@ -444,7 +444,7 @@
444444
'Foundation/ExtraStringAPIs.swift',
445445
'Foundation/Measurement.swift',
446446
'Foundation/NSMeasurement.swift',
447-
'Foundation/NSMeasurementFormatter.swift',
447+
'Foundation/MeasurementFormatter.swift',
448448
'Foundation/Unit.swift',
449449
'Foundation/TimeZone.swift',
450450
'Foundation/Calendar.swift',

0 commit comments

Comments
 (0)