diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-07-29 18:19:31 +0200 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-07-29 18:19:31 +0200 |
commit | 5ed38a75d64c06d923a580175f6ab732234694a1 (patch) | |
tree | 07fbe359a6c3dbfd7bc587d4a06020be1169df96 /tests | |
parent | 3ef680d96623eb6350015843f56b55b593a053bd (diff) | |
download | nextcloud-server-5ed38a75d64c06d923a580175f6ab732234694a1.tar.gz nextcloud-server-5ed38a75d64c06d923a580175f6ab732234694a1.zip |
Remove remainings of mssql
Diffstat (limited to 'tests')
-rw-r--r-- | tests/lib/db/mdb2schemamanager.php | 4 | ||||
-rw-r--r-- | tests/lib/db/migrator.php | 6 | ||||
-rw-r--r-- | tests/lib/dbschema.php | 3 | ||||
-rw-r--r-- | tests/lib/setup.php | 5 |
4 files changed, 4 insertions, 14 deletions
diff --git a/tests/lib/db/mdb2schemamanager.php b/tests/lib/db/mdb2schemamanager.php index e20f4c421b8..8ce6febf3ac 100644 --- a/tests/lib/db/mdb2schemamanager.php +++ b/tests/lib/db/mdb2schemamanager.php @@ -10,7 +10,6 @@ namespace Test\DB; use Doctrine\DBAL\Platforms\OraclePlatform; -use Doctrine\DBAL\Platforms\SQLServerPlatform; class MDB2SchemaManager extends \Test\TestCase { @@ -30,9 +29,6 @@ class MDB2SchemaManager extends \Test\TestCase { if ($connection->getDatabasePlatform() instanceof OraclePlatform) { $this->markTestSkipped('Adding auto increment columns in Oracle is not supported.'); } - if ($connection->getDatabasePlatform() instanceof SQLServerPlatform) { - $this->markTestSkipped('DB migration tests are not supported on MSSQL'); - } $manager = new \OC\DB\MDB2SchemaManager($connection); diff --git a/tests/lib/db/migrator.php b/tests/lib/db/migrator.php index 6bde68c2d20..4d558909743 100644 --- a/tests/lib/db/migrator.php +++ b/tests/lib/db/migrator.php @@ -11,9 +11,9 @@ namespace Test\DB; use \Doctrine\DBAL\DBALException; use Doctrine\DBAL\Platforms\OraclePlatform; -use Doctrine\DBAL\Platforms\SQLServerPlatform; use \Doctrine\DBAL\Schema\Schema; use \Doctrine\DBAL\Schema\SchemaConfig; +use OCP\IConfig; class Migrator extends \Test\TestCase { /** @@ -31,6 +31,7 @@ class Migrator extends \Test\TestCase { **/ private $config; + /** @var string */ private $tableName; protected function setUp() { @@ -41,9 +42,6 @@ class Migrator extends \Test\TestCase { if ($this->connection->getDatabasePlatform() instanceof OraclePlatform) { $this->markTestSkipped('DB migration tests are not supported on OCI'); } - if ($this->connection->getDatabasePlatform() instanceof SQLServerPlatform) { - $this->markTestSkipped('DB migration tests are not supported on MSSQL'); - } $this->manager = new \OC\DB\MDB2SchemaManager($this->connection); $this->tableName = strtolower($this->getUniqueID($this->config->getSystemValue('dbtableprefix', 'oc_') . 'test_')); } diff --git a/tests/lib/dbschema.php b/tests/lib/dbschema.php index cfaebec079e..97307664b6a 100644 --- a/tests/lib/dbschema.php +++ b/tests/lib/dbschema.php @@ -47,9 +47,6 @@ class Test_DBSchema extends \Test\TestCase { */ public function testSchema() { $platform = \OC_DB::getConnection()->getDatabasePlatform(); - if ($platform instanceof \Doctrine\DBAL\Platforms\SQLServerPlatform) { - $this->markTestSkipped("Test not relevant on MSSQL"); - } $this->doTestSchemaCreating(); $this->doTestSchemaChanging(); $this->doTestSchemaDumping(); diff --git a/tests/lib/setup.php b/tests/lib/setup.php index 79ca0c0be90..8900d492b66 100644 --- a/tests/lib/setup.php +++ b/tests/lib/setup.php @@ -81,7 +81,7 @@ class Test_OC_Setup extends \Test\TestCase { ->expects($this->once()) ->method('getSystemValue') ->will($this->returnValue( - array('sqlite', 'mysql', 'pgsql', 'oci', 'mssql') + array('sqlite', 'mysql', 'pgsql', 'oci') )); $this->setupClass ->expects($this->once()) @@ -96,8 +96,7 @@ class Test_OC_Setup extends \Test\TestCase { 'sqlite' => 'SQLite', 'mysql' => 'MySQL/MariaDB', 'pgsql' => 'PostgreSQL', - 'oci' => 'Oracle', - 'mssql' => 'MS SQL' + 'oci' => 'Oracle' ); $this->assertSame($expectedResult, $result); } |