[ticket/15369] Fix tests

PHPBB3-15369
This commit is contained in:
Matt Friedman 2018-01-06 10:37:39 -08:00
parent a6b45ff0fd
commit 6ad1188b65
2 changed files with 7 additions and 2 deletions

View file

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

View file

@ -95,7 +95,12 @@ class phpbb_test_case_helpers
break;
}
$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)