Changeset 519d6f3

Timestamp:

11/01/11 11:14:52 (7 months ago)

Author:

mrook

Branches:

master

Children:

d401315

Parents:

9da533b

git-author:

Michiel Rook <mrook@…> (11/01/11 11:14:52)

git-committer:

Michiel Rook <mrook@…> (11/01/11 11:14:52)

Message:

Rearrange phpunit unit tests

Location:

test

Files:

• classes/phing/regression/PhpUnit34Test.php (deleted)
• classes/phing/tasks/ext/PHPUnitTaskTest.php (modified) (3 diffs)
• etc/regression/363/build.xml (deleted)
• etc/tasks/ext/phpunit/HelloWorld.php (moved) (moved from test/etc/regression/363/HelloWorld.php)
• etc/tasks/ext/phpunit/HelloWorldTest.php (moved) (moved from test/etc/regression/363/HelloWorldTest.php)
• etc/tasks/ext/phpunit/build.xml (modified) (1 diff)

test/classes/phing/tasks/ext/PHPUnitTaskTest.php

@@ -29 +29 @@
  */
 class PHPUnitTaskTest extends BuildFileTest { 
+    protected $backupGlobals = FALSE;
         
     public function setUp()
@@ -37 +38 @@
     /**
      * Regression test for http://www.phing.info/trac/ticket/655
-     * "PlainPHPUnitResultFormatter does not display errors if @dataProvider was used"
+     * "PlainPHPUnitResultFormatter does not display errors if dataProvider was used"
      */
     public function testPlainFormatterDataProvider()
@@ -44 +45 @@
         $this->assertInLogs("Tests run: 2, Failures: 1, Errors: 0, Incomplete: 0, Skipped: 0, Time elapsed:");
     }
+
+    /**    
+     * Regression test for ticket http://www.phing.info/trac/ticket/363
+     * "PHPUnit task fails with formatter type 'xml'"
+     */
+    public function testHelloWorld() {
+      $this->executeTarget(__FUNCTION__);
+      $this->assertInLogs("<testcase name=\"testSayHello\" class=\"HelloWorldTest\"");
+    }
+    
 }

test/etc/tasks/ext/phpunit/build.xml

@@ -11 +11 @@
                         </batchtest>
                 </phpunit>
-         </target>
+        </target>
+
+        <target name="testHelloWorld">
+                <phpunit haltonerror="true" haltonfailure="true"
+                        printsummary="true">
+                        <formatter type="xml" usefile="false"/>
+                        <formatter type="plain" usefile="false"/>
+                        <batchtest>
+                                <fileset dir=".">
+                                        <include name="HelloWorldTest.php"/>
+                                </fileset>
+                        </batchtest>
+                </phpunit>
+        </target>
 </project>