[Fusionforge-commits] r15555 - in branches/Branch_5_1: . tests tests/func tests/func/Soap

Roland Mas lolando at fusionforge.org
Wed May 23 13:48:08 CEST 2012


Author: lolando
Date: 2012-05-23 13:48:07 +0200 (Wed, 23 May 2012)
New Revision: 15555

Modified:
   branches/Branch_5_1/
   branches/Branch_5_1/tests/AllFullTests.php
   branches/Branch_5_1/tests/AllTests.php
   branches/Branch_5_1/tests/DEBDebian60Tests.php
   branches/Branch_5_1/tests/RPMCentos52Tests.php
   branches/Branch_5_1/tests/SeleniumTests.php
   branches/Branch_5_1/tests/TarCentos52Tests.php
   branches/Branch_5_1/tests/func/AllTests.php
   branches/Branch_5_1/tests/func/Soap/AllTests.php
Log:
Conditional adaptation to phpunit 3.6 (should still work with 3.4)

Modified: branches/Branch_5_1/tests/AllFullTests.php
===================================================================
--- branches/Branch_5_1/tests/AllFullTests.php	2012-05-23 11:42:39 UTC (rev 15554)
+++ branches/Branch_5_1/tests/AllFullTests.php	2012-05-23 11:48:07 UTC (rev 15555)
@@ -3,8 +3,10 @@
 	define('PHPUnit_MAIN_METHOD', 'AllTests::main');
 }
 
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
+if (!@include_once 'PHPUnit/Autoload.php') {
+	include_once 'PHPUnit/Framework.php';
+	require_once 'PHPUnit/TextUI/TestRunner.php';
+}
 
 class AllTests
 {

Modified: branches/Branch_5_1/tests/AllTests.php
===================================================================
--- branches/Branch_5_1/tests/AllTests.php	2012-05-23 11:42:39 UTC (rev 15554)
+++ branches/Branch_5_1/tests/AllTests.php	2012-05-23 11:48:07 UTC (rev 15555)
@@ -3,9 +3,10 @@
 	define('PHPUnit_MAIN_METHOD', 'AllTests::main');
 }
 
- at include_once 'PHPUnit/Autoload.php';
- at include_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
+if (!@include_once 'PHPUnit/Autoload.php') {
+	include_once 'PHPUnit/Framework.php';
+	require_once 'PHPUnit/TextUI/TestRunner.php';
+}
 
 class AllTests
 {

Modified: branches/Branch_5_1/tests/DEBDebian60Tests.php
===================================================================
--- branches/Branch_5_1/tests/DEBDebian60Tests.php	2012-05-23 11:42:39 UTC (rev 15554)
+++ branches/Branch_5_1/tests/DEBDebian60Tests.php	2012-05-23 11:48:07 UTC (rev 15555)
@@ -3,8 +3,11 @@
 	define('PHPUnit_MAIN_METHOD', 'AllTests::main');
 }
 
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
+if (!@include_once 'PHPUnit/Autoload.php') {
+	include_once 'PHPUnit/Framework.php';
+	require_once 'PHPUnit/TextUI/TestRunner.php';
+}
+
 require_once 'func/Testing/DEBSeleniumRemoteSuite.php';
 
 class DEBDebian60Tests

Modified: branches/Branch_5_1/tests/RPMCentos52Tests.php
===================================================================
--- branches/Branch_5_1/tests/RPMCentos52Tests.php	2012-05-23 11:42:39 UTC (rev 15554)
+++ branches/Branch_5_1/tests/RPMCentos52Tests.php	2012-05-23 11:48:07 UTC (rev 15555)
@@ -3,8 +3,11 @@
 	define('PHPUnit_MAIN_METHOD', 'AllTests::main');
 }
 
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
+if (!@include_once 'PHPUnit/Autoload.php') {
+	include_once 'PHPUnit/Framework.php';
+	require_once 'PHPUnit/TextUI/TestRunner.php';
+}
+
 require_once 'func/Testing/RPMSeleniumRemoteSuite.php';
 
 class RPMCentos52Tests

Modified: branches/Branch_5_1/tests/SeleniumTests.php
===================================================================
--- branches/Branch_5_1/tests/SeleniumTests.php	2012-05-23 11:42:39 UTC (rev 15554)
+++ branches/Branch_5_1/tests/SeleniumTests.php	2012-05-23 11:48:07 UTC (rev 15555)
@@ -3,9 +3,10 @@
 	define('PHPUnit_MAIN_METHOD', 'AllTests::main');
 }
 
- at include_once 'PHPUnit/Autoload.php';
- at include_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
+if (!@include_once 'PHPUnit/Autoload.php') {
+	include_once 'PHPUnit/Framework.php';
+	require_once 'PHPUnit/TextUI/TestRunner.php';
+}
 
 class AllTests
 {

Modified: branches/Branch_5_1/tests/TarCentos52Tests.php
===================================================================
--- branches/Branch_5_1/tests/TarCentos52Tests.php	2012-05-23 11:42:39 UTC (rev 15554)
+++ branches/Branch_5_1/tests/TarCentos52Tests.php	2012-05-23 11:48:07 UTC (rev 15555)
@@ -3,8 +3,11 @@
 	define('PHPUnit_MAIN_METHOD', 'AllTests::main');
 }
 
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
+if (!@include_once 'PHPUnit/Autoload.php') {
+	include_once 'PHPUnit/Framework.php';
+	require_once 'PHPUnit/TextUI/TestRunner.php';
+}
+
 require_once 'func/Testing/TarSeleniumRemoteSuite.php';
 
 class TarCentos52Tests

Modified: branches/Branch_5_1/tests/func/AllTests.php
===================================================================
--- branches/Branch_5_1/tests/func/AllTests.php	2012-05-23 11:42:39 UTC (rev 15554)
+++ branches/Branch_5_1/tests/func/AllTests.php	2012-05-23 11:48:07 UTC (rev 15555)
@@ -3,8 +3,10 @@
 	define('PHPUnit_MAIN_METHOD', 'AllTests::main');
 }
 
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
+if (!@include_once 'PHPUnit/Autoload.php') {
+	include_once 'PHPUnit/Framework.php';
+	require_once 'PHPUnit/TextUI/TestRunner.php';
+}
 
 // Unit tests
 //require_once 'ACL/AllTests.php';

Modified: branches/Branch_5_1/tests/func/Soap/AllTests.php
===================================================================
--- branches/Branch_5_1/tests/func/Soap/AllTests.php	2012-05-23 11:42:39 UTC (rev 15554)
+++ branches/Branch_5_1/tests/func/Soap/AllTests.php	2012-05-23 11:48:07 UTC (rev 15555)
@@ -47,8 +47,10 @@
     define('PHPUnit_MAIN_METHOD', 'Site_AllTests::main');
 }
  
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
+if (!@include_once 'PHPUnit/Autoload.php') {
+	include_once 'PHPUnit/Framework.php';
+	require_once 'PHPUnit/TextUI/TestRunner.php';
+}
  
 require_once 'func/config.php';
 require_once 'func/Soap/checks.php';




More information about the Fusionforge-commits mailing list