Examples for assertj-db 3.0.0

assertions-examples/pom.xml

@@ -75,7 +75,7 @@
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-db</artifactId>
-      <version>1.1.1</version>
+      <version>3.0.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

assertions-examples/src/test/java/org/assertj/examples/db/AbstractAssertionsExamples.java

@@ -15,6 +15,8 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 
+import org.assertj.db.type.AssertDbConnection;
+import org.assertj.db.type.AssertDbConnectionFactory;
 import org.h2.jdbcx.JdbcConnectionPool;
 import org.junit.jupiter.api.BeforeEach;
 
@@ -23,10 +25,12 @@
  * Init data for assertions examples.
  *
  * @author Régis Pouiller
+ * @author Julien Roy
  */
 public class AbstractAssertionsExamples {
 
   protected static JdbcConnectionPool dataSource;
+  protected static AssertDbConnection assertConnection;
 
   private static final String MEMBERS_CREATE_REQUEST = "create table members(id number primary key, name varchar not null, firstname varchar not null, surname varchar, birthdate date, size decimal);";
   private static final String[] MEMBERS_INSERT_REQUESTS = {
@@ -58,6 +62,7 @@ public class AbstractAssertionsExamples {
   public void setUp() throws SQLException {
     if (dataSource == null) {
       dataSource = JdbcConnectionPool.create("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1", "user", "password");
+      assertConnection = AssertDbConnectionFactory.of(dataSource).create();
     }
     else {
       Connection conn = dataSource.getConnection();

assertions-examples/src/test/java/org/assertj/examples/db/ChangesAssertionExamples.java

@@ -31,6 +31,7 @@
  * {@link Changes} assertions example.
  * 
  * @author Régis Pouiller
+ * @author Julien Roy
  */
 public class ChangesAssertionExamples extends AbstractAssertionsExamples {
 
@@ -39,7 +40,7 @@ public class ChangesAssertionExamples extends AbstractAssertionsExamples {
    */
   @Test
   public void basic_changes_assertion_examples() throws SQLException {
-    Changes changes = new Changes(dataSource);
+    Changes changes = assertConnection.changes().build();
     changes.setStartPointNow();
     makeChangesInTheData();
     changes.setEndPointNow();
@@ -58,7 +59,7 @@ public void basic_changes_assertion_examples() throws SQLException {
    */
   @Test
   public void basic_change_assertion_examples() throws SQLException {
-    Changes changes = new Changes(dataSource);
+    Changes changes = assertConnection.changes().build();
     changes.setStartPointNow();
     makeChangesInTheData();
     changes.setEndPointNow();
@@ -92,7 +93,7 @@ public void basic_change_assertion_examples() throws SQLException {
    */
   @Test
   public void basic_row_assertion_examples() throws SQLException, ParseException {
-    Changes changes = new Changes(dataSource);
+    Changes changes = assertConnection.changes().build();
     changes.setStartPointNow();
     makeChangesInTheData();
     changes.setEndPointNow();
@@ -128,7 +129,7 @@ public void basic_row_assertion_examples() throws SQLException, ParseException {
    */
   @Test
   public void basic_column_assertion_examples() throws SQLException {
-    Changes changes = new Changes(dataSource);
+    Changes changes = assertConnection.changes().build();
     changes.setStartPointNow();
     makeChangesInTheData();
     changes.setEndPointNow();
@@ -166,7 +167,7 @@ public void basic_column_assertion_examples() throws SQLException {
    */
   @Test
   public void basic_value_assertion_examples() throws SQLException, ParseException {
-    Changes changes = new Changes(dataSource);
+    Changes changes = assertConnection.changes().build();
     changes.setStartPointNow();
     makeChangesInTheData();
     changes.setEndPointNow();
@@ -193,8 +194,7 @@ public void basic_value_assertion_examples() throws SQLException, ParseException
    */
   @Test
   public void changes_about_table_assertion_examples() throws SQLException {
-    Table table = new Table(dataSource, "members");
-    Changes changes = new Changes(table);
+    Changes changes = assertConnection.changes().table("members").build();
     changes.setStartPointNow();
     makeChangesInTheData();
     changes.setEndPointNow();
@@ -211,8 +211,7 @@ public void changes_about_table_assertion_examples() throws SQLException {
    */
   @Test
   public void changes_about_request_assertion_examples() throws SQLException {
-    Request request = new Request(dataSource, "select title from albums");
-    Changes changes = new Changes(request);
+    Changes changes = assertConnection.changes().request("select title from albums").build();
     changes.setStartPointNow();
     makeChangesInTheData();
     changes.setEndPointNow();
@@ -227,7 +226,7 @@ public void changes_about_request_assertion_examples() throws SQLException {
    */
   @Test
   public void changetype_assertion_examples() throws SQLException {
-    Changes changes = new Changes(dataSource);
+    Changes changes = assertConnection.changes().build();
     changes.setStartPointNow();
     makeChangesInTheData();
     changes.setEndPointNow();
@@ -243,7 +242,7 @@ public void changetype_assertion_examples() throws SQLException {
    */
   @Test
   public void datatype_isontable_assertion_examples() throws SQLException {
-    Changes changes = new Changes(dataSource);
+    Changes changes = assertConnection.changes().build();
     changes.setStartPointNow();
     makeChangesInTheData();
     changes.setEndPointNow();
@@ -258,9 +257,8 @@ public void datatype_isontable_assertion_examples() throws SQLException {
    * This example shows a simple case of test on data type for change on a request.
    */
   @Test
-  public void datatype_isonrequest_assertion_examples() throws SQLException {
-    Request request = new Request(dataSource, "select title from albums");
-    Changes changes = new Changes(request);
+  public void datatype_is_on_request_assertion_examples() throws SQLException {
+    Changes changes = assertConnection.changes().request("select title from albums").build();
     changes.setStartPointNow();
     makeChangesInTheData();
     changes.setEndPointNow();
@@ -274,7 +272,7 @@ public void datatype_isonrequest_assertion_examples() throws SQLException {
    */
   @Test
   public void column_equality_assertion_examples() throws SQLException {
-    Changes changes = new Changes(dataSource);
+    Changes changes = assertConnection.changes().build();
     changes.setStartPointNow();
     makeChangesInTheData();
     changes.setEndPointNow();
@@ -304,8 +302,8 @@ public void column_equality_assertion_examples() throws SQLException {
    */
   @Test
   public void changes_number_assertion_examples() throws SQLException {
-    Changes changesDataSource = new Changes(dataSource).setStartPointNow();
-    Changes changesRequest = new Changes(new Request(dataSource, "select title from albums"));
+    Changes changesDataSource = assertConnection.changes().build().setStartPointNow();
+    Changes changesRequest = assertConnection.changes().request("select title from albums").build();
     changesRequest.setStartPointNow();
     makeChangesInTheData();
     changesDataSource.setEndPointNow();
@@ -320,7 +318,7 @@ public void changes_number_assertion_examples() throws SQLException {
    */
   @Test
   public void columns_number_assertion_examples() throws SQLException {
-    Changes changes = new Changes(dataSource).setStartPointNow();
+    Changes changes = assertConnection.changes().build().setStartPointNow();
     makeChangesInTheData();
     changes.setEndPointNow();
 
@@ -339,7 +337,7 @@ public void columns_number_assertion_examples() throws SQLException {
    */
   @Test
   public void primary_keys_assertion_examples() throws SQLException {
-    Changes changes = new Changes(dataSource).setStartPointNow();
+    Changes changes = assertConnection.changes().build().setStartPointNow();
     makeChangesInTheData();
     changes.setEndPointNow();
 
@@ -354,7 +352,7 @@ public void primary_keys_assertion_examples() throws SQLException {
    */
   @Test
   public void modified_columns_assertion_examples() throws SQLException {
-    Changes changes = new Changes(dataSource).setStartPointNow();
+    Changes changes = assertConnection.changes().build().setStartPointNow();
     makeChangesInTheData();
     changes.setEndPointNow();
 
@@ -378,7 +376,7 @@ public void modified_columns_assertion_examples() throws SQLException {
    */
   @Test
   public void column_type_assertion_examples() throws SQLException {
-    Changes changes = new Changes(dataSource);
+    Changes changes = assertConnection.changes().build();
     changes.setStartPointNow();
     makeChangesInTheData();
     changes.setEndPointNow();
@@ -408,7 +406,7 @@ public void column_type_assertion_examples() throws SQLException {
    */
   @Test
   public void modified_column_assertion_examples() throws SQLException {
-    Changes changes = new Changes(dataSource);
+    Changes changes = assertConnection.changes().build();
     changes.setStartPointNow();
     makeChangesInTheData();
     changes.setEndPointNow();
@@ -442,7 +440,7 @@ public void modified_column_assertion_examples() throws SQLException {
    */
   @Test
   public void column_name_assertion_examples() throws SQLException {
-    Changes changes = new Changes(dataSource);
+    Changes changes = assertConnection.changes().build();
     changes.setStartPointNow();
     makeChangesInTheData();
     changes.setEndPointNow();
@@ -483,7 +481,7 @@ public void column_name_assertion_examples() throws SQLException {
    */
   @Test
   public void row_existence_assertion_examples() throws SQLException {
-    Changes changes = new Changes(dataSource).setStartPointNow();
+    Changes changes = assertConnection.changes().build().setStartPointNow();
     makeChangesInTheData();
     changes.setEndPointNow();
 
@@ -504,7 +502,7 @@ public void row_existence_assertion_examples() throws SQLException {
    */
   @Test
   public void row_equality_assertion_examples() throws SQLException {
-    Changes changes = new Changes(dataSource).setStartPointNow();
+    Changes changes = assertConnection.changes().build().setStartPointNow();
     makeChangesInTheData();
     changes.setEndPointNow();
 
@@ -523,7 +521,7 @@ public void row_equality_assertion_examples() throws SQLException {
    */
   @Test
   public void value_equality_assertion_examples() throws SQLException {
-    Changes changes = new Changes(dataSource).setStartPointNow();
+    Changes changes = assertConnection.changes().build().setStartPointNow();
     makeChangesInTheData();
     changes.setEndPointNow();
 
@@ -601,7 +599,7 @@ public void value_equality_assertion_examples() throws SQLException {
    */
   @Test
   public void value_non_equality_assertion_examples() throws SQLException {
-    Changes changes = new Changes(dataSource).setStartPointNow();
+    Changes changes = assertConnection.changes().build().setStartPointNow();
     makeChangesInTheData();
     changes.setEndPointNow();
 
@@ -679,7 +677,7 @@ public void value_non_equality_assertion_examples() throws SQLException {
    */
   @Test
   public void value_type_assertion_examples() throws SQLException {
-    Changes changes = new Changes(dataSource).setStartPointNow();
+    Changes changes = assertConnection.changes().build().setStartPointNow();
     makeChangesInTheData();
     changes.setEndPointNow();
 
@@ -757,7 +755,7 @@ public void value_type_assertion_examples() throws SQLException {
    */
   @Test
   public void value_nullity_assertion_examples() throws SQLException {
-    Changes changes = new Changes(dataSource).setStartPointNow();
+    Changes changes = assertConnection.changes().build().setStartPointNow();
     makeChangesInTheData();
     changes.setEndPointNow();
 
@@ -842,7 +840,7 @@ public void value_nullity_assertion_examples() throws SQLException {
    */
   @Test
   public void value_comparison_assertion_examples() throws SQLException {
-    Changes changes = new Changes(dataSource).setStartPointNow();
+    Changes changes = assertConnection.changes().build().setStartPointNow();
     makeChangesInTheData();
     changes.setEndPointNow();
 
@@ -936,7 +934,7 @@ public void value_comparison_assertion_examples() throws SQLException {
    */
   @Test
   public void value_chronology_assertion_examples() throws SQLException {
-    Changes changes = new Changes(dataSource).setStartPointNow();
+    Changes changes = assertConnection.changes().build().setStartPointNow();
     makeChangesInTheData();
     changes.setEndPointNow();
 

assertions-examples/src/test/java/org/assertj/examples/db/NavigationExamples.java

@@ -26,7 +26,7 @@
  * Examples of navigation for a table, a request and changes
  * 
  * @author Régis Pouiller
- *
+ * @author Julien Roy
  */
 public class NavigationExamples extends AbstractAssertionsExamples {
 
@@ -35,7 +35,7 @@ public class NavigationExamples extends AbstractAssertionsExamples {
    */
   @Test
   public void basic_navigation_examples_for_a_table() {
-    Table table = new Table(dataSource, "members");
+    Table table = assertConnection.table("members").build();
 
     assertThat(table)
       .row()                                    // First row
@@ -87,7 +87,7 @@ public void basic_navigation_examples_for_a_table() {
    */
   @Test
   public void basic_navigation_examples_for_a_request() {
-    Request request = new Request(dataSource, "select * from members");
+    Request request = assertConnection.request("select * from members").build();
 
     assertThat(request)
       .row()                                    // First row
@@ -139,7 +139,7 @@ public void basic_navigation_examples_for_a_request() {
    */
   @Test
   public void basic_navigation_examples_for_changes() throws SQLException {
-    Changes changes = new Changes(dataSource);
+    Changes changes = assertConnection.changes().build();
     changes.setStartPointNow();                // Start point (the moment when the changes start to be taken into account)
     makeChangesInTheData();
     changes.setEndPointNow();                  // End point (the moment when the changes stop to be taken into account)