aimeos / ai-flow

lib/custom/tests/MW/Logger/FlowTest.php

Spacing +29 added lines, -29 removed lines

@@ -25,18 +25,18 @@ 
 	 */
 	protected function setUp()
 	{
-		if( class_exists( '\\TYPO3\\Flow\\Log\\Logger' ) === false ) {
-			$this->markTestSkipped( 'Class \\TYPO3\\Flow\\Log\\Logger not found' );
+		if (class_exists('\\TYPO3\\Flow\\Log\\Logger') === false) {
+			$this->markTestSkipped('Class \\TYPO3\\Flow\\Log\\Logger not found');
 		}
 
 		$be = new \TYPO3\Flow\Log\Backend\FileBackend();
-		$be->setSeverityThreshold( LOG_ERR );
-		$be->setLogFileURL( 'flow.log' );
+		$be->setSeverityThreshold(LOG_ERR);
+		$be->setLogFileURL('flow.log');
 
 		$log = new \TYPO3\Flow\Log\Logger();
-		$log->addBackend( $be );
+		$log->addBackend($be);
 
-		$this->object = new \Aimeos\MW\Logger\Flow( $log );
+		$this->object = new \Aimeos\MW\Logger\Flow($log);
 	}
 
 
@@ -48,53 +48,53 @@ 
 	 */
 	protected function tearDown()
 	{
-		@unlink( 'flow.log' );
+		@unlink('flow.log');
 	}
 
 
 	public function testLog()
 	{
-		$this->object->log( 'error' );
-		$this->assertRegExp( '/^[^ ]+ [^ ]+ [0-9]+[ ]+ERROR[ ]+MW[ ]+error/', file_get_contents( 'flow.log' ) );
+		$this->object->log('error');
+		$this->assertRegExp('/^[^ ]+ [^ ]+ [0-9]+[ ]+ERROR[ ]+MW[ ]+error/', file_get_contents('flow.log'));
 	}
 
 
 	public function testNonScalarLog()
 	{
-		$this->object->log( array( 'error', 'error2', 2 ) );
-		$this->assertRegExp( '/^[^ ]+ [^ ]+ [0-9]+[ ]+ERROR[ ]+MW[ ]+\["error","error2",2\]/', file_get_contents( 'flow.log' ) );
+		$this->object->log(array('error', 'error2', 2));
+		$this->assertRegExp('/^[^ ]+ [^ ]+ [0-9]+[ ]+ERROR[ ]+MW[ ]+\["error","error2",2\]/', file_get_contents('flow.log'));
 	}
 
 
 	public function testLogDebug()
 	{
-		$this->object->log( 'debug', \Aimeos\MW\Logger\Base::DEBUG );
-		$this->assertEquals( '', file_get_contents( 'flow.log' ) );
+		$this->object->log('debug', \Aimeos\MW\Logger\Base::DEBUG);
+		$this->assertEquals('', file_get_contents('flow.log'));
 	}
 
 
 	public function testBadPriority()
 	{
-		$this->setExpectedException( '\\Aimeos\\MW\\Logger\\Exception' );
-		$this->object->log( 'error', -1 );
+		$this->setExpectedException('\\Aimeos\\MW\\Logger\\Exception');
+		$this->object->log('error', -1);
 	}
 
 
 	public function testLogPriorityTranslate()
 	{
-		$this->object->log( '', \Aimeos\MW\Logger\Base::EMERG );
-		$this->object->log( '', \Aimeos\MW\Logger\Base::ALERT );
-		$this->object->log( '', \Aimeos\MW\Logger\Base::CRIT );
-		$this->object->log( '', \Aimeos\MW\Logger\Base::ERR );
-		$this->object->log( '', \Aimeos\MW\Logger\Base::WARN );
-		$this->object->log( '', \Aimeos\MW\Logger\Base::NOTICE );
-		$this->object->log( '', \Aimeos\MW\Logger\Base::INFO );
-		$this->object->log( '', \Aimeos\MW\Logger\Base::DEBUG );
-
-		$content = file_get_contents( 'flow.log' );
-		$this->assertContains( 'EMERGENCY', $content );
-		$this->assertContains( 'ALERT', $content );
-		$this->assertContains( 'CRITICAL', $content );
-		$this->assertContains( 'ERROR', $content );
+		$this->object->log('', \Aimeos\MW\Logger\Base::EMERG);
+		$this->object->log('', \Aimeos\MW\Logger\Base::ALERT);
+		$this->object->log('', \Aimeos\MW\Logger\Base::CRIT);
+		$this->object->log('', \Aimeos\MW\Logger\Base::ERR);
+		$this->object->log('', \Aimeos\MW\Logger\Base::WARN);
+		$this->object->log('', \Aimeos\MW\Logger\Base::NOTICE);
+		$this->object->log('', \Aimeos\MW\Logger\Base::INFO);
+		$this->object->log('', \Aimeos\MW\Logger\Base::DEBUG);
+
+		$content = file_get_contents('flow.log');
+		$this->assertContains('EMERGENCY', $content);
+		$this->assertContains('ALERT', $content);
+		$this->assertContains('CRITICAL', $content);
+		$this->assertContains('ERROR', $content);
 	}
 }

