From 5f3584359f284e25ce888b5321d2e00396bf9800 Mon Sep 17 00:00:00 2001 From: datagear Date: Tue, 28 May 2019 12:33:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E6=96=87=E4=BB=B6=E7=BB=93=E6=9E=84=EF=BC=8C=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E7=BB=9F=E4=B8=80=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- datagear-connection/pom.xml | 12 --- .../src/test/resources/log4j.properties | 9 --- .../org/datagear/dbinfo/DBTestSupport.java | 73 +++++++++++++++++++ .../datagear/dbinfo/DatabaseTestSupport.java | 44 ----------- .../GenericDatabaseInfoResolverTest.java | 24 ++---- datagear-dbmodel/pom.xml | 12 --- .../org/datagear/dbmodel/DBTestSupport.java | 73 +++++++++++++++++++ .../dbmodel/DatabaseMetaDataTest.java | 34 +++------ .../GenericDatabaseModelResolverTest.java | 6 +- .../org/datagear/dbmodel/TestSupport.java | 44 ----------- .../src/test/resources/jdbc.properties | 4 - .../src/test/resources/log4j.properties | 9 --- datagear-persistence/pom.xml | 18 ----- .../src/test/resources/jdbc.properties | 4 - .../src/test/resources/log4j.properties | 9 --- pom.xml | 6 ++ test/DBTestSupportTemplate.java | 60 +++++++++++++++ test/config/jdbc.properties | 3 + .../sql}/test-sql-script-mysql.sql | 0 .../sql}/test-sql-script-oracle.sql | 0 .../sql}/test-sql-script-postgresql.sql | 0 .../sql}/test-sql-script-sqlserver.sql | 0 22 files changed, 238 insertions(+), 206 deletions(-) delete mode 100644 datagear-connection/src/test/resources/log4j.properties create mode 100644 datagear-dbinfo/src/test/java/org/datagear/dbinfo/DBTestSupport.java delete mode 100644 datagear-dbinfo/src/test/java/org/datagear/dbinfo/DatabaseTestSupport.java create mode 100644 datagear-dbmodel/src/test/java/org/datagear/dbmodel/DBTestSupport.java delete mode 100644 datagear-dbmodel/src/test/java/org/datagear/dbmodel/TestSupport.java delete mode 100644 datagear-dbmodel/src/test/resources/jdbc.properties delete mode 100644 datagear-dbmodel/src/test/resources/log4j.properties delete mode 100644 datagear-persistence/src/test/resources/jdbc.properties delete mode 100644 datagear-persistence/src/test/resources/log4j.properties create mode 100644 test/DBTestSupportTemplate.java create mode 100644 test/config/jdbc.properties rename {datagear-dbmodel/src/test/resources => test/sql}/test-sql-script-mysql.sql (100%) rename {datagear-dbmodel/src/test/resources => test/sql}/test-sql-script-oracle.sql (100%) rename {datagear-dbmodel/src/test/resources => test/sql}/test-sql-script-postgresql.sql (100%) rename {datagear-dbmodel/src/test/resources => test/sql}/test-sql-script-sqlserver.sql (100%) diff --git a/datagear-connection/pom.xml b/datagear-connection/pom.xml index 58a345d4..150fc91c 100644 --- a/datagear-connection/pom.xml +++ b/datagear-connection/pom.xml @@ -13,17 +13,5 @@ datagear-connection - - org.slf4j - slf4j-log4j12 - ${slf4j-log4j12.version} - test - - - log4j - log4j - ${log4j.version} - test - diff --git a/datagear-connection/src/test/resources/log4j.properties b/datagear-connection/src/test/resources/log4j.properties deleted file mode 100644 index 421185aa..00000000 --- a/datagear-connection/src/test/resources/log4j.properties +++ /dev/null @@ -1,9 +0,0 @@ -# -# Set root category priority to WARN and its only appender to FILE. -# -log4j.rootLogger=DEBUG,A0 - -#==============appender 0========================== -log4j.appender.A0=org.apache.log4j.ConsoleAppender -log4j.appender.A0.layout=org.apache.log4j.PatternLayout -log4j.appender.A0.layout.ConversionPattern=[%d{HH:mm:ss,SSS}] [%p] %-x [%C.%M()] %m%n \ No newline at end of file diff --git a/datagear-dbinfo/src/test/java/org/datagear/dbinfo/DBTestSupport.java b/datagear-dbinfo/src/test/java/org/datagear/dbinfo/DBTestSupport.java new file mode 100644 index 00000000..c75d6156 --- /dev/null +++ b/datagear-dbinfo/src/test/java/org/datagear/dbinfo/DBTestSupport.java @@ -0,0 +1,73 @@ +/* + * Copyright 2018 datagear.tech. All Rights Reserved. + */ + +package org.datagear.dbinfo; + +import java.io.File; +import java.io.FileReader; +import java.io.Reader; +import java.sql.Connection; +import java.sql.DriverManager; +import java.util.Properties; + +/** + * 数据库测试支持类。 + * + * @author datagear@163.com + * + */ +public abstract class DBTestSupport +{ + private static final Properties JDBC_PROPERTIES = new Properties(); + + static + { + File jdbcConfigFile = new File("test/config/jdbc.properties"); + if (!jdbcConfigFile.exists()) + jdbcConfigFile = new File("../test/config/jdbc.properties"); + + try + { + Reader reader = new FileReader(jdbcConfigFile); + JDBC_PROPERTIES.load(reader); + reader.close(); + } + catch (Exception e) + { + if (e instanceof RuntimeException) + throw (RuntimeException) e; + else + throw new RuntimeException(e); + } + } + + protected Connection getConnection() throws Exception + { + return DriverManager.getConnection(JDBC_PROPERTIES.getProperty("jdbc.url"), + JDBC_PROPERTIES.getProperty("jdbc.user"), JDBC_PROPERTIES.getProperty("jdbc.password")); + } + + protected Connection getConnection(Properties properties) throws Exception + { + properties.setProperty("user", JDBC_PROPERTIES.getProperty("jdbc.user")); + properties.setProperty("password", JDBC_PROPERTIES.getProperty("jdbc.password")); + + return DriverManager.getConnection(JDBC_PROPERTIES.getProperty("jdbc.url"), properties); + } + + protected void println() + { + System.out.println(); + } + + protected void println(Object o) + { + System.out.println((o == null ? "null" : o.toString())); + } + + protected void print(Object o) + { + System.out.print((o == null ? "null" : o.toString())); + } +} \ No newline at end of file diff --git a/datagear-dbinfo/src/test/java/org/datagear/dbinfo/DatabaseTestSupport.java b/datagear-dbinfo/src/test/java/org/datagear/dbinfo/DatabaseTestSupport.java deleted file mode 100644 index 27b70f27..00000000 --- a/datagear-dbinfo/src/test/java/org/datagear/dbinfo/DatabaseTestSupport.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2018 datagear.tech. All Rights Reserved. - */ - -package org.datagear.dbinfo; - -import java.sql.Connection; -import java.sql.DriverManager; - -/** - * 单元测试支持类。 - * - * @author datagear@163.com - * - */ -public class DatabaseTestSupport -{ - public DatabaseTestSupport() - { - super(); - } - - protected Connection getMysqlConnection() throws Exception - { - String url = "jdbc:mysql://127.0.0.1:3306/datagear?useUnicode=true&characterEncoding=UTF-8"; - - return DriverManager.getConnection(url, "root", ""); - } - - protected void println() - { - System.out.println(); - } - - protected void println(Object o) - { - System.out.println((o == null ? "null" : o.toString())); - } - - protected void print(Object o) - { - System.out.print((o == null ? "null" : o.toString())); - } -} diff --git a/datagear-dbinfo/src/test/java/org/datagear/dbinfo/GenericDatabaseInfoResolverTest.java b/datagear-dbinfo/src/test/java/org/datagear/dbinfo/GenericDatabaseInfoResolverTest.java index 66200293..086bd1ce 100644 --- a/datagear-dbinfo/src/test/java/org/datagear/dbinfo/GenericDatabaseInfoResolverTest.java +++ b/datagear-dbinfo/src/test/java/org/datagear/dbinfo/GenericDatabaseInfoResolverTest.java @@ -9,14 +9,6 @@ import java.util.ArrayList; import java.util.List; import org.datagear.connection.JdbcUtil; -import org.datagear.dbinfo.ColumnInfo; -import org.datagear.dbinfo.DatabaseInfo; -import org.datagear.dbinfo.DevotedDatabaseInfoResolver; -import org.datagear.dbinfo.ExportedKeyInfo; -import org.datagear.dbinfo.GenericDatabaseInfoResolver; -import org.datagear.dbinfo.ImportedKeyInfo; -import org.datagear.dbinfo.TableInfo; -import org.datagear.dbinfo.WildcardDevotedDatabaseInfoResolver; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -28,7 +20,7 @@ import org.junit.Test; * @author datagear@163.com * */ -public class GenericDatabaseInfoResolverTest extends DatabaseTestSupport +public class GenericDatabaseInfoResolverTest extends DBTestSupport { private GenericDatabaseInfoResolver genericDatabaseInfoResolver; @@ -54,7 +46,7 @@ public class GenericDatabaseInfoResolverTest extends DatabaseTestSupport @Test public void getDatabaseInfoTest() throws Exception { - Connection cn = getMysqlConnection(); + Connection cn = getConnection(); DatabaseInfo databaseInfo = null; @@ -77,7 +69,7 @@ public class GenericDatabaseInfoResolverTest extends DatabaseTestSupport @Test public void getTableInfosTest() throws Exception { - Connection cn = getMysqlConnection(); + Connection cn = getConnection(); TableInfo[] tableInfos = null; @@ -101,7 +93,7 @@ public class GenericDatabaseInfoResolverTest extends DatabaseTestSupport @Test public void getTableInfoTest() throws Exception { - Connection cn = getMysqlConnection(); + Connection cn = getConnection(); TableInfo tableInfo = null; @@ -122,7 +114,7 @@ public class GenericDatabaseInfoResolverTest extends DatabaseTestSupport @Test public void getColumnInfosTest() throws Exception { - Connection cn = getMysqlConnection(); + Connection cn = getConnection(); ColumnInfo[] columnInfos = null; @@ -146,7 +138,7 @@ public class GenericDatabaseInfoResolverTest extends DatabaseTestSupport @Test public void getPrimaryKeyColumnNamesTest() throws Exception { - Connection cn = getMysqlConnection(); + Connection cn = getConnection(); String[] primaryKeyColumnNames = null; @@ -172,7 +164,7 @@ public class GenericDatabaseInfoResolverTest extends DatabaseTestSupport @Test public void getImportedKeyInfosTest() throws Exception { - Connection cn = getMysqlConnection(); + Connection cn = getConnection(); ImportedKeyInfo[] importedKeyInfos = null; @@ -196,7 +188,7 @@ public class GenericDatabaseInfoResolverTest extends DatabaseTestSupport @Test public void getExportedKeyInfosTest() throws Exception { - Connection cn = getMysqlConnection(); + Connection cn = getConnection(); try { diff --git a/datagear-dbmodel/pom.xml b/datagear-dbmodel/pom.xml index 4238e2fc..7b85b444 100644 --- a/datagear-dbmodel/pom.xml +++ b/datagear-dbmodel/pom.xml @@ -33,17 +33,5 @@ datagear-persistence ${project.version} - - mysql - mysql-connector-java - 5.1.24 - test - - - org.slf4j - slf4j-log4j12 - ${slf4j-log4j12.version} - test - diff --git a/datagear-dbmodel/src/test/java/org/datagear/dbmodel/DBTestSupport.java b/datagear-dbmodel/src/test/java/org/datagear/dbmodel/DBTestSupport.java new file mode 100644 index 00000000..bbc5edd9 --- /dev/null +++ b/datagear-dbmodel/src/test/java/org/datagear/dbmodel/DBTestSupport.java @@ -0,0 +1,73 @@ +/* + * Copyright 2018 datagear.tech. All Rights Reserved. + */ + +package org.datagear.dbmodel; + +import java.io.File; +import java.io.FileReader; +import java.io.Reader; +import java.sql.Connection; +import java.sql.DriverManager; +import java.util.Properties; + +/** + * 数据库测试支持类。 + * + * @author datagear@163.com + * + */ +public abstract class DBTestSupport +{ + private static final Properties JDBC_PROPERTIES = new Properties(); + + static + { + File jdbcConfigFile = new File("test/config/jdbc.properties"); + if (!jdbcConfigFile.exists()) + jdbcConfigFile = new File("../test/config/jdbc.properties"); + + try + { + Reader reader = new FileReader(jdbcConfigFile); + JDBC_PROPERTIES.load(reader); + reader.close(); + } + catch (Exception e) + { + if (e instanceof RuntimeException) + throw (RuntimeException) e; + else + throw new RuntimeException(e); + } + } + + protected Connection getConnection() throws Exception + { + return DriverManager.getConnection(JDBC_PROPERTIES.getProperty("jdbc.url"), + JDBC_PROPERTIES.getProperty("jdbc.user"), JDBC_PROPERTIES.getProperty("jdbc.password")); + } + + protected Connection getConnection(Properties properties) throws Exception + { + properties.setProperty("user", JDBC_PROPERTIES.getProperty("jdbc.user")); + properties.setProperty("password", JDBC_PROPERTIES.getProperty("jdbc.password")); + + return DriverManager.getConnection(JDBC_PROPERTIES.getProperty("jdbc.url"), properties); + } + + protected void println() + { + System.out.println(); + } + + protected void println(Object o) + { + System.out.println((o == null ? "null" : o.toString())); + } + + protected void print(Object o) + { + System.out.print((o == null ? "null" : o.toString())); + } +} \ No newline at end of file diff --git a/datagear-dbmodel/src/test/java/org/datagear/dbmodel/DatabaseMetaDataTest.java b/datagear-dbmodel/src/test/java/org/datagear/dbmodel/DatabaseMetaDataTest.java index 150a33c6..c65f3ee4 100644 --- a/datagear-dbmodel/src/test/java/org/datagear/dbmodel/DatabaseMetaDataTest.java +++ b/datagear-dbmodel/src/test/java/org/datagear/dbmodel/DatabaseMetaDataTest.java @@ -6,7 +6,6 @@ package org.datagear.dbmodel; import java.sql.Connection; import java.sql.DatabaseMetaData; -import java.sql.DriverManager; import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; @@ -22,7 +21,7 @@ import org.junit.Test; * @author datagear@163.com * */ -public class DatabaseMetaDataTest extends TestSupport +public class DatabaseMetaDataTest extends DBTestSupport { @Before public void setUp() throws Exception @@ -37,7 +36,7 @@ public class DatabaseMetaDataTest extends TestSupport @Test public void getIdentifierQuoteStringTest() throws Exception { - Connection cn = getMysqlConnection(); + Connection cn = getConnection(); try { @@ -58,7 +57,7 @@ public class DatabaseMetaDataTest extends TestSupport @Test public void getCatalogsTest() throws Exception { - Connection cn = getMysqlConnection(); + Connection cn = getConnection(); try { @@ -77,7 +76,7 @@ public class DatabaseMetaDataTest extends TestSupport @Test public void getSchemasTest() throws Exception { - Connection cn = getMysqlConnection(); + Connection cn = getConnection(); try { @@ -96,7 +95,7 @@ public class DatabaseMetaDataTest extends TestSupport @Test public void getUserNameTest() throws Exception { - Connection cn = getMysqlConnection(); + Connection cn = getConnection(); try { @@ -118,7 +117,7 @@ public class DatabaseMetaDataTest extends TestSupport @Test public void getTableTypesTest() throws Exception { - Connection cn = getMysqlConnection(); + Connection cn = getConnection(); try { @@ -140,7 +139,7 @@ public class DatabaseMetaDataTest extends TestSupport Properties props = new Properties(); props.setProperty("useInformationSchema", "true"); - Connection cn = getMysqlConnection(props); + Connection cn = getConnection(props); try { @@ -159,7 +158,7 @@ public class DatabaseMetaDataTest extends TestSupport @Test public void getPrimaryKeysTest() throws Exception { - Connection cn = getMysqlConnection(); + Connection cn = getConnection(); try { @@ -178,7 +177,7 @@ public class DatabaseMetaDataTest extends TestSupport @Test public void getColumnTest() throws Exception { - Connection cn = getMysqlConnection(); + Connection cn = getConnection(); try { @@ -197,7 +196,7 @@ public class DatabaseMetaDataTest extends TestSupport @Test public void getExportedKeysTest() throws Exception { - Connection cn = getMysqlConnection(); + Connection cn = getConnection(); try { @@ -216,7 +215,7 @@ public class DatabaseMetaDataTest extends TestSupport @Test public void getImportedKeysTest() throws Exception { - Connection cn = getMysqlConnection(); + Connection cn = getConnection(); try { @@ -235,7 +234,7 @@ public class DatabaseMetaDataTest extends TestSupport @Test public void getUniqueKeysTest() throws Exception { - Connection cn = getMysqlConnection(); + Connection cn = getConnection(); try { @@ -290,13 +289,4 @@ public class DatabaseMetaDataTest extends TestSupport println("---" + label + "--------------------------------------------"); println(""); } - - protected Connection getMysqlConnection(Properties properties) throws SQLException - { - properties.setProperty("user", "root"); - properties.setProperty("password", ""); - - return DriverManager.getConnection( - "jdbc:mysql://127.0.0.1:3306/datagear?useUnicode=true&characterEncoding=UTF-8", properties); - } } diff --git a/datagear-dbmodel/src/test/java/org/datagear/dbmodel/GenericDatabaseModelResolverTest.java b/datagear-dbmodel/src/test/java/org/datagear/dbmodel/GenericDatabaseModelResolverTest.java index ce6b5d2a..b8b089f6 100644 --- a/datagear-dbmodel/src/test/java/org/datagear/dbmodel/GenericDatabaseModelResolverTest.java +++ b/datagear-dbmodel/src/test/java/org/datagear/dbmodel/GenericDatabaseModelResolverTest.java @@ -38,7 +38,7 @@ import org.junit.Test; * @author datagear@163.com * */ -public class GenericDatabaseModelResolverTest extends TestSupport +public class GenericDatabaseModelResolverTest extends DBTestSupport { protected ConnectionSensor connectionSensor; @@ -84,7 +84,7 @@ public class GenericDatabaseModelResolverTest extends TestSupport @Test public void resolveTest() throws Exception { - Connection cn = getMysqlConnection(); + Connection cn = getConnection(); int id = 999999; @@ -113,7 +113,7 @@ public class GenericDatabaseModelResolverTest extends TestSupport @Test public void resolveResultset() throws Exception { - Connection cn = getMysqlConnection(); + Connection cn = getConnection(); try { diff --git a/datagear-dbmodel/src/test/java/org/datagear/dbmodel/TestSupport.java b/datagear-dbmodel/src/test/java/org/datagear/dbmodel/TestSupport.java deleted file mode 100644 index f0fe0881..00000000 --- a/datagear-dbmodel/src/test/java/org/datagear/dbmodel/TestSupport.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2018 datagear.tech. All Rights Reserved. - */ - -package org.datagear.dbmodel; - -import java.sql.Connection; -import java.sql.DriverManager; - -/** - * 单元测试支持类。 - * - * @author datagear@163.com - * - */ -public class TestSupport -{ - public TestSupport() - { - super(); - } - - protected Connection getMysqlConnection() throws Exception - { - String url = "jdbc:mysql://127.0.0.1:3306/datagear?useUnicode=true&characterEncoding=UTF-8"; - - return DriverManager.getConnection(url, "root", ""); - } - - protected void println() - { - System.out.println(); - } - - protected void println(Object o) - { - System.out.println((o == null ? "null" : o.toString())); - } - - protected void print(Object o) - { - System.out.print((o == null ? "null" : o.toString())); - } -} diff --git a/datagear-dbmodel/src/test/resources/jdbc.properties b/datagear-dbmodel/src/test/resources/jdbc.properties deleted file mode 100644 index 6525c9c9..00000000 --- a/datagear-dbmodel/src/test/resources/jdbc.properties +++ /dev/null @@ -1,4 +0,0 @@ -driver=com.mysql.jdbc.Driver -url=jdbc:mysql://127.0.0.1:3306/datagear?useUnicode=true&characterEncoding=UTF-8 -user=root -password= \ No newline at end of file diff --git a/datagear-dbmodel/src/test/resources/log4j.properties b/datagear-dbmodel/src/test/resources/log4j.properties deleted file mode 100644 index 421185aa..00000000 --- a/datagear-dbmodel/src/test/resources/log4j.properties +++ /dev/null @@ -1,9 +0,0 @@ -# -# Set root category priority to WARN and its only appender to FILE. -# -log4j.rootLogger=DEBUG,A0 - -#==============appender 0========================== -log4j.appender.A0=org.apache.log4j.ConsoleAppender -log4j.appender.A0.layout=org.apache.log4j.PatternLayout -log4j.appender.A0.layout.ConversionPattern=[%d{HH:mm:ss,SSS}] [%p] %-x [%C.%M()] %m%n \ No newline at end of file diff --git a/datagear-persistence/pom.xml b/datagear-persistence/pom.xml index 4f98e743..9a1fb247 100644 --- a/datagear-persistence/pom.xml +++ b/datagear-persistence/pom.xml @@ -39,23 +39,5 @@ ${spring.version} test - - mysql - mysql-connector-java - 5.1.23 - test - - - org.slf4j - slf4j-log4j12 - ${slf4j-log4j12.version} - test - - - log4j - log4j - 1.2.17 - test - diff --git a/datagear-persistence/src/test/resources/jdbc.properties b/datagear-persistence/src/test/resources/jdbc.properties deleted file mode 100644 index 6525c9c9..00000000 --- a/datagear-persistence/src/test/resources/jdbc.properties +++ /dev/null @@ -1,4 +0,0 @@ -driver=com.mysql.jdbc.Driver -url=jdbc:mysql://127.0.0.1:3306/datagear?useUnicode=true&characterEncoding=UTF-8 -user=root -password= \ No newline at end of file diff --git a/datagear-persistence/src/test/resources/log4j.properties b/datagear-persistence/src/test/resources/log4j.properties deleted file mode 100644 index 421185aa..00000000 --- a/datagear-persistence/src/test/resources/log4j.properties +++ /dev/null @@ -1,9 +0,0 @@ -# -# Set root category priority to WARN and its only appender to FILE. -# -log4j.rootLogger=DEBUG,A0 - -#==============appender 0========================== -log4j.appender.A0=org.apache.log4j.ConsoleAppender -log4j.appender.A0.layout=org.apache.log4j.PatternLayout -log4j.appender.A0.layout.ConversionPattern=[%d{HH:mm:ss,SSS}] [%p] %-x [%C.%M()] %m%n \ No newline at end of file diff --git a/pom.xml b/pom.xml index fb67612d..5aaca24c 100644 --- a/pom.xml +++ b/pom.xml @@ -45,6 +45,12 @@ ${junit.version} test + + mysql + mysql-connector-java + 5.1.24 + test + diff --git a/test/DBTestSupportTemplate.java b/test/DBTestSupportTemplate.java new file mode 100644 index 00000000..005c2cda --- /dev/null +++ b/test/DBTestSupportTemplate.java @@ -0,0 +1,60 @@ +/** + * 数据库测试支持类。 + * + * @author datagear@163.com + * + */ +public abstract class DBTestSupport +{ + private static final Properties JDBC_PROPERTIES = new Properties(); + + static + { + File jdbcConfigFile = new File("test/config/jdbc.properties"); + if (!jdbcConfigFile.exists()) + jdbcConfigFile = new File("../test/config/jdbc.properties"); + + try + { + Reader reader = new FileReader(jdbcConfigFile); + JDBC_PROPERTIES.load(reader); + reader.close(); + } + catch (Exception e) + { + if (e instanceof RuntimeException) + throw (RuntimeException) e; + else + throw new RuntimeException(e); + } + } + + protected Connection getConnection() throws Exception + { + return DriverManager.getConnection(JDBC_PROPERTIES.getProperty("jdbc.url"), + JDBC_PROPERTIES.getProperty("jdbc.user"), JDBC_PROPERTIES.getProperty("jdbc.password")); + } + + protected Connection getConnection(Properties properties) throws Exception + { + properties.setProperty("user", JDBC_PROPERTIES.getProperty("jdbc.user")); + properties.setProperty("password", JDBC_PROPERTIES.getProperty("jdbc.password")); + + return DriverManager.getConnection(JDBC_PROPERTIES.getProperty("jdbc.url"), properties); + } + + protected void println() + { + System.out.println(); + } + + protected void println(Object o) + { + System.out.println((o == null ? "null" : o.toString())); + } + + protected void print(Object o) + { + System.out.print((o == null ? "null" : o.toString())); + } +} \ No newline at end of file diff --git a/test/config/jdbc.properties b/test/config/jdbc.properties new file mode 100644 index 00000000..da7cea73 --- /dev/null +++ b/test/config/jdbc.properties @@ -0,0 +1,3 @@ +jdbc.url=jdbc:mysql://127.0.0.1:3306/datagear?useUnicode=true&characterEncoding=UTF-8 +jdbc.user=root +jdbc.password= \ No newline at end of file diff --git a/datagear-dbmodel/src/test/resources/test-sql-script-mysql.sql b/test/sql/test-sql-script-mysql.sql similarity index 100% rename from datagear-dbmodel/src/test/resources/test-sql-script-mysql.sql rename to test/sql/test-sql-script-mysql.sql diff --git a/datagear-dbmodel/src/test/resources/test-sql-script-oracle.sql b/test/sql/test-sql-script-oracle.sql similarity index 100% rename from datagear-dbmodel/src/test/resources/test-sql-script-oracle.sql rename to test/sql/test-sql-script-oracle.sql diff --git a/datagear-dbmodel/src/test/resources/test-sql-script-postgresql.sql b/test/sql/test-sql-script-postgresql.sql similarity index 100% rename from datagear-dbmodel/src/test/resources/test-sql-script-postgresql.sql rename to test/sql/test-sql-script-postgresql.sql diff --git a/datagear-dbmodel/src/test/resources/test-sql-script-sqlserver.sql b/test/sql/test-sql-script-sqlserver.sql similarity index 100% rename from datagear-dbmodel/src/test/resources/test-sql-script-sqlserver.sql rename to test/sql/test-sql-script-sqlserver.sql