throw exceptions and fixing tests

Author: g-Off

XcodeProject.xcodeproj/project.pbxproj

@@ -42,10 +42,9 @@
 		6C2644271E11C80A0057CFA4 /* XCVersionGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C2644051E11C80A0057CFA4 /* XCVersionGroup.swift */; };
 		6C2644281E11C80A0057CFA4 /* ProjectFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C2644061E11C80A0057CFA4 /* ProjectFile.swift */; };
 		6C82B6841FFC03180040FD50 /* Workspace.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C82B6831FFC03180040FD50 /* Workspace.swift */; };
-		6CBB7D7F1F002EC300188560 /* DiffTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CD0855E1EFF581C00AEC92A /* DiffTests.swift */; };
 		6CD2228D1DDD5C180058C7CD /* XcodeProject.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CD222831DDD5C180058C7CD /* XcodeProject.framework */; };
 		6CD222921DDD5C180058C7CD /* XcodeProjectTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CD222911DDD5C180058C7CD /* XcodeProjectTests.swift */; };
-		6CE0F78A1E0C69FC001DF692 /* GlobalIDTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CE0F7891E0C69FC001DF692 /* GlobalIDTests.swift */; };
+		6CE0F78A1E0C69FC001DF692 /* PBXObjectIDTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CE0F7891E0C69FC001DF692 /* PBXObjectIDTests.swift */; };
 		6CE0F7BA1E0CAB23001DF692 /* Projects in Resources */ = {isa = PBXBuildFile; fileRef = 6CE0F7B91E0CAB23001DF692 /* Projects */; };
 		6CE346AD1FE9B2E400EFF588 /* PBXGroup+Sorting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CE346AC1FE9B2E400EFF588 /* PBXGroup+Sorting.swift */; };
 		6CE346AF1FE9B45E00EFF588 /* PBXGroup+FolderSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CE346AE1FE9B45E00EFF588 /* PBXGroup+FolderSync.swift */; };
@@ -102,12 +101,11 @@
 		6C2644061E11C80A0057CFA4 /* ProjectFile.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProjectFile.swift; sourceTree = "<group>"; };
 		6C2644081E11C80A0057CFA4 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		6C82B6831FFC03180040FD50 /* Workspace.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Workspace.swift; sourceTree = "<group>"; };
-		6CD0855E1EFF581C00AEC92A /* DiffTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiffTests.swift; sourceTree = "<group>"; };
 		6CD222831DDD5C180058C7CD /* XcodeProject.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = XcodeProject.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		6CD2228C1DDD5C180058C7CD /* XcodeProjectTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = XcodeProjectTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		6CD222911DDD5C180058C7CD /* XcodeProjectTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XcodeProjectTests.swift; sourceTree = "<group>"; };
 		6CD222931DDD5C180058C7CD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		6CE0F7891E0C69FC001DF692 /* GlobalIDTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlobalIDTests.swift; sourceTree = "<group>"; };
+		6CE0F7891E0C69FC001DF692 /* PBXObjectIDTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PBXObjectIDTests.swift; sourceTree = "<group>"; };
 		6CE0F7B91E0CAB23001DF692 /* Projects */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Projects; sourceTree = "<group>"; };
 		6CE346AC1FE9B2E400EFF588 /* PBXGroup+Sorting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PBXGroup+Sorting.swift"; sourceTree = "<group>"; };
 		6CE346AE1FE9B45E00EFF588 /* PBXGroup+FolderSync.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PBXGroup+FolderSync.swift"; sourceTree = "<group>"; };
@@ -262,8 +260,7 @@
 			isa = PBXGroup;
 			children = (
 				6CD222931DDD5C180058C7CD /* Info.plist */,
-				6CD0855E1EFF581C00AEC92A /* DiffTests.swift */,
-				6CE0F7891E0C69FC001DF692 /* GlobalIDTests.swift */,
+				6CE0F7891E0C69FC001DF692 /* PBXObjectIDTests.swift */,
 				6CD222911DDD5C180058C7CD /* XcodeProjectTests.swift */,
 				6CD2229F1DDD5CC10058C7CD /* Resources */,
 			);
