Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

MINOR: Simplified phpunit files so that they work with PHPUnit 3.5

  • Loading branch information...
commit 4bb7d6a94017fe245ebe0a0182adcaa8df21d319 1 parent 792df1e
Sam Minnée authored May 28, 2012
21  phpunit.teamcity.xml
... ...
@@ -1,7 +1,7 @@
1 1
 <!-- 
2 2
 	PHPUnit configuration for SilverStripe
3 3
 
4  
-	Requires PHPUnit 3.6+
  4
+	Requires PHPUnit 3.5+
5 5
 
6 6
 	Usage: 
7 7
 	 - "phpunit": Runs all tests in all folders
@@ -16,21 +16,14 @@
16 16
 	  for more information on configuration and execution options.
17 17
 	- framework/dev/TestRunner.php for an alternative way to run unit tests through the "sake" CLI tool.
18 18
 -->
19  
-<phpunit bootstrap="framework/tests/bootstrap.php" colors="true">
  19
+<phpunit bootstrap="framework/tests/bootstrap.php" colors="false" backupGlobals="false" backupStaticAttributes="false" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" syntaxCheck="false" verbose="true" strict="true">
  20
+
20 21
 	<testsuite name="Default">
21  
-		<directory>./</directory>
22  
-		<exclude>framework/thirdparty/</exclude>
  22
+		<directory>mysite/tests</directory>
  23
+		<directory>cms/tests</directory>
  24
+		<directory>framework/tests</directory>
23 25
 	</testsuite>
24 26
 
25  
-	<filter>
26  
-		<blacklist>
27  
-			<directory suffix=".php">framework/dev/</directory>
28  
-			<directory suffix=".php">framework/thirdparty/</directory>
29  
-			<directory suffix=".php">cms/thirdparty/</directory>
30  
-			<file>framework/tests/PhpSyntaxTest.php</file>
31  
-		</blacklist>
32  
-	</filter>
33  
-
34 27
 	<listeners>
35 28
 		<listener class="SS_TestListener" file="framework/dev/TestListener.php" />
36 29
     	<listener class="TeamCityListener" file="framework/dev/TeamCityListener.php"/>
@@ -41,4 +34,4 @@
41 34
 			<group>sanitychecks</group>
42 35
 		</exclude>
43 36
 	</groups>
44  
-</phpunit>
  37
+</phpunit>
23  phpunit.xml.dist
... ...
@@ -1,7 +1,7 @@
1 1
 <!-- 
2 2
 	PHPUnit configuration for SilverStripe
3 3
 
4  
-	Requires PHPUnit 3.6+
  4
+	Requires PHPUnit 3.5+
5 5
 
6 6
 	Usage: 
7 7
 	 - "phpunit": Runs all tests in all folders
@@ -16,21 +16,14 @@
16 16
 	  for more information on configuration and execution options.
17 17
 	- framework/dev/TestRunner.php for an alternative way to run unit tests through the "sake" CLI tool.
18 18
 -->
19  
-<phpunit bootstrap="framework/tests/bootstrap.php" colors="true">
  19
+<phpunit bootstrap="framework/tests/bootstrap.php" colors="true" backupGlobals="false" backupStaticAttributes="false" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" syntaxCheck="false" verbose="true" strict="true">
  20
+
20 21
 	<testsuite name="Default">
21  
-		<directory>./</directory>
22  
-		<exclude>framework/thirdparty/</exclude>
  22
+		<directory>mysite/tests</directory>
  23
+		<directory>cms/tests</directory>
  24
+		<directory>framework/tests</directory>
23 25
 	</testsuite>
24  
-
25  
-	<filter>
26  
-		<blacklist>
27  
-			<directory suffix=".php">framework/dev/</directory>
28  
-			<directory suffix=".php">framework/thirdparty/</directory>
29  
-			<directory suffix=".php">cms/thirdparty/</directory>
30  
-			<file>framework/tests/PhpSyntaxTest.php</file>
31  
-		</blacklist>
32  
-	</filter>
33  
-
  26
+	
34 27
 	<listeners>
35 28
 		<listener class="SS_TestListener" file="framework/dev/TestListener.php" />
36 29
 	</listeners>
@@ -40,4 +33,4 @@
40 33
 			<group>sanitychecks</group>
41 34
 		</exclude>
42 35
 	</groups>
43  
-</phpunit>
  36
+</phpunit>

0 notes on commit 4bb7d6a

Please sign in to comment.
Something went wrong with that request. Please try again.