+ test_match

Author: CreatCodeBuild

hyper2web/router.py

@@ -57,7 +57,13 @@ def _match(cls, route, path):
 			return False, None
 		else:
 			# todo: implement it
-			pass
+			parameters = {}
+			for r, p in zip(route, path):
+				if r[0] == '{' and r[-1] == '}':
+					parameters[r[1:-1]] = p
+				elif r != p:
+					return False, None
+			return True, parameters
 
 	# async
 	async def handle_route(self, http: HTTP, stream: Stream):

test/test_router.py

@@ -18,6 +18,7 @@ def test_handle_existing_route_only(self):
 			coroutine = router.handle_route(None, stream)
 			run(coroutine)
 
+	# todo: this test has some problem
 	def test_get_existing_route(self):
 		router = Router(None, None)
 		stream = Stream(1, {':path': 'x', ':method': 'GET'})
@@ -40,12 +41,15 @@ async def f(http, stream):
 		coroutine = router.handle_route(None, stream)
 		run(coroutine)
 
-	def test_parameterized_route(self):
-		router = Router(None, None)
-		the_route = 'user/{user}'
-		router._route('GET', the_route, None)
-		matched, parameters = router.match('/user/abc')		# todo: to be implemented
-		self.assertEqual(the_route, matched)
-		self.assertEqual(parameters['user'], 'abc')
+	def test_match(self):
+		# match true
+		matched, parameters = Router._match('user/{userId}/name/{name}', 'user/123/name/John')
+		self.assertTrue(matched)
+		self.assertEqual(parameters['userId'], '123')
+		self.assertEqual(parameters['name'], 'John')
+
+		# match false
+		matched, parameters = Router._match('user/{userId}/name/{name}', 'user/123/nam/John')
+		self.assertFalse(matched)
 
 	# will want to test with unicode