From ad612b8307e1101b71e2153c98d76487b79a5f42 Mon Sep 17 00:00:00 2001 From: Nathan Voxland Date: Wed, 13 Jul 2022 12:51:56 -0500 Subject: [PATCH] Merged master into branch --- .../core/AbstractDb2DatabaseTest.java | 18 +-- .../database/core/DB2DatabaseTest.java | 14 +-- .../database/core/DB2zDatabaseTest.java | 14 +-- .../database/core/DerbyDatabaseTest.java | 104 +++++++++--------- .../database/core/MSSQLDatabaseTest.java | 3 +- .../database/core/MySQLDatabaseTest.java | 1 + .../database/core/OracleDatabaseTest.java | 2 + .../database/core/PostgresDatabaseTest.java | 1 + 8 files changed, 82 insertions(+), 75 deletions(-) diff --git a/liquibase-core/src/test/java/liquibase/database/core/AbstractDb2DatabaseTest.java b/liquibase-core/src/test/java/liquibase/database/core/AbstractDb2DatabaseTest.java index e7248a67e8e..7690ebb352f 100644 --- a/liquibase-core/src/test/java/liquibase/database/core/AbstractDb2DatabaseTest.java +++ b/liquibase-core/src/test/java/liquibase/database/core/AbstractDb2DatabaseTest.java @@ -5,15 +5,15 @@ public class AbstractDb2DatabaseTest extends TestCase { - public void testGetDateLiteral() throws DatabaseException { - try (AbstractDb2Database database = new DB2Database()) { - assertEquals("DATE('2018-12-31')", database.getDateLiteral("2018-12-31")); - assertEquals("TIME('23:58:59')", database.getDateLiteral("23:58:59")); - assertEquals("TIMESTAMP('2018-12-31 23:58:59')", database.getDateLiteral("2018-12-31 23:58:59")); - assertEquals("UNSUPPORTED:foo", database.getDateLiteral("foo")); - } catch (final DatabaseException e) { - throw e; + public void testGetDateLiteral() throws DatabaseException { + try (AbstractDb2Database database = new DB2Database()) { + assertEquals("DATE('2018-12-31')", database.getDateLiteral("2018-12-31")); + assertEquals("TIME('23:58:59')", database.getDateLiteral("23:58:59")); + assertEquals("TIMESTAMP('2018-12-31 23:58:59')", database.getDateLiteral("2018-12-31 23:58:59")); + assertEquals("UNSUPPORTED:foo", database.getDateLiteral("foo")); + } catch (final DatabaseException e) { + throw e; + } } - } } diff --git a/liquibase-core/src/test/java/liquibase/database/core/DB2DatabaseTest.java b/liquibase-core/src/test/java/liquibase/database/core/DB2DatabaseTest.java index 9b5d84531c3..9546275e1a4 100644 --- a/liquibase-core/src/test/java/liquibase/database/core/DB2DatabaseTest.java +++ b/liquibase-core/src/test/java/liquibase/database/core/DB2DatabaseTest.java @@ -6,14 +6,14 @@ public class DB2DatabaseTest extends TestCase { - public void testGetDefaultDriver() throws DatabaseException { - try (Database database = new DB2Database()) { - assertEquals("com.ibm.db2.jcc.DB2Driver", database.getDefaultDriver("jdbc:db2://localhost:50000/liquibas")); + public void testGetDefaultDriver() throws DatabaseException { + try (Database database = new DB2Database()) { + assertEquals("com.ibm.db2.jcc.DB2Driver", database.getDefaultDriver("jdbc:db2://localhost:50000/liquibas")); - assertNull(database.getDefaultDriver("jdbc:oracle://localhost;databaseName=liquibase")); - } catch (final DatabaseException e) { - throw e; + assertNull(database.getDefaultDriver("jdbc:oracle://localhost;databaseName=liquibase")); + } catch (final DatabaseException e) { + throw e; + } } - } } diff --git a/liquibase-core/src/test/java/liquibase/database/core/DB2zDatabaseTest.java b/liquibase-core/src/test/java/liquibase/database/core/DB2zDatabaseTest.java index 5c883eedd6e..9b3533f538d 100644 --- a/liquibase-core/src/test/java/liquibase/database/core/DB2zDatabaseTest.java +++ b/liquibase-core/src/test/java/liquibase/database/core/DB2zDatabaseTest.java @@ -6,14 +6,14 @@ public class DB2zDatabaseTest extends TestCase { - public void testGetDefaultDriver() throws DatabaseException { - try (Database database = new Db2zDatabase()) { - assertEquals("com.ibm.db2.jcc.DB2Driver", database.getDefaultDriver("jdbc:db2://localhost:50000/liquibas")); + public void testGetDefaultDriver() throws DatabaseException { + try (Database database = new Db2zDatabase()) { + assertEquals("com.ibm.db2.jcc.DB2Driver", database.getDefaultDriver("jdbc:db2://localhost:50000/liquibas")); - assertNull(database.getDefaultDriver("jdbc:oracle://localhost;databaseName=liquibase")); - } catch (final DatabaseException e) { - throw e; + assertNull(database.getDefaultDriver("jdbc:oracle://localhost;databaseName=liquibase")); + } catch (final DatabaseException e) { + throw e; + } } - } } diff --git a/liquibase-core/src/test/java/liquibase/database/core/DerbyDatabaseTest.java b/liquibase-core/src/test/java/liquibase/database/core/DerbyDatabaseTest.java index 043dc4f3df0..68eb67178d5 100644 --- a/liquibase-core/src/test/java/liquibase/database/core/DerbyDatabaseTest.java +++ b/liquibase-core/src/test/java/liquibase/database/core/DerbyDatabaseTest.java @@ -8,9 +8,11 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; + import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.SQLException; + import junit.framework.TestCase; import liquibase.database.Database; import liquibase.database.jvm.JdbcConnection; @@ -18,58 +20,58 @@ public class DerbyDatabaseTest extends TestCase { - public void testGetDefaultDriver() throws DatabaseException { - try (Database database = new DerbyDatabase()) { - assertEquals("org.apache.derby.jdbc.EmbeddedDriver", database.getDefaultDriver("java:derby:liquibase;create=true")); + public void testGetDefaultDriver() throws DatabaseException { + try (Database database = new DerbyDatabase()) { + assertEquals("org.apache.derby.jdbc.EmbeddedDriver", database.getDefaultDriver("java:derby:liquibase;create=true")); + + assertNull(database.getDefaultDriver("jdbc:oracle://localhost;databaseName=liquibase")); + } catch (final DatabaseException e) { + throw e; + } + } + + public void testGetDateLiteral() { + assertEquals("TIMESTAMP('2008-01-25 13:57:41')", new DerbyDatabase().getDateLiteral("2008-01-25 13:57:41")); + assertEquals("TIMESTAMP('2008-01-25 13:57:41.300000')", new DerbyDatabase().getDateLiteral("2008-01-25 13:57:41.3")); + assertEquals("TIMESTAMP('2008-01-25 13:57:41.340000')", new DerbyDatabase().getDateLiteral("2008-01-25 13:57:41.34")); + assertEquals("TIMESTAMP('2008-01-25 13:57:41.347000')", new DerbyDatabase().getDateLiteral("2008-01-25 13:57:41.347")); + } + + public void testCloseShutsEmbeddedDerbyDown() throws Exception { + Connection con = mockConnection(); + DerbyDatabase database = spyDatabase(con); + + database.close(); + + verify(database).shutdownDerby(anyString(), anyString()); + verify(con).close(); + } + + public void testCloseDoesNotShutEmbeddedDerbyDown() throws Exception { + Connection con = mockConnection(); + DerbyDatabase database = spyDatabase(con); + database.setShutdownEmbeddedDerby(false); + + database.close(); + + verify(database, never()).shutdownDerby(anyString(), anyString()); + verify(con).close(); + } + + private static DerbyDatabase spyDatabase(Connection con) throws DatabaseException { + DerbyDatabase database = spy(new DerbyDatabase()); + doNothing().when(database).shutdownDerby(anyString(), anyString()); + database.setConnection(new JdbcConnection(con)); + return database; + } - assertNull(database.getDefaultDriver("jdbc:oracle://localhost;databaseName=liquibase")); - } catch (final DatabaseException e) { - throw e; + private static Connection mockConnection() throws SQLException { + Connection con = mock(Connection.class); + DatabaseMetaData metaData = mock(DatabaseMetaData.class, RETURNS_SMART_NULLS); + when(metaData.getURL()).thenReturn("jdbc:derby:memory:foo"); + when(metaData.getDriverName()).thenReturn("org.apache.derby.jdbc.EmbeddedDriver"); + when(con.getMetaData()).thenReturn(metaData); + return con; } - } - - public void testGetDateLiteral() { - assertEquals("TIMESTAMP('2008-01-25 13:57:41')", new DerbyDatabase().getDateLiteral("2008-01-25 13:57:41")); - assertEquals("TIMESTAMP('2008-01-25 13:57:41.300000')", new DerbyDatabase().getDateLiteral("2008-01-25 13:57:41.3")); - assertEquals("TIMESTAMP('2008-01-25 13:57:41.340000')", new DerbyDatabase().getDateLiteral("2008-01-25 13:57:41.34")); - assertEquals("TIMESTAMP('2008-01-25 13:57:41.347000')", new DerbyDatabase().getDateLiteral("2008-01-25 13:57:41.347")); - } - - public void testCloseShutsEmbeddedDerbyDown() throws Exception { - Connection con = mockConnection(); - DerbyDatabase database = spyDatabase(con); - - database.close(); - - verify(database).shutdownDerby(anyString(), anyString()); - verify(con).close(); - } - - public void testCloseDoesNotShutEmbeddedDerbyDown() throws Exception { - Connection con = mockConnection(); - DerbyDatabase database = spyDatabase(con); - database.setShutdownEmbeddedDerby(false); - - database.close(); - - verify(database, never()).shutdownDerby(anyString(), anyString()); - verify(con).close(); - } - - private static DerbyDatabase spyDatabase(Connection con) throws DatabaseException { - DerbyDatabase database = spy(new DerbyDatabase()); - doNothing().when(database).shutdownDerby(anyString(), anyString()); - database.setConnection(new JdbcConnection(con)); - return database; - } - - private static Connection mockConnection() throws SQLException { - Connection con = mock(Connection.class); - DatabaseMetaData metaData = mock(DatabaseMetaData.class, RETURNS_SMART_NULLS); - when(metaData.getURL()).thenReturn("jdbc:derby:memory:foo"); - when(metaData.getDriverName()).thenReturn("org.apache.derby.jdbc.EmbeddedDriver"); - when(con.getMetaData()).thenReturn(metaData); - return con; - } } diff --git a/liquibase-core/src/test/java/liquibase/database/core/MSSQLDatabaseTest.java b/liquibase-core/src/test/java/liquibase/database/core/MSSQLDatabaseTest.java index cf1a0f91925..fffb58f4121 100644 --- a/liquibase-core/src/test/java/liquibase/database/core/MSSQLDatabaseTest.java +++ b/liquibase-core/src/test/java/liquibase/database/core/MSSQLDatabaseTest.java @@ -4,6 +4,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; + import org.junit.Test; import liquibase.database.AbstractJdbcDatabaseTest; import liquibase.database.Database; @@ -40,7 +41,7 @@ public void getCurrentDateTimeFunction() { public void getDefaultDriver() throws DatabaseException { try (Database database = new MSSQLDatabase()) { assertEquals("com.microsoft.sqlserver.jdbc.SQLServerDriver", database.getDefaultDriver("jdbc:sqlserver://localhost;databaseName=liquibase")); - + assertNull(database.getDefaultDriver("jdbc:oracle:thin://localhost;databaseName=liquibase")); } catch (final DatabaseException e) { throw e; diff --git a/liquibase-core/src/test/java/liquibase/database/core/MySQLDatabaseTest.java b/liquibase-core/src/test/java/liquibase/database/core/MySQLDatabaseTest.java index 467c03917a1..6b0aa06595a 100644 --- a/liquibase-core/src/test/java/liquibase/database/core/MySQLDatabaseTest.java +++ b/liquibase-core/src/test/java/liquibase/database/core/MySQLDatabaseTest.java @@ -3,6 +3,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; + import org.junit.Assert; import org.junit.Test; import liquibase.database.AbstractJdbcDatabaseTest; diff --git a/liquibase-core/src/test/java/liquibase/database/core/OracleDatabaseTest.java b/liquibase-core/src/test/java/liquibase/database/core/OracleDatabaseTest.java index 655366e6dd5..a86dff84874 100644 --- a/liquibase-core/src/test/java/liquibase/database/core/OracleDatabaseTest.java +++ b/liquibase-core/src/test/java/liquibase/database/core/OracleDatabaseTest.java @@ -5,8 +5,10 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; + import java.util.ArrayList; import java.util.ResourceBundle; + import org.hamcrest.CoreMatchers; import org.junit.Assert; import org.junit.Test; diff --git a/liquibase-core/src/test/java/liquibase/database/core/PostgresDatabaseTest.java b/liquibase-core/src/test/java/liquibase/database/core/PostgresDatabaseTest.java index a0e18536b5d..7ed5ed54439 100644 --- a/liquibase-core/src/test/java/liquibase/database/core/PostgresDatabaseTest.java +++ b/liquibase-core/src/test/java/liquibase/database/core/PostgresDatabaseTest.java @@ -3,6 +3,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; + import org.junit.Assert; import org.junit.Test; import liquibase.GlobalConfiguration;