tests: removed useless usage of deprecated Route::addStyle

nette · Nov 5, 2014 · b9d567a · b9d567a
1 parent c0d9eec
commit b9d567a
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 25 deletions.
diff --git a/tests/Application.Routers/Route.filterTable.query.phpt b/tests/Application.Routers/Route.filterTable.query.phpt
@@ -13,16 +13,17 @@ require __DIR__ . '/../bootstrap.php';
 require __DIR__ . '/Route.inc';
 
 
-Route::addStyle('#xlat', 'presenter');
-Route::setStyleProperty('#xlat', Route::FILTER_TABLE, array(
-	'produkt' => 'Product',
-	'kategorie' => 'Category',
-	'zakaznik' => 'Customer',
-	'kosik' => 'Basket',
+$route = new Route(' ? action=<presenter>', array(
+	'presenter' => array(
+		Route::FILTER_TABLE => array(
+			'produkt' => 'Product',
+			'kategorie' => 'Category',
+			'zakaznik' => 'Customer',
+			'kosik' => 'Basket',
+		),
+	),
 ));
 
-$route = new Route(' ? action=<presenter #xlat>', array());
-
 testRouteIn($route, '/?action=kategorie', 'Category', array(
 	'test' => 'testvalue',
 ), '/?test=testvalue&action=kategorie');
diff --git a/tests/Application.Routers/Route.filterTable.strict.phpt b/tests/Application.Routers/Route.filterTable.strict.phpt
@@ -13,16 +13,17 @@ require __DIR__ . '/../bootstrap.php';
 require __DIR__ . '/Route.inc';
 
 
-Route::addStyle('#xlat', 'presenter');
-Route::setStyleProperty('#xlat', Route::FILTER_TABLE, array(
-	'produkt' => 'Product',
-	'kategorie' => 'Category',
-	'zakaznik' => 'Customer',
-	'kosik' => 'Basket',
+$route = new Route('<presenter>', array(
+	'presenter' => array(
+		Route::FILTER_TABLE => array(
+			'produkt' => 'Product',
+			'kategorie' => 'Category',
+			'zakaznik' => 'Customer',
+			'kosik' => 'Basket',
+		),
+		Route::FILTER_STRICT => TRUE,
+	),
 ));
-Route::setStyleProperty('#xlat', Route::FILTER_STRICT, TRUE);
-
-$route = new Route('<presenter #xlat>', array());
 
 testRouteIn($route, '/kategorie/', 'Category', array(
 	'test' => 'testvalue',

diff --git a/tests/Application.Routers/Route.filterTable.url.phpt b/tests/Application.Routers/Route.filterTable.url.phpt
@@ -13,16 +13,17 @@ require __DIR__ . '/../bootstrap.php';
 require __DIR__ . '/Route.inc';
 
 
-Route::addStyle('#xlat', 'presenter');
-Route::setStyleProperty('#xlat', Route::FILTER_TABLE, array(
-	'produkt' => 'Product',
-	'kategorie' => 'Category',
-	'zakaznik' => 'Customer',
-	'kosik' => 'Basket',
+$route = new Route('<presenter>', array(
+	'presenter' => array(
+		Route::FILTER_TABLE => array(
+			'produkt' => 'Product',
+			'kategorie' => 'Category',
+			'zakaznik' => 'Customer',
+			'kosik' => 'Basket',
+		),
+	),
 ));
 
-$route = new Route('<presenter #xlat>', array());
-
 testRouteIn($route, '/kategorie/', 'Category', array(
 	'test' => 'testvalue',
 ), '/kategorie?test=testvalue');