Merge branch 'pr/121'

Author: parkera

CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h

@@ -218,6 +218,7 @@ extern Boolean _CFURLInitAbsoluteURLWithBytes(CFURLRef url, const UInt8 *relativ
 extern CFHashCode CFHashBytes(uint8_t *bytes, CFIndex length);
 extern CFIndex __CFProcessorCount();
 extern uint64_t __CFMemorySize();
+extern CFStringRef _CFProcessNameString(void);
 extern CFIndex __CFActiveProcessorCount();
 extern CFDictionaryRef __CFGetEnvironment();
 extern int32_t __CFGetPid();

Foundation.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		22B9C1E11C165D7A00DECFF9 /* TestNSDate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22B9C1E01C165D7A00DECFF9 /* TestNSDate.swift */; };
+		400E22651C1A4E58007C5933 /* TestNSProcessInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 400E22641C1A4E58007C5933 /* TestNSProcessInfo.swift */; };
 		4AE109271C17CCBF007367B5 /* TestNSIndexPath.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AE109261C17CCBF007367B5 /* TestNSIndexPath.swift */; };
 		4DC1D0801C12EEEF00B5948A /* TestNSPipe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DC1D07F1C12EEEF00B5948A /* TestNSPipe.swift */; };
 		525AECED1BF2C9C500D15BB0 /* TestNSFileManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 525AECEB1BF2C96400D15BB0 /* TestNSFileManager.swift */; };
@@ -332,6 +333,7 @@
 
 /* Begin PBXFileReference section */
 		22B9C1E01C165D7A00DECFF9 /* TestNSDate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSDate.swift; sourceTree = "<group>"; };
+		400E22641C1A4E58007C5933 /* TestNSProcessInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSProcessInfo.swift; sourceTree = "<group>"; };
 		4AE109261C17CCBF007367B5 /* TestNSIndexPath.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSIndexPath.swift; sourceTree = "<group>"; };
 		4DC1D07F1C12EEEF00B5948A /* TestNSPipe.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSPipe.swift; sourceTree = "<group>"; };
 		522C253A1BF16E1600804FC6 /* FoundationErrors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FoundationErrors.swift; sourceTree = "<group>"; };
@@ -1054,6 +1056,7 @@
 				5EB6A15C1C188FC40037DCB8 /* TestNSJSONSerialization.swift */,
 				EA66F63F1BF1619600136161 /* TestNSNumber.swift */,
 				4DC1D07F1C12EEEF00B5948A /* TestNSPipe.swift */,
+				400E22641C1A4E58007C5933 /* TestNSProcessInfo.swift */,
 				EA66F6401BF1619600136161 /* TestNSPropertyList.swift */,
 				E876A73D1C1180E000F279EC /* TestNSRange.swift */,
 				EA66F6411BF1619600136161 /* TestNSSet.swift */,
@@ -1759,6 +1762,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				400E22651C1A4E58007C5933 /* TestNSProcessInfo.swift in Sources */,
 				525AECED1BF2C9C500D15BB0 /* TestNSFileManager.swift in Sources */,
 				5B915F0F1C1A320E00BE40C5 /* TestNSJSONSerialization.swift in Sources */,
 				EA66F6501BF1619600136161 /* TestNSNumber.swift in Sources */,

Foundation/NSProcessInfo.swift

@@ -72,14 +72,7 @@ public class NSProcessInfo : NSObject {
         }
     }
 
-    public var processName: String {
-        get {
-            NSUnimplemented()
-        }
-        set {
-            NSUnimplemented()
-        }
-    }
+    public var processName: String = _CFProcessNameString()._swiftObject
 
     public var processIdentifier: Int32 {
         get {

TestFoundation/TestNSProcessInfo.swift

@@ -0,0 +1,46 @@
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2015 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
+// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+
+
+#if DEPLOYMENT_RUNTIME_OBJC || os(Linux)
+    import Foundation
+    import XCTest
+#else
+    import SwiftFoundation
+    import SwiftXCTest
+#endif
+
+
+class TestNSProcessInfo : XCTestCase {
+    
+    var allTests : [(String, () -> ())] {
+        return [
+            ("test_processName", test_processName ),
+        ]
+    }
+    
+    func test_processName() {
+        // Assert that the original process name is "TestFoundation". This test
+        // will fail if the test target ever gets renamed, so maybe it should
+        // just test that the initial name is not empty or something?
+        let processInfo = NSProcessInfo.processInfo()
+        let targetName = "TestFoundation"
+        let originalProcessName = processInfo.processName
+        XCTAssertEqual(originalProcessName, targetName, "\"\(originalProcessName)\" not equal to \"TestFoundation\"")
+        
+        // Try assigning a new process name.
+        let newProcessName = "TestProcessName"
+        processInfo.processName = newProcessName
+        XCTAssertEqual(processInfo.processName, newProcessName, "\"\(processInfo.processName)\" not equal to \"\(newProcessName)\"")
+        
+        // Assign back to the original process name.
+        processInfo.processName = originalProcessName
+        XCTAssertEqual(processInfo.processName, originalProcessName, "\"\(processInfo.processName)\" not equal to \"\(originalProcessName)\"")
+    }
+}

TestFoundation/main.swift

@@ -39,6 +39,7 @@ XCTMain([
     TestNSNotificationCenter(),
     TestNSNumber(),
     TestNSPipe(),
+    TestNSProcessInfo(),
     TestNSPropertyList(),
     TestNSRange(),
     TestNSScanner(),