summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/BridgeTest.php12
-rw-r--r--test/MailmanLibTest.php4
-rw-r--r--test/PhpBB3Test.php10
3 files changed, 13 insertions, 13 deletions
diff --git a/test/BridgeTest.php b/test/BridgeTest.php
index 94eae5d..72cae16 100644
--- a/test/BridgeTest.php
+++ b/test/BridgeTest.php
@@ -72,7 +72,7 @@ class BridgeTest extends PHPUnit_Framework_TestCase {
public function providerGetPostId() {
return array(
- array('bogus', null, 'PHPUnit_Framework_Error'),
+ array('bogus', null, 'Exception'),
array('<20100302094228.33F0310091@charybdis.ellipsis.cx>', 1, null),
);
}
@@ -88,7 +88,7 @@ class BridgeTest extends PHPUnit_Framework_TestCase {
public function providerGetMessageId() {
return array(
- array('bogus', null, 'PHPUnit_Framework_Error'),
+ array('bogus', null, 'Exception'),
array(1, '<20100302094228.33F0310091@charybdis.ellipsis.cx>', null),
);
}
@@ -108,7 +108,7 @@ class BridgeTest extends PHPUnit_Framework_TestCase {
public function providerRegisterMessage() {
return array(
- array(null, null, null, null, 'PHPUnit_Framework_Error'),
+ array(null, null, null, null, 'Exception'),
array(
'<20100302094228.33F0310091@charybdis.ellipsis.cx>',
null,
@@ -137,7 +137,7 @@ class BridgeTest extends PHPUnit_Framework_TestCase {
public function providerGetDefaultForumId() {
return array(
- array('bogus', null, 'PHPUnit_Framework_Error'),
+ array('bogus', null, 'Exception'),
array('messages@forums.vassalengine.org', 2, null),
);
}
@@ -155,8 +155,8 @@ class BridgeTest extends PHPUnit_Framework_TestCase {
public function providerSetPostId() {
return array(
- array(null, 1, 'PHPUnit_Framework_Error'),
- array('<10100302094228.33F0310091@charybdis.ellipsis.cx>', null, 'PHPUnit_Framework_Error'),
+ array(null, 1, 'Exception'),
+ array('<10100302094228.33F0310091@charybdis.ellipsis.cx>', null, 'Exception'),
array('<20100302094228.33F0310091@charybdis.ellipsis.cx>', 2, null),
array('<20100302094228.33F0310091@charybdis.ellipsis.cx>', 3, null),
);
diff --git a/test/MailmanLibTest.php b/test/MailmanLibTest.php
index eeee160..d8bf4af 100644
--- a/test/MailmanLibTest.php
+++ b/test/MailmanLibTest.php
@@ -15,8 +15,8 @@ class MailmanLibTest extends PHPUnit_Framework_TestCase {
public function provider_read_raw_message() {
return array(
- array(__DIR__ . '/empty', null, 'PHPUnit_Framework_Error'),
- array(__DIR__ . '/bougs', null, 'PHPUnit_Framework_Error'),
+ array(__DIR__ . '/empty', null, 'Exception'),
+ array(__DIR__ . '/bougs', null, 'Exception'),
array(__DIR__ . '/1', file_get_contents(__DIR__ . '/1'), null),
);
}
diff --git a/test/PhpBB3Test.php b/test/PhpBB3Test.php
index c3f7bae..a5bd7ba 100644
--- a/test/PhpBB3Test.php
+++ b/test/PhpBB3Test.php
@@ -44,7 +44,7 @@ EOF;
public function providerGetUserId() {
return array(
- array('bogus', null, 'PHPUnit_Framework_Error'),
+ array('bogus', null, 'Exception'),
array('uckelman@nomic.net', 2, null)
);
}
@@ -60,7 +60,7 @@ EOF;
public function providerGetUserName() {
return array(
- array(0, null, 'PHPUnit_Framework_Error'),
+ array(0, null, 'Exception'),
array(2, 'admin', null )
);
}
@@ -76,7 +76,7 @@ EOF;
public function providerGetTopicAndForumIds() {
return array(
- array('bogus', null, 'PHPUnit_Framework_Error'),
+ array('bogus', null, 'Exception'),
array(2, array('topic_id' => 2, 'forum_id' => 2), null)
);
}
@@ -92,7 +92,7 @@ EOF;
public function providerForumExists() {
return array(
- array('bogus', null, 'PHPUnit_Framework_Error'),
+ array('bogus', null, 'Exception'),
array(0, false, null),
array(2, true, null)
);
@@ -109,7 +109,7 @@ EOF;
public function providerTopicExists() {
return array(
- array('bogus', null, 'PHPUnit_Framework_Error'),
+ array('bogus', null, 'Exception'),
array(0, false, null),
array(1, true, null)
);