addapted tests to master branch

ju1ius · ju1ius · commit 09ec6216967a · 2011-09-19T09:41:41.000+02:00
diff --git a/tests/bugs/GH26_Test.php b/tests/bugs/GH26_Test.php
@@ -11,8 +11,8 @@ class GH26_Test extends PHPUnit_Framework_TestCase
    **/
   public function testMSFilters($sCss, $sExpected)
   {
-    $oParser = new CSSParser($sCss);
-    $oDoc = $oParser->parse();
+    $oParser = new CSSParser();
+    $oDoc = $oParser->parseString($sCss);
     $this->assertEquals((string)$oDoc, $sExpected);
   }
   public function testMSFiltersProvider()
diff --git a/tests/bugs/GH27_Test.php b/tests/bugs/GH27_Test.php
@@ -11,8 +11,8 @@ class GH27_Test extends PHPUnit_Framework_TestCase
    **/
   public function testNamespaces($sCss, $sExpected)
   {
-    $oParser = new CSSParser($sCss);
-    $oDoc = $oParser->parse();
+    $oParser = new CSSParser();
+    $oDoc = $oParser->parseString($sCss);
     $this->assertEquals((string)$oDoc, $sExpected);
   }
   public function testNamespacesProvider()
diff --git a/testsuite.xml b/testsuite.xml
@@ -1,8 +1,12 @@
 <phpunit>
   <testsuites>
     <testsuite name="PHP-CSS-Parser Tests">
+      <file>tests/CSSColorUtilsTest.php</file>
+      <file>tests/CSSColorTest.php</file>
+      <file>tests/CSSImportTest.php</file>
+      <file>tests/CSSDocumentTest.php</file>
       <file>tests/CSSDeclarationBlockTest.php</file>
-      <file>tests/CSSParserTests.php</file>
+      <file>tests/CSSParserTest.php</file>
     </testsuite>
     <testsuite name="PHP-CSS-Parser Bugs">
       <directory>tests/bugs</directory>

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ class GH26_Test extends PHPUnit_Framework_TestCase`
`11`	`11`	`**/`
`12`	`12`	`public function testMSFilters($sCss, $sExpected)`
`13`	`13`	`{`
`14`		`- $oParser = new CSSParser($sCss);`
`15`		`- $oDoc = $oParser->parse();`
	`14`	`+ $oParser = new CSSParser();`
	`15`	`+ $oDoc = $oParser->parseString($sCss);`
`16`	`16`	`$this->assertEquals((string)$oDoc, $sExpected);`
`17`	`17`	`}`
`18`	`18`	`public function testMSFiltersProvider()`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ class GH27_Test extends PHPUnit_Framework_TestCase`
`11`	`11`	`**/`
`12`	`12`	`public function testNamespaces($sCss, $sExpected)`
`13`	`13`	`{`
`14`		`- $oParser = new CSSParser($sCss);`
`15`		`- $oDoc = $oParser->parse();`
	`14`	`+ $oParser = new CSSParser();`
	`15`	`+ $oDoc = $oParser->parseString($sCss);`
`16`	`16`	`$this->assertEquals((string)$oDoc, $sExpected);`
`17`	`17`	`}`
`18`	`18`	`public function testNamespacesProvider()`