fixed tests

jsteemann · jsteemann · commit de271d98cd30 · 2014-01-29T18:02:14.000+01:00
diff --git a/lib/triagens/ArangoDb/EdgeHandler.php b/lib/triagens/ArangoDb/EdgeHandler.php
@@ -363,7 +363,7 @@ public function replaceById($collectionId, $edgeId, Edge $edge, $options = array
      *
      * @param mixed    $collectionId - collection id as string or number
      * @param mixed    $edgeId   - edge id as string or number
-     * @param Edge     $edge     - patch edge which contains the attributes and values to be updated
+     * @param Document $edge     - patch edge which contains the attributes and values to be updated
      * @param mixed    $options      - optional, array of options (see below) or the boolean value for $policy (for compatibility prior to version 1.1 of this method)
      *                               <p>Options are :
      *                               <li>'policy' - update policy to be used in case of conflict ('error', 'last' or NULL [use default])</li>
@@ -373,7 +373,7 @@ public function replaceById($collectionId, $edgeId, Edge $edge, $options = array
      *
      * @return bool - always true, will throw if there is an error
      */
-    public function updateById($collectionId, $edgeId, Edge $edge, $options = array())
+    public function updateById($collectionId, $edgeId, Document $edge, $options = array())
     {
         return $this->patch(Urls::URL_EDGE, $collectionId, $edgeId, $edge, $options);
     }
diff --git a/tests/EdgeBasicTest.php b/tests/EdgeBasicTest.php
@@ -28,14 +28,27 @@ public function setUp()
     {
         $this->connection        = getConnection();
         $this->collectionHandler = new CollectionHandler($this->connection);
+
+        try {
+            $this->collectionHandler->delete('ArangoDBPHPTestSuiteTestEdgeCollection01');
+        } catch (\Exception $e) {
+            #don't bother us, if it's already deleted.
+        }
+        
+        try {
+            $this->collectionHandler->delete('ArangoDBPHPTestSuiteTestCollection01');
+        } catch (\Exception $e) {
+            #don't bother us, if it's already deleted.
+        }
+
         $this->edgeCollection    = new Collection();
         $this->edgeCollection->setName('ArangoDBPHPTestSuiteTestEdgeCollection01');
         $this->edgeCollection->set('type', 3);
+
         $this->collection = new Collection();
         $this->collection->setName('ArangoDBPHPTestSuiteTestCollection01');
-
+        
         $this->collectionHandler->add($this->edgeCollection);
-
         $this->collectionHandler->add($this->collection);
     }
 
@@ -49,7 +62,6 @@ public function testInitializeEdge()
         $this->collectionHandler = new CollectionHandler($this->connection);
         $document                = new Edge();
         $this->assertInstanceOf('triagens\ArangoDb\Edge', $document);
-        $this->assertInstanceOf('triagens\ArangoDb\Edge', $document);
         unset ($document);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ public function replaceById($collectionId, $edgeId, Edge $edge, $options = array`
`363`	`363`	`*`
`364`	`364`	`* @param mixed $collectionId - collection id as string or number`
`365`	`365`	`* @param mixed $edgeId - edge id as string or number`
`366`		`- * @param Edge $edge - patch edge which contains the attributes and values to be updated`
	`366`	`+ * @param Document $edge - patch edge which contains the attributes and values to be updated`
`367`	`367`	`* @param mixed $options - optional, array of options (see below) or the boolean value for $policy (for compatibility prior to version 1.1 of this method)`
`368`	`368`	`* <p>Options are :`
`369`	`369`	`* <li>'policy' - update policy to be used in case of conflict ('error', 'last' or NULL [use default])</li>`
`@@ -373,7 +373,7 @@ public function replaceById($collectionId, $edgeId, Edge $edge, $options = array`
`373`	`373`	`*`
`374`	`374`	`* @return bool - always true, will throw if there is an error`
`375`	`375`	`*/`
`376`		`- public function updateById($collectionId, $edgeId, Edge $edge, $options = array())`
	`376`	`+ public function updateById($collectionId, $edgeId, Document $edge, $options = array())`
`377`	`377`	`{`
`378`	`378`	`return $this->patch(Urls::URL_EDGE, $collectionId, $edgeId, $edge, $options);`
`379`	`379`	`}`