Update tests

zf-fr · Feb 16, 2014 · b21c3ed · b21c3ed
1 parent 9041d27
commit b21c3ed
Showing 1 changed file with 5 additions and 12 deletions.
diff --git a/tests/ZfrRestTest/Router/Http/Matcher/BaseSubPathMatcherTest.php b/tests/ZfrRestTest/Router/Http/Matcher/BaseSubPathMatcherTest.php
@@ -92,26 +92,19 @@ public function testMatchOnSelectableIfNoPreviousMatch($subPath)
         $data->expects($this->once())
              ->method('matching')
              ->with($this->isInstanceOf('Doctrine\Common\Collections\Criteria'))
-             ->will($this->returnValue('Doctrine\Common\Collections\Collection'));
+             ->will($this->returnValue($this->getMock('Doctrine\Common\Collections\Collection')));
 
         $metadata = $this->getMock('ZfrRest\Resource\Metadata\ResourceMetadataInterface');
 
-        //$reflClass = $this->getMock('ReflectionClass', [], [], '', false);
-        //$reflClass->expects($this->once())->method('isInstance')->will($this->returnValue(true));
-
         $resource = $this->getMock('ZfrRest\Resource\ResourceInterface');
         $resource->expects($this->once())->method('getData')->will($this->returnValue($data));
         $resource->expects($this->once())->method('getMetadata')->will($this->returnValue($metadata));
 
-        // With no previous match, it should create a new one
-        $this->assertInstanceOf(
-            'ZfrRest\Router\Http\Matcher\SubPathMatch',
-            $this->baseMatcher->matchSubPath($resource, $subPath)
-        );
+        $match    = $this->baseMatcher->matchSubPath($resource, $subPath);
+        $resource = $match->getMatchedResource();
 
-        // With an existing match, it should reuse it
-        $match = $this->getMock('ZfrRest\Router\Http\Matcher\SubPathMatch', [], [], '', false);
-        $this->assertSame($match, $this->baseMatcher->matchSubPath($resource, $subPath, $match));
+        $this->assertInstanceOf('ZfrRest\Router\Http\Matcher\SubPathMatch', $match);
+        $this->assertSame($metadata, $resource->getMetadata());
     }
 
     public function testReturnsNullIfNoMatchFromMatchers()