Reorganize tests.

Drop test bootstrap in favor of using the phpunit script from
composer which does the autoloading for us.

Updating test requirements in README.

Flattening hirachy in tests directory.

Renaming bench file.

Use env vars for specifiying the test server location.

Author: mariuswilms

.gitignore

@@ -0,0 +1,2 @@
+composer.lock
+vendor

README

@@ -97,12 +97,20 @@ Running the Tests
 The integration tests contained in this library require a running beanstalkd
 instance. You'll need to start a dedicated instance on port 11301 as follows.
 
-$ beanstalkd -VV -l 127.0.0.1 -p 11301
+```
+beanstalkd -VV -l 127.0.0.1 -p 11301
+```
 
 Tests for this library are PHPUnit based. To run the tests you'll need
 to have PHPUnit installed[1]. Following commands will run all the tests.
 
-$ cd /path/to/beanstalk
-$ phpunit
+```
+cd /path/to/beanstalk
+composer install
+
+export TEST_BEANSTALKD_HOST=127.0.0.1
+export TEST_BEANSTALKD_PORT=11301
+vendor/bin/phpunit tests
+```
 
 [1] http://www.phpunit.de/manual/current/en/installation.html

phpunit.xml

@@ -17,12 +17,17 @@ class ConnectTest extends \PHPUnit_Framework_TestCase {
 	public $subject;
 
 	protected function setUp() {
-		$this->subject = new Client([
-			'host' => TEST_SERVER_HOST,
-			'port' => TEST_SERVER_PORT
-		]);
+		$host = getenv('TEST_BEANSTALKD_HOST');
+		$port = getenv('TEST_BEANSTALKD_PORT');
+
+		if (!$host || !$port) {
+			$message = 'TEST_BEANSTALKD_HOST and/or TEST_BEANSTALKD_PORT env variables not defined.';
+			$this->markTestSkipped($message);
+		}
+		$this->subject = new Client(compact('host', 'port'));
+
 		if (!$this->subject->connect()) {
-			$message = 'Need a running beanstalk server at ' . TEST_SERVER_HOST . ':' . TEST_SERVER_PORT;
+			$message  = "Need a running beanstalkd server at {$host}:{$port}.";
 			$this->markTestSkipped($message);
 		}
 	}

tests/integration/ConnectTest.php tests/ConnectTest.php

@@ -17,14 +17,20 @@ class ProducerTest extends \PHPUnit_Framework_TestCase {
 	public $subject;
 
 	protected function setUp() {
-		$this->subject = new Client([
-			'host' => TEST_SERVER_HOST,
-			'port' => TEST_SERVER_PORT
-		]);
+		$host = getenv('TEST_BEANSTALKD_HOST');
+		$port = getenv('TEST_BEANSTALKD_PORT');
+
+		if (!$host || !$port) {
+			$message = 'TEST_BEANSTALKD_HOST and/or TEST_BEANSTALKD_PORT env variables not defined.';
+			$this->markTestSkipped($message);
+		}
+		$this->subject = new Client(compact('host', 'port'));
+
 		if (!$this->subject->connect()) {
-			$message = 'Need a running beanstalk server at ' . TEST_SERVER_HOST . ':' . TEST_SERVER_PORT;
+			$message  = "Need a running beanstalkd server at {$host}:{$port}.";
 			$this->markTestSkipped($message);
 		}
+
 		foreach ($this->subject->listTubes() as $tube) {
 			$this->subject->useTube($tube);
 

tests/integration/ProducerTest.php tests/ProducerTest.php

@@ -8,14 +8,17 @@
  * Redistributions of files must retain the above copyright notice.
  */
 
-namespace Beanstalk\Tests;
+namespace Beanstalk;
 
 use Beanstalk\Client;
 
 /**
  * A small benchmark to test throughput.
  */
-$connection = new Client();
+$connection = new Client([
+	'host' => getenv('TEST_BEANSTALKD_HOST'),
+	'port' => getenv('TEST_BEANSTALKD_PORT')
+]);
 for ($i = 0; $i < 100000; $i++) {
 	$connection->put(1024, 0, 60, $i);
 }