Skip to content

Commit 3f8906c

Browse files
committed
separate test
1 parent 41ae38b commit 3f8906c

File tree

1 file changed

+19
-11
lines changed

1 file changed

+19
-11
lines changed

tests/AssetManagerTest/Resolver/AliasPathStackResolverTest.php

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -208,19 +208,27 @@ public function testGetAndSetOfLfiProtectionFlag()
208208
*/
209209
public function testResolve()
210210
{
211+
$resolver = new AliasPathStackResolver(array('my/alias/' => __DIR__));
212+
$this->assertTrue($resolver instanceof AliasPathStackResolver);
211213
$mimeResolver = new MimeResolver;
214+
$resolver->setMimeResolver($mimeResolver);
215+
$fileAsset = new Asset\FileAsset(__FILE__);
216+
$fileAsset->mimetype = $mimeResolver->getMimeType(__FILE__);
217+
$this->assertEquals($fileAsset, $resolver->resolve('my/alias/'.basename(__FILE__)));
218+
$this->assertNull($resolver->resolve('i-do-not-exist.php'));
219+
}
212220

213-
foreach (array('my/alias/', 'AliasPathStackResolverTest/') as $alias) {
214-
$resolver = new AliasPathStackResolver(array($alias => __DIR__));
215-
$this->assertTrue($resolver instanceof AliasPathStackResolver);
216-
$resolver->setMimeResolver($mimeResolver);
217-
218-
$fileAsset = new Asset\FileAsset(__FILE__);
219-
$fileAsset->mimetype = $mimeResolver->getMimeType(__FILE__);
220-
221-
$this->assertEquals($fileAsset, $resolver->resolve($alias.basename(__FILE__)));
222-
$this->assertNull($resolver->resolve('i-do-not-exist.php'));
223-
}
221+
/**
222+
* @covers \AssetManager\Resolver\AliasPathStackResolver::resolve
223+
*/
224+
public function testResolveWhenAliasExistsInPath()
225+
{
226+
$resolver = new AliasPathStackResolver(array('AliasPathStackResolverTest/' => __DIR__));
227+
$mimeResolver = new MimeResolver;
228+
$resolver->setMimeResolver($mimeResolver);
229+
$fileAsset = new Asset\FileAsset(__FILE__);
230+
$fileAsset->mimetype = $mimeResolver->getMimeType(__FILE__);
231+
$this->assertEquals($fileAsset, $resolver->resolve('AliasPathStackResolverTest/'.basename(__FILE__)));
224232
}
225233

226234
/**

0 commit comments

Comments
 (0)