This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, 6.1 has been updated
via dad12bd7208e8c2605ebbe2af49230ce661074f7 (commit)
from f902d6ab0c58317d29d4c6395991362c9ee8abc4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=dad12bd7208e8c2605ebbe2af49230ce661074f7
commit dad12bd7208e8c2605ebbe2af49230ce661074f7
Author: Roland Mas <[email protected]>
Date: Thu Dec 3 22:33:16 2020 +0100
Try fixing testsuite
diff --git a/tests/code/deprecations/DeprecationsTest.php
b/tests/code/deprecations/DeprecationsTest.php
index ac2187f..96d4c6e 100644
--- a/tests/code/deprecations/DeprecationsTest.php
+++ b/tests/code/deprecations/DeprecationsTest.php
@@ -10,7 +10,7 @@ require_once 'PHPUnit/Framework/TestCase.php';
* @copyright 2009 Roland Mas
* @license http://www.opensource.org/licenses/gpl-license.php GPL License
*/
-class Deprecations_Tests extends PHPUnit_Framework_TestCase
+class Deprecations_Tests extends PHPUnit\Framework\TestCase
{
/**
* Check that no code uses db_query() or db_mquery()
diff --git a/tests/code/syntax/SyntaxTest.php b/tests/code/syntax/SyntaxTest.php
index ab3f567..135cc7f 100644
--- a/tests/code/syntax/SyntaxTest.php
+++ b/tests/code/syntax/SyntaxTest.php
@@ -10,7 +10,7 @@ require_once 'PHPUnit/Framework/TestCase.php';
* @copyright 2009 Alain Peyrat. All rights reserved.
* @license http://www.opensource.org/licenses/gpl-license.php GPL License
*/
-class Syntax_Tests extends PHPUnit_Framework_TestCase
+class Syntax_Tests extends PHPUnit\Framework\TestCase
{
/**
* First, make sure pcregrep is installed
diff --git a/tests/code_and_unit_tests.php b/tests/code_and_unit_tests.php
index d3089fa..976ce8c 100644
--- a/tests/code_and_unit_tests.php
+++ b/tests/code_and_unit_tests.php
@@ -19,24 +19,18 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-if (!defined('PHPUnit_MAIN_METHOD')) {
- define('PHPUnit_MAIN_METHOD', 'AllTests::main');
-}
-
-include_once 'PHPUnit/Autoload.php';
-class PHPUnit_Framework_TestSuite extends PHPUnit\Framework\TestSuite {}
-class PHPUnit_Framework_TestCase extends PHPUnit\Framework\TestCase {}
+@include_once '/usr/local/share/php/vendor/autoload.php';
@include_once 'PHP/Token/Stream/Autoload.php';
@include_once 'Text/Template/Autoload.php';
class AllTests {
public static function main() {
- PHPUnit_TextUI_TestRunner::run(self::suite());
+ PHPUnit\TextUI\TestRunner::run(self::suite());
}
public static function suite() {
- $suite = new PHPUnit_Framework_TestSuite('PHPUnit');
+ $suite = new PHPUnit\Framework\TestSuite('PHPUnit');
// Unit tests
$suite->addTestFiles(glob("unit/*/*Test.php"));
diff --git a/tests/func/20_Trackers/trackersTest.php
b/tests/func/20_Trackers/trackersTest.php
index 0ecf6ed..cce7891 100644
--- a/tests/func/20_Trackers/trackersTest.php
+++ b/tests/func/20_Trackers/trackersTest.php
@@ -105,7 +105,7 @@ class CreateTracker extends FForge_SeleniumTestCase
$this->waitForPageToLoad("30000");
try {
$this->assertEquals("http://google.com/";,
$this->getValue("//form[@id='trackermodform']//input[@type='text']"));
- } catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit\Framework\AssertionFailedError $e) {
array_push($this->verificationErrors, $e->toString());
}
diff --git a/tests/func/SeleniumForge.php b/tests/func/SeleniumForge.php
index 9dcf791..1df87c5 100644
--- a/tests/func/SeleniumForge.php
+++ b/tests/func/SeleniumForge.php
@@ -605,11 +605,11 @@ abstract class FForge_SeleniumTestCase extends
PHPUnit\Extensions\Selenium2TestC
protected function isElementPresent($element) {
try {
if (preg_match('/^\/\/[a-z]/', $element)) {
- if ($this->byXPath($element) instanceof
PHPUnit_Extensions_Selenium2TestCase_Element) {
+ if ($this->byXPath($element) instanceof
PHPUnit\Extensions\Selenium2TestCase_Element) {
return true;
}
} elseif (preg_match('/^link=/', $element)) {
- if ($this->byLinkText(substr($element, 5))
instanceof PHPUnit_Extensions_Selenium2TestCase_Element) {
+ if ($this->byLinkText(substr($element, 5))
instanceof PHPUnit\Extensions\Selenium2TestCase_Element) {
return true;
}
}
diff --git a/tests/func_tests.php b/tests/func_tests.php
index 37c0d98..92c1b28 100644
--- a/tests/func_tests.php
+++ b/tests/func_tests.php
@@ -19,21 +19,15 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-if (!defined('PHPUnit_MAIN_METHOD')) {
- define('PHPUnit_MAIN_METHOD', 'AllTests::main');
-}
-
-include_once 'PHPUnit/Autoload.php';
-class PHPUnit_Framework_TestSuite extends PHPUnit\Framework\TestSuite {}
-class PHPUnit_Framework_TestCase extends PHPUnit\Framework\TestCase {}
+@include_once '/usr/local/share/php/vendor/autoload.php';
class func_tests {
public static function main() {
- PHPUnit_TextUI_TestRunner::run(self::suite());
+ PHPUnit\TextUI\TestRunner::run(self::suite());
}
public static function suite() {
- $suite = new PHPUnit_Framework_TestSuite('PHPUnit');
+ $suite = new PHPUnit\Framework\TestSuite('PHPUnit');
// Selenium tests
if (getenv('TESTGLOB') != FALSE) {
diff --git a/tests/func_tests.sh b/tests/func_tests.sh
index 5ff1c3e..b773797 100755
--- a/tests/func_tests.sh
+++ b/tests/func_tests.sh
@@ -121,8 +121,8 @@ install_selenium() {
--- Element.php.dist 2014-11-02 09:23:27.000000000 +0000
+++ Element.php 2019-01-15 15:00:44.034513685 +0000
@@ -77,10 +77,21 @@
- PHPUnit_Extensions_Selenium2TestCase_URL $parentFolder,
- PHPUnit_Extensions_Selenium2TestCase_Driver $driver)
+ PHPUnit\Extensions\Selenium2TestCase_URL $parentFolder,
+ PHPUnit\Extensions\Selenium2TestCase_Driver $driver)
{
+ $key = false;
if (!isset($value['ELEMENT'])) {
diff --git a/tests/unit/common/account.php b/tests/unit/common/account.php
index e746619..845a0b7 100644
--- a/tests/unit/common/account.php
+++ b/tests/unit/common/account.php
@@ -25,7 +25,7 @@ require_once dirname(__FILE__) .
'/../../../src/common/include/account.php';
require_once dirname(__FILE__) . '/../../../src/common/include/utils.php';
require_once dirname(__FILE__) . '/../../../src/common/include/config.php';
-class Account_Tests extends PHPUnit_Framework_TestCase
+class Account_Tests extends PHPUnit\Framework\TestCase
{
public function test_account_gensalt()
{
diff --git a/tests/unit/common/minijsonTest.php
b/tests/unit/common/minijsonTest.php
index e6194a6..3857e1f 100644
--- a/tests/unit/common/minijsonTest.php
+++ b/tests/unit/common/minijsonTest.php
@@ -27,7 +27,7 @@
require_once('PHPUnit/Framework/TestCase.php');
require_once(dirname(__FILE__) . '/../../../src/common/include/minijson.php');
-class Minijson_Tests extends PHPUnit_Framework_TestCase {
+class Minijson_Tests extends PHPUnit\Framework\TestCase {
/****************************************************************/
/* $s_orig [parse] print_r->$s_printr [encode] $s_ecompact or
$s_epadded */
/* $s_e* [decode] print_r ->$s_printrs (due to Object key sorting) */
diff --git a/tests/unit/config/ConfigTest.php b/tests/unit/config/ConfigTest.php
index d9c39c0..b731195 100644
--- a/tests/unit/config/ConfigTest.php
+++ b/tests/unit/config/ConfigTest.php
@@ -11,7 +11,7 @@ require_once dirname(__FILE__) .
'/../../../src/common/include/config.php';
* @copyright 2009 Roland Mas
* @license GPL License
*/
-class Config_Tests extends PHPUnit_Framework_TestCase
+class Config_Tests extends PHPUnit\Framework\TestCase
{
/**
* test basic config getting
diff --git a/tests/unit/utils/DbUtilsTest.php b/tests/unit/utils/DbUtilsTest.php
index af35480..6c06ad1 100644
--- a/tests/unit/utils/DbUtilsTest.php
+++ b/tests/unit/utils/DbUtilsTest.php
@@ -11,7 +11,7 @@ require_once dirname(__FILE__) .
'/../../../src/common/include/database-pgsql.ph
* @copyright 2009 Alain Peyrat. All rights reserved.
* @license GPL License
*/
-class Database_Utils_Tests extends PHPUnit_Framework_TestCase
+class Database_Utils_Tests extends PHPUnit\Framework\TestCase
{
/**
* test the validate_hostname function.
diff --git a/tests/unit/utils/HtmlPurifierTest.php
b/tests/unit/utils/HtmlPurifierTest.php
index 0af42f9..a0b3445 100644
--- a/tests/unit/utils/HtmlPurifierTest.php
+++ b/tests/unit/utils/HtmlPurifierTest.php
@@ -10,7 +10,7 @@ require_once 'PHPUnit/Framework/TestCase.php';
* @copyright 2009 Olivier Berger & Institut TELECOM
* @license GPL License
*/
-class HtmlPurifier_Tests extends PHPUnit_Framework_TestCase
+class HtmlPurifier_Tests extends PHPUnit\Framework\TestCase
{
/**
* Test that include of lib doesn't fail, otherwise give some hint on
missing package
@@ -24,7 +24,7 @@ class HtmlPurifier_Tests extends PHPUnit_Framework_TestCase
include 'HTMLPurifier.auto.php';
}
- catch (PHPUnit_Framework_Error $expected) {
+ catch (PHPUnit\Framework\Error $expected) {
$this->fail('You probably need to install htmlpurifier :
'.$expected->getMessage());
return;
}
diff --git a/tests/unit/utils/TextSanitizerTest.php
b/tests/unit/utils/TextSanitizerTest.php
index c0ca850..89700e7 100644
--- a/tests/unit/utils/TextSanitizerTest.php
+++ b/tests/unit/utils/TextSanitizerTest.php
@@ -12,7 +12,7 @@ require_once dirname(__FILE__) .
'/../../../src/common/include/TextSanitizer.cla
* @copyright 2009 Alain Peyrat. All rights reserved.
* @license GPL License
*/
-class TextSanitizerTests extends PHPUnit_Framework_TestCase
+class TextSanitizerTests extends PHPUnit\Framework\TestCase
{
protected $s;
diff --git a/tests/unit/utils/UtilsTest.php b/tests/unit/utils/UtilsTest.php
index c820949..c66bd7e 100644
--- a/tests/unit/utils/UtilsTest.php
+++ b/tests/unit/utils/UtilsTest.php
@@ -12,7 +12,7 @@ require_once dirname(dirname(__FILE__)) .
'/../../src/common/include/escapingUti
* @copyright 2009 Alain Peyrat. All rights reserved.
* @license GPL License
*/
-class Utils_Tests extends PHPUnit_Framework_TestCase
+class Utils_Tests extends PHPUnit\Framework\TestCase
{
/**
* test the validate_email function.
-----------------------------------------------------------------------
Summary of changes:
tests/code/deprecations/DeprecationsTest.php | 2 +-
tests/code/syntax/SyntaxTest.php | 2 +-
tests/code_and_unit_tests.php | 12 +++---------
tests/func/20_Trackers/trackersTest.php | 2 +-
tests/func/SeleniumForge.php | 4 ++--
tests/func_tests.php | 12 +++---------
tests/func_tests.sh | 4 ++--
tests/unit/common/account.php | 2 +-
tests/unit/common/minijsonTest.php | 2 +-
tests/unit/config/ConfigTest.php | 2 +-
tests/unit/utils/DbUtilsTest.php | 2 +-
tests/unit/utils/HtmlPurifierTest.php | 4 ++--
tests/unit/utils/TextSanitizerTest.php | 2 +-
tests/unit/utils/UtilsTest.php | 2 +-
14 files changed, 21 insertions(+), 33 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