@@ -281,9 +278,9 @@
 		6CE346AB1FE9B24000EFF588 /* Objects+Extensions */ = {
 			isa = PBXGroup;
 			children = (
-				6C2643F91E11C80A0057CFA4 /* PBXProject+Helpers.swift */,
-				6CE346AC1FE9B2E400EFF588 /* PBXGroup+Sorting.swift */,
 				6CE346AE1FE9B45E00EFF588 /* PBXGroup+FolderSync.swift */,
+				6CE346AC1FE9B2E400EFF588 /* PBXGroup+Sorting.swift */,
+				6C2643F91E11C80A0057CFA4 /* PBXProject+Helpers.swift */,
 				6CE346B01FE9B4F600EFF588 /* PBXReference+Extensions.swift */,
 				6CE346CB1FECA29100EFF588 /* PBXTarget+Extensions.swift */,
 			);
@@ -456,8 +453,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				6CD222921DDD5C180058C7CD /* XcodeProjectTests.swift in Sources */,
-				6CBB7D7F1F002EC300188560 /* DiffTests.swift in Sources */,
-				6CE0F78A1E0C69FC001DF692 /* GlobalIDTests.swift in Sources */,
+				6CE0F78A1E0C69FC001DF692 /* PBXObjectIDTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

XcodeProject/Objects+Extensions/PBXProject+Helpers.swift

@@ -13,7 +13,7 @@ public extension PBXProject {
 }
 public extension PBXProject {
 	func addTarget(name: String, type: PBXNativeTarget.ProductType) {
-		let target = PBXNativeTarget(globalID: PBXObject.ID())
+		let target = PBXNativeTarget(globalID: generateGlobalId())
 		target.name = name
 		target.productName = name
 		target.productType = type

XcodeProject/ProjectFile.swift

@@ -38,20 +38,19 @@ public final class ProjectFile {
 	///
 	/// - Parameter url: Path to an xcodeproj file to be opened
 	/// - Returns: A fully parsed project from the provided source or `nil` if an error happened
-	public init?(url: URL) {
+	public init?(url: URL) throws {
 		self.url = url
 		do {
 			self.fileWrapper = try FileWrapper(url: url, options: [])
 		} catch {
 			return nil
 		}
-		if fileWrapper.isDirectory == false {
-			//throw
+		guard fileWrapper.isDirectory else {
+			throw CocoaError.error(.fileReadUnknown)
 		}
 
 		guard let pbxproj = fileWrapper.fileWrappers?["project.pbxproj"], pbxproj.isRegularFile else {
-			// throw
-			return nil
+			throw CocoaError.error(.fileReadUnknown)
 		}
 
 		guard let data = pbxproj.regularFileContents else {
@@ -109,8 +108,7 @@ extension ProjectFile {
 		let destination = destination ?? url
 
 		guard let oldPbxproj = fileWrapper.fileWrappers?["project.pbxproj"], oldPbxproj.isRegularFile else {
-			// throw
-			return
+			throw CocoaError.error(.fileReadUnknown)
 		}
 
 		let dataStream = DataStreamWriter()

XcodeProjectTests/DiffTests.swift

@@ -1,5 +1,5 @@
 //
-//  PBXObject.IDTests.swift
+//  PBXObjectIDTests.swift
 //  XcodeProject
 //
 //  Created by Geoffrey Foster on 2016-12-22.
@@ -9,7 +9,7 @@
 import XCTest
 @testable import XcodeProject
 
-class PBXObject.IDTests: XCTestCase {
+class PBXObjectIDTests: XCTestCase {
 
     func testIDGeneration() {
 		var generator = PBXObject.ID.IDGenerator(userName: "XcodeProject", processId: 50_000, referenceDateFunc: { () -> UInt32 in

XcodeProjectTests/GlobalIDTests.swift XcodeProjectTests/PBXObjectIDTests.swiftXcodeProjectTests/GlobalIDTests.swift renamed to XcodeProjectTests/PBXObjectIDTests.swift

@@ -13,7 +13,7 @@ class XcodeProjectTests: XCTestCase {
 
 	@inline(__always)
 	func assertReadWriteProject(xcodeprojURL: URL) {
-		let projectFile = ProjectFile(url: xcodeprojURL)!
+		let projectFile = try! ProjectFile(url: xcodeprojURL)!
 
 		let archiver = PBXPListArchiver(projectFile: projectFile)
 		let streamWriter = StringStreamWriter()
@@ -40,7 +40,7 @@ class XcodeProjectTests: XCTestCase {
 
 		do {
 			try FileManager.default.copyItem(at: xcodeprojURL, to: copyiedProjectURL)
-			let projectFile = ProjectFile(url: copyiedProjectURL)!
+			let projectFile = try! ProjectFile(url: copyiedProjectURL)!
 			projectFile.project.mainGroup.sort(recursive: true, by: .type)
 			try projectFile.save()
 		} catch (let error) {