Merge pull request #5 from jasl/octwu/fix_crash_case

jasl · web-flow · commit 833af427ceee · 2018-11-22T03:38:29.000+08:00
fix crash test case
diff --git a/RouterX.xcodeproj/project.pbxproj b/RouterX.xcodeproj/project.pbxproj
@@ -36,7 +36,6 @@
 		OBJ_63 /* RoutingPatternParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_23 /* RoutingPatternParserTests.swift */; };
 		OBJ_64 /* RoutingPatternScannerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_24 /* RoutingPatternScannerTests.swift */; };
 		OBJ_65 /* URLPathScannerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_25 /* URLPathScannerTests.swift */; };
-		OBJ_66 /* XCTestManifests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_26 /* XCTestManifests.swift */; };
 		OBJ_68 /* RouterX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "RouterX::RouterX::Product" /* RouterX.framework */; };
 /* End PBXBuildFile section */
 
@@ -71,7 +70,6 @@
 		OBJ_23 /* RoutingPatternParserTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoutingPatternParserTests.swift; sourceTree = "<group>"; };
 		OBJ_24 /* RoutingPatternScannerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoutingPatternScannerTests.swift; sourceTree = "<group>"; };
 		OBJ_25 /* URLPathScannerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLPathScannerTests.swift; sourceTree = "<group>"; };
-		OBJ_26 /* XCTestManifests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XCTestManifests.swift; sourceTree = "<group>"; };
 		OBJ_6 /* Package.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
 		OBJ_9 /* Router.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Router.swift; sourceTree = "<group>"; };
 		"RouterX::RouterX::Product" /* RouterX.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = RouterX.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -114,7 +112,6 @@
 				OBJ_23 /* RoutingPatternParserTests.swift */,
 				OBJ_24 /* RoutingPatternScannerTests.swift */,
 				OBJ_25 /* URLPathScannerTests.swift */,
-				OBJ_26 /* XCTestManifests.swift */,
 			);
 			name = RouterXTests;
 			path = Tests/RouterXTests;
