Merge pull request #7355 from wouterj/fix-test-issue

vimeo · Jan 9, 2022 · fe46082 · fe46082
2 parents 2c041f3 + f92841f
commit fe46082
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/tests/Config/ConfigTest.php b/tests/Config/ConfigTest.php
@@ -105,7 +105,7 @@ public function testBarebonesConfig(): void
         $config = $this->project_analyzer->getConfig();
 
         $this->assertTrue($config->isInProjectDirs(realpath('src/Psalm/Type.php')));
-        $this->assertFalse($config->isInProjectDirs(realpath('examples/StringAnalyzer.php')));
+        $this->assertFalse($config->isInProjectDirs(realpath('examples/TemplateScanner.php')));
     }
 
     public function testIgnoreProjectDirectory(): void
@@ -129,7 +129,7 @@ public function testIgnoreProjectDirectory(): void
 
         $this->assertTrue($config->isInProjectDirs(realpath('src/Psalm/Type.php')));
         $this->assertFalse($config->isInProjectDirs(realpath('src/Psalm/Internal/Analyzer/FileAnalyzer.php')));
-        $this->assertFalse($config->isInProjectDirs(realpath('examples/StringAnalyzer.php')));
+        $this->assertFalse($config->isInProjectDirs(realpath('examples/TemplateScanner.php')));
     }
 
     public function testIgnoreMissingProjectDirectory(): void
@@ -152,8 +152,8 @@ public function testIgnoreMissingProjectDirectory(): void
         $config = $this->project_analyzer->getConfig();
 
         $this->assertTrue($config->isInProjectDirs(realpath('src/Psalm/Type.php')));
-        $this->assertFalse($config->isInProjectDirs(realpath('does/not/exist/FileAnalyzer.php')));
-        $this->assertFalse($config->isInProjectDirs(realpath('examples/StringAnalyzer.php')));
+        $this->assertFalse($config->isInProjectDirs(realpath(__DIR__.'/../../').'/does/not/exist/FileAnalyzer.php'));
+        $this->assertFalse($config->isInProjectDirs(realpath('examples/TemplateScanner.php')));
     }
 
     public function testIgnoreSymlinkedProjectDirectory(): void
@@ -199,7 +199,7 @@ public function testIgnoreSymlinkedProjectDirectory(): void
 
         $this->assertTrue($config->isInProjectDirs(realpath('tests/AnnotationTest.php')));
         $this->assertFalse($config->isInProjectDirs(realpath('tests/fixtures/symlinktest/a/ignoreme.php')));
-        $this->assertFalse($config->isInProjectDirs(realpath('examples/StringAnalyzer.php')));
+        $this->assertFalse($config->isInProjectDirs(realpath('examples/TemplateScanner.php')));
 
         $regex = '/^unlink\([^\)]+\): (?:Permission denied|No such file or directory)$/';
         $last_error = error_get_last();
@@ -247,7 +247,7 @@ public function testIgnoreWildcardProjectDirectory(): void
         $this->assertTrue($config->isInProjectDirs(realpath('src/Psalm/Type.php')));
         $this->assertFalse($config->isInProjectDirs(realpath('src/Psalm/Internal/Analyzer/FileAnalyzer.php')));
         $this->assertFalse($config->isInProjectDirs(realpath('src/Psalm/Internal/Analyzer/Statements/ReturnAnalyzer.php')));
-        $this->assertFalse($config->isInProjectDirs(realpath('examples/StringAnalyzer.php')));
+        $this->assertFalse($config->isInProjectDirs(realpath('examples/TemplateScanner.php')));
     }
 
     public function testIgnoreWildcardFiles(): void
@@ -272,7 +272,7 @@ public function testIgnoreWildcardFiles(): void
         $this->assertTrue($config->isInProjectDirs(realpath('src/Psalm/Type.php')));
         $this->assertFalse($config->isInProjectDirs(realpath('src/Psalm/Internal/Analyzer/FileAnalyzer.php')));
         $this->assertTrue($config->isInProjectDirs(realpath('src/Psalm/Internal/Analyzer/Statements/ReturnAnalyzer.php')));
-        $this->assertFalse($config->isInProjectDirs(realpath('examples/StringAnalyzer.php')));
+        $this->assertFalse($config->isInProjectDirs(realpath('examples/TemplateScanner.php')));
     }
 
     public function testIgnoreWildcardFilesInWildcardFolder(): void
@@ -328,7 +328,6 @@ public function testIgnoreWildcardFilesInAllPossibleWildcardFolders(): void
         $this->assertTrue($config->isInProjectDirs(realpath('src/Psalm/Internal/PhpVisitor/ReflectorVisitor.php')));
         $this->assertFalse($config->isInProjectDirs(realpath('src/Psalm/Internal/Analyzer/FileAnalyzer.php')));
         $this->assertFalse($config->isInProjectDirs(realpath('src/Psalm/Internal/Analyzer/Statements/ReturnAnalyzer.php')));
-        $this->assertFalse($config->isInProjectDirs(realpath('examples/StringAnalyzer.php')));
     }
 
     public function testIssueHandler(): void
@@ -352,7 +351,7 @@ public function testIssueHandler(): void
 
         $config = $this->project_analyzer->getConfig();
 
-        $this->assertFalse($config->reportIssueInFile('MissingReturnType', realpath('tests/ConfigTest.php')));
+        $this->assertFalse($config->reportIssueInFile('MissingReturnType', realpath(__FILE__)));
         $this->assertFalse($config->reportIssueInFile('MissingReturnType', realpath('src/Psalm/Type.php')));
     }