lib/custom/tests/MW/Cache/FlowTest.php

Spacing +65 added lines, -65 removed lines

@@ -21,12 +21,12 @@ 
 	 */
 	protected function setUp()
 	{
-		if( interface_exists( 'TYPO3\Flow\Cache\Frontend\FrontendInterface' ) === false ) {
-			$this->markTestSkipped( 'Class \\TYPO3\\Flow\\Cache\\Frontend\\FrontendInterface not found' );
+		if (interface_exists('TYPO3\Flow\Cache\Frontend\FrontendInterface') === false) {
+			$this->markTestSkipped('Class \\TYPO3\\Flow\\Cache\\Frontend\\FrontendInterface not found');
 		}
 
-		$this->mock = $this->getMock( 'TYPO3\Flow\Cache\Frontend\FrontendInterface' );
-		$this->object = new \Aimeos\MW\Cache\Flow( array(), $this->mock );
+		$this->mock = $this->getMock('TYPO3\Flow\Cache\Frontend\FrontendInterface');
+		$this->object = new \Aimeos\MW\Cache\Flow(array(), $this->mock);
 	}
 
 
@@ -38,190 +38,190 @@ 
 	 */
 	protected function tearDown()
 	{
-		unset( $this->mock, $this->object );
+		unset($this->mock, $this->object);
 	}
 
 
 	public function testDelete()
 	{
-		$this->mock->expects( $this->once() )->method( 'remove' )->with( $this->equalTo( 'key' ) );
-		$this->object->delete( 'key' );
+		$this->mock->expects($this->once())->method('remove')->with($this->equalTo('key'));
+		$this->object->delete('key');
 	}
 
 
 	public function testDeleteWithSiteId()
 	{
-		$object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock );
+		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock);
 
-		$this->mock->expects( $this->once() )->method( 'remove' )->with( $this->equalTo( '1-key' ) );
-		$object->delete( 'key' );
+		$this->mock->expects($this->once())->method('remove')->with($this->equalTo('1-key'));
+		$object->delete('key');
 	}
 
 
 	public function testDeleteList()
 	{
-		$this->mock->expects( $this->exactly( 2 ) )->method( 'remove' )->with( $this->equalTo( 'key' ) );
-		$this->object->deleteList( array( 'key', 'key' ) );
+		$this->mock->expects($this->exactly(2))->method('remove')->with($this->equalTo('key'));
+		$this->object->deleteList(array('key', 'key'));
 	}
 
 
 	public function testDeleteListWithSiteId()
 	{
-		$object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock );
+		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock);
 
-		$this->mock->expects( $this->once() )->method( 'remove' )->with( $this->equalTo( '1-key' ) );
-		$object->deleteList( array( 'key' ) );
+		$this->mock->expects($this->once())->method('remove')->with($this->equalTo('1-key'));
+		$object->deleteList(array('key'));
 	}
 
 
 	public function testDeleteByTags()
 	{
-		$this->mock->expects( $this->exactly( 2 ) )->method( 'flushByTag' )->with( $this->equalTo( 'tag' ) );
-		$this->object->deleteByTags( array( 'tag', 'tag' ) );
+		$this->mock->expects($this->exactly(2))->method('flushByTag')->with($this->equalTo('tag'));
+		$this->object->deleteByTags(array('tag', 'tag'));
 	}
 
 
 	public function testDeleteByTagsWithSiteId()
 	{
-		$object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock );
+		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock);
 
