@@ -9,7 +9,7 @@ class AutoRouteManagerTest extends \PHPUnit_Framework_TestCase
9
9
{
10
10
public function setUp ()
11
11
{
12
- $ this ->driver = $ this ->getMock ('Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\Driver\DriverInterface ' );
12
+ $ this ->driver = $ this ->getMock ('Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\Adapter\AdapterInterface ' );
13
13
$ this ->urlGenerator = $ this ->getMock ('Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\UrlGeneratorInterface ' );
14
14
$ this ->defunctRouteHandler = $ this ->getMock ('Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\DefunctRouteHandlerInterface ' );
15
15
$ this ->autoRouteManager = new AutoRouteManager (
@@ -58,26 +58,27 @@ public function testBuildUrlContextCollection($params)
58
58
$ document = new \stdClass ;
59
59
60
60
for ($ i = 0 ; $ i < $ localesCount ; $ i ++) {
61
- $ expectedRoutes [] = $ this ->getMock ('Symfony\Cmf\Component\Routing\RouteObjectInterface ' );
61
+ $ expectedRoutes [] = $ this ->getMock ('Symfony\Cmf\Bundle\RoutingAutoBundle\Model\AutoRouteInterface ' );
62
62
63
63
$ this ->urlGenerator ->expects ($ this ->exactly ($ localesCount ))
64
64
->method ('generateUrl ' )
65
- ->with ($ document )
66
65
->will ($ this ->returnCallback (function () use ($ i , $ indexedUrls ) {
67
66
return $ indexedUrls [$ i ];
68
67
}));
69
-
70
- $ this ->driver ->expects ($ this ->exactly ($ localesCount ))
71
- ->method ('createAutoRoute ' )
72
- ->will ($ this ->returnCallback (function ($ url , $ document ) use ($ i , $ expectedRoutes ) {
73
- return $ expectedRoutes [$ i ];
74
- }));
75
68
}
76
69
77
- $ urlContextCollection = new UrlContextCollection ();
78
- $ this ->autoRouteManager ->buildUrlContextCollection ($ urlContextCollection , $ document );
70
+ $ this ->driver ->expects ($ this ->exactly ($ localesCount ))
71
+ ->method ('createAutoRoute ' )
72
+ ->will ($ this ->returnCallback (function ($ url , $ document ) use ($ expectedRoutes ) {
73
+ static $ i = 0 ;
74
+ return $ expectedRoutes [$ i ++];
75
+ }));
79
76
80
- $ res = $ urlContextCollection ->getPersistStack ();
81
- $ this ->assertEquals ($ expectedRoutes , $ res );
77
+ $ urlContextCollection = new UrlContextCollection ($ document );
78
+ $ this ->autoRouteManager ->buildUrlContextCollection ($ urlContextCollection );
79
+
80
+ foreach ($ expectedRoutes as $ expectedRoute ) {
81
+ $ this ->assertTrue ($ urlContextCollection ->containsAutoRoute ($ expectedRoute ), 'URL context collection contains route: ' . spl_object_hash ($ expectedRoute ));
82
+ }
82
83
}
83
84
}
0 commit comments