@@ -137,15 +134,14 @@
 			name = Products;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		OBJ_5 /*  */ = {
+		OBJ_5 = {
 			isa = PBXGroup;
 			children = (
 				OBJ_6 /* Package.swift */,
 				OBJ_7 /* Sources */,
 				OBJ_17 /* Tests */,
 				OBJ_27 /* Products */,
 			);
-			name = "";
 			sourceTree = "<group>";
 		};
 		OBJ_7 /* Sources */ = {
@@ -237,7 +233,7 @@
 			knownRegions = (
 				en,
 			);
-			mainGroup = OBJ_5 /*  */;
+			mainGroup = OBJ_5;
 			productRefGroup = OBJ_27 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -284,7 +280,6 @@
 				OBJ_63 /* RoutingPatternParserTests.swift in Sources */,
 				OBJ_64 /* RoutingPatternScannerTests.swift in Sources */,
 				OBJ_65 /* URLPathScannerTests.swift in Sources */,
-				OBJ_66 /* XCTestManifests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/Sources/RouterX/RouterXCore.swift b/Sources/RouterX/RouterXCore.swift
@@ -52,8 +52,10 @@ open class RouterXCore {
                 return nil
             }
         }
+        
+        guard let pathPatternIdentifier = targetRoute.patternIdentifier else { return nil }
 
-        return MatchedRoute(url: url, parameters: parameters, patternIdentifier: targetRoute.patternIdentifier!)
+        return MatchedRoute(url: url, parameters: parameters, patternIdentifier: pathPatternIdentifier)
     }
 
     open func matchURLPath(_ urlPath: String) -> MatchedRoute? {
diff --git a/Tests/RouterXTests/RouterTests.swift b/Tests/RouterXTests/RouterTests.swift
@@ -35,9 +35,19 @@ final class RouterTests: XCTestCase {
             isUnmatchHandlerPerformed = true
         }))
         XCTAssertTrue(isUnmatchHandlerPerformed)
-    }
 
-    static var allTests = [
-        ("testIntegration", testIntegration)
-    ]
+        let pattern2 = "/band/:band_id/product"
+        let pattern2Case1 = "/band/20/product"
+        let pattern2Case2 = "/band/21"
+        let pattern2Case3 = "/band"
+
+        XCTAssertTrue(router.register(pattern: pattern2, handler: { _, parameters, _ in
+            XCTAssertEqual(parameters["band_id"], "20")
+            XCTAssertEqual(parameters.count, 1)
+        }))
+
+        XCTAssertTrue(router.match(urlPath: pattern2Case1))
+        XCTAssertFalse(router.match(urlPath: pattern2Case2))
+        XCTAssertFalse(router.match(urlPath: pattern2Case3))
+    }
 }
diff --git a/Tests/RouterXTests/RouterXCoreTests.swift b/Tests/RouterXTests/RouterXCoreTests.swift
@@ -26,8 +26,4 @@ final class RouterXCoreTests: XCTestCase {
 
         XCTAssertNil(router.matchURL(unmatchedCase as URL))
     }
-
-    static var allTests = [
-        ("testIntegration", testIntegration)
-    ]
 }
diff --git a/Tests/RouterXTests/RoutingPatternParserTests.swift b/Tests/RouterXTests/RoutingPatternParserTests.swift
@@ -5,16 +5,6 @@ import XCTest
 final class RoutingPatternParserTests: XCTestCase {
     let patternIdentifier: RouterX.PatternIdentifier = 1
 
-    static var allTests = [
-        ("testParsingFailureShouldThrowError", testParsingFailureShouldThrowError),
-        ("testParseSlash", testParseSlash),
-        ("testParseDot", testParseDot),
-        ("testParseLiteral", testParseLiteral),
-        ("testParseSymbol", testParseSymbol),
-        ("testStar", testStar),
-        ("testParseLParen", testParseLParen)
-    ]
-
     func testParsingFailureShouldThrowError() {
         let badTokens: [RoutingPatternToken] = [.rParen, .literal("bad")]
         let route = RouteVertex()
diff --git a/Tests/RouterXTests/RoutingPatternScannerTests.swift b/Tests/RouterXTests/RoutingPatternScannerTests.swift
@@ -3,10 +3,6 @@ import XCTest
 @testable import RouterX
 
 final class RoutingPatternScannerTests: XCTestCase {
-    static var allTests = [
-        ("testScanner", testScanner),
-        ("testRoundTrip", testRoundTrip)
-    ]
 
     func testScanner() {
         let cases: [String: Array<RoutingPatternToken>] = [
diff --git a/Tests/RouterXTests/URLPathScannerTests.swift b/Tests/RouterXTests/URLPathScannerTests.swift
@@ -3,9 +3,6 @@ import XCTest
 @testable import RouterX
 
 class URLPathScannerTests: XCTestCase {
-    static var allTests = [
-        ("testScanner", testScanner)
-    ]
 
     func testScanner() {
         let cases: [String: Array<URLPathToken>] = [
diff --git a/Tests/RouterXTests/XCTestManifests.swift b/Tests/RouterXTests/XCTestManifests.swift

Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,10 @@ open class RouterXCore {`
`52`	`52`	`return nil`
`53`	`53`	`}`
`54`	`54`	`}`
	`55`	`+`
	`56`	`+ guard let pathPatternIdentifier = targetRoute.patternIdentifier else { return nil }`
`55`	`57`
`56`		`- return MatchedRoute(url: url, parameters: parameters, patternIdentifier: targetRoute.patternIdentifier!)`
	`58`	`+ return MatchedRoute(url: url, parameters: parameters, patternIdentifier: pathPatternIdentifier)`
`57`	`59`	`}`
`58`	`60`
`59`	`61`	`open func matchURLPath(_ urlPath: String) -> MatchedRoute? {`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,4 @@ final class RouterXCoreTests: XCTestCase {`
`26`	`26`
`27`	`27`	`XCTAssertNil(router.matchURL(unmatchedCase as URL))`
`28`	`28`	`}`
`29`		`-`
`30`		`- static var allTests = [`
`31`		`- ("testIntegration", testIntegration)`
`32`		`- ]`
`33`	`29`	`}`