-		$this->mock->expects( $this->once() )->method( 'flushByTag' )->with( $this->equalTo( '1-tag' ) );
-		$object->deleteByTags( array( 'tag' ) );
+		$this->mock->expects($this->once())->method('flushByTag')->with($this->equalTo('1-tag'));
+		$object->deleteByTags(array('tag'));
 	}
 
 
 	public function testFlush()
 	{
-		$this->mock->expects( $this->once() )->method( 'flush' );
+		$this->mock->expects($this->once())->method('flush');
 		$this->object->flush();
 	}
 
 
 	public function testFlushWithSiteId()
 	{
-		$object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock );
+		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock);
 
-		$this->mock->expects( $this->once() )->method( 'flushByTag' )->with( $this->equalTo( '1-siteid' ) );
+		$this->mock->expects($this->once())->method('flushByTag')->with($this->equalTo('1-siteid'));
 		$object->flush();
 	}
 
 
 	public function testGet()
 	{
-		$this->mock->expects( $this->once() )->method( 'get' )
-			->with( $this->equalTo( 'key' ) )->will( $this->returnValue( 'value' ) );
+		$this->mock->expects($this->once())->method('get')
+			->with($this->equalTo('key'))->will($this->returnValue('value'));
 
-		$this->assertEquals( 'value', $this->object->get( 'key', 'default' ) );
+		$this->assertEquals('value', $this->object->get('key', 'default'));
 	}
 
 
 	public function testGetDefault()
 	{
-		$this->mock->expects( $this->once() )->method( 'get' )
-		->with( $this->equalTo( 'key' ) )->will( $this->returnValue( false ) );
+		$this->mock->expects($this->once())->method('get')
+		->with($this->equalTo('key'))->will($this->returnValue(false));
 
-		$this->assertEquals( 'default', $this->object->get( 'key', 'default' ) );
+		$this->assertEquals('default', $this->object->get('key', 'default'));
 	}
 
 
 	public function testGetWithSiteId()
 	{
-		$object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock );
+		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock);
 
-		$this->mock->expects( $this->once() )->method( 'get' )->with( $this->equalTo( '1-key' ) );
-		$object->get( 'key', 'default' );
+		$this->mock->expects($this->once())->method('get')->with($this->equalTo('1-key'));
+		$object->get('key', 'default');
 	}
 
 
 	public function testGetList()
 	{
-		$this->mock->expects( $this->exactly( 2 ) )->method( 'get' )
-			->will( $this->returnValue( 'value' ) );
+		$this->mock->expects($this->exactly(2))->method('get')
+			->will($this->returnValue('value'));
 
-		$expected = array( 'key1' => 'value', 'key2' => 'value' );
-		$this->assertEquals( $expected, $this->object->getList( array( 'key1', 'key2' ) ) );
+		$expected = array('key1' => 'value', 'key2' => 'value');
+		$this->assertEquals($expected, $this->object->getList(array('key1', 'key2')));
 	}
 
 
 	public function testGetListWithSiteId()
 	{
-		$object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock );
+		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock);
 
-		$this->mock->expects( $this->once() )->method( 'get' )->with( $this->equalTo( '1-key' ) );
-		$object->getList( array( 'key' ) );
+		$this->mock->expects($this->once())->method('get')->with($this->equalTo('1-key'));
+		$object->getList(array('key'));
 	}
 
 
 	public function testGetListByTags()
 	{
-		$this->mock->expects( $this->exactly( 2 ) )->method( 'getByTag' )
-			->with( $this->equalTo( 'key' ) )->will( $this->returnValue( array( 'key' => 'value' ) ) );
+		$this->mock->expects($this->exactly(2))->method('getByTag')
+			->with($this->equalTo('key'))->will($this->returnValue(array('key' => 'value')));
 
-		$this->assertEquals( array( 'key' => 'value' ), $this->object->getListByTags( array( 'key', 'key' ) ) );
+		$this->assertEquals(array('key' => 'value'), $this->object->getListByTags(array('key', 'key')));
 	}
 
 
 	public function testGetListByTagsWithSiteId()
 	{
-		$object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock );
+		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock);
 
