From ad1930da88cf347d83e3b4d0d213da550444cc5a Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Wed, 28 Aug 2013 18:19:48 +0200 Subject: [PATCH] Custom unit test code. --- .travis.yml | 2 +- phpunit.xml | 7 ----- src/dependencies.php | 4 --- src/tests/ServerSuiteTest.php | 55 +++++++++++++++++++++++++---------- 4 files changed, 40 insertions(+), 28 deletions(-) delete mode 100644 phpunit.xml diff --git a/.travis.yml b/.travis.yml index 037df2693..1c46d5ed2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ before_script: - pecl install channel://pecl.php.net/pthreads-0.0.44 script: - - phpunit --process-isolation --configuration phpunit.xml + - php src/tests/ServerSuiteTest.php notifications: email: false diff --git a/phpunit.xml b/phpunit.xml deleted file mode 100644 index cdfdb09c0..000000000 --- a/phpunit.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - src/tests - - - \ No newline at end of file diff --git a/src/dependencies.php b/src/dependencies.php index c8cde4938..22c021a03 100644 --- a/src/dependencies.php +++ b/src/dependencies.php @@ -20,10 +20,6 @@ */ /***REM_START***/ -if(!class_exists("PHPUnit_Framework_TestCase", false)){ - class PHPUnit_Framework_TestCase{ - } -} require_once(dirname(__FILE__)."/config.php"); require_once(FILE_PATH."/src/functions.php"); /***REM_END***/ diff --git a/src/tests/ServerSuiteTest.php b/src/tests/ServerSuiteTest.php index 64d98f8ca..cb472e876 100644 --- a/src/tests/ServerSuiteTest.php +++ b/src/tests/ServerSuiteTest.php @@ -1,30 +1,53 @@ assertTrue(Utils::readTriad("\x02\x01\x03") === 131331, "Utils::readTriad"); - $this->assertTrue(Utils::readInt("\xff\x02\x01\x03") === -16645885, "Utils::readInt"); - $this->assertTrue(abs(Utils::readFloat("\x49\x02\x01\x03") - 532496.1875) < 0.0001, "Utils::readFloat"); - $this->assertTrue(abs(Utils::readDouble("\x41\x02\x03\x04\x05\x06\x07\x08") - 147552.5024529) < 0.0001, "Utils::readDouble"); - $this->assertTrue(Utils::readLong("\x41\x02\x03\x04\x05\x06\x07\x08") === "4684309878217770760", "Utils::readLong"); + testCase("Utils::readTriad", Utils::readTriad("\x02\x01\x03"), 131331); + testCase("Utils::readInt", Utils::readInt("\xff\x02\x01\x03"), -16645885); + testCase("Utils::readFloat", abs(Utils::readFloat("\x49\x02\x01\x03") - 532496.1875) < 0.0001, true); + testCase("Utils::readDouble", abs(Utils::readDouble("\x41\x02\x03\x04\x05\x06\x07\x08") - 147552.5024529) < 0.0001, true); + testCase("Utils::readTriad", Utils::readLong("\x41\x02\x03\x04\x05\x06\x07\x08"), "4684309878217770760"); //PocketMine-MP server startup global $server; $server = new ServerAPI(); $server->load(); - $this->assertTrue(is_integer($server->event("server.start", array($this, "hook")))); + testCase("event attached", is_integer($server->event("server.start", array($this, "hook"))), true); $server->init(); } - public function hook(){ + public function hook(){ + testCase("event fired", true, true); //Everything done! ServerAPI::request()->close(); }