summaryrefslogtreecommitdiffstats
path: root/tests/lib
diff options
context:
space:
mode:
Diffstat (limited to 'tests/lib')
-rw-r--r--tests/lib/db/migrator.php2
-rw-r--r--tests/lib/setup.php15
2 files changed, 15 insertions, 2 deletions
diff --git a/tests/lib/db/migrator.php b/tests/lib/db/migrator.php
index 1a1d530f1d2..54267740480 100644
--- a/tests/lib/db/migrator.php
+++ b/tests/lib/db/migrator.php
@@ -39,7 +39,7 @@ class Migrator extends \Test\TestCase {
$this->markTestSkipped('DB migration tests are not supported on MSSQL');
}
$this->manager = new \OC\DB\MDB2SchemaManager($this->connection);
- $this->tableName = strtolower($this->getUniqueID('test_'));
+ $this->tableName = strtolower($this->getUniqueID('oc_test_'));
}
protected function tearDown() {
diff --git a/tests/lib/setup.php b/tests/lib/setup.php
index 8373ba316d6..a221943c016 100644
--- a/tests/lib/setup.php
+++ b/tests/lib/setup.php
@@ -19,7 +19,7 @@ class Test_OC_Setup extends \Test\TestCase {
parent::setUp();
$this->config = $this->getMock('\OCP\IConfig');
- $this->setupClass = $this->getMock('\OC_Setup', array('class_exists', 'is_callable'), array($this->config));
+ $this->setupClass = $this->getMock('\OC_Setup', ['class_exists', 'is_callable'], [$this->config]);
}
public function testGetSupportedDatabasesWithOneWorking() {
@@ -102,4 +102,17 @@ class Test_OC_Setup extends \Test\TestCase {
->will($this->returnValue('NotAnArray'));
$this->setupClass->getSupportedDatabases();
}
+
+ /**
+ * This is actual more an integration test whether the version parameter in the .htaccess
+ * was updated as well when the version has been incremented.
+ * If it hasn't this test will fail.
+ */
+ public function testHtaccessIsCurrent() {
+ $result = Test_Helper::invokePrivate(
+ $this->setupClass,
+ 'isCurrentHtaccess'
+ );
+ $this->assertTrue($result);
+ }
} \ No newline at end of file