diff options
Diffstat (limited to 'tests/ApplicationUtilsTest.php')
-rw-r--r-- | tests/ApplicationUtilsTest.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/ApplicationUtilsTest.php b/tests/ApplicationUtilsTest.php index 7ad1d34c..a232b351 100644 --- a/tests/ApplicationUtilsTest.php +++ b/tests/ApplicationUtilsTest.php | |||
@@ -144,10 +144,10 @@ class ApplicationUtilsTest extends \Shaarli\TestCase | |||
144 | 144 | ||
145 | /** | 145 | /** |
146 | * Test update checks - invalid Git branch | 146 | * Test update checks - invalid Git branch |
147 | * @expectedException Exception | ||
148 | */ | 147 | */ |
149 | public function testCheckUpdateInvalidGitBranch() | 148 | public function testCheckUpdateInvalidGitBranch() |
150 | { | 149 | { |
150 | $this->expectException(\Exception::class); | ||
151 | $this->expectExceptionMessageRegExp('/Invalid branch selected for updates/'); | 151 | $this->expectExceptionMessageRegExp('/Invalid branch selected for updates/'); |
152 | 152 | ||
153 | ApplicationUtils::checkUpdate('', 'null', 0, true, true, 'unstable'); | 153 | ApplicationUtils::checkUpdate('', 'null', 0, true, true, 'unstable'); |
@@ -261,10 +261,10 @@ class ApplicationUtilsTest extends \Shaarli\TestCase | |||
261 | 261 | ||
262 | /** | 262 | /** |
263 | * Check a unsupported PHP version | 263 | * Check a unsupported PHP version |
264 | * @expectedException Exception | ||
265 | */ | 264 | */ |
266 | public function testCheckSupportedPHPVersion51() | 265 | public function testCheckSupportedPHPVersion51() |
267 | { | 266 | { |
267 | $this->expectException(\Exception::class); | ||
268 | $this->expectExceptionMessageRegExp('/Your PHP version is obsolete/'); | 268 | $this->expectExceptionMessageRegExp('/Your PHP version is obsolete/'); |
269 | 269 | ||
270 | $this->assertTrue(ApplicationUtils::checkPHPVersion('5.3', '5.1.0')); | 270 | $this->assertTrue(ApplicationUtils::checkPHPVersion('5.3', '5.1.0')); |
@@ -272,10 +272,10 @@ class ApplicationUtilsTest extends \Shaarli\TestCase | |||
272 | 272 | ||
273 | /** | 273 | /** |
274 | * Check another unsupported PHP version | 274 | * Check another unsupported PHP version |
275 | * @expectedException Exception | ||
276 | */ | 275 | */ |
277 | public function testCheckSupportedPHPVersion52() | 276 | public function testCheckSupportedPHPVersion52() |
278 | { | 277 | { |
278 | $this->expectException(\Exception::class); | ||
279 | $this->expectExceptionMessageRegExp('/Your PHP version is obsolete/'); | 279 | $this->expectExceptionMessageRegExp('/Your PHP version is obsolete/'); |
280 | 280 | ||
281 | $this->assertTrue(ApplicationUtils::checkPHPVersion('5.3', '5.2')); | 281 | $this->assertTrue(ApplicationUtils::checkPHPVersion('5.3', '5.2')); |