From 90734b8ac3e5ba6ec3edab63dc8aba90cfae1b5a Mon Sep 17 00:00:00 2001
From: Zach Borboa <zachborboa@gmail.com>
Date: Fri, 13 Dec 2013 22:26:06 -0800
Subject: [PATCH] Use request header to specify test being run

---
 tests/helper.inc.php |  3 +-
 tests/run.php        | 70 ++++++++++++++++----------------------------
 tests/server.php     |  6 +++-
 3 files changed, 32 insertions(+), 47 deletions(-)

diff --git a/tests/helper.inc.php b/tests/helper.inc.php
index 596e25d..333031a 100644
--- a/tests/helper.inc.php
+++ b/tests/helper.inc.php
@@ -8,7 +8,8 @@ class Test {
         $this->curl->setOpt(CURLOPT_SSL_VERIFYHOST, FALSE);
     }
 
-    function server($request_method, $data=array()) {
+    function server($test, $request_method, $data=array()) {
+        $this->curl->setHeader('X-DEBUG-TEST', $test);
         $request_method = strtolower($request_method);
         $this->curl->$request_method(self::TEST_URL, $data);
         return $this->curl->response;
diff --git a/tests/run.php b/tests/run.php
index ce9b506..382b550 100644
--- a/tests/run.php
+++ b/tests/run.php
@@ -29,40 +29,35 @@ class CurlTest extends PHPUnit_Framework_TestCase {
     public function testUserAgent() {
         $test = new Test();
         $test->curl->setUserAgent(Curl::USER_AGENT);
-        $this->assertTrue($test->server('GET', array(
-            'test' => 'server',
+        $this->assertTrue($test->server('server', 'GET', array(
             'key' => 'HTTP_USER_AGENT',
         )) === Curl::USER_AGENT);
     }
 
     public function testGet() {
         $test = new Test();
-        $this->assertTrue($test->server('GET', array(
-            'test' => 'server',
+        $this->assertTrue($test->server('server', 'GET', array(
             'key' => 'REQUEST_METHOD',
         )) === 'GET');
     }
 
     public function testPostRequestMethod() {
         $test = new Test();
-        $this->assertTrue($test->server('POST', array(
-            'test' => 'server',
+        $this->assertTrue($test->server('server', 'POST', array(
             'key' => 'REQUEST_METHOD',
         )) === 'POST');
     }
 
     public function testPostData() {
         $test = new Test();
-        $this->assertTrue($test->server('POST', array(
-            'test' => 'post',
-            'key' => 'test',
-        )) === 'post');
+        $this->assertTrue($test->server('post', 'POST', array(
+            'key' => 'value',
+        )) === 'key=value');
     }
 
     public function testPostAssociativeArrayData() {
         $test = new Test();
-        $this->assertTrue($test->server('POST', array(
-            'test' => 'post_multidimensional',
+        $this->assertTrue($test->server('post_multidimensional', 'POST', array(
             'username' => 'myusername',
             'password' => 'mypassword',
             'more_data' => array(
@@ -71,28 +66,26 @@ class CurlTest extends PHPUnit_Framework_TestCase {
                 'param3' => 123,
                 'param4' => 3.14,
             ),
-        )) === 'test=post_multidimensional&username=myusername&password=mypassword&more_data%5Bparam1%5D=something&more_data%5Bparam2%5D=other%20thing&more_data%5Bparam3%5D=123&more_data%5Bparam4%5D=3.14');
+        )) === 'username=myusername&password=mypassword&more_data%5Bparam1%5D=something&more_data%5Bparam2%5D=other%20thing&more_data%5Bparam3%5D=123&more_data%5Bparam4%5D=3.14');
     }
 
     public function testPostMultidimensionalData() {
         $test = new Test();
-        $this->assertTrue($test->server('POST', array(
-            'test' => 'post_multidimensional',
+        $this->assertTrue($test->server('post_multidimensional', 'POST', array(
             'key' => 'file',
             'file' => array(
                 'wibble',
                 'wubble',
                 'wobble',
             ),
-        )) === 'test=post_multidimensional&key=file&file%5B%5D=wibble&file%5B%5D=wubble&file%5B%5D=wobble');
+        )) === 'key=file&file%5B%5D=wibble&file%5B%5D=wubble&file%5B%5D=wobble');
     }
 
     public function testPostFilePathUpload() {
         $file_path = get_png();
 
         $test = new Test();
-        $this->assertTrue($test->server('POST', array(
-            'test' => 'post_file_path_upload',
+        $this->assertTrue($test->server('post_file_path_upload', 'POST', array(
             'key' => 'image',
             'image' => '@' . $file_path,
         )) === 'image/png');
@@ -102,18 +95,16 @@ class CurlTest extends PHPUnit_Framework_TestCase {
 
     public function testPutRequestMethod() {
         $test = new Test();
-        $this->assertTrue($test->server('PUT', array(
-            'test' => 'server',
+        $this->assertTrue($test->server('server', 'PUT', array(
             'key' => 'REQUEST_METHOD',
         )) === 'PUT');
     }
 
     public function testPutData() {
         $test = new Test();
-        $this->assertTrue($test->server('PUT', array(
-            'test' => 'put',
+        $this->assertTrue($test->server('put', 'PUT', array(
             'key' => 'test',
-        )) === 'put');
+        )) === 'test');
     }
 
     public function testPutFileHandle() {
@@ -121,12 +112,11 @@ class CurlTest extends PHPUnit_Framework_TestCase {
         $tmp_file = create_tmp_file($png);
 
         $test = new Test();
+        $test->curl->setHeader('X-DEBUG-TEST', 'put_file_handle');
         $test->curl->setopt(CURLOPT_PUT, TRUE);
         $test->curl->setopt(CURLOPT_INFILE, $tmp_file);
         $test->curl->setopt(CURLOPT_INFILESIZE, strlen($png));
-        $test->curl->put(Test::TEST_URL, array(
-            'test' => 'put_file_handle',
-        ));
+        $test->curl->put(Test::TEST_URL);
 
         fclose($tmp_file);
 
@@ -135,13 +125,12 @@ class CurlTest extends PHPUnit_Framework_TestCase {
 
     public function testDelete() {
         $test = new Test();
-        $this->assertTrue($test->server('DELETE', array(
-            'test' => 'server',
+        $this->assertTrue($test->server('server', 'DELETE', array(
             'key' => 'REQUEST_METHOD',
         )) === 'DELETE');
 
         $test = new Test();
-        $this->assertTrue($test->server('DELETE', array(
+        $this->assertTrue($test->server('delete', 'DELETE', array(
             'test' => 'delete',
             'key' => 'test',
         )) === 'delete');
@@ -149,17 +138,13 @@ class CurlTest extends PHPUnit_Framework_TestCase {
 
     public function testBasicHttpAuth() {
         $test = new Test();
-        $this->assertTrue($test->server('GET', array(
-            'test' => 'http_basic_auth',
-        )) === 'canceled');
+        $this->assertTrue($test->server('http_basic_auth', 'GET') === 'canceled');
 
         $username = 'myusername';
         $password = 'mypassword';
         $test = new Test();
         $test->curl->setBasicAuthentication($username, $password);
-        $test->server('GET', array(
-            'test' => 'http_basic_auth',
-        ));
+        $test->server('http_basic_auth', 'GET');
         $json = json_decode($test->curl->response);
         $this->assertTrue($json->username === $username);
         $this->assertTrue($json->password === $password);
@@ -168,8 +153,7 @@ class CurlTest extends PHPUnit_Framework_TestCase {
     public function testReferrer() {
         $test = new Test();
         $test->curl->setReferrer('myreferrer');
-        $this->assertTrue($test->server('GET', array(
-            'test' => 'server',
+        $this->assertTrue($test->server('server', 'GET', array(
             'key' => 'HTTP_REFERER',
         )) === 'myreferrer');
     }
@@ -177,8 +161,7 @@ class CurlTest extends PHPUnit_Framework_TestCase {
     public function testCookies() {
         $test = new Test();
         $test->curl->setCookie('mycookie', 'yum');
-        $this->assertTrue($test->server('GET', array(
-            'test' => 'cookie',
+        $this->assertTrue($test->server('cookie', 'GET', array(
             'key' => 'mycookie',
         )) === 'yum');
     }
@@ -197,16 +180,13 @@ class CurlTest extends PHPUnit_Framework_TestCase {
         $test->curl->setHeader('Content-Type', 'application/json');
         $test->curl->setHeader('X-Requested-With', 'XMLHttpRequest');
         $test->curl->setHeader('Accept', 'application/json');
-        $this->assertTrue($test->server('GET', array(
-            'test' => 'server',
+        $this->assertTrue($test->server('server', 'GET', array(
             'key' => 'CONTENT_TYPE',
         )) === 'application/json');
-        $this->assertTrue($test->server('GET', array(
-            'test' => 'server',
+        $this->assertTrue($test->server('server', 'GET', array(
             'key' => 'HTTP_X_REQUESTED_WITH',
         )) === 'XMLHttpRequest');
-        $this->assertTrue($test->server('GET', array(
-            'test' => 'server',
+        $this->assertTrue($test->server('server', 'GET', array(
             'key' => 'HTTP_ACCEPT',
         )) === 'application/json');
     }
diff --git a/tests/server.php b/tests/server.php
index 4a24cbc..95c72a8 100644
--- a/tests/server.php
+++ b/tests/server.php
@@ -1,7 +1,7 @@
 <?php
 $request_method = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : '';
 $data_values = $request_method === 'POST' ? $_POST : $_GET;
-$test = isset($data_values['test']) ? $data_values['test'] : '';
+$test = isset($_SERVER['HTTP_X_DEBUG_TEST']) ? $_SERVER['HTTP_X_DEBUG_TEST'] : '';
 $key = isset($data_values['key']) ? $data_values['key'] : '';
 
 if ($test == 'http_basic_auth') {
@@ -19,6 +19,10 @@ if ($test == 'http_basic_auth') {
     ));
     exit;
 }
+else if ($test === 'post') {
+    echo http_build_query($_POST);
+    exit;
+}
 else if ($test === 'post_multidimensional') {
     $http_raw_post_data = file_get_contents('php://input');
     echo $http_raw_post_data;