more cleanup

jsteemann · jsteemann · commit 144eb35d1927 · 2014-01-29T17:45:28.000+01:00
diff --git a/tests/CollectionBasicTest.php b/tests/CollectionBasicTest.php
@@ -81,8 +81,15 @@ public function testCreateAndDeleteCollectionPre1_2()
         $connection        = $this->connection;
         $collection        = new Collection();
         $collectionHandler = new CollectionHandler($connection);
-
+        
         $name = 'ArangoDB_PHP_TestSuite_TestCollection_01';
+        
+        try {
+            $collectionHandler->drop($name);
+        } catch (Exception $e) {
+            //Silence the exception
+        }
+
         $collection->setName($name);
         $response = $collectionHandler->add($collection);
 
@@ -109,8 +116,15 @@ public function testCreateCollectionWithKeyOptionsAndVerifyProperties()
         $connection        = $this->connection;
         $collection        = new Collection();
         $collectionHandler = new CollectionHandler($connection);
-
+        
         $name = 'ArangoDB_PHP_TestSuite_TestCollection_01';
+        
+        try {
+            $collectionHandler->drop($name);
+        } catch (Exception $e) {
+            //Silence the exception
+        }
+
         $collection->setName($name);
         $collection->setKeyOptions(
                    array("type" => "autoincrement", "allowUserKeys" => false, "increment" => 5, "offset" => 10)
@@ -153,8 +167,15 @@ public function testCreateAndDeleteCollection()
         $connection        = $this->connection;
         $collection        = new Collection();
         $collectionHandler = new CollectionHandler($connection);
-
+        
         $name = 'ArangoDB_PHP_TestSuite_TestCollection_01';
+        
+        try {
+            $collectionHandler->drop($name);
+        } catch (Exception $e) {
+            //Silence the exception
+        }
+
         $collection->setName($name);
         $collectionHandler->add($collection);
 
@@ -180,8 +201,15 @@ public function testCreateAndDeleteEdgeCollection()
         $connection        = $this->connection;
         $collection        = new Collection();
         $collectionHandler = new CollectionHandler($connection);
-
+        
         $name = 'ArangoDB_PHP_TestSuite_TestCollection_02';
+
+        try {
+            $collectionHandler->drop($name);
+        } catch (Exception $e) {
+            //Silence the exception
+        }
+
         $collection->setName($name);
         $collection->setType(3);
         $collectionHandler->add($collection);
@@ -209,6 +237,13 @@ public function testCreateAndDeleteEdgeCollectionWithoutCreatingObject()
         $collectionHandler = new CollectionHandler($connection);
 
         $name    = 'ArangoDB_PHP_TestSuite_TestCollection_02';
+        
+        try {
+            $collectionHandler->drop($name);
+        } catch (Exception $e) {
+            //Silence the exception
+        }
+
         $options = array('type' => 3);
         $collectionHandler->create($name, $options);
 
@@ -235,6 +270,13 @@ public function testCreateAndDeleteVolatileCollectionWithoutCreatingObject()
         $collectionHandler = new CollectionHandler($connection);
 
         $name    = 'ArangoDB_PHP_TestSuite_TestCollection_02';
+        
+        try {
+            $collectionHandler->drop($name);
+        } catch (Exception $e) {
+            //Silence the exception
+        }
+
         $options = array('isVolatile' => true);
         $collectionHandler->create($name, $options);
         $resultingCollection = $collectionHandler->get($name);
@@ -260,6 +302,13 @@ public function testCreateAndDeleteSystemCollectionWithoutCreatingObject()
         $collectionHandler = new CollectionHandler($connection);
 
         $name    = 'ArangoDB_PHP_TestSuite_TestCollection_02';
+        
+        try {
+            $collectionHandler->drop($name);
+        } catch (Exception $e) {
+            //Silence the exception
+        }
+
         $options = array('isSystem' => true, 'waitForSync' => true);
         $collectionHandler->create($name, $options);
 
@@ -494,7 +543,6 @@ public function testGetIndex()
 
     public function tearDown()
     {
-
         try {
             $this->collectionHandler->drop('ArangoDB_PHP_TestSuite_IndexTestCollection');
         } catch (Exception $e) {
diff --git a/tests/TransactionTest.php b/tests/TransactionTest.php
@@ -34,6 +34,12 @@ public function setUp()
         } catch (\Exception $e) {
             // don't bother us, if it's already deleted.
         }
+        
+        try {
+            $this->collectionHandler->delete('ArangoDB_PHP_TestSuite_TestCollection_02');
+        } catch (Exception $e) {
+            //Silence the exception
+        }
 
 
         $this->collection1 = new Collection();
