[ticket/15369] Fix tests

PHPBB3-15369
This commit is contained in:
Matt Friedman 2018-01-06 10:37:39 -08:00 committed by Marc Alexander
parent 18d4b7f358
commit 2753f8ccc8
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 7 additions and 2 deletions

View file

@ -36,7 +36,7 @@ class phpbb_feed_attachments_base_test extends phpbb_database_test_case
new phpbb_mock_request() new phpbb_mock_request()
), ),
$this->filesystem, $this->filesystem,
$this->getMock('\phpbb\request\request'), $this->createMock('\phpbb\request\request'),
$phpbb_root_path, $phpbb_root_path,
'php' 'php'
); );

View file

@ -95,7 +95,12 @@ class phpbb_test_case_helpers
break; break;
} }
$this->expectedTriggerError = true; $this->expectedTriggerError = true;
$this->test_case->setExpectedException($exceptionName, (string) $message, $errno); $this->test_case->expectException($exceptionName);
$this->test_case->expectExceptionCode($errno);
if ($message)
{
$this->test_case->expectExceptionMessage((string) $message);
}
} }
public function makedirs($path) public function makedirs($path)