Merge branch 'drone-fix' of bitbucket.org:ikflowdat/ftth

app/config/config_test.yml

@@ -21,7 +21,11 @@ swiftmailer:
 services:
     backtrace_formatter:
       class:  Monolog\Formatter\LineFormatter
-      methods: { includeStacktraces: [true] }
+      calls:
+        - [ includeStacktraces ]
+# run 181
+# unexpected '1' (T_LNUMBER), expecting identifier (T_STRING) or variable (T_VARIABLE) or '{' or '$' in /drone/src/bitbucket.org/ikflowdat/ftth/var/cache/test/appTestDebugProjectContainer.php:638
+#      calls: { includeStacktraces: [true] }
 
 monolog:
     handlers:
@@ -35,4 +39,4 @@ monolog:
         console:
             type:   console
             channels: [!event, !doctrine]
- 
+

composer.json

@@ -120,13 +120,13 @@
         "voryx/restgeneratorbundle": "dev-master",
         "ik/base-admin-bundle": "dev-master",
         "ik/oauthclient-bundle": "dev-master",
-        "ik/webservice-bundle": "dev-master",
+        "ik/webservice-bundle": "dev-drone-fix",
         "hwi/oauth-bundle": "^0.5.3",
         "ik/workflow-bundle": "dev-master",
         "php-amqplib/rabbitmq-bundle": "^1.12",
         "ik/template-bundle": "dev-master",
         "ik/extra-data-bundle": "dev-master",
-        "ik/device-bundle": "dev-master",
+        "ik/device-bundle": "dev-drone-fix",
         "ik/owner-voter-bundle": "dev-master",
         "doctrine/doctrine-migrations-bundle": "^1.2",
         "ik/migrations-bundle": "dev-master",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "fd260ad86210b789972a4b87f2f87819",
+    "content-hash": "eb0e4660efd8c7c8e667abf9e8b50437",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -1420,7 +1420,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "29fe3d938a9fb56c08d5c9a8e6ab512af15f1f99"
+                "reference": "61fde3a81cacdf5d56bc823528de00e1e728ecfa"
             },
             "type": "library",
             "autoload": {
@@ -1435,15 +1435,15 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-09-07 12:57:45"
+            "time": "2017-09-14 18:39:13"
         },
         {
             "name": "ik/device-bundle",
-            "version": "dev-master",
+            "version": "dev-drone-fix",
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
-                "reference": "f574d1a7a2e021ac4148c633ef94cfaafc4601f4"
+                "reference": "d6e4b53c759bdce8f03580e8783b1f40581f0d3f"
             },
             "type": "library",
             "autoload": {
@@ -1458,7 +1458,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2017-09-12 19:28:27"
+            "time": "2017-09-15 14:14:26"
         },
         {
             "name": "ik/extra-data-bundle",
@@ -1510,7 +1510,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/MapBundle.git",
-                "reference": "8e61c7c8723b332a522cd6b08943b0a1326ad5e2"
+                "reference": "882bd79ed979cf17a4c4e69e2f8a8373e21bac22"
             },
             "type": "library",
             "autoload": {
@@ -1525,7 +1525,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-08-15 15:34:50"
+            "time": "2017-09-08 15:38:29"
         },
         {
             "name": "ik/migrations-bundle",
@@ -1628,11 +1628,11 @@
         },
         {
             "name": "ik/webservice-bundle",
-            "version": "dev-master",
+            "version": "dev-drone-fix",
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/Webservice.git",
-                "reference": "a9c6e4f6e212db9df49f090c4883ecf7292ecd46"
+                "reference": "9ca153996372b0e67788c32628b2fa49a43e3e13"
             },
             "require": {
                 "ext-curl": "*",
@@ -1645,7 +1645,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2017-09-12 19:14:27"
+            "time": "2017-09-15 13:40:56"
         },
         {
             "name": "ik/workflow-bundle",
@@ -2077,7 +2077,7 @@
                     "email": "stof@notk.org"
                 },
                 {
-                    "name": "Knplabs",
+                    "name": "KnpLabs",
                     "homepage": "http://knplabs.com"
                 },
                 {
@@ -2136,7 +2136,7 @@
                     "email": "stof@notk.org"
                 },
                 {
-                    "name": "Knplabs",
+                    "name": "KnpLabs",
                     "homepage": "http://knplabs.com"
                 },
                 {

src/FTTHBundle/tests/ONURESTControllerTest.php

@@ -37,8 +37,10 @@ class ONURESTControllerTest extends WebTestCaseBase
     protected function obtainDataWebService()
     {
         $datos = array();
-        $datos['client'] =
+        $datos['api/clients'] =
             json_encode(array(array("name" => "Stock", "id" => 1)));
+        $datos['api/devices/check'] =
+            json_encode(array(array('result' => true, 'errors' => null)));
         return $datos;
     }
 
@@ -58,9 +60,9 @@ class ONURESTControllerTest extends WebTestCaseBase
         $datos['mac'] = '00:11:22:33';
         $datos['ponSerialNumber'] = 'pon';
         $datos['clientId'] = array('name' => 'Stock GZ [pruebass]');
-//        $datos['clientId'] = '1';
         $datos['transitionState'] = 'ts';
         $datos['tenancyId'] = 1;
+        $datos['deviceId'] = 1;
 
         if ($key == null) {
             return $datos;
@@ -105,8 +107,11 @@ class ONURESTControllerTest extends WebTestCaseBase
      */
     public function testPOST()
     {
-        echo "\n";
+        // inicializo con los datos del webservicemock
         $this->initDefault($this->obtainDataWebService());
+        // seteo los datos del listener
+        $this->setListener();
+        // hago la inserccion llamando al servicio por post
         $this->getClient()->request('POST', $this->getUri(), $this->obtainData());
         // obtengo la respuesta
         $response = $this->getClient()->getResponse();
@@ -137,11 +142,17 @@ class ONURESTControllerTest extends WebTestCaseBase
      */
     public function testPUT()
     {
+        // realizo la consulta
         $response = $this->generateGET();
+        // busco el id
         $id = $this->getProperty($response, 'id');
-        $this->initDefault();
-        // realizo la consulta
+        // inicializo con los datos del webservicemock
+        $this->initDefault($this->obtainDataWebService());
+        // seteo los datos del listener
+        $this->setListener();
+        // creo el nuevo set de datos a enviar.
         $data = $this->obtainDataChange($this->obtainData(), array('ponSerialNumber' => 'pon_modifi', 'id' => $id));
+        // hago la modificacion llamando al servicio por put
         $this->getClient()->request('PUT', $this->getUriPutDelete() . $id, $data);
         // obtengo la respuesta
         $response = $this->getClient()->getResponse();
@@ -172,7 +183,7 @@ class ONURESTControllerTest extends WebTestCaseBase
      */
     public function testDELETE()
     {
-        // busco el id de
+        // realizo la consulta
         $response = $this->generateGET();
         // obtengo el id de la respuesta de la busqueda
         $id = $this->getProperty($response, 'id');
@@ -196,8 +207,20 @@ class ONURESTControllerTest extends WebTestCaseBase
         $response = $this->generateGET();
         // verifco el resultado
         $this->assertEquals(200, $response->getStatusCode(), "Error en la respuesta http.");
-        $json = json_decode($response->getContent());
-        $this->assertTrue(empty($json), "No se obtuvo un objeto json.");
+        $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);
+    }
 }