Test enhancement

peter279k · peter279k · commit e21e0066ab8f · 2019-11-12T17:02:26.000+08:00
diff --git a/test/HTML5/Html5Test.php b/test/HTML5/Html5Test.php
@@ -11,7 +11,7 @@ class Html5Test extends TestCase
      */
     private $html5;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->html5 = $this->getInstance();
     }
@@ -226,15 +226,15 @@ public function testConfig()
     {
         $html5 = $this->getInstance();
         $options = $html5->getOptions();
-        $this->assertEquals(false, $options['encode_entities']);
+        $this->assertFalse($options['encode_entities']);
 
         $html5 = $this->getInstance(array(
             'foo' => 'bar',
             'encode_entities' => true,
         ));
         $options = $html5->getOptions();
         $this->assertEquals('bar', $options['foo']);
-        $this->assertEquals(true, $options['encode_entities']);
+        $this->assertTrue($options['encode_entities']);
 
         // Need to reset to original so future tests pass as expected.
         // $this->getInstance()->setOption('encode_entities', false);
diff --git a/test/HTML5/Parser/DOMTreeBuilderTest.php b/test/HTML5/Parser/DOMTreeBuilderTest.php
@@ -62,7 +62,7 @@ public function testBareAmpersand()
     {
         $html = "<!doctype html>
         <html>
-            <body> 
+            <body>
                 <img src='a&b' />
                 <img src='a&=' />
                 <img src='a&=c' />
@@ -74,7 +74,7 @@ public function testBareAmpersand()
         $this->assertEmpty($this->errors);
         $this->assertXmlStringEqualsXmlString('
         <!DOCTYPE html>
-        <html xmlns="http://www.w3.org/1999/xhtml"><body> 
+        <html xmlns="http://www.w3.org/1999/xhtml"><body>
                 <img src="a&amp;b"/>
                 <img src="a&amp;="/>
                 <img src="a&amp;=c"/>
@@ -97,7 +97,7 @@ public function testBareAmpersandNotAllowedInAttributes()
         $this->assertCount(2, $this->errors);
         $this->assertXmlStringEqualsXmlString('
         <!DOCTYPE html>
-        <html xmlns="http://www.w3.org/1999/xhtml"><body> 
+        <html xmlns="http://www.w3.org/1999/xhtml"><body>
                 <img src="a&amp;"/>
                 <img src="a&amp;+"/>
             </body>
@@ -108,7 +108,7 @@ public function testBareAmpersandNotAllowedInBody()
     {
         $html = '<!doctype html>
         <html>
-            <body> 
+            <body>
                 a&b
                 a&=
                 a&=c
@@ -122,7 +122,7 @@ public function testBareAmpersandNotAllowedInBody()
         $this->assertCount(5, $this->errors);
         $this->assertXmlStringEqualsXmlString('
         <!DOCTYPE html>
-        <html xmlns="http://www.w3.org/1999/xhtml"><body> 
+        <html xmlns="http://www.w3.org/1999/xhtml"><body>
                 a&amp;b
                 a&amp;=
                 a&amp;=c
@@ -467,7 +467,7 @@ public function testParseErrors()
         // We're JUST testing that we can access errors. Actual testing of
         // error messages happen in the Tokenizer's tests.
         $this->assertGreaterThan(0, count($this->errors));
-        $this->assertTrue(is_string($this->errors[0]));
+        $this->assertInternalType('string', $this->errors[0]);
     }
 
     public function testProcessingInstruction()
diff --git a/test/HTML5/Serializer/OutputRulesTest.php b/test/HTML5/Serializer/OutputRulesTest.php
@@ -24,7 +24,7 @@ class OutputRulesTest extends \Masterminds\HTML5\Tests\TestCase
      */
     protected $html5;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->html5 = $this->getInstance();
     }
@@ -645,7 +645,7 @@ public function testHandlingInvalidRawContent()
 
         $contents = $this->html5->saveHTML($dom);
 
-        $this->assertTrue(false !== strpos($contents, '<script id="template" type="x-tmpl-mustache">
+        $this->assertGreaterThanOrEqual(0, strpos($contents, '<script id="template" type="x-tmpl-mustache">
            <h1>Hello!</h1>
        <p>Bar</p></script>'));
     }
diff --git a/test/HTML5/Serializer/TraverserTest.php b/test/HTML5/Serializer/TraverserTest.php
@@ -18,7 +18,7 @@ class TraverserTest extends \Masterminds\HTML5\Tests\TestCase
       </body>
     </html>';
 
-    public function setUp()
+    protected function setUp()
     {
         $this->html5 = $this->getInstance();
     }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class OutputRulesTest extends \Masterminds\HTML5\Tests\TestCase`
`24`	`24`	`*/`
`25`	`25`	`protected $html5;`
`26`	`26`
`27`		`- public function setUp()`
	`27`	`+ protected function setUp()`
`28`	`28`	`{`
`29`	`29`	`$this->html5 = $this->getInstance();`
`30`	`30`	`}`
`@@ -645,7 +645,7 @@ public function testHandlingInvalidRawContent()`
`645`	`645`
`646`	`646`	`$contents = $this->html5->saveHTML($dom);`
`647`	`647`
`648`		`- $this->assertTrue(false !== strpos($contents, '<script id="template" type="x-tmpl-mustache">`
	`648`	`+ $this->assertGreaterThanOrEqual(0, strpos($contents, '<script id="template" type="x-tmpl-mustache">`
`649`	`649`	`<h1>Hello!</h1>`
`650`	`650`	`<p>Bar</p></script>'));`
`651`	`651`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class TraverserTest extends \Masterminds\HTML5\Tests\TestCase`
`18`	`18`	`</body>`
`19`	`19`	`</html>';`
`20`	`20`
`21`		`- public function setUp()`
	`21`	`+ protected function setUp()`
`22`	`22`	`{`
`23`	`23`	`$this->html5 = $this->getInstance();`
`24`	`24`	`}`