X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=tests%2FApplicationUtilsTest.php;h=15388970a0b0680e4a2e0ecb7fbf5d7d6bb2d90d;hb=66063ed1a18d739b1a60bfb163d8656417a4c529;hp=ff4c9e17944be6de5fa9e53f9574eb1baac5c665;hpb=f9ff7f1b69f19b42569ffa67280807ba56f5d48a;p=github%2Fshaarli%2FShaarli.git

diff --git a/tests/ApplicationUtilsTest.php b/tests/ApplicationUtilsTest.php
index ff4c9e17..15388970 100644
--- a/tests/ApplicationUtilsTest.php
+++ b/tests/ApplicationUtilsTest.php
@@ -1,33 +1,14 @@
 <?php
-use Shaarli\Config\ConfigManager;
-
-/**
- * ApplicationUtils' tests
- */
+namespace Shaarli;
 
-require_once 'application/ApplicationUtils.php';
-
-/**
- * Fake ApplicationUtils class to avoid HTTP requests
- */
-class FakeApplicationUtils extends ApplicationUtils
-{
-    public static $VERSION_CODE = '';
-
-    /**
-     * Toggle HTTP requests, allow overriding the version code
-     */
-    public static function getVersion($url, $timeout=0)
-    {
-        return self::$VERSION_CODE;
-    }
-}
+use Shaarli\Config\ConfigManager;
 
+require_once 'tests/utils/FakeApplicationUtils.php';
 
 /**
  * Unitary tests for Shaarli utilities
  */
-class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
+class ApplicationUtilsTest extends \PHPUnit\Framework\TestCase
 {
     protected static $testUpdateFile = 'sandbox/update.txt';
     protected static $testVersion = '0.5.0';
@@ -67,7 +48,7 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
             '0.5.4',
             ApplicationUtils::getVersion(
                 'https://raw.githubusercontent.com/shaarli/Shaarli/'
-               .'v0.5.4/shaarli_version.php',
+                .'v0.5.4/shaarli_version.php',
                 $testTimeout
             )
         );
@@ -75,7 +56,7 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
             self::$versionPattern,
             ApplicationUtils::getVersion(
                 'https://raw.githubusercontent.com/shaarli/Shaarli/'
-               .'latest/shaarli_version.php',
+                .'latest/shaarli_version.php',
                 $testTimeout
             )
         );
@@ -272,9 +253,9 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
     public function testCheckSupportedPHPVersion()
     {
         $minVersion = '5.3';
-        ApplicationUtils::checkPHPVersion($minVersion, '5.4.32');
-        ApplicationUtils::checkPHPVersion($minVersion, '5.5');
-        ApplicationUtils::checkPHPVersion($minVersion, '5.6.10');
+        $this->assertTrue(ApplicationUtils::checkPHPVersion($minVersion, '5.4.32'));
+        $this->assertTrue(ApplicationUtils::checkPHPVersion($minVersion, '5.5'));
+        $this->assertTrue(ApplicationUtils::checkPHPVersion($minVersion, '5.6.10'));
     }
 
     /**
@@ -284,7 +265,7 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
      */
     public function testCheckSupportedPHPVersion51()
     {
-        ApplicationUtils::checkPHPVersion('5.3', '5.1.0');
+        $this->assertTrue(ApplicationUtils::checkPHPVersion('5.3', '5.1.0'));
     }
 
     /**
@@ -294,7 +275,7 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
      */
     public function testCheckSupportedPHPVersion52()
     {
-        ApplicationUtils::checkPHPVersion('5.3', '5.2');
+        $this->assertTrue(ApplicationUtils::checkPHPVersion('5.3', '5.2'));
     }
 
     /**