浏览代码

webservice patch

Luciano Andrade 7 年之前
父节点
当前提交
108b102671
共有 3 个文件被更改,包括 12 次插入7 次删除
  1. 2 2
      composer.lock
  2. 1 2
      src/FTTHBundle/Controller/ONURESTController.php
  3. 9 3
      src/FTTHBundle/tests/ONURESTControllerTest.php

+ 2 - 2
composer.lock

@@ -1671,7 +1671,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/Webservice.git",
-                "reference": "fb60d50563c32cab0b1ce4627c76064a16a22cd5"
+                "reference": "1f266d828b51f631df7bddd29ff0220b2c9e3fde"
             },
             "require": {
                 "ext-curl": "*",
@@ -1684,7 +1684,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2017-09-22 16:07:20"
+            "time": "2017-09-26 12:34:36"
         },
         {
             "name": "ik/workflow-bundle",

+ 1 - 2
src/FTTHBundle/Controller/ONURESTController.php

@@ -164,8 +164,7 @@ class ONURESTController extends RESTController
 	    }else{
 		    $entity->setAdministrativeState("suspend");
 		    $em->persist($entity);
-		    $em->flush();
-		    $em->getConnection()->commit();
+		    $em->flush($entity);
 
 		    return $entity;
 	    }

+ 9 - 3
src/FTTHBundle/tests/ONURESTControllerTest.php

@@ -42,8 +42,9 @@ class ONURESTControllerTest extends WebTestCaseBase
         $datos['api/devices/check'] =
             json_encode(array(array('result' => true, 'errors' => null)));
 	$datos['api/devices'] =
-            json_encode(array(array('name' => true, 'errors' => null)));
+            json_encode(array('id' => 1));
 
+	$datos["client"] = array(array("id"=> 1));
 
 
         return $datos;
@@ -65,7 +66,7 @@ class ONURESTControllerTest extends WebTestCaseBase
         $datos['mac'] = '00:11:22:33';
         $datos['ponSerialNumber'] = 'pon';
         $datos['clientId'] = array('name' => 'Stock GZ [pruebass]');
-        $datos['transitionState'] = 'ts';
+        //$datos['transitionState'] = 'ts';
         $datos['tenancyId'] = 1;
         $datos['deviceId'] = 1;
 
@@ -120,6 +121,8 @@ 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.");
     }
 
@@ -200,6 +203,10 @@ class ONURESTControllerTest extends WebTestCaseBase
 
         $this->initDefault($this->obtainDataWebService());
 
+        $original = $this->getClient()->getContainer()->get('device.device_listener');
+	$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());
         $response = $this->getClient()->getResponse();
@@ -210,7 +217,6 @@ class ONURESTControllerTest extends WebTestCaseBase
 	$this->assertEquals("suspend", $json["administrativeState"]);
 
         $response = $this->getClient()->getResponse();
-	var_dump( $response->getStatusCode());
     }
 
     /**