diff --git a/rxjava/src/main/java/com/baeldung/rxjava/jdbc/Connector.java b/rxjava/src/main/java/com/baeldung/rxjava/jdbc/Connector.java index ca241d74c4..290cc9cb3d 100644 --- a/rxjava/src/main/java/com/baeldung/rxjava/jdbc/Connector.java +++ b/rxjava/src/main/java/com/baeldung/rxjava/jdbc/Connector.java @@ -1,8 +1,13 @@ package com.baeldung.rxjava.jdbc; +import com.github.davidmoten.rx.jdbc.ConnectionProvider; +import com.github.davidmoten.rx.jdbc.ConnectionProviderFromUrl; + public class Connector { - + public static final String DB_CONNECTION = "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1"; public static final String DB_USER = ""; public static final String DB_PASSWORD = ""; + + public static final ConnectionProvider connectionProvider = new ConnectionProviderFromUrl(DB_CONNECTION, DB_USER, DB_PASSWORD); } diff --git a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/AutomapClassTest.java b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/AutomapClassTest.java index e8bca98701..50d4551494 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/AutomapClassTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/AutomapClassTest.java @@ -9,28 +9,20 @@ import org.junit.Before; import org.junit.Test; import com.github.davidmoten.rx.jdbc.ConnectionProvider; -import com.github.davidmoten.rx.jdbc.ConnectionProviderFromUrl; import com.github.davidmoten.rx.jdbc.Database; import rx.Observable; public class AutomapClassTest { - private String DB_CONNECTION = Connector.DB_CONNECTION; - private String DB_USER = Connector.DB_USER; - private String DB_PASSWORD = Connector.DB_PASSWORD; - - ConnectionProvider cp = null; - Database db = null; + ConnectionProvider connectionProvider = Connector.connectionProvider; + Database db = Database.from(connectionProvider); Observable create = null; Observable insert1, insert2 = null; @Before public void setup() { - cp = new ConnectionProviderFromUrl(DB_CONNECTION, DB_USER, DB_PASSWORD); - db = Database.from(cp); - create = db.update("CREATE TABLE IF NOT EXISTS MANAGER(id int primary key, name varchar(255))") .count(); insert1 = db.update("INSERT INTO MANAGER(id, name) VALUES(1, 'Alan')") @@ -66,6 +58,6 @@ public class AutomapClassTest { public void close() { db.update("DROP TABLE MANAGER") .dependsOn(create); - cp.close(); + connectionProvider.close(); } } diff --git a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/AutomapInterfaceTest.java b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/AutomapInterfaceTest.java index f636dda155..fc85213b80 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/AutomapInterfaceTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/AutomapInterfaceTest.java @@ -16,21 +16,14 @@ import rx.Observable; public class AutomapInterfaceTest { - private String DB_CONNECTION = Connector.DB_CONNECTION; - private String DB_USER = Connector.DB_USER; - private String DB_PASSWORD = Connector.DB_PASSWORD; - - ConnectionProvider cp = null; - Database db = null; + ConnectionProvider connectionProvider = Connector.connectionProvider; + Database db = Database.from(connectionProvider); Observable create = null; Observable insert1, insert2 = null; @Before public void setup() { - cp = new ConnectionProviderFromUrl(DB_CONNECTION, DB_USER, DB_PASSWORD); - db = Database.from(cp); - create = db.update("CREATE TABLE IF NOT EXISTS EMPLOYEE(id int primary key, name varchar(255))") .count(); insert1 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(1, 'Alan')") @@ -66,7 +59,7 @@ public class AutomapInterfaceTest { public void close() { db.update("DROP TABLE EMPLOYEE") .dependsOn(create); - cp.close(); + connectionProvider.close(); } } diff --git a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesTest.java b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesTest.java index 6118e6f127..17d047d42f 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesTest.java @@ -17,20 +17,10 @@ import rx.Observable; public class BasicQueryTypesTest { - private String DB_CONNECTION = Connector.DB_CONNECTION; - private String DB_USER = Connector.DB_USER; - private String DB_PASSWORD = Connector.DB_PASSWORD; + ConnectionProvider connectionProvider = Connector.connectionProvider; + Database db = Database.from(connectionProvider); - ConnectionProvider cp = null; - Database db = null; - - Observable create, insert1, insert2, insert3, insert4, insert5, update, delete = null; - - @Before - public void setup() { - cp = new ConnectionProviderFromUrl(DB_CONNECTION, DB_USER, DB_PASSWORD); - db = Database.from(cp); - } + Observable create, insert1, insert2, insert3, update, delete = null; @Test public void whenCreateTableAndInsertRecords_thenCorrect() { @@ -48,36 +38,29 @@ public class BasicQueryTypesTest { insert3 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(3, 'Mike')") .dependsOn(create) .count(); - insert4 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(4, 'Jennifer')") + delete = db.update("DELETE FROM EMPLOYEE WHERE id = 2") .dependsOn(create) .count(); - insert5 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(5, 'George')") - .dependsOn(create) - .count(); - delete = db.update("DELETE FROM EMPLOYEE WHERE id = 5") - .dependsOn(create) - .count(); - List names = db.select("select name from EMPLOYEE where id > ?") - .parameter(2) + List names = db.select("select name from EMPLOYEE where id < ?") + .parameter(3) .dependsOn(create) .dependsOn(insert1) .dependsOn(insert2) .dependsOn(insert3) - .dependsOn(insert4) - .dependsOn(insert5) .dependsOn(update) .dependsOn(delete) .getAs(String.class) .toList() .toBlocking() .single(); - assertEquals(Arrays.asList("Mike", "Jennifer"), names); + + assertEquals(Arrays.asList("Alan"), names); } @After public void close() { db.update("DROP TABLE EMPLOYEE") .dependsOn(create); - cp.close(); + connectionProvider.close(); } } diff --git a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/InsertBlobTest.java b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/InsertBlobTest.java index ced394eccb..d166bdac10 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/InsertBlobTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/InsertBlobTest.java @@ -5,28 +5,21 @@ import static org.junit.Assert.assertEquals; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import java.io.StringWriter; import java.nio.charset.StandardCharsets; -import org.apache.commons.io.IOUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; import com.github.davidmoten.rx.jdbc.ConnectionProvider; -import com.github.davidmoten.rx.jdbc.ConnectionProviderFromUrl; import com.github.davidmoten.rx.jdbc.Database; import rx.Observable; public class InsertBlobTest { - private String DB_CONNECTION = Connector.DB_CONNECTION; - private String DB_USER = Connector.DB_USER; - private String DB_PASSWORD = Connector.DB_PASSWORD; - - ConnectionProvider cp = new ConnectionProviderFromUrl(DB_CONNECTION, DB_USER, DB_PASSWORD); - Database db = Database.from(cp); + ConnectionProvider connectionProvider = Connector.connectionProvider; + Database db = Database.from(connectionProvider); String expectedDocument = null; String actualDocument = null; @@ -67,6 +60,6 @@ public class InsertBlobTest { public void close() { db.update("DROP TABLE SERVERLOG") .dependsOn(create); - cp.close(); + connectionProvider.close(); } } diff --git a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/InsertClobTest.java b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/InsertClobTest.java index 90f798aa43..d49d7edf1a 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/InsertClobTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/InsertClobTest.java @@ -18,12 +18,8 @@ import rx.Observable; public class InsertClobTest { - private String DB_CONNECTION = Connector.DB_CONNECTION; - private String DB_USER = Connector.DB_USER; - private String DB_PASSWORD = Connector.DB_PASSWORD; - - ConnectionProvider cp = new ConnectionProviderFromUrl(DB_CONNECTION, DB_USER, DB_PASSWORD); - Database db = Database.from(cp); + ConnectionProvider connectionProvider = Connector.connectionProvider; + Database db = Database.from(connectionProvider); String expectedDocument = null; String actualDocument = null; @@ -63,6 +59,6 @@ public class InsertClobTest { public void close() { db.update("DROP TABLE SERVERLOG") .dependsOn(create); - cp.close(); + connectionProvider.close(); } } \ No newline at end of file diff --git a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/ReturnKeysTest.java b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/ReturnKeysTest.java index d67fe1d4c1..9a2765f03d 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/ReturnKeysTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/ReturnKeysTest.java @@ -2,6 +2,7 @@ package com.baeldung.rxjava.jdbc; import static org.assertj.core.api.Assertions.assertThat; +import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -13,15 +14,11 @@ import rx.Observable; public class ReturnKeysTest { - private String DB_CONNECTION = Connector.DB_CONNECTION; - private String DB_USER = Connector.DB_USER; - private String DB_PASSWORD = Connector.DB_PASSWORD; - Observable begin, commit = null; Observable createStatement, insertStatement, updateStatement = null; - ConnectionProvider cp = new ConnectionProviderFromUrl(DB_CONNECTION, DB_USER, DB_PASSWORD); - Database db = Database.from(cp); + ConnectionProvider connectionProvider = Connector.connectionProvider; + Database db = Database.from(connectionProvider); @Before public void setup() { @@ -42,4 +39,11 @@ public class ReturnKeysTest { .single(); assertThat(key).isEqualTo(1); } + + @After + public void close() { + db.update("DROP TABLE EMPLOYEE") + .dependsOn(createStatement); + connectionProvider.close(); + } } diff --git a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/TransactionTest.java b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/TransactionTest.java index a0076861da..584add4a6e 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/TransactionTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/TransactionTest.java @@ -2,6 +2,7 @@ package com.baeldung.rxjava.jdbc; import static org.junit.Assert.assertEquals; +import org.junit.After; import org.junit.Test; import com.github.davidmoten.rx.jdbc.ConnectionProvider; @@ -12,15 +13,11 @@ import rx.Observable; public class TransactionTest { - private String DB_CONNECTION = Connector.DB_CONNECTION; - private String DB_USER = Connector.DB_USER; - private String DB_PASSWORD = Connector.DB_PASSWORD; - Observable begin, commit = null; Observable createStatement, insertStatement, updateStatement = null; - ConnectionProvider cp = new ConnectionProviderFromUrl(DB_CONNECTION, DB_USER, DB_PASSWORD); - Database db = Database.from(cp); + ConnectionProvider connectionProvider = Connector.connectionProvider; + Database db = Database.from(connectionProvider); @Test public void whenCommitTransaction_thenRecordUpdated() { @@ -43,4 +40,11 @@ public class TransactionTest { assertEquals("Tom", name); } + + @After + public void close() { + db.update("DROP TABLE EMPLOYEE") + .dependsOn(createStatement); + connectionProvider.close(); + } }