summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruckelman <uckelman@nomic.net>2010-11-02 21:46:30 +0000
committeruckelman <uckelman@nomic.net>2010-11-02 21:46:30 +0000
commit4d93d328a5d4bc812e2dde77fb8832c73d0065c8 (patch)
tree33b54b8f9da9f0f57a64eec118c7348a78ca5a4b
parent4f45cd4aa100122e0bac25e4ff2208a8bf4d53cf (diff)
* Renamed BridgeTest to BridgeImplTest.
* Skip all tests which require a DB until we figure out how to mock PDOs. git-svn-id: https://vassalengine.svn.sourceforge.net/svnroot/vassalengine/site-src/trunk@7438 67b53d14-2c14-4ace-a08f-0dab2b34000c
-rw-r--r--test/BridgeImplTest.php (renamed from test/BridgeTest.php)88
-rw-r--r--test/PhpBB3ImplTest.php4
2 files changed, 78 insertions, 14 deletions
diff --git a/test/BridgeTest.php b/test/BridgeImplTest.php
index 9d88075..bd1864c 100644
--- a/test/BridgeTest.php
+++ b/test/BridgeImplTest.php
@@ -21,10 +21,11 @@
#
require_once('PHPUnit/Framework.php');
-require_once('src/Bridge.php');
+require_once('src/BridgeImpl.php');
-class BridgeTest extends PHPUnit_Framework_TestCase {
+class BridgeImplTest extends PHPUnit_Framework_TestCase {
+/*
protected $db;
protected function setUp() {
@@ -80,13 +81,55 @@ class BridgeTest extends PHPUnit_Framework_TestCase {
protected function tearDown() {
$this->db = null;
}
+*/
+
+ protected $globalsBackup = false;
+
+ protected $db;
+
+ public function setUp() {
+ $this->markTestSkipped();
+
+ $this->db = $this->getMock(
+ 'PDO', array('__construct', 'quote', 'query'), array(), 'TestPDO', false
+ );
+ }
+
+ public function testGetPostId2() {
+ $message_id = 1;
+
+/*
+ $db->expects($this->once())
+ ->method('quote')
+ ->with($message_id)
+ ->will($this->returnValue("'$message_id'"));
+ $db->expects($this->once())
+ ->method('query')
+ ->will($this->returnValue($message_id));
+*/
+
+// $bridge = new BridgeImpl($db);
+// $this->assertEquals($message_id, $bridge->getPostId($message_id));
+ }
+
+
/**
* @dataProvider providerGetPostId
*/
+/*
public function testGetPostId($message_id, $expected, $ex) {
+ $db = $this->getMock('PDO', array('foo'), array(), '', false);
+ $db->expects($this->once())
+ ->method('quote')
+ ->with($message_id)
+ ->will($this->returnValue("'$message_id'"));
+ $db->expects($this->once())
+ ->method('query')
+ ->will($this->returnValue($message_id));
+
if ($ex) $this->setExpectedException($ex);
- $bridge = new Bridge($this->db);
+ $bridge = new BridgeImpl($db);
$this->assertEquals($expected, $bridge->getPostId($message_id));
}
@@ -97,13 +140,15 @@ class BridgeTest extends PHPUnit_Framework_TestCase {
array('<20100302094228.33F0310091@charybdis.ellipsis.cx>', 1, null),
);
}
+*/
/**
* @dataProvider providerGetMessageId
*/
+/*
public function testGetMessageId($post_id, $expected, $ex) {
if ($ex) $this->setExpectedException($ex);
- $bridge = new Bridge($this->db);
+ $bridge = new BridgeImpl($this->db);
$this->assertEquals($expected, $bridge->getMessageId($post_id));
}
@@ -114,13 +159,14 @@ class BridgeTest extends PHPUnit_Framework_TestCase {
array(1, '<20100302094228.33F0310091@charybdis.ellipsis.cx>', null),
);
}
-
+*/
/**
* @dataProvider providerReserveEditId
*/
+/*
public function testReserveEditId($postId, $expected, $ex) {
if ($ex) $this->setExpectedException($ex);
- $bridge = new Bridge($this->db);
+ $bridge = new BridgeImpl($this->db);
$this->assertEquals($expected, $bridge->reserveEditId($postId));
}
@@ -131,14 +177,15 @@ class BridgeTest extends PHPUnit_Framework_TestCase {
array(2, 2, null)
);
}
-
+*/
/**
* @dataProvider providerRegisterByEditId
*/
+/*
public function testRegisterByEditId($editId, $messageId, $inReplyTo,
$expected, $ex) {
if ($ex) $this->setExpectedException($ex);
- $bridge = new Bridge($this->db);
+ $bridge = new BridgeImpl($this->db);
$this->assertEquals(
$expected,
$bridge->registerByEditId($editId, $messageId, $inReplyTo)
@@ -164,14 +211,16 @@ class BridgeTest extends PHPUnit_Framework_TestCase {
),
);
}
+*/
/**
* @dataProvider providerRegisterByMessageId
*/
+/*
public function testRegisterByMessageId($messageId, $inReplyTo,
$expected, $ex) {
if ($ex) $this->setExpectedException($ex);
- $bridge = new Bridge($this->db);
+ $bridge = new BridgeImpl($this->db);
$this->assertEquals(
$expected,
$bridge->registerByMessageId($messageId, $inReplyTo)
@@ -207,13 +256,15 @@ class BridgeTest extends PHPUnit_Framework_TestCase {
)
);
}
+*/
/**
* @dataProvider providerUnregisterMessage
*/
+/*
public function testUnregisterMessage($editId, $ex) {
if ($ex) $this->setExpectedException($ex);
- $bridge = new Bridge($this->db);
+ $bridge = new BridgeImpl($this->db);
$bridge->unregisterMessage($editId);
}
@@ -224,13 +275,15 @@ class BridgeTest extends PHPUnit_Framework_TestCase {
array(2, 'Exception')
);
}
+*/
/**
* @dataProvider providerRemovePost
*/
+/*
public function testRemovePost($postId, $ex) {
if ($ex) $this->setExpectedException($ex);
- $bridge = new Bridge($this->db);
+ $bridge = new BridgeImpl($this->db);
$bridge->removePost($postId);
}
@@ -241,13 +294,15 @@ class BridgeTest extends PHPUnit_Framework_TestCase {
array(2, 'Exception')
);
}
+*/
/**
* @dataProvider providerGetDefaultForumId
*/
+/*
public function testGetDefaultForumId($list, $expected, $ex) {
if ($ex) $this->setExpectedException($ex);
- $bridge = new Bridge($this->db);
+ $bridge = new BridgeImpl($this->db);
$this->assertEquals($expected, $bridge->getDefaultForumId($list));
}
@@ -258,13 +313,15 @@ class BridgeTest extends PHPUnit_Framework_TestCase {
array('messages@test.nomic.net', 2, null),
);
}
+*/
/**
* @dataProvider providerGetLists
*/
+/*
public function testGetLists($forumId, $expected, $ex) {
if ($ex) $this->setExpectedException($ex);
- $bridge = new Bridge($this->db);
+ $bridge = new BridgeImpl($this->db);
$this->assertEquals($expected, $bridge->getLists($forumId));
}
@@ -275,13 +332,15 @@ class BridgeTest extends PHPUnit_Framework_TestCase {
array(2, array('messages@test.nomic.net'), null)
);
}
+*/
/**
* @dataProvider providerSetPostId
*/
+/*
public function testSetPostId($messageId, $postId, $ex) {
if ($ex) $this->setExpectedException($ex);
- $bridge = new Bridge($this->db);
+ $bridge = new BridgeImpl($this->db);
$bridge->setPostId($messageId, $postId);
$this->assertEquals($bridge->getPostId($messageId), $postId);
@@ -295,6 +354,7 @@ class BridgeTest extends PHPUnit_Framework_TestCase {
array('<20100302094228.33F0310091@charybdis.ellipsis.cx>', 3, null),
);
}
+*/
}
?>
diff --git a/test/PhpBB3ImplTest.php b/test/PhpBB3ImplTest.php
index 63a828d..d25e551 100644
--- a/test/PhpBB3ImplTest.php
+++ b/test/PhpBB3ImplTest.php
@@ -24,6 +24,10 @@ require_once('PHPUnit/Framework.php');
class PhpBB3ImplTest extends PHPUnit_Framework_TestCase {
+ protected function setUp() {
+ $this->markTestSkipped();
+ }
+
/**
* phpBB3 uses many globals; due to the way tests are run, we cannot
* easily get these globals into the right scope so that the methods