Skip to content

Commit 53a8f2b

Browse files
ikesyoparkera
authored andcommitted
Drop NS prefix from some files to match the class names (swiftlang#971)
1 parent 0a39c97 commit 53a8f2b

14 files changed

+65
-65
lines changed

Foundation.xcodeproj/project.pbxproj

+44-44
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.

TestFoundation/TestNSBundle.swift TestFoundation/TestBundle.swift

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

2020

2121

22-
class TestNSBundle : XCTestCase {
22+
class TestBundle : XCTestCase {
2323

24-
static var allTests: [(String, (TestNSBundle) -> () throws -> Void)] {
24+
static var allTests: [(String, (TestBundle) -> () throws -> Void)] {
2525
return [
2626
("test_paths", test_paths),
2727
("test_resources", test_resources),

TestFoundation/TestNSFileHandle.swift TestFoundation/TestFileHandle.swift

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

18-
class TestNSFileHandle : XCTestCase {
19-
static var allTests : [(String, (TestNSFileHandle) -> () throws -> ())] {
18+
class TestFileHandle : XCTestCase {
19+
static var allTests : [(String, (TestFileHandle) -> () throws -> ())] {
2020
return [
2121
("test_constants", test_constants),
2222
("test_pipe", test_pipe),

TestFoundation/TestNSFileManager.swift TestFoundation/TestFileManager.swift

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

18-
class TestNSFileManager : XCTestCase {
18+
class TestFileManager : XCTestCase {
1919

20-
static var allTests: [(String, (TestNSFileManager) -> () throws -> Void)] {
20+
static var allTests: [(String, (TestFileManager) -> () throws -> Void)] {
2121
return [
2222
("test_createDirectory", test_createDirectory ),
2323
("test_createFile", test_createFile ),

TestFoundation/TestNSProcessInfo.swift TestFoundation/TestProcessInfo.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
#endif
1818

1919

20-
class TestNSProcessInfo : XCTestCase {
20+
class TestProcessInfo : XCTestCase {
2121

22-
static var allTests: [(String, (TestNSProcessInfo) -> () throws -> Void)] {
22+
static var allTests: [(String, (TestProcessInfo) -> () throws -> Void)] {
2323
return [
2424
("test_operatingSystemVersion", test_operatingSystemVersion ),
2525
("test_processName", test_processName ),

TestFoundation/TestNSThread.swift TestFoundation/TestThread.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
import CoreFoundation
2020

21-
class TestNSThread : XCTestCase {
22-
static var allTests: [(String, (TestNSThread) -> () throws -> Void)] {
21+
class TestThread : XCTestCase {
22+
static var allTests: [(String, (TestThread) -> () throws -> Void)] {
2323
return [
2424
("test_currentThread", test_currentThread ),
2525
("test_threadStart", test_threadStart),

TestFoundation/main.swift

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ internal func testBundle() -> Bundle {
2323
XCTMain([
2424
testCase(TestNSAffineTransform.allTests),
2525
testCase(TestNSArray.allTests),
26-
testCase(TestNSBundle.allTests),
26+
testCase(TestBundle.allTests),
2727
testCase(TestNSByteCountFormatter.allTests),
2828
testCase(TestNSCache.allTests),
2929
testCase(TestNSCalendar.allTests),
@@ -37,7 +37,7 @@ XCTMain([
3737
testCase(TestNSDictionary.allTests),
3838
testCase(TestNSError.allTests),
3939
testCase(TestNSEnergyFormatter.allTests),
40-
testCase(TestNSFileManager.allTests),
40+
testCase(TestFileManager.allTests),
4141
testCase(TestNSGeometry.allTests),
4242
testCase(TestNSHTTPCookie.allTests),
4343
testCase(TestNSHTTPCookieStorage.allTests),
@@ -58,7 +58,7 @@ XCTMain([
5858
testCase(TestNSPersonNameComponents.allTests),
5959
testCase(TestNSPipe.allTests),
6060
testCase(TestNSPredicate.allTests),
61-
testCase(TestNSProcessInfo.allTests),
61+
testCase(TestProcessInfo.allTests),
6262
testCase(TestNSPropertyList.allTests),
6363
testCase(TestNSRange.allTests),
6464
testCase(TestNSRegularExpression.allTests),
@@ -67,7 +67,7 @@ XCTMain([
6767
testCase(TestNSSet.allTests),
6868
testCase(TestNSStream.allTests),
6969
testCase(TestNSString.allTests),
70-
// testCase(TestNSThread.allTests),
70+
// testCase(TestThread.allTests),
7171
testCase(TestProcess.allTests),
7272
testCase(TestNSTextCheckingResult.allTests),
7373
testCase(TestNSTimer.allTests),
@@ -89,7 +89,7 @@ XCTMain([
8989
testCase(TestNSXMLDocument.allTests),
9090
testCase(TestNSAttributedString.allTests),
9191
testCase(TestNSMutableAttributedString.allTests),
92-
testCase(TestNSFileHandle.allTests),
92+
testCase(TestFileHandle.allTests),
9393
testCase(TestUnitConverter.allTests),
9494
testCase(TestProgressFraction.allTests),
9595
testCase(TestProgress.allTests),

build.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@
307307
'Foundation/NSAffineTransform.swift',
308308
'Foundation/NSArray.swift',
309309
'Foundation/NSAttributedString.swift',
310-
'Foundation/NSBundle.swift',
310+
'Foundation/Bundle.swift',
311311
'Foundation/NSByteCountFormatter.swift',
312312
'Foundation/NSCache.swift',
313313
'Foundation/NSCalendar.swift',
@@ -334,8 +334,8 @@
334334
'Foundation/NSEnumerator.swift',
335335
'Foundation/NSError.swift',
336336
'Foundation/NSExpression.swift',
337-
'Foundation/NSFileHandle.swift',
338-
'Foundation/NSFileManager.swift',
337+
'Foundation/FileHandle.swift',
338+
'Foundation/FileManager.swift',
339339
'Foundation/NSFormatter.swift',
340340
'Foundation/NSGeometry.swift',
341341
'Foundation/Host.swift',
@@ -359,7 +359,7 @@
359359
'Foundation/NSNumber.swift',
360360
'Foundation/NSNumberFormatter.swift',
361361
'Foundation/NSObjCRuntime.swift',
362-
'Foundation/NSOperation.swift',
362+
'Foundation/Operation.swift',
363363
'Foundation/NSOrderedSet.swift',
364364
'Foundation/NSPathUtilities.swift',
365365
'Foundation/NSPersonNameComponents.swift',
@@ -368,7 +368,7 @@
368368
'Foundation/NSPort.swift',
369369
'Foundation/NSPortMessage.swift',
370370
'Foundation/NSPredicate.swift',
371-
'Foundation/NSProcessInfo.swift',
371+
'Foundation/ProcessInfo.swift',
372372
'Foundation/Progress.swift',
373373
'Foundation/ProgressFraction.swift',
374374
'Foundation/NSPropertyList.swift',
@@ -385,7 +385,7 @@
385385
'Foundation/NSSwiftRuntime.swift',
386386
'Foundation/Process.swift',
387387
'Foundation/NSTextCheckingResult.swift',
388-
'Foundation/NSThread.swift',
388+
'Foundation/Thread.swift',
389389
'Foundation/NSTimer.swift',
390390
'Foundation/NSTimeZone.swift',
391391
'Foundation/NSURL.swift',

0 commit comments

Comments
 (0)