diff --git a/.travis.yml b/.travis.yml index c3cf74e6..6c4cc803 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,11 +5,10 @@ php: before_script: - pecl install channel://pecl.php.net/pthreads-0.0.44 - - git clone --depth=100 --quiet --branch=tests git://github.com/PocketMine/PocketMine-MP.git $(pwd)/tests/ script: - - phpunit tests/ + - phpunit src/tests/ notifications: email: false - webhooks: http://n.tkte.ch/h/214/wsNvmG43-ncxUVRrFPwSM-r0 + webhooks: http://n.tkte.ch/h/214/wsNvmG43-ncxUVRrFPwSM-r0 \ No newline at end of file diff --git a/src/API/ConsoleAPI.php b/src/API/ConsoleAPI.php index e60b2e5c..e74a68da 100644 --- a/src/API/ConsoleAPI.php +++ b/src/API/ConsoleAPI.php @@ -31,7 +31,9 @@ class ConsoleAPI{ public function init(){ $this->server->schedule(2, array($this, "handle"), array(), true); - $this->loop = new ConsoleLoop(); + if(!defined("NO_THREADS")){ + $this->loop = new ConsoleLoop(); + } $this->register("help", "[page|command name]", array($this, "defaultCommands")); $this->register("status", "", array($this, "defaultCommands")); $this->register("difficulty", "<0|1|2|3>", array($this, "defaultCommands")); @@ -42,9 +44,11 @@ class ConsoleAPI{ function __destruct(){ $this->server->deleteEvent($this->event); - $this->loop->stop(); - $this->loop->notify(); - //$this->loop->join(); + if(!defined("NO_THREADS")){ + $this->loop->stop(); + $this->loop->notify(); + //$this->loop->join(); + } } public function defaultCommands($cmd, $params, $issuer, $alias){ @@ -248,6 +252,9 @@ class ConsoleAPI{ } public function handle($time){ + if(defined("NO_THREADS")){ + return; + } if($this->loop->line !== false){ $line = trim($this->loop->line); $this->loop->line = false; diff --git a/src/API/ServerAPI.php b/src/API/ServerAPI.php index 157994db..54f8cd3b 100644 --- a/src/API/ServerAPI.php +++ b/src/API/ServerAPI.php @@ -281,7 +281,7 @@ class ServerAPI{ if($this->getProperty("auto-save") === true){ $this->server->schedule(18000, array($this, "autoSave"), array(), true); } - if($this->getProperty("enable-rcon") === true){ + if(!defined("NO_THREADS") and $this->getProperty("enable-rcon") === true){ $this->rcon = new RCON($this->getProperty("rcon.password", ""), $this->getProperty("rcon.port", $this->getProperty("server-port")), ($ip = $this->getProperty("server-ip")) != "" ? $ip:"0.0.0.0", $this->getProperty("rcon.threads", 1), $this->getProperty("rcon.clients-per-thread", 50)); } diff --git a/src/tests/ServerSuiteTest.php b/src/tests/ServerSuiteTest.php new file mode 100644 index 00000000..aa938214 --- /dev/null +++ b/src/tests/ServerSuiteTest.php @@ -0,0 +1,38 @@ +assertTrue(true); + $server = ServerAPI::request(); + + + //Everything done! + $server->close(); + } + + public function testRead(){ + define("NO_THREADS", true); + require_once(dirname(__FILE__)."/../dependencies.php"); + require_once(FILE_PATH."/src/functions.php"); + require_once(FILE_PATH."/src/dependencies.php"); + + //binary things + $this->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"); + + //PocketMine-MP server startup + $this->server = new ServerAPI(); + $this->server->load(); + $this->assertTrue(is_integer($this->server->event("server.start", array($this, "hook")))); + $this->server->init(); + exit(0); + } + } + +} \ No newline at end of file diff --git a/src/tests/phpunit.xml b/src/tests/phpunit.xml new file mode 100644 index 00000000..2fa40761 --- /dev/null +++ b/src/tests/phpunit.xml @@ -0,0 +1,6 @@ + + + + ./ + + \ No newline at end of file