diff options
author | Tamas Bunth <tamas.bunth@collabora.co.uk> | 2018-04-14 16:13:02 +0200 |
---|---|---|
committer | Tamás Bunth <btomi96@gmail.com> | 2018-04-14 17:44:48 +0200 |
commit | 3bb1f0b3a8f71807c221fda22433571f9a0497d2 (patch) | |
tree | ba115dd93458981785c308b752c794cf12547492 /dbaccess/qa | |
parent | c760ebc55f0d0a9838256e9dc6374d85d12ee93e (diff) |
Revert HSQLDB related unit tests
Revert changes making HSQLDB related unit tests test Firebird migration.
They should still test the HSQLDB driver.
It reverts part of 159dd28651788a19848eae56693ad06ed947414d
Change-Id: If2b9207e95055418bd1dc1dc6e472335de311d1e
Reviewed-on: https://gerrit.libreoffice.org/52873
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Bunth <btomi96@gmail.com>
Diffstat (limited to 'dbaccess/qa')
-rw-r--r-- | dbaccess/qa/complex/dbaccess/ApplicationController.java | 8 | ||||
-rw-r--r-- | dbaccess/qa/complex/dbaccess/DataSource.java | 4 | ||||
-rw-r--r-- | dbaccess/qa/complex/dbaccess/Query.java | 2 | ||||
-rw-r--r-- | dbaccess/qa/complex/dbaccess/RowSet.java | 18 | ||||
-rw-r--r-- | dbaccess/qa/extras/testdocuments/RowSetClones.odb | bin | 33726 -> 33734 bytes | |||
-rw-r--r-- | dbaccess/qa/unit/data/hsqldb_migration_test.odb | bin | 4019 -> 3949 bytes | |||
-rw-r--r-- | dbaccess/qa/unit/hsql_binary_import.cxx | 9 |
7 files changed, 24 insertions, 17 deletions
diff --git a/dbaccess/qa/complex/dbaccess/ApplicationController.java b/dbaccess/qa/complex/dbaccess/ApplicationController.java index 459571db067c..eafc32dba65f 100644 --- a/dbaccess/qa/complex/dbaccess/ApplicationController.java +++ b/dbaccess/qa/complex/dbaccess/ApplicationController.java @@ -30,7 +30,7 @@ import com.sun.star.sdbcx.XTablesSupplier; import com.sun.star.uno.Exception; import com.sun.star.uno.UnoRuntime; import connectivity.tools.HsqlColumnDescriptor; -import connectivity.tools.FirebirdDatabase; +import connectivity.tools.HsqlDatabase; import connectivity.tools.HsqlTableDescriptor; import java.io.IOException; @@ -47,7 +47,7 @@ import static org.junit.Assert.*; public class ApplicationController extends TestCase { - private FirebirdDatabase m_database; + private HsqlDatabase m_database; private XOfficeDatabaseDocument m_databaseDocument; private XDatabaseDocumentUI m_documentUI; @@ -76,8 +76,8 @@ public class ApplicationController extends TestCase // create/load the new database document m_database = (_documentURL == null) - ? new FirebirdDatabase(getMSF()) - : new FirebirdDatabase(getMSF(), _documentURL); + ? new HsqlDatabase(getMSF()) + : new HsqlDatabase(getMSF(), _documentURL); m_databaseDocument = m_database.getDatabaseDocument(); // load it into a frame diff --git a/dbaccess/qa/complex/dbaccess/DataSource.java b/dbaccess/qa/complex/dbaccess/DataSource.java index d2b1d3f4263b..0413a6e07b69 100644 --- a/dbaccess/qa/complex/dbaccess/DataSource.java +++ b/dbaccess/qa/complex/dbaccess/DataSource.java @@ -21,7 +21,7 @@ import com.sun.star.container.XNameAccess; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XNamingService; import connectivity.tools.CRMDatabase; -import connectivity.tools.FirebirdDatabase; +import connectivity.tools.HsqlDatabase; // ---------- junit imports ----------------- import org.junit.Test; @@ -32,7 +32,7 @@ import static org.junit.Assert.*; public class DataSource extends TestCase { - FirebirdDatabase m_database; + HsqlDatabase m_database; connectivity.tools.DataSource m_dataSource; diff --git a/dbaccess/qa/complex/dbaccess/Query.java b/dbaccess/qa/complex/dbaccess/Query.java index a8357ed7bcb3..8881bb3edecb 100644 --- a/dbaccess/qa/complex/dbaccess/Query.java +++ b/dbaccess/qa/complex/dbaccess/Query.java @@ -34,7 +34,7 @@ import static org.junit.Assert.*; public class Query extends TestCase { - connectivity.tools.FirebirdDatabase m_database; + connectivity.tools.HsqlDatabase m_database; private void createTestCase() diff --git a/dbaccess/qa/complex/dbaccess/RowSet.java b/dbaccess/qa/complex/dbaccess/RowSet.java index e1e5f9b191f8..4c5fcc6da793 100644 --- a/dbaccess/qa/complex/dbaccess/RowSet.java +++ b/dbaccess/qa/complex/dbaccess/RowSet.java @@ -41,7 +41,7 @@ import com.sun.star.uno.UnoRuntime; import connectivity.tools.CRMDatabase; import connectivity.tools.DataSource; -import connectivity.tools.FirebirdDatabase; +import connectivity.tools.HsqlDatabase; import connectivity.tools.sdb.Connection; import java.lang.reflect.Method; import java.util.Random; @@ -59,7 +59,7 @@ public class RowSet extends TestCase static final int MAX_FETCH_ROWS = 10; private static final String NEXT = "next"; private static final String TEST21 = "Test21"; - FirebirdDatabase m_database; + HsqlDatabase m_database; DataSource m_dataSource; XRowSet m_rowSet; XResultSet m_resultSet; @@ -220,10 +220,8 @@ public class RowSet extends TestCase void createStructure() throws SQLException { - m_database.executeSQL("EXECUTE BLOCK AS BEGIN" - + " if (not exists(select 1 from rdb$relations where rdb$relation_name = '\"TEST1\"')) then" - + " execute statement 'CREATE TABLE \"TEST1\" (\"ID\" integer not null primary key, \"col2\" varchar(50) )';" - + " END"); + m_database.executeSQL("DROP TABLE \"TEST1\" IF EXISTS"); + m_database.executeSQL("CREATE TABLE \"TEST1\" (\"ID\" integer not null primary key, \"col2\" varchar(50) )"); final Connection connection = m_database.defaultConnection(); final XPreparedStatement prep = connection.prepareStatement("INSERT INTO \"TEST1\" values (?,?)"); @@ -933,12 +931,12 @@ public class RowSet extends TestCase // use an own RowSet instance, not the one which is also used for the other cases testTableParameters(); - //testParametrizedQuery(); - //testParametersInFilter(); + testParametrizedQuery(); + testParametersInFilter(); - //testParametersAfterNormalExecute(); + testParametersAfterNormalExecute(); - //testParametersInteraction(); + testParametersInteraction(); } } diff --git a/dbaccess/qa/extras/testdocuments/RowSetClones.odb b/dbaccess/qa/extras/testdocuments/RowSetClones.odb Binary files differindex a0e6a8cfa2b4..91ed328ac8e9 100644 --- a/dbaccess/qa/extras/testdocuments/RowSetClones.odb +++ b/dbaccess/qa/extras/testdocuments/RowSetClones.odb diff --git a/dbaccess/qa/unit/data/hsqldb_migration_test.odb b/dbaccess/qa/unit/data/hsqldb_migration_test.odb Binary files differindex b20adbfbcc92..99b6b5d9a69d 100644 --- a/dbaccess/qa/unit/data/hsqldb_migration_test.odb +++ b/dbaccess/qa/unit/data/hsqldb_migration_test.odb diff --git a/dbaccess/qa/unit/hsql_binary_import.cxx b/dbaccess/qa/unit/hsql_binary_import.cxx index 33f63db60e10..8bc81c0587b1 100644 --- a/dbaccess/qa/unit/hsql_binary_import.cxx +++ b/dbaccess/qa/unit/hsql_binary_import.cxx @@ -27,6 +27,8 @@ class HsqlBinaryImportTest : public DBTestBase public: void testBinaryImport(); + virtual void setUp() override; + CPPUNIT_TEST_SUITE(HsqlBinaryImportTest); CPPUNIT_TEST(testBinaryImport); @@ -34,6 +36,13 @@ public: CPPUNIT_TEST_SUITE_END(); }; +void HsqlBinaryImportTest::setUp() +{ + DBTestBase::setUp(); + SvtMiscOptions aMiscOptions; + osl_setEnvironment(OUString{ "DBACCESS_HSQL_MIGRATION" }.pData, OUString{ "1" }.pData); +} + void HsqlBinaryImportTest::testBinaryImport() { uno::Reference<XOfficeDatabaseDocument> xDocument |