Merge pull request #46 from JBlond/cli-unittest

JBlond · web-flow · commit 8793911a6f02 · 2020-07-13T15:22:37.000+02:00
Cli unittest
diff --git a/tests/Diff/Renderer/Html/HtmlRenderersTest.php b/tests/Diff/Renderer/Html/HtmlRenderersTest.php
@@ -37,6 +37,9 @@ public function __construct($name = null, array $data = [], $dataName = '')
         parent::__construct($name, $data, $dataName);
     }
 
+    /**
+     * @covers \jblond\Diff\Renderer\Html\SideBySide
+     */
     public function testSideBySide()
     {
         $diff = new Diff(
@@ -53,6 +56,9 @@ public function testSideBySide()
         $this->assertStringEqualsFile('tests/resources/htmlSideBySide.txt', $result);
     }
 
+    /**
+     * @covers \jblond\Diff\Renderer\Html\Inline
+     */
     public function testInline()
     {
         $diff = new Diff(
@@ -69,6 +75,9 @@ public function testInline()
         $this->assertStringEqualsFile('tests/resources/htmlInline.txt', $result);
     }
 
+    /**
+     * @covers \jblond\Diff\Renderer\Html\Unified
+     */
     public function testUnified()
     {
         $diff = new Diff(
diff --git a/tests/Diff/Renderer/Text/TextRenderersTest.php b/tests/Diff/Renderer/Text/TextRenderersTest.php
@@ -36,6 +36,10 @@ public function __construct($name = null, array $data = [], $dataName = '')
         parent::__construct($name, $data, $dataName);
     }
 
+    /**
+     * Test context
+     * @covers \jblond\Diff\Renderer\Text\Context
+     */
     public function testContext()
     {
         $diff = new Diff(
@@ -52,6 +56,10 @@ public function testContext()
         $this->assertStringEqualsFile('tests/resources/textContext.txt', $result);
     }
 
+    /**
+     * Test Unified
+     * @covers \jblond\Diff\Renderer\Text\Unified
+     */
     public function testUnified()
     {
         $diff = new Diff(
@@ -67,4 +75,24 @@ public function testUnified()
 
         $this->assertStringEqualsFile('tests/resources/textUnified.txt', $result);
     }
+
+    /**
+     * Test Unified Cli
+     * @covers \jblond\Diff\Renderer\Text\UnifiedCli
+     */
+    public function testUnifiedCli()
+    {
+        $diff = new Diff(
+            file_get_contents('tests/resources/a.txt'),
+            file_get_contents('tests/resources/b.txt')
+        );
+
+        $renderer = new Diff\Renderer\Text\UnifiedCli();
+        $result   = $diff->render($renderer);
+        if ($this->genOutputFiles) {
+            file_put_contents('textUnifiedCli.txt', $result);
+        }
+        $this->assertStringEqualsFile('tests/resources/ab.diff', $result);
+    }
 }
+
diff --git a/tests/resources/ab.diff b/tests/resources/ab.diff
@@ -0,0 +1,42 @@
+@@ -1,22 +1,22 @@
+ <html>
+     <head>
+         <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+-        <title>Hello World!</title>
++        <title>Hello You!</title>
+     </head>
+     <body>
+         <h1>This is demo content to show features of the php-diff package.</h1>
+-        <h2>This line is removed from version2.</h2>
+         <h2>This line is the same for both versions.</h2>
+-        <h2>This line has inline differences between both versions.</h2>
++        <h2>This line has differences between both versions.</h2>
+         <h2>This line is the same for both versions.</h2>
+-        <h2>This line also has inline differences between both versions.</h2>
++        <h2>This line also has InLine differences between both versions.</h2>
+         <h2>This line is the same for both versions.</h2>
++        <h2>This line is added to version2.</h2>
+ 
+         <p>
+             It's also compatible with multibyte characters (like Chinese and emoji) as shown below:
+-            另外我覺得那個評價的白色櫃子有點沒有必要欸。外觀我就不說了 ，怎麼連空間都那麼狹隘。不過倒是從這個地方看出所謂的“改革”
+-             Do you know what "金槍魚罐頭" means in Chinese?
+-             🍏🍎🙂
++            另外我覺得那個評鑑的白色櫃子有點沒有必要欸。外觀我就不說了 ，怎麼連空間都那麼狹隘。不過倒是從這個地方看出所謂的“改革”
++            Do you know what "魚の缶詰" means in Chinese?
++            🍎🍏🙂
+         </p>
+ 
+         <p>Just some lines to demonstrate the collapsing of a block of lines which are the same in both versions.</p>
+@@ -25,9 +25,9 @@
+         <p>Just some lines to demonstrate the collapsing of a block of lines which are the same in both versions.</p>
+         <p>Just some lines to demonstrate the collapsing of a block of lines which are the same in both versions.</p>
+         <p>Just some lines to demonstrate the collapsing of a block of lines which are the same in both versions.</p>
+-		<h2>This line also has inline differences between both versions. It's the whitespace in front.</h2>
++        <h2>This line also has inline differences between both versions. It's the whitespace in front.</h2>
+         <h2>This line is the same for both versions.</h2>
+-        <h2>This line also has inline differences between both versions.</h2>
++        <h2>This line also has inline differences between both versions!</h2>
+     </body>
+ </html>
+ 

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,9 @@ public function __construct($name = null, array $data = [], $dataName = '')`
`37`	`37`	`parent::__construct($name, $data, $dataName);`
`38`	`38`	`}`
`39`	`39`
	`40`	`+ /**`
	`41`	`+ * @covers \jblond\Diff\Renderer\Html\SideBySide`
	`42`	`+ */`
`40`	`43`	`public function testSideBySide()`
`41`	`44`	`{`
`42`	`45`	`$diff = new Diff(`
`@@ -53,6 +56,9 @@ public function testSideBySide()`
`53`	`56`	`$this->assertStringEqualsFile('tests/resources/htmlSideBySide.txt', $result);`
`54`	`57`	`}`
`55`	`58`
	`59`	`+ /**`
	`60`	`+ * @covers \jblond\Diff\Renderer\Html\Inline`
	`61`	`+ */`
`56`	`62`	`public function testInline()`
`57`	`63`	`{`
`58`	`64`	`$diff = new Diff(`
`@@ -69,6 +75,9 @@ public function testInline()`
`69`	`75`	`$this->assertStringEqualsFile('tests/resources/htmlInline.txt', $result);`
`70`	`76`	`}`
`71`	`77`
	`78`	`+ /**`
	`79`	`+ * @covers \jblond\Diff\Renderer\Html\Unified`
	`80`	`+ */`
`72`	`81`	`public function testUnified()`
`73`	`82`	`{`
`74`	`83`	`$diff = new Diff(`