Arreglo ONURESTControllerTest

src/FTTHBundle/tests/ONURESTControllerTest.php

@@ -41,10 +41,10 @@ class ONURESTControllerTest extends WebTestCaseBase
             json_encode(array(array("name" => "Stock", "id" => 1)));
         $datos['api/devices/check'] =
             json_encode(array(array('result' => true, 'errors' => null)));
-	$datos['api/devices'] =
+        $datos['api/devices'] =
             json_encode(array('id' => 1));
 
-	$datos["client"] = array(array("id"=> 1));
+        $datos["client"] = array(array("id" => 1));
 
 
         return $datos;
@@ -65,8 +65,7 @@ class ONURESTControllerTest extends WebTestCaseBase
         $datos['profileId'] = '1';
         $datos['mac'] = '00:11:22:33';
         $datos['ponSerialNumber'] = 'pon';
-        $datos['clientId'] = array('name' => 'Stock GZ [pruebass]');
-        //$datos['transitionState'] = 'ts';
+        $datos['clientId'] = 1;
         $datos['tenancyId'] = 1;
         $datos['deviceId'] = 1;
 
@@ -105,6 +104,20 @@ class ONURESTControllerTest extends WebTestCaseBase
         return $this->getClient()->getResponse();
     }
 
+    /**
+     * Sobreescribe el device.device_listener
+     */
+    private function setListener()
+    {
+        $webservicemock = $this->getContainerObject('webservice');
+        $listener = $this->getContainerObject('device.device_listener');
+        $listener->setWebservice($webservicemock);
+        //$this->setContainerObject('device.device_listener', $listener);
+        $validator = $this->getContainerObject('device.device_validator');
+        $validator->setWebservice($webservicemock);
+        //$this->setContainerObject('device.device_validator', $validator);
+    }
+
     /**
      * Realiza el alta.
      * post_onu -> /api/onus.{_format}
@@ -121,8 +134,6 @@ class ONURESTControllerTest extends WebTestCaseBase
         $this->getClient()->request('POST', $this->getUri(), $this->obtainData());
         // obtengo la respuesta
         $response = $this->getClient()->getResponse();
-
-        //var_dump($response->getContent());
         $this->assertEquals(201, $response->getStatusCode(), "Error en la respuesta http.");
     }
 
@@ -196,25 +207,25 @@ class ONURESTControllerTest extends WebTestCaseBase
         $this->assertEquals(200, $response->getStatusCode(), "Error en la respuesta http.");
         $this->assertJson($json = $response->getContent(), "No se obtuvo un objeto json.");
 
-	$json = json_decode($json, true);
-	$json = $json[0];
+        $json = json_decode($json, true);
+        $json = $json[0];
 
-	$this->assertEquals("active", $json["administrativeState"]);
+        $this->assertEquals("active", $json["administrativeState"]);
 
         $this->initDefault($this->obtainDataWebService());
 
         $original = $this->getClient()->getContainer()->get('device.device_listener');
-	$fakeWebService = $this->getClient()->getContainer()->get('webservice');
-	$original->setWebservice($fakeWebService);
+        $fakeWebService = $this->getClient()->getContainer()->get('webservice');
+        $original->setWebservice($fakeWebService);
 
-	$this->getClient()->request('PATCH',
-		$this->getUriPutDelete(). "apply/". $json["id"] . "/administrative_state/active_to_suspend.json" , array());
+        $this->getClient()->request('PATCH',
+            $this->getUriPutDelete() . "apply/" . $json["id"] . "/administrative_state/active_to_suspend.json", array());
         $response = $this->getClient()->getResponse();
 
-	$json = json_decode($response->getContent(), true);
+        $json = json_decode($response->getContent(), true);
 
         $this->assertEquals(201, $response->getStatusCode(), "Error en la respuesta http.");
-	$this->assertEquals("suspend", $json["administrativeState"]);
+        $this->assertEquals("suspend", $json["administrativeState"]);
 
         $response = $this->getClient()->getResponse();
     }
@@ -253,18 +264,4 @@ class ONURESTControllerTest extends WebTestCaseBase
         $this->assertEquals(200, $response->getStatusCode(), "Error en la respuesta http.");
         $this->assertJson($response->getContent(), "No se obtuvo un objeto json.");
     }
-
-    /**
-     * Sobreescribe el device.device_listener
-     */
-    private function setListener()
-    {
-        $webservicemock = $this->getContainerObject('webservice');
-        $listener = $this->getContainerObject('device.device_listener');
-        $listener->setWebservice($webservicemock);
-        //$this->setContainerObject('device.device_listener', $listener);
-        $validator = $this->getContainerObject('device.device_validator');
-        $validator->setWebservice($webservicemock);
-        //$this->setContainerObject('device.device_validator', $validator);
-    }
 }