From 227c44ce079de309cf054899c15ec06b075d7940 Mon Sep 17 00:00:00 2001
From: uckelman <uckelman@nomic.net>
Date: Tue, 13 Apr 2010 20:29:30 +0000
Subject: PHP apparently doesn't support function overloading. Bah!

git-svn-id: https://vassalengine.svn.sourceforge.net/svnroot/vassalengine/site-src/trunk@6701 67b53d14-2c14-4ace-a08f-0dab2b34000c
---
 test/BridgeTest.php | 45 ++++++++++++++-------------------------------
 1 file changed, 14 insertions(+), 31 deletions(-)

(limited to 'test/BridgeTest.php')

diff --git a/test/BridgeTest.php b/test/BridgeTest.php
index 28ef8d5..e2b98a7 100644
--- a/test/BridgeTest.php
+++ b/test/BridgeTest.php
@@ -94,24 +94,25 @@ class BridgeTest extends PHPUnit_Framework_TestCase {
       array(1, '<20100302094228.33F0310091@charybdis.ellipsis.cx>', null),
     );
   }
-
+ 
   /**
-   * @dataProvider providerRegisterMessage3
+   * @dataProvider providerRegisterMessage
    */
-  public function testRegisterMessage3($messageId, $inReplyTo, $refs,
+  public function testRegisterMessage($postId, $messageId, $inReplyTo, $refs,
                                       $expected, $ex) {
     if ($ex) $this->setExpectedException($ex);
     $bridge = new Bridge($this->db);
     $this->assertEquals(
       $expected,
-      $bridge->registerMessage($messageId, $inReplyTo, $refs)
+      $bridge->registerMessage($postId, $messageId, $inReplyTo, $refs)
     );
   }
 
-  public function providerRegisterMessage3() {
+  public function providerRegisterMessage() {
     return array(
       array(null, null, null, null, 'Exception'),
       array(
+        null,
         '<20100302094228.33F0310091@charybdis.ellipsis.cx>',
         null,
         null,
@@ -119,47 +120,29 @@ class BridgeTest extends PHPUnit_Framework_TestCase {
         null
       ),
       array(
-        '<10100302094228.33F0310091@charybdis.ellipsis.cx>',
+        2,
+        '<20100302094228.33F0310091@charybdis.ellipsis.cx>',
         null,
         null,
-        true,
+        false,
         null
-      )    
-    );
-  }
-
-  /**
-   * @dataProvider providerRegisterMessage4
-   */
-  public function testRegisterMessage4($postId, $messageId, $inReplyTo, $refs,
-                                       $expected, $ex) {
-    if ($ex) $this->setExpectedException($ex);
-    $bridge = new Bridge($this->db);
-    $this->assertEquals(
-      $expected,
-      $bridge->registerMessage($postId, $messageId, $inReplyTo, $refs)
-    );
-  }
-
-  public function providerRegisterMessage4() {
-    return array(
-      array(null, null, null, null, 'Exception'),
+      ),
       array(
         2,
-        '<20100302094228.33F0310091@charybdis.ellipsis.cx>',
+        '<10100302094228.33F0310091@charybdis.ellipsis.cx>',
         null,
         null,
-        false,
+        true,
         null
       ),
       array(
-        2,
+        null,
         '<10100302094228.33F0310091@charybdis.ellipsis.cx>',
         null,
         null,
         true,
         null
-      )    
+      )
     );
   }
 
-- 
cgit v1.2.3