From 386872f4367e9dedb5664839d451f956626d6a80 Mon Sep 17 00:00:00 2001
From: uckelman <uckelman@nomic.net>
Date: Sun, 11 Apr 2010 13:55:10 +0000
Subject: Refactoring to make PhpBB object.

git-svn-id: https://vassalengine.svn.sourceforge.net/svnroot/vassalengine/site-src/trunk@6645 67b53d14-2c14-4ace-a08f-0dab2b34000c
---
 test/PhpBB3LibTest.php | 82 -------------------------------------------------
 test/PhpBB3Test.php    | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+), 82 deletions(-)
 delete mode 100644 test/PhpBB3LibTest.php
 create mode 100644 test/PhpBB3Test.php

(limited to 'test')

diff --git a/test/PhpBB3LibTest.php b/test/PhpBB3LibTest.php
deleted file mode 100644
index 21fe862..0000000
--- a/test/PhpBB3LibTest.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-require_once('PHPUnit/Framework.php');
-
-class PhpBB3LibTest extends PHPUnit_Framework_TestCase {
-
-  /**
-   * 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
-   * called by our tests can see them. Therefore, we use this function
-   * to run tests externally and report back on the results.
-   */
-  protected function exec_kludge($run) {
-    $prog = <<<EOF
-try {
-  require_once("src/PhpBB3Lib.php");
-  \$result = serialize($run);
-}
-catch (Exception \$e) {
-  \$result = serialize(\$e);
-}
-
-print \$result;
-EOF;
-
-    $result = unserialize(exec('php -r \'' . $prog . '\''));
-
-    if ($result instanceof Exception) {
-      throw $result;
-    }
-
-    return $result;    
-  }
-
-  /**
-   * @dataProvider provider_get_user_id
-   */
-  public function test_get_user_id($from, $expected, $ex) {
-    if ($ex) $this->setExpectedException($ex);
-    $run = 'get_user_id("' . $from . '")';
-    $this->assertEquals($expected, $this->exec_kludge($run));
-  }
-
-  public function provider_get_user_id() {
-    return array(
-      array('bogus',              null, 'PHPUnit_Framework_Error'),
-      array('uckelman@nomic.net', 2,    null)
-    );
-  }
-
-  /**
-   * @dataProvider provider_get_user_name
-   */
-  public function test_get_user_name($id, $expected, $ex) {
-    if ($ex) $this->setExpectedException($ex);
-    $run = 'get_user_name(' . $id . ')';
-    $this->assertEquals($expected, $this->exec_kludge($run));
-  }
-
-  public function provider_get_user_name() {
-    return array(
-      array(0, null,    'PHPUnit_Framework_Error'),
-      array(2, 'admin', null                     )
-    );
-  }
-
-  /**
-   * @dataProvider provider_get_topic_id
-   */
-  public function test_get_topic_and_forum_ids($post_id, $expected, $ex) {
-    if ($ex) $this->setExpectedException($ex);
-    $run = 'get_topic_and_forum_ids(' . $post_id . ')';
-    $this->assertEquals($expected, $this->exec_kludge($run));
-  }
-
-  public function provider_get_topic_id() {
-    return array(
-      array(0, null, 'PHPUnit_Framework_Error'),
-      array(2, array('topic_id' => 2, 'forum_id' => 2), null)
-    );
-  }
-}
diff --git a/test/PhpBB3Test.php b/test/PhpBB3Test.php
new file mode 100644
index 0000000..8f06170
--- /dev/null
+++ b/test/PhpBB3Test.php
@@ -0,0 +1,83 @@
+<?php
+
+require_once('PHPUnit/Framework.php');
+
+class PhpBB3Test extends PHPUnit_Framework_TestCase {
+
+  /**
+   * 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
+   * called by our tests can see them. Therefore, we use this function
+   * to run tests externally and report back on the results.
+   */
+  protected function exec_kludge($run) {
+    $prog = <<<EOF
+try {
+  require_once("src/PhpBB3.php");
+  \$phpBB = new PhpBB3();
+  \$result = serialize(\$phpBB->$run);
+}
+catch (Exception \$e) {
+  \$result = serialize(\$e);
+}
+
+print \$result;
+EOF;
+
+    $result = unserialize(exec('php -r \'' . $prog . '\''));
+
+    if ($result instanceof Exception) {
+      throw $result;
+    }
+
+    return $result;    
+  }
+
+  /**
+   * @dataProvider provider_GetUserId
+   */
+  public function testGetUserId($from, $expected, $ex) {
+    if ($ex) $this->setExpectedException($ex);
+    $run = 'getUserId("' . $from . '")';
+    $this->assertEquals($expected, $this->exec_kludge($run));
+  }
+
+  public function providerGetUserId() {
+    return array(
+      array('bogus', null, 'PHPUnit_Framework_Error'),
+      array('uckelman@nomic.net', 2,    null)
+    );
+  }
+
+  /**
+   * @dataProvider providerGetUserName
+   */
+  public function testGetUserName($id, $expected, $ex) {
+    if ($ex) $this->setExpectedException($ex);
+    $run = 'getUserName(' . $id . ')';
+    $this->assertEquals($expected, $this->exec_kludge($run));
+  }
+
+  public function providerGetUserName() {
+    return array(
+      array(0, null, 'PHPUnit_Framework_Error'),
+      array(2, 'admin', null                     )
+    );
+  }
+
+  /**
+   * @dataProvider providerGetTopicAndForumIds
+   */
+  public function testGetTopicAndForumIds($post_id, $expected, $ex) {
+    if ($ex) $this->setExpectedException($ex);
+    $run = 'getTopicAndForumIds(' . $post_id . ')';
+    $this->assertEquals($expected, $this->exec_kludge($run));
+  }
+
+  public function providerGetTopicAndForumIds() {
+    return array(
+      array(0, null, 'PHPUnit_Framework_Error'),
+      array(2, array('topic_id' => 2, 'forum_id' => 2), null)
+    );
+  }
+}
-- 
cgit v1.2.3