Add coverage for changed files

phpmd · Jul 17, 2021 · aa723b7 · aa723b7
1 parent c8d6ba3
commit aa723b7
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 63 deletions.
diff --git a/src/test/php/PHPMD/Baseline/ViolationBaselineTest.php b/src/test/php/PHPMD/Baseline/ViolationBaselineTest.php
@@ -13,23 +13,42 @@ class ViolationBaselineTest extends TestCase
      * @covers ::__construct
      * @covers ::getRuleName
      * @covers ::getFileName
-     * @covers ::getMethodName
      */
-    public function testAccessorsWithoutMethod()
+    public function testGetRuleName()
     {
         $violation = new ViolationBaseline('rule', 'foobar', null);
         static::assertSame('rule', $violation->getRuleName());
-        static::assertSame('foobar', $violation->getFileName());
-        static::assertNull($violation->getMethodName());
     }
 
     /**
+     * Test the give file matches the baseline correctly
+     *
      * @covers ::__construct
-     * @covers ::getMethodName
+     * @covers ::matches
+     * @return void
      */
-    public function testAccessorsWithMethod()
+    public function testMatchesWithMethod()
     {
-        $violation = new ViolationBaseline('rule', 'foobar', 'method');
-        static::assertSame('method', $violation->getMethodName());
+        $violation = new ViolationBaseline('sniff', 'foobar.txt', 'method');
+        static::assertTrue($violation->matches('foobar.txt', 'method'));
+        static::assertTrue($violation->matches('/test/foobar.txt', 'method'));
+        static::assertFalse($violation->matches('foo.txt', 'method'));
+        static::assertFalse($violation->matches('foobar.txt', 'unknown'));
+    }
+
+    /**
+     * Test the give file matches the baseline correctly
+     *
+     * @covers ::__construct
+     * @covers ::matches
+     * @return void
+     */
+    public function testMatchesWithoutMethod()
+    {
+        $violation = new ViolationBaseline('sniff', 'foobar.txt', null);
+        static::assertTrue($violation->matches('foobar.txt', null));
+        static::assertTrue($violation->matches('/test/foobar.txt', null));
+        static::assertFalse($violation->matches('foobar.txt', 'method'));
+        static::assertFalse($violation->matches('/test/unknown.txt', null));
     }
 }
diff --git a/src/test/php/PHPMD/Renderer/RendererFactoryTest.php b/src/test/php/PHPMD/Renderer/RendererFactoryTest.php
@@ -4,7 +4,6 @@
 
 use PHPMD\AbstractTest;
 use PHPMD\Writer\StreamWriter;
-use RuntimeException;
 
 /**
  * @coversDefaultClass \PHPMD\Renderer\RendererFactory
@@ -21,15 +20,4 @@ public function testCreateBaselineRendererSuccessfully()
 
         static::assertSame($writer, $renderer->getWriter());
     }
-
-    /**
-     * @covers ::createBaselineRenderer
-     * @expectedException RuntimeException
-     * @expectedExceptionMessage Unable to determine the realpath for
-     */
-    public function testCreateBaselineRendererThrowsExceptionForInvalidStream()
-    {
-        $writer = new StreamWriter(STDOUT);
-        RendererFactory::createBaselineRenderer($writer);
-    }
 }
diff --git a/src/test/php/PHPMD/TextUI/CommandTest.php b/src/test/php/PHPMD/TextUI/CommandTest.php
@@ -18,6 +18,7 @@
 namespace PHPMD\TextUI;
 
 use PHPMD\AbstractTest;
+use PHPMD\Utility\Paths;
 
 /**
  * Test case for the {@link \PHPMD\TextUI\Command} class.
@@ -246,7 +247,7 @@ public function testMainGenerateBaseline()
 
         static::assertSame(Command::EXIT_SUCCESS, $exitCode);
         static::assertFileExists($temp);
-        static::assertContains($uri, file_get_contents($temp));
+        static::assertContains(Paths::getRelativePath(getcwd(), $uri), file_get_contents($temp));
     }
 
     /**
@@ -262,6 +263,9 @@ public function testMainUpdateBaseline()
     {
         $sourceTemp   = self::createTempFileUri('ClassWithMultipleViolations.php');
         $baselineTemp = self::createTempFileUri();
+        // set work directory to the temp dir
+        self::changeWorkingDirectory(dirname($baselineTemp));
+
         copy(static::createResourceUriForTest('UpdateBaseline/ClassWithMultipleViolations.php'), $sourceTemp);
         copy(static::createResourceUriForTest('UpdateBaseline/phpmd.baseline.xml'), $baselineTemp);
 

diff --git a/src/test/php/PHPMD/Utility/PathsTest.php b/src/test/php/PHPMD/Utility/PathsTest.php
@@ -10,30 +10,6 @@
  */
 class PathsTest extends AbstractTest
 {
-    /**
-     * @covers ::concat
-     */
-    public function testConcatShouldConcatTwoPaths()
-    {
-        static::assertSame('/foo/bar', Paths::concat('/foo', '/bar'));
-    }
-
-    /**
-     * @covers ::concat
-     */
-    public function testConcatShouldDeduplicateSlashes()
-    {
-        static::assertSame('/foo/bar', Paths::concat('/foo/', '/bar'));
-    }
-
-    /**
-     * @covers ::concat
-     */
-    public function testConcatShouldForwardAllSlashes()
-    {
-        static::assertSame('/foo/bar/text.txt', Paths::concat('/foo\\', '/bar\\text.txt'));
-    }
-
     /**
      * @covers ::getRelativePath
      */
@@ -58,24 +34,6 @@ public function testGetRelativePathShouldNotSubtractOnInfixPath()
         static::assertSame('/foo/bar/text.txt', Paths::getRelativePath('/bar', '/foo/bar/text.txt'));
     }
 
-    /**
-     * @covers ::getAbsolutePath
-     * @expectedException RuntimeException
-     */
-    public function testGetAbsolutePathShouldReturnNullForIrregularStream()
-    {
-        Paths::getAbsolutePath(fopen('php://stdout', 'wb'));
-    }
-
-    /**
-     * @covers ::getAbsolutePath
-     */
-    public function testGetAbsolutePathShouldReturnPath()
-    {
-        $path = static::createResourceUriForTest('resource.txt');
-        static::assertSame(realpath($path), Paths::getAbsolutePath(fopen($path, 'rb')));
-    }
-
     /**
      * @covers ::getRealPath
      */