-		$this->mock->expects( $this->once() )->method( 'getByTag' )
-			->with( $this->equalTo( '1-key' ) )->will( $this->returnValue( array( '1-key' => 'value' ) ) );
+		$this->mock->expects($this->once())->method('getByTag')
+			->with($this->equalTo('1-key'))->will($this->returnValue(array('1-key' => 'value')));
 
-		$this->assertEquals( array( 'key' => 'value' ), $object->getListByTags( array( 'key' ) ) );
+		$this->assertEquals(array('key' => 'value'), $object->getListByTags(array('key')));
 	}
 
 
 	public function testSet()
 	{
-		$this->mock->expects( $this->once() )->method( 'set' )
+		$this->mock->expects($this->once())->method('set')
 			->with(
-				$this->equalTo( 'key' ), $this->equalTo( 'value' ),
-				$this->equalTo( array( 'tag' ) ), $this->greaterThan( 0 )
+				$this->equalTo('key'), $this->equalTo('value'),
+				$this->equalTo(array('tag')), $this->greaterThan(0)
 			);
 
-		$this->object->set( 'key', 'value', array( 'tag' ), '2000-01-01 00:00:00' );
+		$this->object->set('key', 'value', array('tag'), '2000-01-01 00:00:00');
 	}
 
 
 	public function testSetWithSiteId()
 	{
-		$object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock );
+		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock);
 
-		$this->mock->expects( $this->once() )->method( 'set' )
+		$this->mock->expects($this->once())->method('set')
 			->with(
-				$this->equalTo( '1-key' ), $this->equalTo( 'value' ),
-				$this->equalTo( array( '1-siteid', '1-tag' ) ), $this->equalTo( null )
+				$this->equalTo('1-key'), $this->equalTo('value'),
+				$this->equalTo(array('1-siteid', '1-tag')), $this->equalTo(null)
 			);
 
-		$object->set( 'key', 'value', array( 'tag' ), null );
+		$object->set('key', 'value', array('tag'), null);
 	}
 
 
 	public function testSetList()
 	{
-		$this->mock->expects( $this->once() )->method( 'set' )
+		$this->mock->expects($this->once())->method('set')
 			->with(
-				$this->equalTo( 'key' ), $this->equalTo( 'value' ),
-				$this->equalTo( array( 'tag' ) ), $this->greaterThan( 0 )
+				$this->equalTo('key'), $this->equalTo('value'),
+				$this->equalTo(array('tag')), $this->greaterThan(0)
 			);
 
-		$expires = array( 'key' => '2000-01-01 00:00:00' );
-		$this->object->setList( array( 'key' => 'value' ), array( 'key' => array( 'tag' ) ), $expires );
+		$expires = array('key' => '2000-01-01 00:00:00');
+		$this->object->setList(array('key' => 'value'), array('key' => array('tag')), $expires);
 	}
 
 
 	public function testSetListWithSiteId()
 	{
-		$object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock );
+		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock);
 
-		$this->mock->expects( $this->once() )->method( 'set' )
+		$this->mock->expects($this->once())->method('set')
 			->with(
-				$this->equalTo( '1-key' ), $this->equalTo( 'value' ),
-				$this->equalTo( array( '1-siteid', '1-tag' ) ), $this->equalTo( null )
+				$this->equalTo('1-key'), $this->equalTo('value'),
+				$this->equalTo(array('1-siteid', '1-tag')), $this->equalTo(null)
 			);
 
-		$object->setList( array( 'key' => 'value' ), array( 'key' => array( 'tag' ) ), array() );
+		$object->setList(array('key' => 'value'), array('key' => array('tag')), array());
 	}
 
 }

lib/custom/tests/MW/View/Helper/Url/FlowTest.php

Spacing +44 added lines, -44 removed lines

