123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416 |
- <?php
- /*
- * This file is part of sebastian/diff.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
- namespace SebastianBergmann\Diff;
- use SebastianBergmann\Diff\LCS\MemoryEfficientImplementation;
- use SebastianBergmann\Diff\LCS\TimeEfficientImplementation;
- use PHPUnit\Framework\TestCase;
- /**
- * @covers SebastianBergmann\Diff\Differ
- *
- * @uses SebastianBergmann\Diff\LCS\MemoryEfficientImplementation
- * @uses SebastianBergmann\Diff\LCS\TimeEfficientImplementation
- * @uses SebastianBergmann\Diff\Chunk
- * @uses SebastianBergmann\Diff\Diff
- * @uses SebastianBergmann\Diff\Line
- * @uses SebastianBergmann\Diff\Parser
- */
- class DifferTest extends TestCase
- {
- const REMOVED = 2;
- const ADDED = 1;
- const OLD = 0;
- /**
- * @var Differ
- */
- private $differ;
- protected function setUp()
- {
- $this->differ = new Differ;
- }
- /**
- * @param array $expected
- * @param string|array $from
- * @param string|array $to
- * @dataProvider arrayProvider
- */
- public function testArrayRepresentationOfDiffCanBeRenderedUsingTimeEfficientLcsImplementation(array $expected, $from, $to)
- {
- $this->assertEquals($expected, $this->differ->diffToArray($from, $to, new TimeEfficientImplementation));
- }
- /**
- * @param string $expected
- * @param string $from
- * @param string $to
- * @dataProvider textProvider
- */
- public function testTextRepresentationOfDiffCanBeRenderedUsingTimeEfficientLcsImplementation($expected, $from, $to)
- {
- $this->assertEquals($expected, $this->differ->diff($from, $to, new TimeEfficientImplementation));
- }
- /**
- * @param array $expected
- * @param string|array $from
- * @param string|array $to
- * @dataProvider arrayProvider
- */
- public function testArrayRepresentationOfDiffCanBeRenderedUsingMemoryEfficientLcsImplementation(array $expected, $from, $to)
- {
- $this->assertEquals($expected, $this->differ->diffToArray($from, $to, new MemoryEfficientImplementation));
- }
- /**
- * @param string $expected
- * @param string $from
- * @param string $to
- * @dataProvider textProvider
- */
- public function testTextRepresentationOfDiffCanBeRenderedUsingMemoryEfficientLcsImplementation($expected, $from, $to)
- {
- $this->assertEquals($expected, $this->differ->diff($from, $to, new MemoryEfficientImplementation));
- }
- public function testCustomHeaderCanBeUsed()
- {
- $differ = new Differ('CUSTOM HEADER');
- $this->assertEquals(
- "CUSTOM HEADER@@ @@\n-a\n+b\n",
- $differ->diff('a', 'b')
- );
- }
- public function testTypesOtherThanArrayAndStringCanBePassed()
- {
- $this->assertEquals(
- "--- Original\n+++ New\n@@ @@\n-1\n+2\n",
- $this->differ->diff(1, 2)
- );
- }
- /**
- * @param string $diff
- * @param Diff[] $expected
- * @dataProvider diffProvider
- */
- public function testParser($diff, array $expected)
- {
- $parser = new Parser;
- $result = $parser->parse($diff);
- $this->assertEquals($expected, $result);
- }
- public function arrayProvider()
- {
- return array(
- array(
- array(
- array('a', self::REMOVED),
- array('b', self::ADDED)
- ),
- 'a',
- 'b'
- ),
- array(
- array(
- array('ba', self::REMOVED),
- array('bc', self::ADDED)
- ),
- 'ba',
- 'bc'
- ),
- array(
- array(
- array('ab', self::REMOVED),
- array('cb', self::ADDED)
- ),
- 'ab',
- 'cb'
- ),
- array(
- array(
- array('abc', self::REMOVED),
- array('adc', self::ADDED)
- ),
- 'abc',
- 'adc'
- ),
- array(
- array(
- array('ab', self::REMOVED),
- array('abc', self::ADDED)
- ),
- 'ab',
- 'abc'
- ),
- array(
- array(
- array('bc', self::REMOVED),
- array('abc', self::ADDED)
- ),
- 'bc',
- 'abc'
- ),
- array(
- array(
- array('abc', self::REMOVED),
- array('abbc', self::ADDED)
- ),
- 'abc',
- 'abbc'
- ),
- array(
- array(
- array('abcdde', self::REMOVED),
- array('abcde', self::ADDED)
- ),
- 'abcdde',
- 'abcde'
- ),
- 'same start' => array(
- array(
- array(17, self::OLD),
- array('b', self::REMOVED),
- array('d', self::ADDED),
- ),
- array(30 => 17, 'a' => 'b'),
- array(30 => 17, 'c' => 'd'),
- ),
- 'same end' => array(
- array(
- array(1, self::REMOVED),
- array(2, self::ADDED),
- array('b', self::OLD),
- ),
- array(1 => 1, 'a' => 'b'),
- array(1 => 2, 'a' => 'b'),
- ),
- 'same start (2), same end (1)' => array(
- array(
- array(17, self::OLD),
- array(2, self::OLD),
- array(4, self::REMOVED),
- array('a', self::ADDED),
- array(5, self::ADDED),
- array('x', self::OLD),
- ),
- array(30 => 17, 1 => 2, 2 => 4, 'z' => 'x'),
- array(30 => 17, 1 => 2, 3 => 'a', 2 => 5, 'z' => 'x'),
- ),
- 'same' => array(
- array(
- array('x', self::OLD),
- ),
- array('z' => 'x'),
- array('z' => 'x'),
- ),
- 'diff' => array(
- array(
- array('y', self::REMOVED),
- array('x', self::ADDED),
- ),
- array('x' => 'y'),
- array('z' => 'x'),
- ),
- 'diff 2' => array(
- array(
- array('y', self::REMOVED),
- array('b', self::REMOVED),
- array('x', self::ADDED),
- array('d', self::ADDED),
- ),
- array('x' => 'y', 'a' => 'b'),
- array('z' => 'x', 'c' => 'd'),
- ),
- 'test line diff detection' => array(
- array(
- array(
- '#Warning: Strings contain different line endings!',
- self::OLD,
- ),
- array(
- '<?php',
- self::OLD,
- ),
- array(
- '',
- self::OLD,
- ),
- ),
- "<?php\r\n",
- "<?php\n"
- )
- );
- }
- public function textProvider()
- {
- return array(
- array(
- "--- Original\n+++ New\n@@ @@\n-a\n+b\n",
- 'a',
- 'b'
- ),
- array(
- "--- Original\n+++ New\n@@ @@\n-ba\n+bc\n",
- 'ba',
- 'bc'
- ),
- array(
- "--- Original\n+++ New\n@@ @@\n-ab\n+cb\n",
- 'ab',
- 'cb'
- ),
- array(
- "--- Original\n+++ New\n@@ @@\n-abc\n+adc\n",
- 'abc',
- 'adc'
- ),
- array(
- "--- Original\n+++ New\n@@ @@\n-ab\n+abc\n",
- 'ab',
- 'abc'
- ),
- array(
- "--- Original\n+++ New\n@@ @@\n-bc\n+abc\n",
- 'bc',
- 'abc'
- ),
- array(
- "--- Original\n+++ New\n@@ @@\n-abc\n+abbc\n",
- 'abc',
- 'abbc'
- ),
- array(
- "--- Original\n+++ New\n@@ @@\n-abcdde\n+abcde\n",
- 'abcdde',
- 'abcde'
- ),
- array(
- "--- Original\n+++ New\n@@ @@\n-A\n+A1\n B\n",
- "A\nB",
- "A1\nB",
- ),
- array(
- <<<EOF
- --- Original
- +++ New
- @@ @@
- a
- -b
- +p
- @@ @@
- i
- -j
- +w
- k
- EOF
- ,
- "a\nb\nc\nd\ne\nf\ng\nh\ni\nj\nk",
- "a\np\nc\nd\ne\nf\ng\nh\ni\nw\nk",
- ),
- array(
- <<<EOF
- --- Original
- +++ New
- @@ @@
- a
- -b
- +p
- @@ @@
- i
- -j
- +w
- k
- EOF
- ,
- "a\nb\nc\nd\ne\nf\ng\nh\ni\nj\nk",
- "a\np\nc\nd\ne\nf\ng\nh\ni\nw\nk",
- ),
- );
- }
- public function diffProvider()
- {
- $serialized_arr = <<<EOL
- a:1:{i:0;O:27:"SebastianBergmann\Diff\Diff":3:{s:33:"�SebastianBergmann\Diff\Diff�from";s:7:"old.txt";s:31:"�SebastianBergmann\Diff\Diff�to";s:7:"new.txt";s:35:"�SebastianBergmann\Diff\Diff�chunks";a:3:{i:0;O:28:"SebastianBergmann\Diff\Chunk":5:{s:35:"�SebastianBergmann\Diff\Chunk�start";i:1;s:40:"�SebastianBergmann\Diff\Chunk�startRange";i:3;s:33:"�SebastianBergmann\Diff\Chunk�end";i:1;s:38:"�SebastianBergmann\Diff\Chunk�endRange";i:4;s:35:"�SebastianBergmann\Diff\Chunk�lines";a:4:{i:0;O:27:"SebastianBergmann\Diff\Line":2:{s:33:"�SebastianBergmann\Diff\Line�type";i:1;s:36:"�SebastianBergmann\Diff\Line�content";s:7:"2222111";}i:1;O:27:"SebastianBergmann\Diff\Line":2:{s:33:"�SebastianBergmann\Diff\Line�type";i:3;s:36:"�SebastianBergmann\Diff\Line�content";s:7:"1111111";}i:2;O:27:"SebastianBergmann\Diff\Line":2:{s:33:"�SebastianBergmann\Diff\Line�type";i:3;s:36:"�SebastianBergmann\Diff\Line�content";s:7:"1111111";}i:3;O:27:"SebastianBergmann\Diff\Line":2:{s:33:"�SebastianBergmann\Diff\Line�type";i:3;s:36:"�SebastianBergmann\Diff\Line�content";s:7:"1111111";}}}i:1;O:28:"SebastianBergmann\Diff\Chunk":5:{s:35:"�SebastianBergmann\Diff\Chunk�start";i:5;s:40:"�SebastianBergmann\Diff\Chunk�startRange";i:10;s:33:"�SebastianBergmann\Diff\Chunk�end";i:6;s:38:"�SebastianBergmann\Diff\Chunk�endRange";i:8;s:35:"�SebastianBergmann\Diff\Chunk�lines";a:11:{i:0;O:27:"SebastianBergmann\Diff\Line":2:{s:33:"�SebastianBergmann\Diff\Line�type";i:3;s:36:"�SebastianBergmann\Diff\Line�content";s:7:"1111111";}i:1;O:27:"SebastianBergmann\Diff\Line":2:{s:33:"�SebastianBergmann\Diff\Line�type";i:3;s:36:"�SebastianBergmann\Diff\Line�content";s:7:"1111111";}i:2;O:27:"SebastianBergmann\Diff\Line":2:{s:33:"�SebastianBergmann\Diff\Line�type";i:3;s:36:"�SebastianBergmann\Diff\Line�content";s:7:"1111111";}i:3;O:27:"SebastianBergmann\Diff\Line":2:{s:33:"�SebastianBergmann\Diff\Line�type";i:3;s:36:"�SebastianBergmann\Diff\Line�content";s:8:"+1121211";}i:4;O:27:"SebastianBergmann\Diff\Line":2:{s:33:"�SebastianBergmann\Diff\Line�type";i:3;s:36:"�SebastianBergmann\Diff\Line�content";s:7:"1111111";}i:5;O:27:"SebastianBergmann\Diff\Line":2:{s:33:"�SebastianBergmann\Diff\Line�type";i:3;s:36:"�SebastianBergmann\Diff\Line�content";s:8:"-1111111";}i:6;O:27:"SebastianBergmann\Diff\Line":2:{s:33:"�SebastianBergmann\Diff\Line�type";i:3;s:36:"�SebastianBergmann\Diff\Line�content";s:8:"-1111111";}i:7;O:27:"SebastianBergmann\Diff\Line":2:{s:33:"�SebastianBergmann\Diff\Line�type";i:3;s:36:"�SebastianBergmann\Diff\Line�content";s:8:"-2222222";}i:8;O:27:"SebastianBergmann\Diff\Line":2:{s:33:"�SebastianBergmann\Diff\Line�type";i:3;s:36:"�SebastianBergmann\Diff\Line�content";s:7:"2222222";}i:9;O:27:"SebastianBergmann\Diff\Line":2:{s:33:"�SebastianBergmann\Diff\Line�type";i:3;s:36:"�SebastianBergmann\Diff\Line�content";s:7:"2222222";}i:10;O:27:"SebastianBergmann\Diff\Line":2:{s:33:"�SebastianBergmann\Diff\Line�type";i:3;s:36:"�SebastianBergmann\Diff\Line�content";s:7:"2222222";}}}i:2;O:28:"SebastianBergmann\Diff\Chunk":5:{s:35:"�SebastianBergmann\Diff\Chunk�start";i:17;s:40:"�SebastianBergmann\Diff\Chunk�startRange";i:5;s:33:"�SebastianBergmann\Diff\Chunk�end";i:16;s:38:"�SebastianBergmann\Diff\Chunk�endRange";i:6;s:35:"�SebastianBergmann\Diff\Chunk�lines";a:6:{i:0;O:27:"SebastianBergmann\Diff\Line":2:{s:33:"�SebastianBergmann\Diff\Line�type";i:3;s:36:"�SebastianBergmann\Diff\Line�content";s:7:"2222222";}i:1;O:27:"SebastianBergmann\Diff\Line":2:{s:33:"�SebastianBergmann\Diff\Line�type";i:3;s:36:"�SebastianBergmann\Diff\Line�content";s:7:"2222222";}i:2;O:27:"SebastianBergmann\Diff\Line":2:{s:33:"�SebastianBergmann\Diff\Line�type";i:3;s:36:"�SebastianBergmann\Diff\Line�content";s:7:"2222222";}i:3;O:27:"SebastianBergmann\Diff\Line":2:{s:33:"�SebastianBergmann\Diff\Line�type";i:3;s:36:"�SebastianBergmann\Diff\Line�content";s:8:"+2122212";}i:4;O:27:"SebastianBergmann\Diff\Line":2:{s:33:"�SebastianBergmann\Diff\Line�type";i:3;s:36:"�SebastianBergmann\Diff\Line�content";s:7:"2222222";}i:5;O:27:"SebastianBergmann\Diff\Line":2:{s:33:"�SebastianBergmann\Diff\Line�type";i:3;s:36:"�SebastianBergmann\Diff\Line�content";s:7:"2222222";}}}}}}
- EOL;
- return array(
- array(
- "--- old.txt 2014-11-04 08:51:02.661868729 +0300\n+++ new.txt 2014-11-04 08:51:02.665868730 +0300\n@@ -1,3 +1,4 @@\n+2222111\n 1111111\n 1111111\n 1111111\n@@ -5,10 +6,8 @@\n 1111111\n 1111111\n 1111111\n +1121211\n 1111111\n -1111111\n -1111111\n -2222222\n 2222222\n 2222222\n 2222222\n@@ -17,5 +16,6 @@\n 2222222\n 2222222\n 2222222\n +2122212\n 2222222\n 2222222\n",
- \unserialize($serialized_arr)
- )
- );
- }
- /**
- * @param string $expected
- * @param string $from
- * @param string $to
- * @dataProvider textForNoNonDiffLinesProvider
- */
- public function testDiffDoNotShowNonDiffLines($expected, $from, $to)
- {
- $differ = new Differ('', false);
- $this->assertSame($expected, $differ->diff($from, $to));
- }
- public function textForNoNonDiffLinesProvider()
- {
- return array(
- array(
- '', 'a', 'a'
- ),
- array(
- "-A\n+C\n",
- "A\n\n\nB",
- "C\n\n\nB",
- ),
- );
- }
- /**
- * @requires PHPUnit 5.7
- */
- public function testDiffToArrayInvalidFromType()
- {
- $differ = new Differ;
- $this->expectException('\InvalidArgumentException');
- $this->expectExceptionMessageRegExp('#^"from" must be an array or string\.$#');
- $differ->diffToArray(null, '');
- }
- /**
- * @requires PHPUnit 5.7
- */
- public function testDiffInvalidToType()
- {
- $differ = new Differ;
- $this->expectException('\InvalidArgumentException');
- $this->expectExceptionMessageRegExp('#^"to" must be an array or string\.$#');
- $differ->diffToArray('', new \stdClass);
- }
- }
|