From 9c928cfa54b2dddc1575acc244823ff3abd99426 Mon Sep 17 00:00:00 2001
From: Guillermo Dev <public.guillermo@gmail.com>
Date: Sat, 13 Oct 2018 18:37:30 +0200
Subject: [PATCH] webservice tests pass

---
 log/log.txt                                   |  15 ++
 src/Webservice/.WebService.php.swp            | Bin 12288 -> 12288 bytes
 .../.MockWebserviceSubclass.php.swp           | Bin 12288 -> 12288 bytes
 tests/Webservice/.WebserviceTest.php.swp      | Bin 16384 -> 24576 bytes
 tests/Webservice/MockWebserviceSubclass.php   |   9 +
 tests/Webservice/WebserviceTest.php           | 157 +++++++++++++++---
 6 files changed, 157 insertions(+), 24 deletions(-)
 create mode 100644 log/log.txt

diff --git a/log/log.txt b/log/log.txt
new file mode 100644
index 0000000..f603907
--- /dev/null
+++ b/log/log.txt
@@ -0,0 +1,15 @@
+(n-a) - [13.10.2018 16:36:29] - 400 NoArguments - 0.41ms - (none)
+(n-a) - [13.10.2018 16:36:29] - 400 NoArguments - 0.75ms - (none)
+(n-a) - [13.10.2018 16:36:29] - 400 MissingMethod - 1.06ms - (none)
+(n-a) - [13.10.2018 16:36:29] - 400 MissingMethod - 0.04ms - (none)
+(n-a) - [13.10.2018 16:36:29] - 400 MissingMethod - 0.05ms - (none)
+(n-a) - [13.10.2018 16:36:29] - 400 BadMethod - 0.06ms - someNonExistentMockFunction()
+(n-a) - [13.10.2018 16:36:29] - 400 BadMethod - 0.06ms - someNonExistentMockFunction()
+(n-a) - [13.10.2018 16:36:29] - 400 TooFewArgs - 0.25ms - someMockFunction()
+(n-a) - [13.10.2018 16:36:29] - 400 TooFewArgs - 0.16ms - someMockFunction(val)
+(n-a) - [13.10.2018 16:36:29] - 400 TooManyArgs - 0.18ms - someMockFunction(val, val, val, val)
+(n-a) - [13.10.2018 16:36:29] - 200  - 0.03ms - someMockFunction(val, val)
+(n-a) - [13.10.2018 16:36:29] - 200  - 0.02ms - someMockFunction(val, val, val)
+(n-a) - [13.10.2018 16:36:29] - 200  - 0.02ms - someMockFunction(val, val, val)
+(n-a) - [13.10.2018 16:36:29] - 200  - 0.03ms - someOtherMockFunction(one, two, threeOpt)
+(n-a) - [13.10.2018 16:36:29] - 200  - 0.02ms - someOtherMockFunction(two, threeOpt, one)
diff --git a/src/Webservice/.WebService.php.swp b/src/Webservice/.WebService.php.swp
index 4a0509c2086f1b3ef336ab5293ac6d5390f478a3..c6db1db6d5bdd953d7e7c06d15b7e88f3cde5415 100644
GIT binary patch
delta 52
zcmZojXh@JvG6?hZRj|-AU;qLE28QDjhoZYHmNG={WMD|2xKVwh%M?YX4~!EP#W#Oc
H<mUqbjBO9_

delta 49
zcmZojXh@JvG6?hZRj|-AU;qLE28LathobAtmNG={WMD|2xKVwh%M`_l%95KuD)RFI
E09ywR;{X5v

diff --git a/tests/Webservice/.MockWebserviceSubclass.php.swp b/tests/Webservice/.MockWebserviceSubclass.php.swp
index 42453110ece76727093688fe4a0a3817dec322ee..566dc8ee821538dbf3310bad893ff1543e143e15 100644
GIT binary patch
delta 274
zcmZojXh@JvG6?hZRj|-AU;qLE28N}whoVcWmoh}|WMD|2cu;+#%Nc$~;mv{qpZR%z
z@G>wY@IllGPZm_rRx{*hV0Z}>c?`s7fp`-TPY2>+AkF~dBp^=U+pH+?k9V?xzCgXE
zHG={YP%p_SN=@}IC{b6iwNp@m@zB(i=R>8-^L0?A^7B$5Qa}bmswlOjv?xy@v8X7q
tQUk1^8cY_HiYMh{CM%?s<|UV8=I1FC=jW#Smt>?CO>WZHo@}Up9sqsZL)-uW

delta 86
zcmZojXh@JvG6?hZRj|-AU;qLE1_oZCL($#EOBo_}GBBi1JgC0W<qSU~*JeS1&-}b^
j_!t-r_#x`JCJQQPvw?W}{F@a8-tkRN&=Z*Kpnm`WuKE>8

diff --git a/tests/Webservice/.WebserviceTest.php.swp b/tests/Webservice/.WebserviceTest.php.swp
index 5a8eca6474a04bfbd9280e273a267019f3964305..f8519d60950aa7daf44250292443651164ca5122 100644
GIT binary patch
literal 24576
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

delta 632
zcmYk&T}YE*6u|NG&Skof-gk<PSi|MgEsa_Qu?Vv$Dl_LwC?YD~&1Jzh*XE=TXzQ*>
zNP8}V2=B6+ZtBHCq%tECLg?eF%RX)*qN~W8KK=`&9{9oYaX9BWr#z#T%bGtCIn>!5
zh^~tW%Mkh8Fne@*__iFG5*ZkK8oIaZv98;s#H+0m!aA)yMx*9a8w{^?**L3@z1n^~
zV0T9~k%dYOSqKR{E7dqfJ~%|~U;-C#9=%wPg<6qGoI(O73^?$$M&t!Xa1{eMi4OSi
zX{pFKV%Up4_+BmY4R3I_T9R^xO%7eyhai405t+jT`e49;T0F9gJj6{5VGE+DM;*RY
z@hOa=8^3JUgH`>SDg{@lm$9h2(mb!;2mR{Srn0&gb*Xa8ym#2lpXe`Ua^cnaR3SH*
zEu?nj^X57AdfTYl+TvS`x18aN+TuYu!)vX#YYzUqAe+_GHfeWfT=a>`lzqw*sXsoV
zGa0m@6(5%|bxh+1`rwBb%kji5G6f6waSVrX0C7~|Cl!ADtz=y?3NE#>X-<WkHaG4r
zW|MI<Z)Q3RvB9C8W;$&q(y5+oZ!wWfn+4_B7*g@p88zOntN4DmdfwjfUr%-FT}S8-
DEYXn7

diff --git a/tests/Webservice/MockWebserviceSubclass.php b/tests/Webservice/MockWebserviceSubclass.php
index 06fde41..2a2a714 100644
--- a/tests/Webservice/MockWebserviceSubclass.php
+++ b/tests/Webservice/MockWebserviceSubclass.php
@@ -7,4 +7,13 @@ class MockWebserviceSubclass extends Webservice
     {
         return 'Some Mock Function Return';
     }
+
+    public function someOtherMockFunction($one, $two, $threeOpt = null)
+    {
+        return array(
+            'one' => $one,
+            'two' => $two,
+            'threeOpt' => $threeOpt
+        );
+    }
 }
diff --git a/tests/Webservice/WebserviceTest.php b/tests/Webservice/WebserviceTest.php
index 464334e..31cc2fc 100644
--- a/tests/Webservice/WebserviceTest.php
+++ b/tests/Webservice/WebserviceTest.php
@@ -45,10 +45,6 @@ class WebserviceTest extends TestCase
      */
     public function testReturnsErrorNoArgumentsWhenNoParamtersInGetPostRequest()
     {
-        $this->removeLogs();
-        $log = Logger::getLastLogs();
-        $this->assertEquals(Logger::NO_LOG_YET_MSG, $log);
-
         $_GET = array(); $_POST = array();
 
         $this->webservice->run(false);
@@ -60,10 +56,6 @@ class WebserviceTest extends TestCase
 
     public function testDoesNotReturnErrorNoArgumentsWhenParamtersInGetRequest()
     {
-        $this->removeLogs();
-        $log = Logger::getLastLogs();
-        $this->assertEquals(Logger::NO_LOG_YET_MSG, $log);
-
         $_GET = array('a' => 'a1');
 
         $this->webservice->run(false);
@@ -75,26 +67,17 @@ class WebserviceTest extends TestCase
 
     public function testDoesNotReturnErrorNoArgumentsWhenParamtersInPostRequest()
     {
-        $this->removeLogs();
-        $log = Logger::getLastLogs();
-        $this->assertEquals(Logger::NO_LOG_YET_MSG, $log);
-
         $_POST = array('a' => 'a1');
 
         $this->webservice->run(false);
         $response = ob_get_clean();
         $responseArray = json_decode($response, true);
-        var_dump($responseArray);
         $this->assertNotEquals(100, $responseArray['error']['code']);
         $this->assertNotEquals('NoArguments', $responseArray['error']['name']);
     }
 
     public function testReturnsErrorMissingMethodWhenNoFuncParamInRequest()
     {
-        $this->removeLogs();
-        $log = Logger::getLastLogs();
-        $this->assertEquals(Logger::NO_LOG_YET_MSG, $log);
-
         $_POST = array('a' => 'a1');
 
         $this->webservice->run(false);
@@ -106,27 +89,153 @@ class WebserviceTest extends TestCase
 
     public function testDoesNotReturnErrorMissingMethodWhenFuncParamInRequest()
     {
-        $this->removeLogs();
-        $log = Logger::getLastLogs();
-        $this->assertEquals(Logger::NO_LOG_YET_MSG, $log);
+        $_GET = array('func' => 'someNonExistentMockFunction'); $_POST = array();
 
+        $this->webservice->run(false);
+        $response = ob_get_clean();
+        $responseArray = json_decode($response, true);
+        $this->assertNotEquals(101, $responseArray['error']['code']);
+        $this->assertNotEquals('MissingMethod', $responseArray['error']['name']);
+    }
+
+    public function testReturnsErrorBadMethodWhenMethodNotExistsFuncParamInRequest()
+    {
+        $_GET = array('func' => 'someNonExistentMockFunction'); $_POST = array();
+
+        $this->webservice->run(false);
+        $response = ob_get_clean();
+        $responseArray = json_decode($response, true);
+        $this->assertEquals(102, $responseArray['error']['code']);
+        $this->assertEquals('BadMethod', $responseArray['error']['name']);
+    }
+
+    public function testReturnsErrorTooFewArgsWhenMethodNeedsMoreParamsInRequest()
+    {
         $_GET = array('func' => 'someMockFunction'); $_POST = array();
 
         $this->webservice->run(false);
         $response = ob_get_clean();
         $responseArray = json_decode($response, true);
-        $this->assertEquals(100, $responseArray['error']['code']);
+        $this->assertEquals(103, $responseArray['error']['code']);
+        $this->assertEquals('TooFewArgs', $responseArray['error']['name']);
     }
 
-    public function testRunThrowsAUsageExceptionWhenFuncParamIsNotCallableOnSubclass()
+    public function testReturnsErrorTooFewArgsWhenMethodNeedsEvenMoreParamsInRequest()
     {
+        $_GET = array(
+            'func' => 'someMockFunction', 
+            'wrongParamName' => 'val',
+        );
+
+        $this->webservice->run(false);
+        $response = ob_get_clean();
+        $responseArray = json_decode($response, true);
+        $this->assertEquals(103, $responseArray['error']['code']);
+        $this->assertEquals('TooFewArgs', $responseArray['error']['name']);
     }
 
-    public function testRunThrowsAUsageExceptionWhenMissingRequiredParamsInRequest()
+    public function testReturnsErrorTooManyArgsWhenMethodHasLessParamsThanInRequest()
     {
+        $_GET = array(
+            'param1' => 'val',
+            'param2' => 'val',
+            'param3' => 'val',
+            'func' => 'someMockFunction', 
+            'param4' => 'val',
+        );
+
+        $this->webservice->run(false);
+        $response = ob_get_clean();
+        $responseArray = json_decode($response, true);
+        $this->assertEquals(104, $responseArray['error']['code']);
+        $this->assertEquals('TooManyArgs', $responseArray['error']['name']);
+    }
+
+    public function testWebserviceSubclassMethodParamNamesDontMatterAsLongThatThereIsTheRightCount()
+    {
+        $_GET = array(
+            'func' => 'someMockFunction', 
+            'wrongParamName' => 'val',
+            'wrongParamName2' => 'val',
+        );
+
+        $this->webservice->run(false);
+        $response = ob_get_clean();
+        $responseArray = json_decode($response, true);
+        $this->assertEquals(true, isset($responseArray['result']));
+    }
+
+    public function testReturnsResultIfProvidedAllParameters()
+    {
+        $_GET = array(
+            'func' => 'someMockFunction', 
+            'anyParamName1' => 'val',
+            'anyParamName2' => 'val',
+            'anyParamName3' => 'val',
+        );
+
+        $this->webservice->run(false);
+        $response = ob_get_clean();
+        $responseArray = json_decode($response, true);
+        $this->assertEquals(true, isset($responseArray['result']));
     }
 
-    public function testRunThrowsAUsageExceptionWhenTooManyParamsInRequest()
+    public function testReturnsResultFormattedAsMethodNameAndReturnValue()
     {
+        $_GET = array(
+            'func' => 'someMockFunction', 
+            'anyParamName1' => 'val',
+            'anyParamName2' => 'val',
+            'anyParamName3' => 'val',
+        );
+
+        $this->webservice->run(false);
+        $response = ob_get_clean();
+        $responseArray = json_decode($response, true);
+        $this->assertEquals(array(
+            'someMockFunction' => 'Some Mock Function Return'
+        ), $responseArray['result']);
+    }
+
+    public function testOrderOfParamatersMatchesArrayOrder()
+    {
+        $_GET = array(
+            'func' => 'someOtherMockFunction', 
+            'anyParamName1' => 'one',
+            'anyParamName2' => 'two',
+            'anyParamName3' => 'threeOpt',
+        );
+
+        $this->webservice->run(false);
+        $response = ob_get_clean();
+        $responseArray = json_decode($response, true);
+        $this->assertEquals(array(
+            'someOtherMockFunction' => array(
+                'one' => 'one',
+                'two' => 'two',
+                'threeOpt' => 'threeOpt',
+            )
+        ), $responseArray['result']);
+    }
+
+    public function testOrderOfParamatersMatchesArrayMixedOrder()
+    {
+        $_GET = array(
+            'func' => 'someOtherMockFunction', 
+            'anyParamName2' => 'two',
+            'anyParamName3' => 'threeOpt',
+            'anyParamName1' => 'one',
+        );
+
+        $this->webservice->run(false);
+        $response = ob_get_clean();
+        $responseArray = json_decode($response, true);
+        $this->assertEquals(array(
+            'someOtherMockFunction' => array(
+                'one' => 'two',
+                'two' => 'threeOpt',
+                'threeOpt' => 'one',
+            )
+        ), $responseArray['result']);
     }
 }