@@ -26,42 +26,42 @@ 
 	 */
 	protected function setUp()
 	{
-		if( !class_exists( '\\TYPO3\\Flow\\Mvc\\Routing\\UriBuilder' ) ) {
-			$this->markTestSkipped( '\\TYPO3\\Flow\\Mvc\\Routing\\UriBuilder is not available' );
+		if (!class_exists('\\TYPO3\\Flow\\Mvc\\Routing\\UriBuilder')) {
+			$this->markTestSkipped('\\TYPO3\\Flow\\Mvc\\Routing\\UriBuilder is not available');
 		}
 
 		$view = new \Aimeos\MW\View\Standard();
 
-		$mockHttpRequest = $this->getMockBuilder( 'TYPO3\Flow\Http\Request' )
+		$mockHttpRequest = $this->getMockBuilder('TYPO3\Flow\Http\Request')
 			->disableOriginalConstructor()
-			->setMethods( array( 'getBaseUri' ) )
+			->setMethods(array('getBaseUri'))
 			->getMock();
-		$mockHttpRequest->expects( $this->any() )
-			->method( 'getBaseUri' )
-			->will( $this->returnValue( 'http://localhost/' ) );
+		$mockHttpRequest->expects($this->any())
+			->method('getBaseUri')
+			->will($this->returnValue('http://localhost/'));
 
-		$mockMainRequest = $this->getMock( 'TYPO3\Flow\Mvc\ActionRequest', array( 'getControllerObjectName' ), array( $mockHttpRequest ) );
-		$mockMainRequest->expects( $this->any() )
-			->method( 'getArgumentNamespace' )
-			->will( $this->returnValue( 'ai' ) );
+		$mockMainRequest = $this->getMock('TYPO3\Flow\Mvc\ActionRequest', array('getControllerObjectName'), array($mockHttpRequest));
+		$mockMainRequest->expects($this->any())
+			->method('getArgumentNamespace')
+			->will($this->returnValue('ai'));
 
-		$this->mockRouter = $this->getMock( 'TYPO3\Flow\Mvc\Routing\Router' );
-		$mockEnv = $this->getMock( 'TYPO3\Flow\Utility\Environment', array( 'isRewriteEnabled' ), array(), '', false );
+		$this->mockRouter = $this->getMock('TYPO3\Flow\Mvc\Routing\Router');
+		$mockEnv = $this->getMock('TYPO3\Flow\Utility\Environment', array('isRewriteEnabled'), array(), '', false);
 
 		$builder = new \TYPO3\Flow\Mvc\Routing\UriBuilder();
-		$builder->setRequest( $mockMainRequest );
+		$builder->setRequest($mockMainRequest);
 
-		$objectReflection = new \ReflectionObject( $builder );
+		$objectReflection = new \ReflectionObject($builder);
 
-		$property = $objectReflection->getProperty( 'router' );
-		$property->setAccessible( true );
-		$property->setValue( $builder, $this->mockRouter );
+		$property = $objectReflection->getProperty('router');
+		$property->setAccessible(true);
+		$property->setValue($builder, $this->mockRouter);
 
-		$property = $objectReflection->getProperty( 'environment' );
-		$property->setAccessible( true );
-		$property->setValue( $builder, $mockEnv );
+		$property = $objectReflection->getProperty('environment');
+		$property->setAccessible(true);
+		$property->setValue($builder, $mockEnv);
 
-		$this->object = new \Aimeos\MW\View\Helper\Url\Flow( $view, $builder, array( 'site' => 'unittest' ) );
+		$this->object = new \Aimeos\MW\View\Helper\Url\Flow($view, $builder, array('site' => 'unittest'));
 	}
 
 
@@ -79,60 +79,60 @@ 
 
 	public function testTransform()
 	{
-		$this->mockRouter->expects( $this->once() )->method( 'resolve' )
-			->will( $this->returnValue( 'shop/catalog/lists') );
+		$this->mockRouter->expects($this->once())->method('resolve')
+			->will($this->returnValue('shop/catalog/lists'));
 
-		$this->assertEquals( '/index.php/shop/catalog/lists', $this->object->transform( 'shop', 'catalog', 'lists' ) );
+		$this->assertEquals('/index.php/shop/catalog/lists', $this->object->transform('shop', 'catalog', 'lists'));
 	}
 
 
 	public function testTransformSlashes()
 	{
-		$this->mockRouter->expects( $this->once() )->method( 'resolve' )
-			->will( $this->returnValue( 'shop/catalog/lists?test=a%2Fb') );
+		$this->mockRouter->expects($this->once())->method('resolve')
+			->will($this->returnValue('shop/catalog/lists?test=a%2Fb'));
 
-		$this->assertEquals( '/index.php/shop/catalog/lists?test=a%2Fb', $this->object->transform( 'shop', 'catalog', 'lists', array( 'test' => 'a/b' ) ) );
+		$this->assertEquals('/index.php/shop/catalog/lists?test=a%2Fb', $this->object->transform('shop', 'catalog', 'lists', array('test' => 'a/b')));
 	}
 
 
 	public function testTransformArrays()
 	{
-		$this->mockRouter->expects( $this->once() )->method( 'resolve' )
-			->will( $this->returnValue( 'shop/catalog/list?test%5B0%5D=a&test%5B1%5D=b') );
+		$this->mockRouter->expects($this->once())->method('resolve')
+			->will($this->returnValue('shop/catalog/list?test%5B0%5D=a&test%5B1%5D=b'));
 
-		$this->assertEquals( '/index.php/shop/catalog/list?test%5B0%5D=a&test%5B1%5D=b', $this->object->transform( 'shop', 'catalog', 'lists', array( 'test' => array( 'a', 'b' ) ) ) );
+		$this->assertEquals('/index.php/shop/catalog/list?test%5B0%5D=a&test%5B1%5D=b', $this->object->transform('shop', 'catalog', 'lists', array('test' => array('a', 'b'))));
 	}
 
 
 	public function testTransformTrailing()
 	{
-		$this->mockRouter->expects( $this->once() )->method( 'resolve' )
-			->will( $this->returnValue( 'shop/catalog/lists') );
+		$this->mockRouter->expects($this->once())->method('resolve')
+			->will($this->returnValue('shop/catalog/lists'));
 
-		$this->assertEquals( '/index.php/shop/catalog/lists#a/b', $this->object->transform( 'shop', 'catalog', 'lists', array(), array( 'a', 'b' ) ) );
+		$this->assertEquals('/index.php/shop/catalog/lists#a/b', $this->object->transform('shop', 'catalog', 'lists', array(), array('a', 'b')));
 	}
 
 
 	public function testTransformAbsolute()
 	{
-		$this->mockRouter->expects( $this->once() )->method( 'resolve' )
-			->will( $this->returnValue( 'shop/catalog/lists') );
+		$this->mockRouter->expects($this->once())->method('resolve')
+			->will($this->returnValue('shop/catalog/lists'));
 
-		$options = array( 'absoluteUri' => true );
-		$result = $this->object->transform( 'shop', 'catalog', 'lists', array(), array(), $options );
+		$options = array('absoluteUri' => true);
+		$result = $this->object->transform('shop', 'catalog', 'lists', array(), array(), $options);
 
-		$this->assertEquals( 'http://localhost/index.php/shop/catalog/lists', $result );
+		$this->assertEquals('http://localhost/index.php/shop/catalog/lists', $result);
 	}
 
 
 	public function testTransformConfig()
 	{
-		$this->mockRouter->expects( $this->once() )->method( 'resolve' )
-			->will( $this->returnValue( 'shop/catalog/lists') );
+		$this->mockRouter->expects($this->once())->method('resolve')
+			->will($this->returnValue('shop/catalog/lists'));
 
-		$options = array( 'package' => 'test', 'subpackage' => 'subtest', 'format' => 'fmt' );
-		$result = $this->object->transform( 'shop', 'catalog', 'lists', array(), array(), $options );
+		$options = array('package' => 'test', 'subpackage' => 'subtest', 'format' => 'fmt');
+		$result = $this->object->transform('shop', 'catalog', 'lists', array(), array(), $options);
 
-		$this->assertEquals( '/index.php/shop/catalog/lists', $result );
+		$this->assertEquals('/index.php/shop/catalog/lists', $result);
 	}
 }