Fixed tests

doctrine · May 13, 2021 · 9dce7f0 · 9dce7f0
1 parent 7a5b6c6
commit 9dce7f0
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 14 deletions.
diff --git a/lib/Error.php b/lib/Error.php
@@ -34,10 +34,10 @@ public function asString(): string
     {
         $output = $this->message;
         if ($this->getFile() !== null) {
-            $output .= sprintf(' in "%s"', $this->file);
+            $output .= sprintf(' in file "%s"', $this->file);
 
             if ($this->line !== null) {
-                $output .= sprintf(' at line "%d"', $this->line);
+                $output .= sprintf(' at line %d', $this->line);
             }
         }
 

diff --git a/lib/Parser/DocumentParser.php b/lib/Parser/DocumentParser.php
@@ -590,7 +590,7 @@ private function flush(): void
                     );
                 } catch (Throwable $e) {
                     $this->environment->getErrorManager()->error(
-                        sprintf('Error while processing "%s" directive: %s', $currentDirective->getName(), $e->getMessage()),
+                        sprintf('Error while processing "%s" directive: "%s"', $currentDirective->getName(), $e->getMessage()),
                         $this->environment->getCurrentFileName(),
                         $this->currentLineNumber ?? null,
                         $e

diff --git a/tests/BuilderWithErrors/BuilderWithErrorsTest.php b/tests/BuilderWithErrors/BuilderWithErrorsTest.php
@@ -32,8 +32,8 @@ public function testNoContentDirectiveError(): void
             , $bodyHtml);
 
         self::assertEquals(
-            ['Error while processing "note" directive in "no_content_directive" around line 6: Content expected, none found.'],
-            $this->builder->getErrorManager()->getErrors()
+            'Error while processing "note" directive: "Content expected, none found." in file "no_content_directive" at line 6',
+            $this->builder->getErrorManager()->getErrors()[0]->asString()
         );
     }
 

diff --git a/tests/EnvironmentTest.php b/tests/EnvironmentTest.php
@@ -82,7 +82,7 @@ public function getMissingSectionTests(): iterable
         ];
 
         yield 'with_current_filename' => [
-            'Unknown reference section "doc" in "current_doc_filename"',
+            'Unknown reference section "doc" in file "current_doc_filename"',
             'current_doc_filename',
         ];
     }

diff --git a/tests/Functional/tests/main-directive/main-directive.html b/tests/Functional/tests/main-directive/main-directive.html
@@ -1,2 +1,2 @@
 Exception: Exception
-Unknown directive: "latex-main" for line ".. latex-main::"
+Unknown directive "latex-main": .. latex-main::
diff --git a/tests/Functional/tests/pretty-table-error1/pretty-table-error1.html b/tests/Functional/tests/pretty-table-error1/pretty-table-error1.html
@@ -4,7 +4,6 @@
 forgot a blank line
 
 does not appear to be a complete table row
-in file (unknown)
 
 +-----------+----------------+----------------------------+
 | Type      | Options        | Description                |
@@ -13,4 +12,4 @@
 +-----------+----------------+----------------------------+
 | currency  | currency (m)   | A currency string          |
 +-----------+----------------+----------------------------+
-forgot a blank line
+forgot a blank line in file "(unknown)"
diff --git a/tests/Functional/tests/simple-table-error1/simple-table-error1.html b/tests/Functional/tests/simple-table-error1/simple-table-error1.html
@@ -1,9 +1,8 @@
 Exception: Exception
 Malformed table: content "l" appears in the "gap" on row "Second row  Other colllOther col"
-in file (unknown)
 
 =========== ========== =========
 First col   Second col Third col
 Second row  Other colllOther col
 Third  row  Other col  Last col
-=========== ========== =========
+=========== ========== ========= in file "(unknown)"
diff --git a/tests/Functional/tests/unknown-directive/unknown-directive.html b/tests/Functional/tests/unknown-directive/unknown-directive.html
@@ -1,2 +1,2 @@
 Exception: Exception
-Unknown directive: "unknown-directive" for line ".. unknown-directive::"
+Unknown directive "unknown-directive": .. unknown-directive::
diff --git a/tests/Parser/DocumentParserTest.php b/tests/Parser/DocumentParserTest.php
@@ -7,6 +7,7 @@
 use Doctrine\Common\EventManager;
 use Doctrine\RST\Directives\Directive;
 use Doctrine\RST\Environment;
+use Doctrine\RST\ErrorManager;
 use Doctrine\RST\NodeFactory\NodeFactory;
 use Doctrine\RST\Parser;
 use Doctrine\RST\Parser\DocumentParser;
@@ -22,6 +23,7 @@ public function testErrorWhenDirectiveThrowsException(): void
         $nodeFactory        = $this->createMock(NodeFactory::class);
         $eventManager       = $this->createMock(EventManager::class);
         $codeBlockDirective = $this->createMock(Directive::class);
+        $errorManager       = $this->createMock(ErrorManager::class);
 
         $docParser = new DocumentParser(
             $parser,
@@ -41,8 +43,12 @@ public function testErrorWhenDirectiveThrowsException(): void
             ->willReturn('code-block-name');
 
         $environment->expects(self::once())
-            ->method('addError')
-            ->with('Error while processing "code-block-name" directive: Invalid something something!');
+            ->method('getErrorManager')
+            ->willReturn($errorManager);
+
+        $errorManager->expects(self::once())
+            ->method('error')
+            ->with('Error while processing "code-block-name" directive: "Invalid something something!"');
 
         $docParser->parse('.. code-block:: php');
     }