test: remove diff parser test helper

Author: NickSdot

tests/Unit/Diff/DiffParserTest.php

@@ -30,7 +30,7 @@ protected function setUp(): void
     #[Test]
     public function itReturnsEmptyArrayForEmptyDiff(): void
     {
-        self::assertSame([], $this->lineNumbersByFile($this->parser->parse('')));
+        self::assertSame([], $this->parser->parse('')->fileChanges);
     }
 
     #[Test]
@@ -47,10 +47,10 @@ public function itParsesAddedLineNumbers(): void
  line3
 DIFF;
 
-        $result = $this->lineNumbersByFile($this->parser->parse($diff));
+        $change = $this->parser->parse($diff)->changeFor('reference/file.xml');
 
-        self::assertArrayHasKey('reference/file.xml', $result);
-        self::assertSame([2], $result['reference/file.xml']);
+        self::assertNotNull($change);
+        self::assertSame([2], $change->addedLineNumbers);
     }
 
     #[Test]
@@ -68,9 +68,9 @@ public function itParsesMultipleAddedLines(): void
  last line
 DIFF;
 
-        $result = $this->lineNumbersByFile($this->parser->parse($diff));
+        $result = $this->parser->parse($diff);
 
-        self::assertSame([6, 7], $result['doc/chapter.xml']);
+        self::assertSame([6, 7], $result->changeFor('doc/chapter.xml')?->addedLineNumbers);
     }
 
     #[Test]
@@ -85,10 +85,10 @@ public function itStripsTheBPrefix(): void
 +added
 DIFF;
 
-        $result = $this->lineNumbersByFile($this->parser->parse($diff));
+        $result = $this->parser->parse($diff);
 
-        self::assertArrayHasKey('src/file.xml', $result);
-        self::assertArrayNotHasKey('b/src/file.xml', $result);
+        self::assertCount(1, $result->fileChanges);
+        self::assertSame('src/file.xml', $result->fileChanges[0]->filePath);
     }
 
     #[Test]
@@ -105,7 +105,7 @@ public function itExcludesDeletedFiles(): void
 -line3
 DIFF;
 
-        self::assertSame([], $this->lineNumbersByFile($this->parser->parse($diff)));
+        self::assertSame([], $this->parser->parse($diff)->fileChanges);
     }
 
     #[Test]
@@ -122,10 +122,10 @@ public function itHandlesNewlyCreatedFiles(): void
 +line3
 DIFF;
 
-        $result = $this->lineNumbersByFile($this->parser->parse($diff));
+        $change = $this->parser->parse($diff)->changeFor('new.xml');
 
-        self::assertArrayHasKey('new.xml', $result);
-        self::assertSame([1, 2, 3], $result['new.xml']);
+        self::assertNotNull($change);
+        self::assertSame([1, 2, 3], $change->addedLineNumbers);
     }
 
     #[Test]
@@ -148,12 +148,14 @@ public function itHandlesMultipleFilesInOneDiff(): void
  unchanged
 DIFF;
 
-        $result = $this->lineNumbersByFile($this->parser->parse($diff));
+        $result = $this->parser->parse($diff);
+        $firstChange = $result->changeFor('first.xml');
+        $secondChange = $result->changeFor('second.xml');
 
-        self::assertArrayHasKey('first.xml', $result);
-        self::assertArrayHasKey('second.xml', $result);
-        self::assertSame([2], $result['first.xml']);
-        self::assertSame([2], $result['second.xml']);
+        self::assertNotNull($firstChange);
+        self::assertNotNull($secondChange);
+        self::assertSame([2], $firstChange->addedLineNumbers);
+        self::assertSame([2], $secondChange->addedLineNumbers);
     }
 
     #[Test]
@@ -170,11 +172,11 @@ public function itIgnoresRemovedLines(): void
  line3
 DIFF;
 
-        $result = $this->lineNumbersByFile($this->parser->parse($diff));
+        $change = $this->parser->parse($diff)->changeFor('file.xml');
 
         // No lines added, so the changed set is empty (not absent — the file is tracked).
-        self::assertArrayHasKey('file.xml', $result);
-        self::assertSame([], $result['file.xml']);
+        self::assertNotNull($change);
+        self::assertSame([], $change->addedLineNumbers);
     }
 
     #[Test]
@@ -211,9 +213,9 @@ public function itIgnoresTheMissingFinalNewlineMarker(): void
 +second
 DIFF;
 
-        $result = $this->lineNumbersByFile($this->parser->parse($diff));
+        $result = $this->parser->parse($diff);
 
-        self::assertSame([1, 2], $result['file.xml']);
+        self::assertSame([1, 2], $result->changeFor('file.xml')?->addedLineNumbers);
     }
 
     #[Test]
@@ -255,9 +257,9 @@ public function itTracksLineNumbersAcrossMultipleHunks(): void
  line12
 DIFF;
 
-        $result = $this->lineNumbersByFile($this->parser->parse($diff));
+        $result = $this->parser->parse($diff);
 
-        self::assertSame([2, 12], $result['file.xml']);
+        self::assertSame([2, 12], $result->changeFor('file.xml')?->addedLineNumbers);
     }
 
     #[Test]
@@ -271,21 +273,8 @@ public function itHandlesHunkWithNoContext(): void
 +only line
 DIFF;
 
-        $result = $this->lineNumbersByFile($this->parser->parse($diff));
-
-        self::assertSame([1], $result['file.xml']);
-    }
-
-    // TODO: avoids test diff churn; remove when fixers merged
-    /** @return array<string, list<int>> */
-    private function lineNumbersByFile(DiffChangeset $diff): array
-    {
-        $lineNumbersByFile = [];
-
-        foreach ($diff->fileChanges as $fileChange) {
-            $lineNumbersByFile[$fileChange->filePath] = $fileChange->addedLineNumbers;
-        }
+        $result = $this->parser->parse($diff);
 
-        return $lineNumbersByFile;
+        self::assertSame([1], $result->changeFor('file.xml')?->addedLineNumbers);
     }
 }