From 4eb265e884fd76344c26ff8ebb879499f272f3dc Mon Sep 17 00:00:00 2001 From: Waqas Iftikhar Date: Thu, 5 Apr 2012 23:33:23 +0500 Subject: [PATCH 1/2] Changes to test files to allow test on remote servers by specifying address and port or just the address --- .../java/org/drizzle/jdbc/BigQueryTest.java | 20 ++++++- .../org/drizzle/jdbc/BlobStreamingTest.java | 10 +++- src/test/java/org/drizzle/jdbc/BlobTest.java | 10 +++- .../java/org/drizzle/jdbc/BooleanTest.java | 10 +++- .../java/org/drizzle/jdbc/CancelTest.java | 32 ++++++++-- .../java/org/drizzle/jdbc/DataSourceTest.java | 27 ++++++++- .../drizzle/jdbc/DatabaseMetadataTest.java | 10 +++- src/test/java/org/drizzle/jdbc/DateTest.java | 60 +++++++++++++++++-- .../java/org/drizzle/jdbc/DriverTest.java | 31 ++++++++-- src/test/java/org/drizzle/jdbc/LoadTest.java | 54 ++++++++++++++--- src/test/java/org/drizzle/jdbc/MultiTest.java | 9 ++- .../org/drizzle/jdbc/MySQLDriverTest.java | 39 ++++++++++-- .../drizzle/jdbc/ResultSetMetaDataTest.java | 10 +++- .../jdbc/ResultSetUnsupportedMethodsTest.java | 23 ++++++- src/test/java/org/drizzle/jdbc/SSLTest.java | 11 +++- .../java/org/drizzle/jdbc/UnicodeTest.java | 30 +++++++++- 16 files changed, 345 insertions(+), 41 deletions(-) diff --git a/src/test/java/org/drizzle/jdbc/BigQueryTest.java b/src/test/java/org/drizzle/jdbc/BigQueryTest.java index 41bbf77..28f32b8 100644 --- a/src/test/java/org/drizzle/jdbc/BigQueryTest.java +++ b/src/test/java/org/drizzle/jdbc/BigQueryTest.java @@ -18,7 +18,15 @@ public class BigQueryTest { @Test public void sendBigQuery2() throws SQLException { - Connection conn = DriverManager.getConnection("jdbc:drizzle://"+DriverTest.host+":3306/test_units_jdbc"); + Connection conn; + if (DriverTest.host.contains(":")) + { + conn = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + "/test_units_jdbc"); + } + else + { + conn = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + ":4427/test_units_jdbc"); + } Statement stmt = conn.createStatement(); stmt.execute("drop table if exists bigblob"); stmt.execute("create table bigblob (id int not null primary key auto_increment, test longblob)"); @@ -47,7 +55,15 @@ public void sendBigQuery2() throws SQLException { } @Test public void sendBigPreparedQuery() throws SQLException { - Connection conn = DriverManager.getConnection("jdbc:drizzle://"+DriverTest.host+":3306/test_units_jdbc"); + Connection conn; + if (DriverTest.host.contains(":")) + { + conn = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + "/test_units_jdbc"); + } + else + { + conn = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + ":4427/test_units_jdbc"); + } Statement stmt = conn.createStatement(); stmt.execute("drop table if exists bigblob2"); stmt.execute("create table bigblob2 (id int not null primary key auto_increment, test longblob, test2 longblob)"); diff --git a/src/test/java/org/drizzle/jdbc/BlobStreamingTest.java b/src/test/java/org/drizzle/jdbc/BlobStreamingTest.java index ec98d21..66c7a60 100644 --- a/src/test/java/org/drizzle/jdbc/BlobStreamingTest.java +++ b/src/test/java/org/drizzle/jdbc/BlobStreamingTest.java @@ -51,7 +51,15 @@ public class BlobStreamingTest { public BlobStreamingTest() throws SQLException { //connection = DriverManager.getConnection("jdbc:mysql:thin://10.100.100.50:3306/test_units_jdbc"); - connection = DriverManager.getConnection("jdbc:drizzle://"+host+":3307/test_units_jdbc?enableBlobStreaming=true"); + if (DriverTest.host.contains(":")) + { + System.out.println("yes"); + connection = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + "/test_units_jdbc?enableBlobStreaming=true"); + } + else + { + connection = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + ":3307/test_units_jdbc?enableBlobStreaming=true"); + } //connection = DriverManager.getConnection("jdbc:mysql://10.100.100.50:3306/test_units_jdbc"); } // @After diff --git a/src/test/java/org/drizzle/jdbc/BlobTest.java b/src/test/java/org/drizzle/jdbc/BlobTest.java index 935c4cc..0f95718 100644 --- a/src/test/java/org/drizzle/jdbc/BlobTest.java +++ b/src/test/java/org/drizzle/jdbc/BlobTest.java @@ -54,7 +54,15 @@ public void testBadStart2() throws SQLException { @Test public void testBug716378() throws SQLException { - Connection conn = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + ":3306/test_units_jdbc"); + Connection conn; + if (DriverTest.host.contains(":")) + { + conn = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + "/test_units_jdbc"); + } + else + { + conn = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + ":3306/test_units_jdbc"); + } Statement stmt = conn.createStatement(); stmt.execute("drop table if exists bug716378"); stmt.execute("create table bug716378 (id int not null primary key auto_increment, test longblob, test2 blob, test3 text)"); diff --git a/src/test/java/org/drizzle/jdbc/BooleanTest.java b/src/test/java/org/drizzle/jdbc/BooleanTest.java index bee9ac4..c753742 100644 --- a/src/test/java/org/drizzle/jdbc/BooleanTest.java +++ b/src/test/java/org/drizzle/jdbc/BooleanTest.java @@ -19,7 +19,15 @@ public class BooleanTest { @Test public void testBoolean() throws SQLException { - Connection conn = DriverManager.getConnection("jdbc:drizzle://root@"+DriverTest.host+":4427/test_units_jdbc"); + Connection conn; + if (DriverTest.host.contains(":")) + { + conn = DriverManager.getConnection("jdbc:drizzle://root@" + DriverTest.host + "/test_units_jdbc"); + } + else + { + conn = DriverManager.getConnection("jdbc:drizzle://root@" + DriverTest.host + ":4427/test_units_jdbc"); + } Statement stmt = conn.createStatement(); stmt.execute("drop table if exists booleantest"); stmt.execute("create table booleantest (id int not null primary key auto_increment, test boolean)"); diff --git a/src/test/java/org/drizzle/jdbc/CancelTest.java b/src/test/java/org/drizzle/jdbc/CancelTest.java index b00a83a..f6aae35 100644 --- a/src/test/java/org/drizzle/jdbc/CancelTest.java +++ b/src/test/java/org/drizzle/jdbc/CancelTest.java @@ -17,7 +17,15 @@ public class CancelTest { @Test(expected = SQLQueryCancelledException.class) public void cancelQuery() throws SQLException, InterruptedException { - Connection conn = DriverManager.getConnection("jdbc:drizzle://"+DriverTest.host+":3306/test_units_jdbc"); + Connection conn; + if (DriverTest.host.contains(":")) + { + conn = DriverManager.getConnection("jdbc:drizzle://"+DriverTest.host+"/test_units_jdbc"); + } + else + { + conn = DriverManager.getConnection("jdbc:drizzle://"+DriverTest.host+":3306/test_units_jdbc"); + } Statement stmt = conn.createStatement(); new CancelThread(stmt).start(); stmt.execute("select * from information_schema.columns, information_schema.tables, information_schema.table_constraints"); @@ -47,7 +55,15 @@ public void run() { @Test(expected = SQLQueryTimedOutException.class) public void timeoutQuery() throws SQLException, InterruptedException { - Connection conn = DriverManager.getConnection("jdbc:drizzle://"+DriverTest.host+":3306/test_units_jdbc"); + Connection conn; + if (DriverTest.host.contains(":")) + { + conn = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + "/test_units_jdbc"); + } + else + { + conn = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + ":3306/test_units_jdbc"); + } Statement stmt = conn.createStatement(); stmt.setQueryTimeout(1); stmt.executeQuery("select * from information_schema.columns, information_schema.tables, information_schema.table_constraints"); @@ -55,14 +71,22 @@ public void timeoutQuery() throws SQLException, InterruptedException { } @Test(expected = SQLQueryTimedOutException.class) public void timeoutPrepQuery() throws SQLException, InterruptedException { - Connection conn = DriverManager.getConnection("jdbc:drizzle://"+DriverTest.host+":3306/test_units_jdbc"); + Connection conn; + if (DriverTest.host.contains(":")) + { + conn = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + "/test_units_jdbc"); + } + else + { + conn = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + ":3306/test_units_jdbc"); + } PreparedStatement stmt = conn.prepareStatement("select * from information_schema.columns, information_schema.tables, information_schema.table_constraints"); stmt.setQueryTimeout(1); stmt.execute(); } @Test(expected = SQLNonTransientException.class) public void connectionTimeout() throws SQLException { - Connection conn = DriverManager.getConnection("jdbc:drizzle://www.google.com:1234/test_units_jdbc?connectTimeout=1"); + Connection conn = DriverManager.getConnection("jdbc:drizzle://www.google.com:1234/test_units_jdbc?connectTimeout=1"); } diff --git a/src/test/java/org/drizzle/jdbc/DataSourceTest.java b/src/test/java/org/drizzle/jdbc/DataSourceTest.java index c392dc1..3666111 100644 --- a/src/test/java/org/drizzle/jdbc/DataSourceTest.java +++ b/src/test/java/org/drizzle/jdbc/DataSourceTest.java @@ -15,15 +15,36 @@ * To change this template use File | Settings | File Templates. */ public class DataSourceTest { - @Test + + DataSource ds; public void testDrizzleDataSource() throws SQLException { - DataSource ds = new DrizzleDataSource(DriverTest.host,3307,"test_units_jdbc"); + if (DriverTest.host.contains(":")) + { + String copyhost=DriverTest.host; + String Brk[]=copyhost.split(":"); + int convert=Integer.parseInt(Brk[1]); + ds = new DrizzleDataSource(Brk[0],convert,"test_units_jdbc"); + } + else + { + ds = new DrizzleDataSource(DriverTest.host,3307,"test_units_jdbc"); + } Connection connection = ds.getConnection("root", null); assertEquals(connection.isValid(0),true); } @Test public void testDrizzleDataSource2() throws SQLException { - DataSource ds = new DrizzleDataSource(DriverTest.host,3307,"test_units_jdbc"); + if (DriverTest.host.contains(":")) + { + String copyhost=DriverTest.host; + String Brk[]=copyhost.split(":"); + int convert=Integer.parseInt(Brk[1]); + ds = new DrizzleDataSource(Brk[0],convert,"test_units_jdbc"); + } + else + { + ds = new DrizzleDataSource(DriverTest.host,3307,"test_units_jdbc"); + } Connection connection = ds.getConnection("root",""); assertEquals(connection.isValid(0),true); } diff --git a/src/test/java/org/drizzle/jdbc/DatabaseMetadataTest.java b/src/test/java/org/drizzle/jdbc/DatabaseMetadataTest.java index 41c817b..88bf601 100644 --- a/src/test/java/org/drizzle/jdbc/DatabaseMetadataTest.java +++ b/src/test/java/org/drizzle/jdbc/DatabaseMetadataTest.java @@ -17,7 +17,15 @@ public class DatabaseMetadataTest { static { Logger.getLogger("").setLevel(Level.OFF); } private Connection connection; public DatabaseMetadataTest() throws ClassNotFoundException, SQLException { - connection = DriverManager.getConnection("jdbc:drizzle://root@"+DriverTest.host+":3307/test_units_jdbc"); + if (DriverTest.host.contains(":")) + { + + connection = DriverManager.getConnection("jdbc:drizzle://root@" + DriverTest.host + "/test_units_jdbc"); + } + else + { + connection = DriverManager.getConnection("jdbc:drizzle://root@" + DriverTest.host + ":3307/test_units_jdbc"); + } //connection = DriverManager.getConnection("jdbc:mysql://a@localhost:3306/test_units_jdbc"); } @Test diff --git a/src/test/java/org/drizzle/jdbc/DateTest.java b/src/test/java/org/drizzle/jdbc/DateTest.java index c943d79..33d453c 100644 --- a/src/test/java/org/drizzle/jdbc/DateTest.java +++ b/src/test/java/org/drizzle/jdbc/DateTest.java @@ -20,7 +20,15 @@ public class DateTest { static { Logger.getLogger("").setLevel(Level.OFF); } @Test public void dateTest() throws SQLException { - Connection connection = DriverManager.getConnection("jdbc:drizzle://root@"+DriverTest.host+":3307/test_units_jdbc"); + Connection connection; + if (DriverTest.host.contains(":")) + { + connection = DriverManager.getConnection("jdbc:drizzle://root@" + DriverTest.host + "/test_units_jdbc"); + } + else + { + connection = DriverManager.getConnection("jdbc:drizzle://root@" + DriverTest.host + ":3307/test_units_jdbc"); + } Statement stmt = connection.createStatement(); stmt.executeUpdate("drop table if exists date_test"); @@ -51,7 +59,15 @@ public void dateTest() throws SQLException { } @Test(expected = SQLException.class) public void dateTest2() throws SQLException { - Connection connection = DriverManager.getConnection("jdbc:drizzle://"+DriverTest.host+":4427/test_units_jdbc"); + Connection connection; + if (DriverTest.host.contains(":")) + { + connection = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + "/test_units_jdbc"); + } + else + { + connection = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + ":4427/test_units_jdbc"); + } Statement stmt = connection.createStatement(); ResultSet rs = stmt.executeQuery("select 1"); @@ -61,7 +77,15 @@ public void dateTest2() throws SQLException { @Test(expected = SQLException.class) public void dateTest3() throws SQLException { - Connection connection = DriverManager.getConnection("jdbc:drizzle://"+DriverTest.host+":4427/test_units_jdbc"); + Connection connection; + if (DriverTest.host.contains(":")) + { + connection = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + "/test_units_jdbc"); + } + else + { + connection = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + ":4427/test_units_jdbc"); + } Statement stmt = connection.createStatement(); ResultSet rs = stmt.executeQuery("select 1 as a"); @@ -70,7 +94,15 @@ public void dateTest3() throws SQLException { } @Test(expected = SQLException.class) public void timeTest3() throws SQLException { - Connection connection = DriverManager.getConnection("jdbc:drizzle://"+DriverTest.host+":4427/test_units_jdbc"); + Connection connection; + if (DriverTest.host.contains(":")) + { + connection = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + "/test_units_jdbc"); + } + else + { + connection = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + ":4427/test_units_jdbc"); + } Statement stmt = connection.createStatement(); ResultSet rs = stmt.executeQuery("select 'aaa' as a"); @@ -95,7 +127,15 @@ public void timePackTest() { @Test public void yearTest() throws SQLException { - Connection connection = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.host+":3306/test_units_jdbc"); + Connection connection; + if(DriverTest.mysql_host.contains(":")) + { + connection = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+"/test_units_jdbc"); + } + else + { + connection = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+":3306/test_units_jdbc"); + } connection.createStatement().execute("drop table if exists yeartest"); connection.createStatement().execute("create table yeartest (y1 year, y2 year(2))"); connection.createStatement().execute("insert into yeartest values (null, null), (1901, 70), (0, 0), (2155, 69)"); @@ -111,7 +151,15 @@ public void yearTest() throws SQLException { } @Test public void timeTest() throws SQLException { - Connection connection = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.host+":3306/test_units_jdbc"); + Connection connection; + if(DriverTest.mysql_host.contains(":")) + { + connection = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+"/test_units_jdbc"); + } + else + { + connection = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+":3306/test_units_jdbc"); + } connection.createStatement().execute("drop table if exists timetest"); connection.createStatement().execute("create table timetest (t time)"); connection.createStatement().execute("insert into timetest values (null), ('-838:59:59'), ('00:00:00'), ('838:59:59')"); diff --git a/src/test/java/org/drizzle/jdbc/DriverTest.java b/src/test/java/org/drizzle/jdbc/DriverTest.java index a5de0c5..e7882b9 100644 --- a/src/test/java/org/drizzle/jdbc/DriverTest.java +++ b/src/test/java/org/drizzle/jdbc/DriverTest.java @@ -28,13 +28,21 @@ * Time: 7:58:11 AM */ public class DriverTest { - public static String host = "10.100.100.50"; + public static String host="localhost"; + public static String mysql_host="localhost"; private Connection connection; static { Logger.getLogger("").setLevel(Level.OFF); } public DriverTest() throws SQLException { //connection = DriverManager.getConnection("jdbc:mysql:thin://10.100.100.50:3306/test_units_jdbc"); - connection = DriverManager.getConnection("jdbc:drizzle://root@"+host+":3307/test_units_jdbc"); + if (DriverTest.host.contains(":")) + { + connection = DriverManager.getConnection("jdbc:drizzle://root@" + DriverTest.host + "/test_units_jdbc"); + } + else + { + connection = DriverManager.getConnection("jdbc:drizzle://root@" + DriverTest.host + ":3307/test_units_jdbc"); + } //connection = DriverManager.getConnection("jdbc:mysql://10.100.100.50:3306/test_units_jdbc"); } @After @@ -1215,11 +1223,26 @@ public void testBit() throws SQLException { @Test public void testConnectWithDB() throws SQLException { - Connection conn = DriverManager.getConnection("jdbc:mysql:thin://"+host+":3306/"); + Connection conn; + if(DriverTest.mysql_host.contains(":")) + { + conn = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+"/"); + } + else + { + conn = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+":3306/"); + } try { conn.createStatement().executeUpdate("drop database test_units_jdbc_testdrop"); } catch (Exception e) {} - conn = DriverManager.getConnection("jdbc:mysql:thin://"+host+":3306/test_units_jdbc_testdrop?createDB=true"); + if(DriverTest.host.contains(":")) + { + conn = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+"/test_units_jdbc_testdrop?createDB=true"); + } + else + { + conn = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+":3306/test_units_jdbc_testdrop?createDB=true"); + } DatabaseMetaData dbmd = conn.getMetaData(); ResultSet rs = dbmd.getSchemas(); boolean foundDb = false; diff --git a/src/test/java/org/drizzle/jdbc/LoadTest.java b/src/test/java/org/drizzle/jdbc/LoadTest.java index c016875..ea8e614 100644 --- a/src/test/java/org/drizzle/jdbc/LoadTest.java +++ b/src/test/java/org/drizzle/jdbc/LoadTest.java @@ -12,8 +12,18 @@ public class LoadTest { @Test public void tm() throws SQLException { - Connection drizConnection = DriverManager.getConnection("jdbc:mysql:thin://10.100.100.50:3306/test_units_jdbc"); - Connection mysqlConnection = DriverManager.getConnection("jdbc:mysql://10.100.100.50:3306/test_units_jdbc"); + Connection drizConnection; + Connection mysqlConnection; + if (DriverTest.mysql_host.contains(":")) + { + drizConnection = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+"/test_units_jdbc"); + mysqlConnection = DriverManager.getConnection("jdbc:mysql://"+DriverTest.mysql_host+"/test_units_jdbc"); + } + else + { + drizConnection = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+":3306/test_units_jdbc"); + mysqlConnection = DriverManager.getConnection("jdbc:mysql://"+DriverTest.mysql_host+":3306/test_units_jdbc"); + } long sum = 0; int i; @@ -57,8 +67,18 @@ public long loadTest(Connection connection) throws SQLException { } @Test public void prepareTest() throws SQLException { - Connection drizConnection = DriverManager.getConnection("jdbc:mysql:thin://10.100.100.50:3306/test_units_jdbc"); - Connection mysqlConnection = DriverManager.getConnection("jdbc:mysql://10.100.100.50:3306/test_units_jdbc"); + Connection drizConnection; + Connection mysqlConnection; + if (DriverTest.mysql_host.contains(":")) + { + drizConnection = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+"/test_units_jdbc"); + mysqlConnection = DriverManager.getConnection("jdbc:mysql://"+DriverTest.mysql_host+"/test_units_jdbc"); + } + else + { + drizConnection = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+":3306/test_units_jdbc"); + mysqlConnection = DriverManager.getConnection("jdbc:mysql://"+DriverTest.mysql_host+":3306/test_units_jdbc"); + } Statement stmt = drizConnection.createStatement(); stmt.executeUpdate("drop table if exists loadsofdata2"); stmt.executeUpdate("create table loadsofdata2 (id int not null primary key auto_increment, data blob) engine=innodb"); @@ -119,8 +139,18 @@ public void prepareTest() throws SQLException { @Test public void prepareManyParamsTest() throws SQLException { - Connection drizConnection = DriverManager.getConnection("jdbc:mysql:thin://10.100.100.50:3306/test_units_jdbc"); - Connection mysqlConnection = DriverManager.getConnection("jdbc:mysql://10.100.100.50:3306/test_units_jdbc"); + Connection drizConnection; + Connection mysqlConnection; + if (DriverTest.mysql_host.contains(":")) + { + drizConnection = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+"/test_units_jdbc"); + mysqlConnection = DriverManager.getConnection("jdbc:mysql://"+DriverTest.mysql_host+"/test_units_jdbc"); + } + else + { + drizConnection = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+":3306/test_units_jdbc"); + mysqlConnection = DriverManager.getConnection("jdbc:mysql://"+DriverTest.mysql_host+":3306/test_units_jdbc"); + } Statement stmt = drizConnection.createStatement(); stmt.executeUpdate("drop table if exists loadsofdata3"); StringBuilder sb = new StringBuilder("d0 int"); @@ -163,7 +193,17 @@ public void prepareManyParamsTest() throws SQLException { } @Test public void benchPrepare() throws SQLException { - Connection drizConnection = DriverManager.getConnection("jdbc:mysql:thin://10.100.100.50:3306/test_units_jdbc"); + Connection drizConnection; + if (DriverTest.mysql_host.contains(":")) + { + drizConnection=DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+"/test_units_jdbc"); + + } + else + { + drizConnection=DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+":3306/test_units_jdbc"); + } + long startTime=System.nanoTime(); long x = 1000000; for(int i=0; i Date: Tue, 17 Apr 2012 21:43:28 +0500 Subject: [PATCH 2/2] Commit after incorporating changes suggested by Mr. Eriksson --- .../java/org/drizzle/jdbc/BigQueryTest.java | 20 +--- .../org/drizzle/jdbc/BlobStreamingTest.java | 10 +- src/test/java/org/drizzle/jdbc/BlobTest.java | 10 +- .../java/org/drizzle/jdbc/BooleanTest.java | 10 +- .../java/org/drizzle/jdbc/CancelTest.java | 44 ++------- .../org/drizzle/jdbc/ConnectionCheck.java | 99 +++++++++++++++++++ .../java/org/drizzle/jdbc/DataSourceTest.java | 16 +-- .../drizzle/jdbc/DatabaseMetadataTest.java | 10 +- src/test/java/org/drizzle/jdbc/DateTest.java | 62 ++---------- .../java/org/drizzle/jdbc/DriverTest.java | 44 ++++----- src/test/java/org/drizzle/jdbc/LoadTest.java | 42 +++----- .../org/drizzle/jdbc/MySQLDriverTest.java | 36 ++----- .../drizzle/jdbc/ResultSetMetaDataTest.java | 10 +- .../jdbc/ResultSetUnsupportedMethodsTest.java | 25 ++--- src/test/java/org/drizzle/jdbc/SSLTest.java | 10 +- .../java/org/drizzle/jdbc/UnicodeTest.java | 30 +----- 16 files changed, 180 insertions(+), 298 deletions(-) create mode 100644 src/test/java/org/drizzle/jdbc/ConnectionCheck.java diff --git a/src/test/java/org/drizzle/jdbc/BigQueryTest.java b/src/test/java/org/drizzle/jdbc/BigQueryTest.java index 28f32b8..ec4b39a 100644 --- a/src/test/java/org/drizzle/jdbc/BigQueryTest.java +++ b/src/test/java/org/drizzle/jdbc/BigQueryTest.java @@ -18,15 +18,7 @@ public class BigQueryTest { @Test public void sendBigQuery2() throws SQLException { - Connection conn; - if (DriverTest.host.contains(":")) - { - conn = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + "/test_units_jdbc"); - } - else - { - conn = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + ":4427/test_units_jdbc"); - } + Connection conn=ConnectionCheck.Get_ConnectionDrizzle(); Statement stmt = conn.createStatement(); stmt.execute("drop table if exists bigblob"); stmt.execute("create table bigblob (id int not null primary key auto_increment, test longblob)"); @@ -55,15 +47,7 @@ public void sendBigQuery2() throws SQLException { } @Test public void sendBigPreparedQuery() throws SQLException { - Connection conn; - if (DriverTest.host.contains(":")) - { - conn = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + "/test_units_jdbc"); - } - else - { - conn = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + ":4427/test_units_jdbc"); - } + Connection conn=ConnectionCheck.Get_ConnectionDrizzle(); Statement stmt = conn.createStatement(); stmt.execute("drop table if exists bigblob2"); stmt.execute("create table bigblob2 (id int not null primary key auto_increment, test longblob, test2 longblob)"); diff --git a/src/test/java/org/drizzle/jdbc/BlobStreamingTest.java b/src/test/java/org/drizzle/jdbc/BlobStreamingTest.java index 66c7a60..9806828 100644 --- a/src/test/java/org/drizzle/jdbc/BlobStreamingTest.java +++ b/src/test/java/org/drizzle/jdbc/BlobStreamingTest.java @@ -51,15 +51,7 @@ public class BlobStreamingTest { public BlobStreamingTest() throws SQLException { //connection = DriverManager.getConnection("jdbc:mysql:thin://10.100.100.50:3306/test_units_jdbc"); - if (DriverTest.host.contains(":")) - { - System.out.println("yes"); - connection = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + "/test_units_jdbc?enableBlobStreaming=true"); - } - else - { - connection = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + ":3307/test_units_jdbc?enableBlobStreaming=true"); - } + connection=ConnectionCheck.Get_ConnectionDrizzle("?enableBlobStreaming=truec"); //connection = DriverManager.getConnection("jdbc:mysql://10.100.100.50:3306/test_units_jdbc"); } // @After diff --git a/src/test/java/org/drizzle/jdbc/BlobTest.java b/src/test/java/org/drizzle/jdbc/BlobTest.java index 0f95718..af00fd1 100644 --- a/src/test/java/org/drizzle/jdbc/BlobTest.java +++ b/src/test/java/org/drizzle/jdbc/BlobTest.java @@ -54,15 +54,7 @@ public void testBadStart2() throws SQLException { @Test public void testBug716378() throws SQLException { - Connection conn; - if (DriverTest.host.contains(":")) - { - conn = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + "/test_units_jdbc"); - } - else - { - conn = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + ":3306/test_units_jdbc"); - } + Connection conn=ConnectionCheck.Get_ConnectionDrizzle(); Statement stmt = conn.createStatement(); stmt.execute("drop table if exists bug716378"); stmt.execute("create table bug716378 (id int not null primary key auto_increment, test longblob, test2 blob, test3 text)"); diff --git a/src/test/java/org/drizzle/jdbc/BooleanTest.java b/src/test/java/org/drizzle/jdbc/BooleanTest.java index c753742..961efbf 100644 --- a/src/test/java/org/drizzle/jdbc/BooleanTest.java +++ b/src/test/java/org/drizzle/jdbc/BooleanTest.java @@ -19,15 +19,7 @@ public class BooleanTest { @Test public void testBoolean() throws SQLException { - Connection conn; - if (DriverTest.host.contains(":")) - { - conn = DriverManager.getConnection("jdbc:drizzle://root@" + DriverTest.host + "/test_units_jdbc"); - } - else - { - conn = DriverManager.getConnection("jdbc:drizzle://root@" + DriverTest.host + ":4427/test_units_jdbc"); - } + Connection conn=ConnectionCheck.Get_ConnectionDrizzle(); Statement stmt = conn.createStatement(); stmt.execute("drop table if exists booleantest"); stmt.execute("create table booleantest (id int not null primary key auto_increment, test boolean)"); diff --git a/src/test/java/org/drizzle/jdbc/CancelTest.java b/src/test/java/org/drizzle/jdbc/CancelTest.java index f6aae35..8ceff41 100644 --- a/src/test/java/org/drizzle/jdbc/CancelTest.java +++ b/src/test/java/org/drizzle/jdbc/CancelTest.java @@ -7,28 +7,18 @@ import java.sql.Connection; import java.sql.DriverManager; import java.sql.PreparedStatement; -import java.sql.ResultSet; import java.sql.SQLException; import java.sql.SQLNonTransientException; import java.sql.Statement; -import static org.junit.Assert.assertTrue; public class CancelTest { @Test(expected = SQLQueryCancelledException.class) public void cancelQuery() throws SQLException, InterruptedException { - Connection conn; - if (DriverTest.host.contains(":")) - { - conn = DriverManager.getConnection("jdbc:drizzle://"+DriverTest.host+"/test_units_jdbc"); - } - else - { - conn = DriverManager.getConnection("jdbc:drizzle://"+DriverTest.host+":3306/test_units_jdbc"); - } + Connection conn=ConnectionCheck.Get_ConnectionDrizzle(); Statement stmt = conn.createStatement(); new CancelThread(stmt).start(); - stmt.execute("select * from information_schema.columns, information_schema.tables, information_schema.table_constraints"); + stmt.execute("select * from information_schema.columns CROSS JOIN information_schema.tables CROSS JOIN information_schema.table_constraints"); } private static class CancelThread extends Thread { @@ -55,32 +45,18 @@ public void run() { @Test(expected = SQLQueryTimedOutException.class) public void timeoutQuery() throws SQLException, InterruptedException { - Connection conn; - if (DriverTest.host.contains(":")) - { - conn = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + "/test_units_jdbc"); - } - else - { - conn = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + ":3306/test_units_jdbc"); - } - Statement stmt = conn.createStatement(); - stmt.setQueryTimeout(1); - stmt.executeQuery("select * from information_schema.columns, information_schema.tables, information_schema.table_constraints"); + Connection conn=ConnectionCheck.Get_ConnectionDrizzle(); + + Statement stmt = conn.createStatement(); + stmt.setQueryTimeout(1); + stmt.executeQuery("select * from information_schema.columns CROSS JOIN information_schema.tables CROSS JOIN information_schema.table_constraints"); + } @Test(expected = SQLQueryTimedOutException.class) public void timeoutPrepQuery() throws SQLException, InterruptedException { - Connection conn; - if (DriverTest.host.contains(":")) - { - conn = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + "/test_units_jdbc"); - } - else - { - conn = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + ":3306/test_units_jdbc"); - } - PreparedStatement stmt = conn.prepareStatement("select * from information_schema.columns, information_schema.tables, information_schema.table_constraints"); + Connection conn=ConnectionCheck.Get_ConnectionDrizzle(); + PreparedStatement stmt = conn.prepareStatement("select * from information_schema.columns CROSS JOIN information_schema.tables CROSS JOIN information_schema.table_constraints"); stmt.setQueryTimeout(1); stmt.execute(); } diff --git a/src/test/java/org/drizzle/jdbc/ConnectionCheck.java b/src/test/java/org/drizzle/jdbc/ConnectionCheck.java new file mode 100644 index 0000000..903b63a --- /dev/null +++ b/src/test/java/org/drizzle/jdbc/ConnectionCheck.java @@ -0,0 +1,99 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package org.drizzle.jdbc; + +import org.junit.Test; +import static org.junit.Assert.assertEquals; + +import java.sql.*; +import java.util.logging.Logger; +import java.util.logging.Level; + +/** + * + * @author waqas + */ +public class ConnectionCheck { + public static String host="localhost"; + public static String mysql_host="localhost"; + public static Connection Get_ConnectionDrizzle() throws SQLException + { + Connection connection; + if (host.contains(":")) + { + + connection = DriverManager.getConnection("jdbc:drizzle://root@" + host + "/test_units_jdbc"); + } + else + { + + connection = DriverManager.getConnection("jdbc:drizzle://root@" + host + ":4427/test_units_jdbc"); + } + return connection; + } + public static Connection Get_ConnectionDrizzle(String Property) throws SQLException + { + Connection connection; + if (host.contains(":")) + { + + connection = DriverManager.getConnection("jdbc:drizzle://root@" + host + "/test_units_jdbc"+Property); + } + else + { + + connection = DriverManager.getConnection("jdbc:drizzle://root@" + host + ":4427/test_units_jdbc"+Property); + } + return connection; + } + public static Connection Get_ConnectionMySQL() throws SQLException + { + Connection connection; + if (mysql_host.contains(":")) + { + + connection = DriverManager.getConnection("jdbc:mysql:thin://"+mysql_host+"/test_units_jdbc"); + } + else + { + + connection = DriverManager.getConnection("jdbc:mysql:thin://"+mysql_host+":3306/test_units_jdbc"); + } + return connection; + } + public static Connection Get_ConnectionMySQL_WithUsername(String Username) throws SQLException + { + Connection connection; + if (mysql_host.contains(":")) + { + + connection = DriverManager.getConnection("jdbc:mysql:thin://"+Username+"@"+mysql_host+"/test_units_jdbc"); + } + else + { + + connection = DriverManager.getConnection("jdbc:mysql:thin://"+Username+"@"+mysql_host+":3306/test_units_jdbc"); + } + return connection; + } + public static Connection Get_ConnectionMySQL(String Property) throws SQLException + { + Connection connection; + if (mysql_host.contains(":")) + { + + connection = DriverManager.getConnection("jdbc:mysql:thin://"+mysql_host+"/test_units_jdbc"+Property); + } + else + { + + connection = DriverManager.getConnection("jdbc:mysql:thin://"+mysql_host+":3306/test_units_jdbc"+Property); + } + + return connection; + } + + +} diff --git a/src/test/java/org/drizzle/jdbc/DataSourceTest.java b/src/test/java/org/drizzle/jdbc/DataSourceTest.java index 3666111..d45203d 100644 --- a/src/test/java/org/drizzle/jdbc/DataSourceTest.java +++ b/src/test/java/org/drizzle/jdbc/DataSourceTest.java @@ -18,32 +18,32 @@ public class DataSourceTest { DataSource ds; public void testDrizzleDataSource() throws SQLException { - if (DriverTest.host.contains(":")) + if (ConnectionCheck.host.contains(":")) { - String copyhost=DriverTest.host; - String Brk[]=copyhost.split(":"); + String copyhost_forsplit=ConnectionCheck.host; + String Brk[]=copyhost_forsplit.split(":"); int convert=Integer.parseInt(Brk[1]); ds = new DrizzleDataSource(Brk[0],convert,"test_units_jdbc"); } else { - ds = new DrizzleDataSource(DriverTest.host,3307,"test_units_jdbc"); + ds = new DrizzleDataSource(ConnectionCheck.host,3307,"test_units_jdbc"); } Connection connection = ds.getConnection("root", null); assertEquals(connection.isValid(0),true); } @Test public void testDrizzleDataSource2() throws SQLException { - if (DriverTest.host.contains(":")) + if (ConnectionCheck.host.contains(":")) { - String copyhost=DriverTest.host; - String Brk[]=copyhost.split(":"); + String copyhost_forsplit=ConnectionCheck.host; + String Brk[]=copyhost_forsplit.split(":"); int convert=Integer.parseInt(Brk[1]); ds = new DrizzleDataSource(Brk[0],convert,"test_units_jdbc"); } else { - ds = new DrizzleDataSource(DriverTest.host,3307,"test_units_jdbc"); + ds = new DrizzleDataSource(ConnectionCheck.host,3307,"test_units_jdbc"); } Connection connection = ds.getConnection("root",""); assertEquals(connection.isValid(0),true); diff --git a/src/test/java/org/drizzle/jdbc/DatabaseMetadataTest.java b/src/test/java/org/drizzle/jdbc/DatabaseMetadataTest.java index 88bf601..a9e2e7d 100644 --- a/src/test/java/org/drizzle/jdbc/DatabaseMetadataTest.java +++ b/src/test/java/org/drizzle/jdbc/DatabaseMetadataTest.java @@ -17,15 +17,7 @@ public class DatabaseMetadataTest { static { Logger.getLogger("").setLevel(Level.OFF); } private Connection connection; public DatabaseMetadataTest() throws ClassNotFoundException, SQLException { - if (DriverTest.host.contains(":")) - { - - connection = DriverManager.getConnection("jdbc:drizzle://root@" + DriverTest.host + "/test_units_jdbc"); - } - else - { - connection = DriverManager.getConnection("jdbc:drizzle://root@" + DriverTest.host + ":3307/test_units_jdbc"); - } + connection = ConnectionCheck.Get_ConnectionDrizzle(); //connection = DriverManager.getConnection("jdbc:mysql://a@localhost:3306/test_units_jdbc"); } @Test diff --git a/src/test/java/org/drizzle/jdbc/DateTest.java b/src/test/java/org/drizzle/jdbc/DateTest.java index 33d453c..601f4c0 100644 --- a/src/test/java/org/drizzle/jdbc/DateTest.java +++ b/src/test/java/org/drizzle/jdbc/DateTest.java @@ -20,15 +20,7 @@ public class DateTest { static { Logger.getLogger("").setLevel(Level.OFF); } @Test public void dateTest() throws SQLException { - Connection connection; - if (DriverTest.host.contains(":")) - { - connection = DriverManager.getConnection("jdbc:drizzle://root@" + DriverTest.host + "/test_units_jdbc"); - } - else - { - connection = DriverManager.getConnection("jdbc:drizzle://root@" + DriverTest.host + ":3307/test_units_jdbc"); - } + Connection connection=ConnectionCheck.Get_ConnectionDrizzle(); Statement stmt = connection.createStatement(); stmt.executeUpdate("drop table if exists date_test"); @@ -59,16 +51,7 @@ public void dateTest() throws SQLException { } @Test(expected = SQLException.class) public void dateTest2() throws SQLException { - Connection connection; - if (DriverTest.host.contains(":")) - { - connection = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + "/test_units_jdbc"); - } - else - { - connection = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + ":4427/test_units_jdbc"); - } - + Connection connection = ConnectionCheck.Get_ConnectionDrizzle(); Statement stmt = connection.createStatement(); ResultSet rs = stmt.executeQuery("select 1"); rs.next(); @@ -77,15 +60,7 @@ public void dateTest2() throws SQLException { @Test(expected = SQLException.class) public void dateTest3() throws SQLException { - Connection connection; - if (DriverTest.host.contains(":")) - { - connection = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + "/test_units_jdbc"); - } - else - { - connection = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + ":4427/test_units_jdbc"); - } + Connection connection = ConnectionCheck.Get_ConnectionDrizzle(); Statement stmt = connection.createStatement(); ResultSet rs = stmt.executeQuery("select 1 as a"); @@ -94,16 +69,7 @@ public void dateTest3() throws SQLException { } @Test(expected = SQLException.class) public void timeTest3() throws SQLException { - Connection connection; - if (DriverTest.host.contains(":")) - { - connection = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + "/test_units_jdbc"); - } - else - { - connection = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + ":4427/test_units_jdbc"); - } - + Connection connection= ConnectionCheck.Get_ConnectionDrizzle(); Statement stmt = connection.createStatement(); ResultSet rs = stmt.executeQuery("select 'aaa' as a"); rs.next(); @@ -127,15 +93,7 @@ public void timePackTest() { @Test public void yearTest() throws SQLException { - Connection connection; - if(DriverTest.mysql_host.contains(":")) - { - connection = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+"/test_units_jdbc"); - } - else - { - connection = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+":3306/test_units_jdbc"); - } + Connection connection=ConnectionCheck.Get_ConnectionMySQL(); connection.createStatement().execute("drop table if exists yeartest"); connection.createStatement().execute("create table yeartest (y1 year, y2 year(2))"); connection.createStatement().execute("insert into yeartest values (null, null), (1901, 70), (0, 0), (2155, 69)"); @@ -151,15 +109,7 @@ public void yearTest() throws SQLException { } @Test public void timeTest() throws SQLException { - Connection connection; - if(DriverTest.mysql_host.contains(":")) - { - connection = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+"/test_units_jdbc"); - } - else - { - connection = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+":3306/test_units_jdbc"); - } + Connection connection=ConnectionCheck.Get_ConnectionMySQL(); connection.createStatement().execute("drop table if exists timetest"); connection.createStatement().execute("create table timetest (t time)"); connection.createStatement().execute("insert into timetest values (null), ('-838:59:59'), ('00:00:00'), ('838:59:59')"); diff --git a/src/test/java/org/drizzle/jdbc/DriverTest.java b/src/test/java/org/drizzle/jdbc/DriverTest.java index e7882b9..eed5a7c 100644 --- a/src/test/java/org/drizzle/jdbc/DriverTest.java +++ b/src/test/java/org/drizzle/jdbc/DriverTest.java @@ -28,21 +28,14 @@ * Time: 7:58:11 AM */ public class DriverTest { - public static String host="localhost"; - public static String mysql_host="localhost"; + private Connection connection; static { Logger.getLogger("").setLevel(Level.OFF); } + public DriverTest() throws SQLException { //connection = DriverManager.getConnection("jdbc:mysql:thin://10.100.100.50:3306/test_units_jdbc"); - if (DriverTest.host.contains(":")) - { - connection = DriverManager.getConnection("jdbc:drizzle://root@" + DriverTest.host + "/test_units_jdbc"); - } - else - { - connection = DriverManager.getConnection("jdbc:drizzle://root@" + DriverTest.host + ":3307/test_units_jdbc"); - } + connection=ConnectionCheck.Get_ConnectionDrizzle(); //connection = DriverManager.getConnection("jdbc:mysql://10.100.100.50:3306/test_units_jdbc"); } @After @@ -844,8 +837,8 @@ public void testException1() throws SQLException { @Test public void testExceptionDivByZero() throws SQLException { - - + String dbname=getConnection().getMetaData().getDatabaseProductName(); + System.out.println(dbname); if(getConnection().getMetaData().getDatabaseProductName().toLowerCase().equals("drizzle")) { boolean threwException = false; try{ @@ -855,10 +848,12 @@ public void testExceptionDivByZero() throws SQLException { } assertEquals(true,threwException); } else { - ResultSet rs = getConnection().createStatement().executeQuery("select 1/0"); + ResultSet rs; + rs= getConnection().createStatement().executeQuery("select 1/0"); assertEquals(rs.next(),true); assertEquals(null, rs.getString(1)); - } + } + } @Test(expected = SQLSyntaxErrorException.class) public void testSyntaxError() throws SQLException { @@ -1224,25 +1219,22 @@ public void testBit() throws SQLException { public void testConnectWithDB() throws SQLException { Connection conn; - if(DriverTest.mysql_host.contains(":")) + String AddPortToHost=ConnectionCheck.mysql_host; + if(!ConnectionCheck.mysql_host.contains(":")) { - conn = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+"/"); + AddPortToHost=AddPortToHost+":3306/"; } - else + else { - conn = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+":3306/"); + AddPortToHost=AddPortToHost+"/"; } + + conn = DriverManager.getConnection("jdbc:mysql:thin://"+AddPortToHost); + try { conn.createStatement().executeUpdate("drop database test_units_jdbc_testdrop"); } catch (Exception e) {} - if(DriverTest.host.contains(":")) - { - conn = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+"/test_units_jdbc_testdrop?createDB=true"); - } - else - { - conn = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+":3306/test_units_jdbc_testdrop?createDB=true"); - } + conn=ConnectionCheck.Get_ConnectionMySQL("_testdrop?createDB=true"); DatabaseMetaData dbmd = conn.getMetaData(); ResultSet rs = dbmd.getSchemas(); boolean foundDb = false; diff --git a/src/test/java/org/drizzle/jdbc/LoadTest.java b/src/test/java/org/drizzle/jdbc/LoadTest.java index ea8e614..3b112dc 100644 --- a/src/test/java/org/drizzle/jdbc/LoadTest.java +++ b/src/test/java/org/drizzle/jdbc/LoadTest.java @@ -12,17 +12,15 @@ public class LoadTest { @Test public void tm() throws SQLException { - Connection drizConnection; + Connection drizConnection=ConnectionCheck.Get_ConnectionMySQL(); Connection mysqlConnection; - if (DriverTest.mysql_host.contains(":")) + if (ConnectionCheck.mysql_host.contains(":")) { - drizConnection = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+"/test_units_jdbc"); - mysqlConnection = DriverManager.getConnection("jdbc:mysql://"+DriverTest.mysql_host+"/test_units_jdbc"); + mysqlConnection = DriverManager.getConnection("jdbc:mysql://"+ConnectionCheck.mysql_host+"/test_units_jdbc"); } else { - drizConnection = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+":3306/test_units_jdbc"); - mysqlConnection = DriverManager.getConnection("jdbc:mysql://"+DriverTest.mysql_host+":3306/test_units_jdbc"); + mysqlConnection = DriverManager.getConnection("jdbc:mysql://"+ConnectionCheck.mysql_host+":3306/test_units_jdbc"); } long sum = 0; @@ -67,18 +65,17 @@ public long loadTest(Connection connection) throws SQLException { } @Test public void prepareTest() throws SQLException { - Connection drizConnection; + Connection drizConnection=ConnectionCheck.Get_ConnectionMySQL(); Connection mysqlConnection; - if (DriverTest.mysql_host.contains(":")) + if (ConnectionCheck.mysql_host.contains(":")) { - drizConnection = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+"/test_units_jdbc"); - mysqlConnection = DriverManager.getConnection("jdbc:mysql://"+DriverTest.mysql_host+"/test_units_jdbc"); + mysqlConnection = DriverManager.getConnection("jdbc:mysql://"+ConnectionCheck.mysql_host+"/test_units_jdbc"); } else { - drizConnection = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+":3306/test_units_jdbc"); - mysqlConnection = DriverManager.getConnection("jdbc:mysql://"+DriverTest.mysql_host+":3306/test_units_jdbc"); + mysqlConnection = DriverManager.getConnection("jdbc:mysql://"+ConnectionCheck.mysql_host+":3306/test_units_jdbc"); } + Statement stmt = drizConnection.createStatement(); stmt.executeUpdate("drop table if exists loadsofdata2"); stmt.executeUpdate("create table loadsofdata2 (id int not null primary key auto_increment, data blob) engine=innodb"); @@ -139,17 +136,15 @@ public void prepareTest() throws SQLException { @Test public void prepareManyParamsTest() throws SQLException { - Connection drizConnection; + Connection drizConnection=ConnectionCheck.Get_ConnectionMySQL(); Connection mysqlConnection; - if (DriverTest.mysql_host.contains(":")) + if (ConnectionCheck.mysql_host.contains(":")) { - drizConnection = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+"/test_units_jdbc"); - mysqlConnection = DriverManager.getConnection("jdbc:mysql://"+DriverTest.mysql_host+"/test_units_jdbc"); + mysqlConnection = DriverManager.getConnection("jdbc:mysql://"+ConnectionCheck.mysql_host+"/test_units_jdbc"); } else { - drizConnection = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+":3306/test_units_jdbc"); - mysqlConnection = DriverManager.getConnection("jdbc:mysql://"+DriverTest.mysql_host+":3306/test_units_jdbc"); + mysqlConnection = DriverManager.getConnection("jdbc:mysql://"+ConnectionCheck.mysql_host+":3306/test_units_jdbc"); } Statement stmt = drizConnection.createStatement(); stmt.executeUpdate("drop table if exists loadsofdata3"); @@ -193,16 +188,7 @@ public void prepareManyParamsTest() throws SQLException { } @Test public void benchPrepare() throws SQLException { - Connection drizConnection; - if (DriverTest.mysql_host.contains(":")) - { - drizConnection=DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+"/test_units_jdbc"); - - } - else - { - drizConnection=DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+":3306/test_units_jdbc"); - } + Connection drizConnection=ConnectionCheck.Get_ConnectionMySQL(); long startTime=System.nanoTime(); long x = 1000000; diff --git a/src/test/java/org/drizzle/jdbc/MySQLDriverTest.java b/src/test/java/org/drizzle/jdbc/MySQLDriverTest.java index 9f180d8..9cc58e0 100644 --- a/src/test/java/org/drizzle/jdbc/MySQLDriverTest.java +++ b/src/test/java/org/drizzle/jdbc/MySQLDriverTest.java @@ -13,7 +13,6 @@ import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertTrue; import static org.junit.Assert.assertFalse; - /** * Created by IntelliJ IDEA. * User: marcuse @@ -24,14 +23,7 @@ public class MySQLDriverTest extends DriverTest { private Connection connection; public MySQLDriverTest() throws SQLException { - if(DriverTest.mysql_host.contains(":")) - { - connection = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+"/test_units_jdbc"); - } - else - { - connection = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+":3306/test_units_jdbc"); - } + connection=ConnectionCheck.Get_ConnectionMySQL(); // connection = DriverManager.getConnection("jdbc:mysql://10.100.100.50:3306/test_units_jdbc"); } @Override @@ -41,15 +33,7 @@ public Connection getConnection() { @Test public void testAuthConnection() throws SQLException { - Connection conn; - if(DriverTest.mysql_host.contains(":")) - { - conn= DriverManager.getConnection("jdbc:mysql:thin://test:test@"+DriverTest.mysql_host+"/test_units_jdbc"); - } - else - { - conn= DriverManager.getConnection("jdbc:mysql:thin://test:test@"+DriverTest.mysql_host+":3306/test_units_jdbc"); - } + Connection conn=ConnectionCheck.Get_ConnectionMySQL_WithUsername("test:test"); Statement stmt = conn.createStatement(); ResultSet rs = stmt.executeQuery("select * from t1"); rs.close(); @@ -59,15 +43,7 @@ public void testAuthConnection() throws SQLException { @Test public void testAuthConnection2() throws SQLException { - Connection conn; - if(DriverTest.mysql_host.contains(":")) - { - conn=DriverManager.getConnection("jdbc:mysql:thin://e_passwd:@"+DriverTest.mysql_host+"/test_units_jdbc"); - } - else - { - conn=DriverManager.getConnection("jdbc:mysql:thin://e_passwd:@"+DriverTest.mysql_host+":3306/test_units_jdbc"); - } + Connection conn=ConnectionCheck.Get_ConnectionMySQL_WithUsername("e_passwd:"); Statement stmt = conn.createStatement(); ResultSet rs = stmt.executeQuery("select * from t1"); rs.close(); @@ -82,13 +58,13 @@ public void testAuthConnectionProperties() throws SQLException { props.setProperty("password","test"); Connection conn; - if (DriverTest.mysql_host.contains(":")) + if (ConnectionCheck.mysql_host.contains(":")) { - conn= DriverManager.getConnection("jdbc:mysql:thin://teest:teest@"+DriverTest.mysql_host+"/test_units_jdbc",props); + conn= DriverManager.getConnection("jdbc:mysql:thin://teest:teest@"+ConnectionCheck.mysql_host+"/test_units_jdbc",props); } else { - conn= DriverManager.getConnection("jdbc:mysql:thin://teest:teest@"+DriverTest.mysql_host+":3306/test_units_jdbc",props); + conn= DriverManager.getConnection("jdbc:mysql:thin://teest:teest@"+ConnectionCheck.mysql_host+":3306/test_units_jdbc",props); } Statement stmt = conn.createStatement(); ResultSet rs = stmt.executeQuery("select * from t1"); diff --git a/src/test/java/org/drizzle/jdbc/ResultSetMetaDataTest.java b/src/test/java/org/drizzle/jdbc/ResultSetMetaDataTest.java index 4d501c7..8169c78 100644 --- a/src/test/java/org/drizzle/jdbc/ResultSetMetaDataTest.java +++ b/src/test/java/org/drizzle/jdbc/ResultSetMetaDataTest.java @@ -17,15 +17,7 @@ public class ResultSetMetaDataTest { static { Logger.getLogger("").setLevel(Level.OFF); } @Test public void metaDataTest() throws SQLException { - Connection connection; - if (DriverTest.host.contains(":")) - { - connection = DriverManager.getConnection("jdbc:drizzle://root@" + DriverTest.host + "/test_units_jdbc"); - } - else - { - connection = DriverManager.getConnection("jdbc:drizzle://root@" + DriverTest.host + ":3307/test_units_jdbc"); - } + Connection connection=ConnectionCheck.Get_ConnectionDrizzle(); Statement stmt = connection.createStatement(); stmt.execute("drop table if exists test_rsmd"); stmt.execute("create table test_rsmd (id_col int not null primary key auto_increment, " + diff --git a/src/test/java/org/drizzle/jdbc/ResultSetUnsupportedMethodsTest.java b/src/test/java/org/drizzle/jdbc/ResultSetUnsupportedMethodsTest.java index 68f354f..720926b 100644 --- a/src/test/java/org/drizzle/jdbc/ResultSetUnsupportedMethodsTest.java +++ b/src/test/java/org/drizzle/jdbc/ResultSetUnsupportedMethodsTest.java @@ -22,27 +22,18 @@ public class ResultSetUnsupportedMethodsTest { public ResultSetUnsupportedMethodsTest() throws SQLException { //connection = DriverManager.getConnection("jdbc:mysql:thin://localhost:3306/test_units_jdbc"); - String abc= System.getProperty("drizzle.test.address"); - if (abc!=null) + String check_connectionaddress= System.getProperty("drizzle.test.address"); + if (check_connectionaddress!=null) { - DriverTest.host=System.getProperty("drizzle.test.address"); + ConnectionCheck.host=System.getProperty("drizzle.test.address"); } - abc=System.getProperty("mysql.test.address"); + check_connectionaddress=System.getProperty("mysql.test.address"); - if (abc!=null) - DriverTest.mysql_host=System.getProperty("mysql.test.address"); + if (check_connectionaddress!=null) + ConnectionCheck.mysql_host=System.getProperty("mysql.test.address"); - Connection connection; - if (DriverTest.host.contains(":")) - { - - connection = DriverManager.getConnection("jdbc:drizzle://root@" + DriverTest.host + "/test_units_jdbc"); - } - else - { - - connection = DriverManager.getConnection("jdbc:drizzle://root@" + DriverTest.host + ":4427/test_units_jdbc"); - } + Connection connection=ConnectionCheck.Get_ConnectionDrizzle(); + //connection = DriverManager.getConnection("jdbc:mysql://localhost:3306/test_units_jdbc"); rs = connection.createStatement().executeQuery("select 1"); } diff --git a/src/test/java/org/drizzle/jdbc/SSLTest.java b/src/test/java/org/drizzle/jdbc/SSLTest.java index cdeea9a..f4f2488 100644 --- a/src/test/java/org/drizzle/jdbc/SSLTest.java +++ b/src/test/java/org/drizzle/jdbc/SSLTest.java @@ -49,14 +49,6 @@ public class SSLTest { public void sslTest() throws SQLException { - Connection conn; - if (DriverTest.host.contains(":")) - { - conn = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + "/test_units_jdbc?useSSL=true"); - } - else - { - conn = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + ":3306/test_units_jdbc?useSSL=true"); - } + Connection conn=ConnectionCheck.Get_ConnectionDrizzle("?useSSL=true"); } } diff --git a/src/test/java/org/drizzle/jdbc/UnicodeTest.java b/src/test/java/org/drizzle/jdbc/UnicodeTest.java index 034c0e8..5a95864 100644 --- a/src/test/java/org/drizzle/jdbc/UnicodeTest.java +++ b/src/test/java/org/drizzle/jdbc/UnicodeTest.java @@ -21,15 +21,7 @@ public class UnicodeTest { @Test public void firstTest() throws SQLException { - Connection connection; - if (DriverTest.host.contains(":")) - { - connection = DriverManager.getConnection("jdbc:drizzle://root@" + DriverTest.host + "/test_units_jdbc"); - } - else - { - connection = DriverManager.getConnection("jdbc:drizzle://root@" + DriverTest.host + ":4427/test_units_jdbc"); - } + Connection connection=ConnectionCheck.Get_ConnectionDrizzle(); String jaString = "\u65e5\u672c\u8a9e\u6587\u5b57\u5217"; // hmm wonder what this means... Statement stmt = connection.createStatement(); stmt.executeUpdate("drop table if exists unicode_test"); @@ -45,15 +37,7 @@ public void firstTest() throws SQLException { @Test public void testGermanUmlauts() throws SQLException { String query = "insert into umlaut_test values('tax-1273608028038--5546415852995205209-13', 'MwSt. 7% Bücher & Lebensmittel', 7)"; - Connection connection; - if (DriverTest.mysql_host.contains(":")) - { - connection = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+"/test_units_jdbc"); - } - else - { - connection = DriverManager.getConnection("jdbc:mysql:thin://"+DriverTest.mysql_host+":3306/test_units_jdbc"); - } + Connection connection=ConnectionCheck.Get_ConnectionMySQL(); Statement stmt = connection.createStatement(); stmt.executeUpdate("drop table if exists umlaut_test"); stmt.executeUpdate("create table umlaut_test (id varchar(100), test_text varchar(100), t int)"); @@ -67,15 +51,7 @@ public void testGermanUmlauts() throws SQLException { @Test public void mysqlTest() throws SQLException { - Connection connection; - if (DriverTest.host.contains(":")) - { - connection = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + "/test_units_jdbc"); - } - else - { - connection = DriverManager.getConnection("jdbc:drizzle://" + DriverTest.host + ":3306/test_units_jdbc"); - } + Connection connection=ConnectionCheck.Get_ConnectionDrizzle(); String jaString = "\u65e5\u672c\u8a9e\u6587\u5b57\u5217"; // hmm wonder what this means... Statement stmt = connection.createStatement(); stmt.executeUpdate("drop table if exists unicode_test2");