1 files changed, 33 insertions, 12 deletions

diff --git a/apps/files_external/tests/swift.php b/apps/files_external/tests/swift.php
index 5c782840246..bdfdbdeebe9 100644
--- a/apps/files_external/tests/swift.php
+++ b/apps/files_external/tests/swift.php
@@ -1,30 +1,51 @@
 <?php
+
 /**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * ownCloud
+ *
+ * @author Christian Berendt
+ * @copyright 2013 Christian Berendt berendt@b1-systems.de
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 namespace Test\Files\Storage;
 
-class SWIFT extends Storage {
+class Swift extends Storage {
+
 	private $config;
 
 	public function setUp() {
-		$id = uniqid();
 		$this->config = include('files_external/tests/config.php');
-		if ( ! is_array($this->config) or ! isset($this->config['swift']) or ! $this->config['swift']['run']) {
-			$this->markTestSkipped('OpenStack SWIFT backend not configured');
+		if (!is_array($this->config) or !isset($this->config['swift'])
+                    or !$this->config['swift']['run']) {
+			$this->markTestSkipped('OpenStack Object Storage backend not configured');
 		}
-		$this->config['swift']['root'] .= '/' . $id; //make sure we have an new empty folder to work in
-		$this->instance = new \OC\Files\Storage\SWIFT($this->config['swift']);
+		$this->instance = new \OC\Files\Storage\Swift($this->config['swift']);
 	}
 
-
 	public function tearDown() {
 		if ($this->instance) {
-			$this->instance->rmdir('');
+			$connection = $this->instance->getConnection();
+			$container = $connection->Container($this->config['swift']['bucket']);
+
+			$objects = $container->ObjectList();
+			while($object = $objects->Next()) {
+				$object->Delete();
+			}
+
+			$container->Delete();
 		}
 	}
 }