- 3.0

- Updated tests

tests/ElementsTestCase.phpt

@@ -18,6 +18,9 @@ namespace Macdom\Tests;
 require_once 'bootstrap.php';
 
 
+/**
+ * @testCase
+ */
 final class ElementsTestCase extends AbstractTestCase
 {
 
@@ -123,4 +126,4 @@ final class ElementsTestCase extends AbstractTestCase
 
 }
 
-run(new ElementsTestCase());
+(new ElementsTestCase())->run();

tests/ElementsTests/Actual/elementsContentType.html

@@ -1,5 +1,5 @@
 div
 input
 xml
-category
-channel
+description
+comments

tests/ElementsTests/Expected/elementsContentType.html

@@ -1,4 +1,4 @@
 divinput
 <?xml?>
-<category></category>
-<channel></channel>
+<description></description>
+<comments></comments>

tests/FormattingTestCase.phpt

@@ -18,6 +18,9 @@ namespace Macdom\Tests;
 require_once 'bootstrap.php';
 
 
+/**
+ * @testCase
+ */
 final class FormattingTestCase extends AbstractTestCase
 {
 
@@ -56,4 +59,4 @@ final class FormattingTestCase extends AbstractTestCase
 
 }
 
-run(new FormattingTestCase());
+(new FormattingTestCase())->run();

tests/FormattingTests/Actual/inlineMode.html

@@ -8,12 +8,6 @@
 
 <script> var a = 123; a ++; alert(a); </script>
 
-skipthisarea var a = 123; a ++; alert(a);
-
 <skipthisarea> var a = 123; a ++; alert(a); </skipthisarea>
 
-textarea var a = 123; a ++; alert(a);
-
-macdom-off var a = 123; a ++; alert(a);
-
 <macdom-off> var a = 123; a ++; alert(a); </macdom-off>

tests/FormattingTests/Expected/inlineMode.html

@@ -11,15 +11,9 @@
 	 var a = 123; a ++; alert(a);
 </script>
 <script>
-	 var a = 123; a ++; alert(a); 
+	 var a = 123; a ++; alert(a);
 </script>
 <skipthisarea>
 	 var a = 123; a ++; alert(a);
 </skipthisarea>
-<skipthisarea>
-	 var a = 123; a ++; alert(a); 
-</skipthisarea>
-<textarea>
-	 var a = 123; a ++; alert(a);
-</textarea>
-var a = 123; a ++; alert(a); var a = 123; a ++; alert(a);
+var a = 123; a ++; alert(a);

tests/MacrosTestCase.phpt

@@ -18,6 +18,9 @@ namespace Macdom\Tests;
 require_once 'bootstrap.php';
 
 
+/**
+ * @testCase
+ */
 final class MacrosTestCase extends AbstractTestCase
 {
 
@@ -97,4 +100,4 @@ final class MacrosTestCase extends AbstractTestCase
 
 }
 
-run(new MacrosTestCase());
+(new MacrosTestCase())->run();

tests/MacrosTests/Expected/macrosOverwriting.html

@@ -1,4 +1,4 @@
 Selected charset is UTF-8.
 <script>
-	 alert('Hello World!');
+	alert('Hello World!');
 </script>

tests/ReplicatorTestCase.phpt

@@ -17,7 +17,9 @@ namespace Macdom\Tests;
 
 require_once 'bootstrap.php';
 
-
+/**
+ * @testCase
+ */
 final class ReplicatorTestCase extends AbstractTestCase
 {
 
@@ -49,4 +51,4 @@ final class ReplicatorTestCase extends AbstractTestCase
 
 }
 
-run(new ReplicatorTestCase());
+(new ReplicatorTestCase())->run();

tests/TextTestCase.phpt

@@ -18,6 +18,9 @@ namespace Macdom\Tests;
 require_once 'bootstrap.php';
 
 
+/**
+ * @testCase
+ */
 final class TextTestCase extends AbstractTestCase
 {
 
@@ -62,4 +65,4 @@ final class TextTestCase extends AbstractTestCase
 
 }
 
-run(new TextTestCase());
+(new TextTestCase())->run();

tests/bootstrap.php

@@ -1,11 +1,6 @@
 <?php
 
-require __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__ . '/../vendor/autoload.php';
 
 Tester\Environment::setup();
 date_default_timezone_set('Europe/Prague');
-
-function run(Tester\TestCase $testCase)
-{
-	$testCase->run();
-}