diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php index be1e02b338d..e35abf51868 100644 --- a/test/phpunit/LangTest.php +++ b/test/phpunit/LangTest.php @@ -126,10 +126,13 @@ class LangTest extends CommonClassTest // Test java string contains only d,M,y,/,-,. and not m,... $result = $tmplangs->transnoentitiesnoconv("FormatDateShortJava"); print __METHOD__." FormatDateShortJava=".$result."\n"; - $this->assertRegExp('/^[dMy\/\-\.]+$/', $result, 'FormatDateShortJava KO for lang code '.$code); + $tmpvar = preg_match('/^[dMy\/\-\.]+$/', $result); + $this->assertEquals(1, $tmpvar, 'FormatDateShortJava KO for lang code '.$code.'. Does not match /[dMy\/\-\.]+/'); + $result = $tmplangs->trans("FormatDateShortJavaInput"); print __METHOD__." FormatDateShortJavaInput=".$result."\n"; - $this->assertRegExp('/^[dMy\/\-\.]+$/', $result, 'FormatDateShortJavaInput KO for lang code '.$code); + $tmpvar = preg_match('/^[dMy\/\-\.]+$/', $result); + $this->assertEquals(1, $tmpvar, 'FormatDateShortJavaInput KO for lang code '.$code.'. Does not match /^[dMy\/\-\.]+$/'); unset($tmplangs); diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php index d0c0b005e62..f7ab7d0273b 100644 --- a/test/phpunit/SecurityTest.php +++ b/test/phpunit/SecurityTest.php @@ -839,7 +839,9 @@ class SecurityTest extends CommonClassTest $url = 'ftp://mydomain.com'; $tmp = getURLContent($url); print __METHOD__." url=".$url."\n"; - $this->assertRegExp("/not supported/", $tmp['curl_error_msg'], "Should disable ftp connection"); // Test error if return does not contains 'not supported' + + $tmpvar = preg_match('/not supported/', $tmp['curl_error_msg']); + $this->assertEquals(1, $tmpvar, "Did not find the /not supported/ in getURLContent error message. We should."); $url = 'https://www.dolibarr.fr'; // This is a redirect 301 page $tmp = getURLContent($url, 'GET', '', 0); // We do NOT follow