Update to PHPUnit 6

alcaeus · alcaeus · commit dafa8b4a3729 · 2018-01-10T11:12:48.000+01:00
diff --git a/tests/CollectionTest.php b/tests/CollectionTest.php
@@ -4,8 +4,9 @@
 use PHPHtmlParser\Dom\HtmlNode;
 use PHPHtmlParser\Dom\Tag;
 use PHPHtmlParser\Dom\Collection;
+use PHPUnit\Framework\TestCase;
 
-class CollectionTest extends PHPUnit_Framework_TestCase {
+class CollectionTest extends TestCase {
     
     public function testEach()
     {
@@ -29,10 +30,10 @@ public function testEach()
     }
 
     /**
-     * @expectedException PHPHtmlParser\Exceptions\EmptyCollectionException
      */
     public function testCallNoNodes()
     {
+        $this->expectException('PHPHtmlParser\Exceptions\EmptyCollectionException');
         $collection = new Collection();
         $collection->innerHtml();
     }
@@ -70,10 +71,10 @@ public function testGetMagic()
     }
 
     /**
-     * @expectedException PHPHtmlParser\Exceptions\EmptyCollectionException
      */
     public function testGetNoNodes()
     {
+        $this->expectException('PHPHtmlParser\Exceptions\EmptyCollectionException');
         $collection = new Collection();
         $collection->innerHtml;
     }
diff --git a/tests/ContentTest.php b/tests/ContentTest.php
@@ -1,8 +1,9 @@
 <?php
 
 use PHPHtmlParser\Content;
+use PHPUnit\Framework\TestCase;
 
-class ContentTest extends PHPUnit_Framework_TestCase {
+class ContentTest extends TestCase {
 
     public function testChar()
     {
diff --git a/tests/DomTest.php b/tests/DomTest.php
@@ -1,8 +1,10 @@
 <?php
 
 use PHPHtmlParser\Dom;
+use PHPHtmlParser\Exceptions\NotLoadedException;
+use PHPUnit\Framework\TestCase;
 
-class DomTest extends PHPUnit_Framework_TestCase {
+class DomTest extends TestCase {
 
     public function tearDown()
     {
@@ -17,11 +19,9 @@ public function testLoad()
         $this->assertEquals('<div class="all"><p>Hey bro, <a href="google.com">click here</a><br /> :)</p></div>', $div->outerHtml);
     }
 
-    /**
-     * @expectedException PHPHtmlParser\Exceptions\NotLoadedException
-     */
     public function testNotLoaded()
     {
+        $this->expectException(NotLoadedException::class);
         $dom = new Dom;
         $div = $dom->find('div', 0);
     }
diff --git a/tests/Node/ChildrenTest.php b/tests/Node/ChildrenTest.php
@@ -1,8 +1,11 @@
 <?php
 
 use PHPHtmlParser\Dom\MockNode as Node;
+use PHPHtmlParser\Exceptions\ChildNotFoundException;
+use PHPHtmlParser\Exceptions\ParentNotFoundException;
+use PHPUnit\Framework\TestCase;
 
-class NodeChildTest extends PHPUnit_Framework_TestCase {
+class NodeChildTest extends TestCase {
 
     public function testGetParent()
     {
@@ -32,22 +35,20 @@ public function testNextSibling()
         $this->assertEquals($child2->id(), $child->nextSibling()->id());
     }
 
-    /**
-     * @expectedException PHPHtmlParser\Exceptions\ChildNotFoundException
-     */
     public function testNextSiblingNotFound()
     {
+        $this->expectException(ChildNotFoundException::class);
+
         $parent = new Node;
         $child  = new Node;
         $child->setParent($parent);
         $child->nextSibling();
     }
 
-    /**
-     * @expectedException PHPHtmlParser\Exceptions\ParentNotFoundException
-     */
     public function testNextSiblingNoParent()
     {
+        $this->expectException(ParentNotFoundException::class);
+
         $child = new Node;
         $child->nextSibling();
     }
@@ -62,22 +63,20 @@ public function testPreviousSibling()
         $this->assertEquals($child->id(), $child2->previousSibling()->id());
     }
 
-    /**
-     * @expectedException PHPHtmlParser\Exceptions\ChildNotFoundException
-     */
     public function testPreviousSiblingNotFound()
     {
+        $this->expectException(ChildNotFoundException::class);
+
         $parent = new Node;
         $node = new Node;
         $node->setParent($parent);
         $node->previousSibling();
     }
 
-    /**
-     * @expectedException PHPHtmlParser\Exceptions\ParentNotFoundException
-     */
     public function testPreviousSiblingNoParent()
     {
+        $this->expectException(ParentNotFoundException::class);
+
         $child = new Node;
         $child->previousSibling();
     }
diff --git a/tests/Node/HtmlTest.php b/tests/Node/HtmlTest.php
@@ -5,8 +5,11 @@
 use PHPHtmlParser\Dom\TextNode;
 use PHPHtmlParser\Dom\MockNode;
 use PHPHtmlParser\Dom\Tag;
+use PHPHtmlParser\Exceptions\ParentNotFoundException;
+use PHPHtmlParser\Exceptions\UnknownChildTypeException;
+use PHPUnit\Framework\TestCase;
 
-class NodeHtmlTest extends PHPUnit_Framework_TestCase {
+class NodeHtmlTest extends TestCase {
 
     public function testInnerHtml()
     {
@@ -65,11 +68,10 @@ public function testInnerHtmlTwice()
         $this->assertEquals($inner, $parent->innerHtml());
     }
 
-    /**
-     * @expectedException PHPHtmlParser\Exceptions\UnknownChildTypeException
-     */
     public function testInnerHtmlUnkownChild()
     {
+        $this->expectException(UnknownChildTypeException::class);
+
         $div = new Tag('div');
         $div->setAttributes([
             'class' => [
@@ -447,11 +449,10 @@ public function testIterator()
         $this->assertEquals(2, $children);
     }
 
-    /**
-     * @expectedException PHPHtmlParser\Exceptions\ParentNotFoundException
-     */
     public function testAncestorByTagFailure()
     {
+        $this->expectException(ParentNotFoundException::class);
+
         $a    = new Tag('a');
         $node = new HtmlNode($a);
         $node->ancestorByTag('div');
diff --git a/tests/Node/ParentTest.php b/tests/Node/ParentTest.php
@@ -1,8 +1,10 @@
 <?php
 
 use PHPHtmlParser\Dom\MockNode as Node;
+use PHPHtmlParser\Exceptions\CircularException;
+use PHPUnit\Framework\TestCase;
 
-class NodeParentTest extends PHPUnit_Framework_TestCase {
+class NodeParentTest extends TestCase {
 
     public function testHasChild()
     {
@@ -150,33 +152,30 @@ public function testReplaceChild()
         $this->assertFalse($parent->isChild($child->id()));
     }
 
-    /**
-     * @expectedException PHPHtmlParser\Exceptions\CircularException
-     */
     public function testSetParentDescendantException()
     {
+        $this->expectException(CircularException::class);
+
         $parent = new Node;
         $child  = new Node;
         $parent->addChild($child);
         $parent->setParent($child);
     }
 
-    /**
-     * @expectedException PHPHtmlParser\Exceptions\CircularException
-     */
     public function testAddChildAncestorException()
     {
+        $this->expectException(CircularException::class);
+
         $parent = new Node;
         $child  = new Node;
         $parent->addChild($child);
         $child->addChild($parent);
     }
 
-    /**
-     * @expectedException PHPHtmlParser\Exceptions\CircularException
-     */
     public function testAddItselfAsChild()
     {
+        $this->expectException(CircularException::class);
+
         $parent = new Node;
         $parent->addChild($parent);
     }
diff --git a/tests/Node/TagTest.php b/tests/Node/TagTest.php
@@ -1,8 +1,9 @@
 <?php
 
 use PHPHtmlParser\Dom\Tag;
+use PHPUnit\Framework\TestCase;
 
-class NodeTagTest extends PHPUnit_Framework_TestCase {
+class NodeTagTest extends TestCase {
 
     public function testSelfClosing()
     {
diff --git a/tests/Node/TextTest.php b/tests/Node/TextTest.php
@@ -1,8 +1,9 @@
 <?php
 
 use PHPHtmlParser\Dom\TextNode;
+use PHPUnit\Framework\TestCase;
 
-class NodeTextTest extends PHPUnit_Framework_TestCase {
+class NodeTextTest extends TestCase {
 
     public function testText()
     {
diff --git a/tests/Options/CleanupTest.php b/tests/Options/CleanupTest.php
@@ -1,8 +1,9 @@
 <?php
 
 use PHPHtmlParser\Dom;
+use PHPUnit\Framework\TestCase;
 
-class CleanupTest extends PHPUnit_Framework_TestCase {
+class CleanupTest extends TestCase {
 
     public function testCleanupInputTrue()
     {
diff --git a/tests/Options/PreserveLineBreaks.php b/tests/Options/PreserveLineBreaks.php
@@ -1,8 +1,9 @@
 <?php
 
 use PHPHtmlParser\Dom;
+use PHPUnit\Framework\TestCase;
 
-class PreserveLineBreaks extends PHPUnit_Framework_TestCase {
+class PreserveLineBreaks extends TestCase {
 
     public function testPreserveLineBreakTrue()
     {
diff --git a/tests/Options/StrictTest.php b/tests/Options/StrictTest.php
@@ -2,8 +2,9 @@
 
 use PHPHtmlParser\Dom;
 use PHPHtmlParser\Exceptions\StrictException;
+use PHPUnit\Framework\TestCase;
 
-class StrictTest extends PHPUnit_Framework_TestCase {
+class StrictTest extends TestCase {
 
     public function testConfigStrict()
     {
diff --git a/tests/Options/WhitespaceTextNodeTest.php b/tests/Options/WhitespaceTextNodeTest.php
@@ -1,8 +1,9 @@
 <?php
 
 use PHPHtmlParser\Dom;
+use PHPUnit\Framework\TestCase;
 
-class WhitespaceTextNodeTest extends PHPUnit_Framework_TestCase {
+class WhitespaceTextNodeTest extends TestCase {
 
     public function testConfigGlobalNoWhitespaceTextNode()
     {
diff --git a/tests/OptionsTest.php b/tests/OptionsTest.php
@@ -1,8 +1,9 @@
 <?php
 
 use PHPHtmlParser\Options;
+use PHPUnit\Framework\TestCase;
 
-class OptionsTest extends PHPUnit_Framework_TestCase {
+class OptionsTest extends TestCase {
 
     public function testDefaultWhitespaceTextNode()
     {
diff --git a/tests/SelectorTest.php b/tests/SelectorTest.php
@@ -3,8 +3,9 @@
 use PHPHtmlParser\Selector;
 use PHPHtmlParser\Dom\HtmlNode;
 use PHPHtmlParser\Dom\Tag;
+use PHPUnit\Framework\TestCase;
 
-class SelectorTest extends PHPUnit_Framework_TestCase {
+class SelectorTest extends TestCase {
     
     public function testParseSelectorStringId()
     {
diff --git a/tests/StaticDomTest.php b/tests/StaticDomTest.php
@@ -1,8 +1,10 @@
 <?php
 
+use PHPHtmlParser\Exceptions\NotLoadedException;
 use PHPHtmlParser\StaticDom;
+use PHPUnit\Framework\TestCase;
 
-class StaticDomTest extends PHPUnit_Framework_TestCase {
+class StaticDomTest extends TestCase {
 
     public function setUp()
     {
@@ -47,11 +49,9 @@ public function testFind()
         $this->assertEquals('<input type="submit" tabindex="0" name="submit" value="Информации" />', Dom::find('table input', 1)->outerHtml);
     }
 
-    /**
-     * @expectedException PHPHtmlParser\Exceptions\NotLoadedException
-     */
     public function testFindNoLoad()
     {
+        $this->expectException(NotLoadedException::class);
         StaticDom::find('.post-user font', 0);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,9 @@`
`4`	`4`	`use PHPHtmlParser\Dom\HtmlNode;`
`5`	`5`	`use PHPHtmlParser\Dom\Tag;`
`6`	`6`	`use PHPHtmlParser\Dom\Collection;`
	`7`	`+use PHPUnit\Framework\TestCase;`
`7`	`8`
`8`		`-class CollectionTest extends PHPUnit_Framework_TestCase {`
	`9`	`+class CollectionTest extends TestCase {`
`9`	`10`
`10`	`11`	`public function testEach()`
`11`	`12`	`{`
`@@ -29,10 +30,10 @@ public function testEach()`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`/**`
`32`		`- * @expectedException PHPHtmlParser\Exceptions\EmptyCollectionException`
`33`	`33`	`*/`
`34`	`34`	`public function testCallNoNodes()`
`35`	`35`	`{`
	`36`	`+ $this->expectException('PHPHtmlParser\Exceptions\EmptyCollectionException');`
`36`	`37`	`$collection = new Collection();`
`37`	`38`	`$collection->innerHtml();`
`38`	`39`	`}`
`@@ -70,10 +71,10 @@ public function testGetMagic()`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`/**`
`73`		`- * @expectedException PHPHtmlParser\Exceptions\EmptyCollectionException`
`74`	`74`	`*/`
`75`	`75`	`public function testGetNoNodes()`
`76`	`76`	`{`
	`77`	`+ $this->expectException('PHPHtmlParser\Exceptions\EmptyCollectionException');`
`77`	`78`	`$collection = new Collection();`
`78`	`79`	`$collection->innerHtml;`
`79`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`	`use PHPHtmlParser\Content;`
	`4`	`+use PHPUnit\Framework\TestCase;`
`4`	`5`
`5`		`-class ContentTest extends PHPUnit_Framework_TestCase {`
	`6`	`+class ContentTest extends TestCase {`
`6`	`7`
`7`	`8`	`public function testChar()`
`8`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,10 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`	`use PHPHtmlParser\Dom;`
	`4`	`+use PHPHtmlParser\Exceptions\NotLoadedException;`
	`5`	`+use PHPUnit\Framework\TestCase;`
`4`	`6`
`5`		`-class DomTest extends PHPUnit_Framework_TestCase {`
	`7`	`+class DomTest extends TestCase {`
`6`	`8`
`7`	`9`	`public function tearDown()`
`8`	`10`	`{`
`@@ -17,11 +19,9 @@ public function testLoad()`
`17`	`19`	`$this->assertEquals('<div class="all"><p>Hey bro, <a href="google.com">click here</a><br /> :)</p></div>', $div->outerHtml);`
`18`	`20`	`}`
`19`	`21`
`20`		`- /**`
`21`		`- * @expectedException PHPHtmlParser\Exceptions\NotLoadedException`
`22`		`- */`
`23`	`22`	`public function testNotLoaded()`
`24`	`23`	`{`
	`24`	`+ $this->expectException(NotLoadedException::class);`
`25`	`25`	`$dom = new Dom;`
`26`	`26`	`$div = $dom->find('div', 0);`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,11 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`	`use PHPHtmlParser\Dom\MockNode as Node;`
	`4`	`+use PHPHtmlParser\Exceptions\ChildNotFoundException;`
	`5`	`+use PHPHtmlParser\Exceptions\ParentNotFoundException;`
	`6`	`+use PHPUnit\Framework\TestCase;`
`4`	`7`
`5`		`-class NodeChildTest extends PHPUnit_Framework_TestCase {`
	`8`	`+class NodeChildTest extends TestCase {`
`6`	`9`
`7`	`10`	`public function testGetParent()`
`8`	`11`	`{`
`@@ -32,22 +35,20 @@ public function testNextSibling()`
`32`	`35`	`$this->assertEquals($child2->id(), $child->nextSibling()->id());`
`33`	`36`	`}`
`34`	`37`
`35`		`- /**`
`36`		`- * @expectedException PHPHtmlParser\Exceptions\ChildNotFoundException`
`37`		`- */`
`38`	`38`	`public function testNextSiblingNotFound()`
`39`	`39`	`{`
	`40`	`+ $this->expectException(ChildNotFoundException::class);`
	`41`	`+`
`40`	`42`	`$parent = new Node;`
`41`	`43`	`$child = new Node;`
`42`	`44`	`$child->setParent($parent);`
`43`	`45`	`$child->nextSibling();`
`44`	`46`	`}`
`45`	`47`
`46`		`- /**`
`47`		`- * @expectedException PHPHtmlParser\Exceptions\ParentNotFoundException`
`48`		`- */`
`49`	`48`	`public function testNextSiblingNoParent()`
`50`	`49`	`{`
	`50`	`+ $this->expectException(ParentNotFoundException::class);`
	`51`	`+`
`51`	`52`	`$child = new Node;`
`52`	`53`	`$child->nextSibling();`
`53`	`54`	`}`
`@@ -62,22 +63,20 @@ public function testPreviousSibling()`
`62`	`63`	`$this->assertEquals($child->id(), $child2->previousSibling()->id());`
`63`	`64`	`}`
`64`	`65`
`65`		`- /**`
`66`		`- * @expectedException PHPHtmlParser\Exceptions\ChildNotFoundException`
`67`		`- */`
`68`	`66`	`public function testPreviousSiblingNotFound()`
`69`	`67`	`{`
	`68`	`+ $this->expectException(ChildNotFoundException::class);`
	`69`	`+`
`70`	`70`	`$parent = new Node;`
`71`	`71`	`$node = new Node;`
`72`	`72`	`$node->setParent($parent);`
`73`	`73`	`$node->previousSibling();`
`74`	`74`	`}`
`75`	`75`
`76`		`- /**`
`77`		`- * @expectedException PHPHtmlParser\Exceptions\ParentNotFoundException`
`78`		`- */`
`79`	`76`	`public function testPreviousSiblingNoParent()`
`80`	`77`	`{`
	`78`	`+ $this->expectException(ParentNotFoundException::class);`
	`79`	`+`
`81`	`80`	`$child = new Node;`
`82`	`81`	`$child->previousSibling();`
`83`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`	`use PHPHtmlParser\Dom\TextNode;`
	`4`	`+use PHPUnit\Framework\TestCase;`
`4`	`5`
`5`		`-class NodeTextTest extends PHPUnit_Framework_TestCase {`
	`6`	`+class NodeTextTest extends TestCase {`
`6`	`7`
`7`	`8`	`public function testText()`
`8`	`9`	`{`