3 files changed, 62 insertions, 72 deletions
diff --git a/tests/lib/repair/dropoldtables.php b/tests/lib/repair/dropoldtables.php
new file mode 100644
index 00000000000..244d8837949
--- /dev/null
+++ b/tests/lib/repair/dropoldtables.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright (c) 2015 Joas Schilling <nickvergessen@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Repair;
+
+/**
+ * Tests for the dropping old tables
+ *
+ * @see \OC\Repair\DropOldTables
+ */
+class DropOldTables extends \Test\TestCase {
+	/** @var \OCP\IDBConnection */
+	protected $connection;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$this->connection = \OC::$server->getDatabaseConnection();
+		$manager = new \OC\DB\MDB2SchemaManager($this->connection);
+		$manager->createDbFromStructure(__DIR__ . '/fixtures/dropoldtables.xml');
+	}
+
+	public function testRun() {
+		$this->assertFalse($this->connection->tableExists('sharing'), 'Asserting that the table oc_sharing does not exist before repairing');
+		$this->assertTrue($this->connection->tableExists('permissions'), 'Asserting that the table oc_permissions does exist before repairing');
+
+		$repair = new \OC\Repair\DropOldTables($this->connection);
+		$repair->run();
+
+		$this->assertFalse($this->connection->tableExists('sharing'), 'Asserting that the table oc_sharing does not exist after repairing');
+		$this->assertFalse($this->connection->tableExists('permissions'), 'Asserting that the table oc_permissions does not exist after repairing');
+	}
+}
diff --git a/tests/lib/repair/fixtures/dropoldtables.xml b/tests/lib/repair/fixtures/dropoldtables.xml
new file mode 100644
index 00000000000..6c42a8f90a7
--- /dev/null
+++ b/tests/lib/repair/fixtures/dropoldtables.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<database>
+
+	<name>*dbname*</name>
+	<create>true</create>
+	<overwrite>false</overwrite>
+
+	<charset>utf8</charset>
+
+	<table>
+
+		<name>*dbprefix*permissions</name>
+
+		<declaration>
+			<field>
+				<name>textfield</name>
+				<type>text</type>
+				<default>foo</default>
+				<notnull>true</notnull>
+				<length>32</length>
+			</field>
+		</declaration>
+	</table>
+</database>
diff --git a/tests/lib/templatelayout.php b/tests/lib/templatelayout.php
deleted file mode 100644
index c23aaa9b762..00000000000
--- a/tests/lib/templatelayout.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Copyright (c) 2014 Lukas Reschke <lukas@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-namespace OC\Test;
-
-/**
- * @package OC\Test
- */
-class OC_TemplateLayout extends \Test\TestCase {
-
-	private $oldServerURI;
-	private $oldScriptName;
-
-	protected function setUp() {
-		parent::setUp();
-
-		$this->oldServerURI = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : null;
-		$this->oldScriptName = $_SERVER['SCRIPT_NAME'];
-	}
-
-	protected function tearDown() {
-		if ($this->oldServerURI === null) {
-			unset($_SERVER['REQUEST_URI']);
-		} else {
-			$_SERVER['REQUEST_URI'] = $this->oldServerURI;
-		}
-		$_SERVER['SCRIPT_NAME'] = $this->oldScriptName;
-
-		parent::tearDown();
-	}
-
-	/**
-	 * Contains valid file paths in the scheme array($absolutePath, $expectedPath)
-	 * @return array
-	 */
-	public function validFilePathProvider() {
-		return array(
-			array(\OC::$SERVERROOT . '/apps/files/js/fancyJS.js', '/apps/files/js/fancyJS.js'),
-			array(\OC::$SERVERROOT. '/test.js', '/test.js'),
-			array(\OC::$SERVERROOT . '/core/test.js', '/core/test.js'),
-			array(\OC::$SERVERROOT, ''),
-		);
-	}
-
-	/**
-	 * @dataProvider validFilePathProvider
-	 */
-	public function testConvertToRelativePath($absolutePath, $expected) {
-		$_SERVER['REQUEST_URI'] = $expected;
-		$_SERVER['SCRIPT_NAME'] = $expected;
-
-		$relativePath = \Test_Helper::invokePrivate(new \OC_TemplateLayout('user'), 'convertToRelativePath', array($absolutePath));
-		$this->assertEquals($expected, $relativePath);
-	}
-
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage $filePath is not under the \OC::$SERVERROOT
-	 */
-	public function testInvalidConvertToRelativePath() {
-		$invalidFile = '/this/file/is/invalid';
-		$_SERVER['REQUEST_URI'] = $invalidFile;
-		$_SERVER['SCRIPT_NAME'] = '/';
-
-		\Test_Helper::invokePrivate(new \OC_TemplateLayout('user'), 'convertToRelativePath', array($invalidFile));
-	}
-}