diff --git a/lib/unitTest/Alchemy/Phrasea/Core/Configuration/ApplicationTest.php b/lib/unitTest/Alchemy/Phrasea/Core/Configuration/ApplicationTest.php index 542d869b7a..a9bb4413f1 100644 --- a/lib/unitTest/Alchemy/Phrasea/Core/Configuration/ApplicationTest.php +++ b/lib/unitTest/Alchemy/Phrasea/Core/Configuration/ApplicationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -require_once __DIR__ . '/../../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc'; +require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc'; use Alchemy\Phrasea\Core as PhraseaCore; use Alchemy\Phrasea\Core\Configuration\Application; @@ -20,7 +20,7 @@ use Alchemy\Phrasea\Core\Configuration\Application; * @license http://opensource.org/licenses/gpl-3.0 GPLv3 * @link www.phraseanet.com */ -class ApplicationTest extends PhraseanetPHPUnitAuthenticatedAbstract +class ApplicationTest extends \PhraseanetPHPUnitAbstract { /** diff --git a/lib/unitTest/Alchemy/Phrasea/Core/Configuration/ConfigurationTest.php b/lib/unitTest/Alchemy/Phrasea/Core/Configuration/ConfigurationTest.php index 53f26664ea..268fc6033e 100644 --- a/lib/unitTest/Alchemy/Phrasea/Core/Configuration/ConfigurationTest.php +++ b/lib/unitTest/Alchemy/Phrasea/Core/Configuration/ConfigurationTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -require_once __DIR__ . '/../../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc'; +require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc'; use Alchemy\Phrasea\Core as PhraseaCore; use Alchemy\Phrasea\Core\Configuration; @@ -20,7 +20,7 @@ use Alchemy\Phrasea\Core\Configuration; * @license http://opensource.org/licenses/gpl-3.0 GPLv3 * @link www.phraseanet.com */ -class ConfigurationTest extends PhraseanetPHPUnitAuthenticatedAbstract +class ConfigurationTest extends \PhraseanetPHPUnitAbstract { public function setUp() diff --git a/lib/unitTest/Alchemy/Phrasea/Core/Configuration/HandlerTest.php b/lib/unitTest/Alchemy/Phrasea/Core/Configuration/HandlerTest.php index e6de6e11fc..e7799460f3 100644 --- a/lib/unitTest/Alchemy/Phrasea/Core/Configuration/HandlerTest.php +++ b/lib/unitTest/Alchemy/Phrasea/Core/Configuration/HandlerTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -require_once __DIR__ . '/../../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc'; +require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc'; use Alchemy\Phrasea\Core\Configuration; use Alchemy\Phrasea\Core\Configuration\Application; @@ -20,7 +20,7 @@ use Alchemy\Phrasea\Core\Configuration\Application; * @license http://opensource.org/licenses/gpl-3.0 GPLv3 * @link www.phraseanet.com */ -class handlerTest extends PhraseanetPHPUnitAuthenticatedAbstract +class handlerTest extends \PhraseanetPHPUnitAbstract { public function setUp() diff --git a/lib/unitTest/Alchemy/Phrasea/Core/Configuration/ParserTest.php b/lib/unitTest/Alchemy/Phrasea/Core/Configuration/ParserTest.php index 32472aba86..588716c6bb 100644 --- a/lib/unitTest/Alchemy/Phrasea/Core/Configuration/ParserTest.php +++ b/lib/unitTest/Alchemy/Phrasea/Core/Configuration/ParserTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -require_once __DIR__ . '/../../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc'; +require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc'; use Alchemy\Phrasea\Core as PhraseaCore; use Alchemy\Phrasea\Core\Configuration\Parser\Yaml; @@ -20,7 +20,7 @@ use Alchemy\Phrasea\Core\Configuration\Parser\Yaml; * @license http://opensource.org/licenses/gpl-3.0 GPLv3 * @link www.phraseanet.com */ -class parserTest extends PhraseanetPHPUnitAuthenticatedAbstract +class parserTest extends \PhraseanetPHPUnitAbstract { public function setUp() diff --git a/lib/unitTest/Alchemy/Phrasea/Core/VersionTest.php b/lib/unitTest/Alchemy/Phrasea/Core/VersionTest.php index 1794633db2..12b0c208d5 100644 --- a/lib/unitTest/Alchemy/Phrasea/Core/VersionTest.php +++ b/lib/unitTest/Alchemy/Phrasea/Core/VersionTest.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -require_once __DIR__ . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc'; +require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc'; use Alchemy\Phrasea\Core\Version; @@ -19,7 +19,7 @@ use Alchemy\Phrasea\Core\Version; * @license http://opensource.org/licenses/gpl-3.0 GPLv3 * @link www.phraseanet.com */ -class VersionTest extends PhraseanetPHPUnitAuthenticatedAbstract +class VersionTest extends \PhraseanetPHPUnitAbstract { /** @@ -38,11 +38,13 @@ class VersionTest extends PhraseanetPHPUnitAuthenticatedAbstract public function testGetNumber() { - $this->assertTrue(is_string(Version::getName())); + $this->assertTrue(is_string(Version::getNumber())); + $this->assertRegExp('/[\d]{1}\.[\d]{1,2}\.[\d]{1,2}/', Version::getNumber()); } public function testGetName() { - $this->assertTrue(is_string(Version::getNumber())); + $this->assertTrue(is_string(Version::getName())); + $this->assertTrue(strlen(Version::getName()) > 3); } } \ No newline at end of file