diff --git a/assertions-examples/pom.xml b/assertions-examples/pom.xml index 4cc0c8b1..a2f028c5 100644 --- a/assertions-examples/pom.xml +++ b/assertions-examples/pom.xml @@ -75,7 +75,7 @@ org.assertj assertj-db - 1.1.1 + 3.0.0 test diff --git a/assertions-examples/src/test/java/org/assertj/examples/db/AbstractAssertionsExamples.java b/assertions-examples/src/test/java/org/assertj/examples/db/AbstractAssertionsExamples.java index 63c13953..e5843066 100644 --- a/assertions-examples/src/test/java/org/assertj/examples/db/AbstractAssertionsExamples.java +++ b/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(); diff --git a/assertions-examples/src/test/java/org/assertj/examples/db/ChangesAssertionExamples.java b/assertions-examples/src/test/java/org/assertj/examples/db/ChangesAssertionExamples.java index 0504f7e8..84c111dd 100644 --- a/assertions-examples/src/test/java/org/assertj/examples/db/ChangesAssertionExamples.java +++ b/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(); diff --git a/assertions-examples/src/test/java/org/assertj/examples/db/NavigationExamples.java b/assertions-examples/src/test/java/org/assertj/examples/db/NavigationExamples.java index 9baab856..c06e1bd6 100644 --- a/assertions-examples/src/test/java/org/assertj/examples/db/NavigationExamples.java +++ b/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) diff --git a/assertions-examples/src/test/java/org/assertj/examples/db/RequestAssertionExamples.java b/assertions-examples/src/test/java/org/assertj/examples/db/RequestAssertionExamples.java index 5cea39ec..589113ee 100644 --- a/assertions-examples/src/test/java/org/assertj/examples/db/RequestAssertionExamples.java +++ b/assertions-examples/src/test/java/org/assertj/examples/db/RequestAssertionExamples.java @@ -21,6 +21,7 @@ * {@link Request} assertions example. * * @author Régis Pouiller + * @author Julien Roy */ public class RequestAssertionExamples extends AbstractAssertionsExamples { @@ -29,7 +30,7 @@ public class RequestAssertionExamples extends AbstractAssertionsExamples { */ @Test public void basic_request_assertion_examples() { - Request request = new Request(dataSource, "select * from albums"); + Request request = assertConnection.request("select * from albums").build(); // On the values of a column by using the name of the column assertThat(request).column("title") @@ -64,8 +65,11 @@ public void basic_request_assertion_examples() { */ @Test public void basic_column_request_assertion_examples() { - Source source = new Source("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1", "user", "password"); - Request request = new Request(source, "select * from albums"); + Request request = AssertDbConnectionFactory + .of("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1", "user", "password") + .create() + .request("select * from albums") + .build(); assertThat(request).column("title") .hasValues("Boy", "October", "War", "Under a Blood Red Sky", @@ -79,7 +83,7 @@ public void basic_column_request_assertion_examples() { */ @Test public void basic_row_request_assertion_examples() { - Request request = new Request(dataSource, "select * from albums"); + Request request = assertConnection.request("select * from albums").build(); assertThat(request).row(1) .hasValues(2, DateValue.of(1981, 10, 12), "October", 11, TimeValue.of(0, 41, 8), null) @@ -91,7 +95,7 @@ public void basic_row_request_assertion_examples() { */ @Test public void size_request_assertion_examples() { - Request request = new Request(dataSource, "select * from albums"); + Request request = assertConnection.request("select * from albums").build(); // There is assertion to test the column and row size. assertThat(request).hasNumberOfColumns(6); @@ -107,7 +111,10 @@ public void size_request_assertion_examples() { */ @Test public void request_parameters_examples() { - Request request = new Request(dataSource, "select release, title from albums where title like ?", "A%"); + Request request = assertConnection + .request("select release, title from albums where title like ?") + .parameters("A%") + .build(); assertThat(request).hasNumberOfColumns(2).hasNumberOfRows(2); assertThat(request) @@ -120,12 +127,12 @@ public void request_parameters_examples() { */ @Test public void text_for_numeric_request_assertion_examples() { - Request request = new Request(dataSource, "select * from members"); + Request request = assertConnection.request("select * from members").build(); assertThat(request).row(1) .value("size").isEqualTo("1.77").isNotEqualTo("1.78"); - Request request1 = new Request(dataSource, "select * from albums"); + Request request1 = assertConnection.request("select * from albums").build(); assertThat(request1).row(14) .value("numberofsongs").isEqualTo("11").isNotEqualTo("12"); @@ -136,15 +143,18 @@ public void text_for_numeric_request_assertion_examples() { */ @Test public void numeric_request_assertion_examples() { - Source source = new Source("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1", "user", "password"); - Request request = new Request(source, "select * from members"); + Request request = AssertDbConnectionFactory + .of("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1", "user", "password") + .create() + .request("select * from members") + .build(); assertThat(request).row(1) .value("size").isNotZero() .isGreaterThan(1.5).isGreaterThanOrEqualTo(1.77) .isLessThan(2).isLessThanOrEqualTo(1.77); - Request request1 = new Request(dataSource, "select * from albums"); + Request request1 = assertConnection.request("select * from albums").build(); assertThat(request1).row(14) .value("numberofsongs").isNotZero() @@ -157,7 +167,7 @@ public void numeric_request_assertion_examples() { */ @Test public void boolean_request_assertion_examples() { - Request request = new Request(dataSource, "select * from albums"); + Request request = assertConnection.request("select * from albums").build(); assertThat(request).column("live") .value(3).isTrue() @@ -170,8 +180,11 @@ public void boolean_request_assertion_examples() { */ @Test public void type_request_assertion_examples() { - Source source = new Source("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1", "user", "password"); - Request request = new Request(source, "select * from albums"); + Request request = AssertDbConnectionFactory + .of("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1", "user", "password") + .create() + .request("select * from albums") + .build(); assertThat(request).row(3) .value().isNumber() @@ -187,7 +200,7 @@ public void type_request_assertion_examples() { */ @Test public void colum_type_request_assertion_examples() { - Request request = new Request(dataSource, "select * from albums"); + Request request = assertConnection.request("select * from albums").build(); assertThat(request) .column().isNumber(false) @@ -204,8 +217,11 @@ public void colum_type_request_assertion_examples() { */ @Test public void date_request_assertion_examples() { - Source source = new Source("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1", "user", "password"); - Request request = new Request(source, "select * from members"); + Request request = AssertDbConnectionFactory + .of("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1", "user", "password") + .create() + .request("select * from members") + .build(); // Compare date to date or date in string format assertThat(request).row(1) @@ -245,7 +261,7 @@ public void date_request_assertion_examples() { */ @Test public void columns_number_assertion_examples() { - Request request = new Request(dataSource, "select * from albums"); + Request request = assertConnection.request("select * from albums").build(); assertThat(request).hasNumberOfColumns(6) .row().hasNumberOfColumns(6); @@ -256,7 +272,7 @@ public void columns_number_assertion_examples() { */ @Test public void rows_number_assertion_examples() { - Request request = new Request(dataSource, "select * from albums"); + Request request = assertConnection.request("select * from albums").build(); assertThat(request).hasNumberOfRows(15) .column().hasNumberOfRows(15); @@ -267,7 +283,7 @@ public void rows_number_assertion_examples() { */ @Test public void column_name_assertion_examples() { - Request request = new Request(dataSource, "select * from albums"); + Request request = assertConnection.request("select * from albums").build(); assertThat(request) .column().hasColumnName("id") @@ -283,7 +299,7 @@ public void column_name_assertion_examples() { */ @Test public void column_type_assertion_examples() { - Request request = new Request(dataSource, "select * from albums"); + Request request = assertConnection.request("select * from albums").build(); assertThat(request) .column().isNumber(false).isOfType(ValueType.NUMBER, false).isOfAnyTypeIn(ValueType.NUMBER) @@ -299,7 +315,7 @@ public void column_type_assertion_examples() { */ @Test public void column_equality_assertion_examples() { - Request request = new Request(dataSource, "select * from albums"); + Request request = assertConnection.request("select * from albums").build(); assertThat(request) .column().hasValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15) @@ -339,7 +355,7 @@ public void column_equality_assertion_examples() { */ @Test public void row_equality_assertion_examples() { - Request request = new Request(dataSource, "select * from albums"); + Request request = assertConnection.request("select * from albums").build(); assertThat(request) .row().hasValues(1, DateValue.of(1980, 10, 20), "Boy", 12, TimeValue.of(0, 42, 17), null) @@ -364,7 +380,7 @@ public void row_equality_assertion_examples() { */ @Test public void column_nullity_assertion_examples() { - Request request = new Request(dataSource, "select * from members where id >= 3"); + Request request = assertConnection.request("select * from members where id >= 3").build(); assertThat(request) .column("surname").hasOnlyNullValues() @@ -376,7 +392,7 @@ public void column_nullity_assertion_examples() { */ @Test public void value_equality_assertion_examples() { - Request request = new Request(dataSource, "select * from albums"); + Request request = assertConnection.request("select * from albums").build(); assertThat(request) .column() @@ -522,7 +538,7 @@ public void value_equality_assertion_examples() { */ @Test public void value_nullity_assertion_examples() { - Request request = new Request(dataSource, "select * from albums"); + Request request = assertConnection.request("select * from albums").build(); assertThat(request) .column() @@ -589,7 +605,7 @@ public void value_nullity_assertion_examples() { */ @Test public void value_type_assertion_examples() { - Request request = new Request(dataSource, "select * from albums"); + Request request = assertConnection.request("select * from albums").build(); assertThat(request) .column() @@ -639,7 +655,7 @@ public void value_type_assertion_examples() { */ @Test public void value_non_equality_assertion_examples() { - Request request = new Request(dataSource, "select * from albums"); + Request request = assertConnection.request("select * from albums").build(); assertThat(request) .column() @@ -799,7 +815,7 @@ public void value_non_equality_assertion_examples() { */ @Test public void value_comparison_assertion_examples() { - Request request = new Request(dataSource, "select * from albums"); + Request request = assertConnection.request("select * from albums").build(); assertThat(request) .column() @@ -1126,7 +1142,7 @@ public void value_comparison_assertion_examples() { */ @Test public void value_chronology_assertion_examples() { - Request request = new Request(dataSource, "select * from albums"); + Request request = assertConnection.request("select * from albums").build(); assertThat(request) .column("release") diff --git a/assertions-examples/src/test/java/org/assertj/examples/db/TableAssertionExamples.java b/assertions-examples/src/test/java/org/assertj/examples/db/TableAssertionExamples.java index 5e507500..b08c978f 100644 --- a/assertions-examples/src/test/java/org/assertj/examples/db/TableAssertionExamples.java +++ b/assertions-examples/src/test/java/org/assertj/examples/db/TableAssertionExamples.java @@ -21,6 +21,7 @@ * {@link Table} assertions example. * * @author Régis Pouiller + * @author Julien Roy */ public class TableAssertionExamples extends AbstractAssertionsExamples { @@ -29,7 +30,7 @@ public class TableAssertionExamples extends AbstractAssertionsExamples { */ @Test public void basic_table_assertion_examples() { - Table table = new Table(dataSource, "members"); + Table table = assertConnection.table("members").build(); // Check column "name" values assertThat(table).column("name") @@ -53,8 +54,11 @@ public void basic_table_assertion_examples() { */ @Test public void basic_column_table_assertion_examples() { - Source source = new Source("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1", "user", "password"); - Table table = new Table(source, "members"); + Table table = AssertDbConnectionFactory + .of("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1", "user", "password") + .create() + .table("members") + .build(); assertThat(table).column("name") .hasValues("Hewson", "Evans", "Clayton", "Mullen"); @@ -65,13 +69,13 @@ public void basic_column_table_assertion_examples() { */ @Test public void basic_row_table_assertion_examples() { - Table table = new Table(dataSource, "members"); + Table table = assertConnection.table("members").build(); assertThat(table).row(1) .hasValues(2, "Evans", "David Howell", "The Edge", DateValue.of(1961, 8, 8), 1.77) .hasValues("2", "Evans", "David Howell", "The Edge", "1961-08-08", "1.77"); - Table table1 = new Table(dataSource, "albums"); + Table table1 = assertConnection.table("albums").build(); assertThat(table1).row() .hasValues(1, DateValue.of(1980, 10, 20), "Boy", 12, TimeValue.of(0, 42, 17), null) @@ -83,7 +87,7 @@ public void basic_row_table_assertion_examples() { */ @Test public void size_table_assertion_examples() { - Table table = new Table(dataSource, "members"); + Table table = assertConnection.table("members").build(); // There is assertion to test the column and row size. assertThat(table).hasNumberOfColumns(6); @@ -99,7 +103,10 @@ public void size_table_assertion_examples() { */ @Test public void table_inclusion_examples() { - Table table = new Table(dataSource, "members", new String[] {"id", "name", "firstname"}, null); + Table table = assertConnection + .table("members") + .columnsToCheck(new String[] {"id", "name", "firstname"}) + .build(); assertThat(table).hasNumberOfColumns(3); assertThat(table).row().hasNumberOfColumns(3) @@ -111,7 +118,9 @@ public void table_inclusion_examples() { */ @Test public void table_exclusion_examples() { - Table table = new Table(dataSource, "members", null, new String[] {"id", "name", "firstname"}); + Table table = assertConnection.table("members") + .columnsToExclude(new String[] {"id", "name", "firstname"}) + .build(); assertThat(table).hasNumberOfColumns(3) .row().hasNumberOfColumns(3) @@ -123,12 +132,12 @@ public void table_exclusion_examples() { */ @Test public void text_for_numeric_table_assertion_examples() { - Table table = new Table(dataSource, "members"); + Table table = assertConnection.table("members").build(); assertThat(table).row(1) .value("size").isEqualTo("1.77").isNotEqualTo("1.78"); - Table table1 = new Table(dataSource, "albums"); + Table table1 = assertConnection.table("albums").build(); assertThat(table1).row(14) .value("numberofsongs").isEqualTo("11").isNotEqualTo("12"); @@ -139,15 +148,18 @@ public void text_for_numeric_table_assertion_examples() { */ @Test public void numeric_table_assertion_examples() { - Source source = new Source("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1", "user", "password"); - Table table = new Table(source, "members"); + Table table = AssertDbConnectionFactory + .of("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1", "user", "password") + .create() + .table("members") + .build(); assertThat(table).row(1) .value("size").isNotZero() .isGreaterThan(1.5).isGreaterThanOrEqualTo(1.77) .isLessThan(2).isLessThanOrEqualTo(1.77); - Table table1 = new Table(dataSource, "albums"); + Table table1 = assertConnection.table("albums").build(); assertThat(table1).row(14) .value("numberofsongs").isNotZero() @@ -160,7 +172,7 @@ public void numeric_table_assertion_examples() { */ @Test public void boolean_table_assertion_examples() { - Table table = new Table(dataSource, "albums"); + Table table = assertConnection.table("albums").build(); assertThat(table).column("live") .value(3).isTrue() @@ -173,8 +185,11 @@ public void boolean_table_assertion_examples() { */ @Test public void type_table_assertion_examples() { - Source source = new Source("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1", "user", "password"); - Table table = new Table(source, "albums"); + Table table = AssertDbConnectionFactory + .of("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1", "user", "password") + .create() + .table("albums") + .build(); assertThat(table).row(3) .value().isNumber() @@ -190,7 +205,7 @@ public void type_table_assertion_examples() { */ @Test public void colum_type_table_assertion_examples() { - Table table = new Table(dataSource, "albums"); + Table table = assertConnection.table("albums").build(); assertThat(table) .column().isNumber(false) @@ -207,8 +222,11 @@ public void colum_type_table_assertion_examples() { */ @Test public void date_table_assertion_examples() { - Source source = new Source("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1", "user", "password"); - Table table = new Table(source, "members"); + Table table = AssertDbConnectionFactory + .of("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1", "user", "password") + .create() + .table("members") + .build(); // Compare date to date or date in string format assertThat(table).row(1) @@ -248,7 +266,7 @@ public void date_table_assertion_examples() { */ @Test public void columns_number_assertion_examples() { - Table table = new Table(dataSource, "members"); + Table table = assertConnection.table("members").build(); assertThat(table).hasNumberOfColumns(6) .row().hasNumberOfColumns(6); @@ -259,7 +277,7 @@ public void columns_number_assertion_examples() { */ @Test public void rows_number_assertion_examples() { - Table table = new Table(dataSource, "members"); + Table table = assertConnection.table("members").build(); assertThat(table).hasNumberOfRows(4) .column().hasNumberOfRows(4); @@ -270,7 +288,7 @@ public void rows_number_assertion_examples() { */ @Test public void column_name_assertion_examples() { - Table table = new Table(dataSource, "members"); + Table table = assertConnection.table("members").build(); assertThat(table) .column().hasColumnName("id") @@ -286,7 +304,7 @@ public void column_name_assertion_examples() { */ @Test public void column_type_assertion_examples() { - Table table = new Table(dataSource, "members"); + Table table = assertConnection.table("members").build(); assertThat(table) .column().isNumber(false).isOfType(ValueType.NUMBER, false).isOfAnyTypeIn(ValueType.NUMBER) @@ -302,7 +320,7 @@ public void column_type_assertion_examples() { */ @Test public void column_equality_assertion_examples() { - Table table = new Table(dataSource, "members"); + Table table = assertConnection.table("members").build(); assertThat(table) .column().hasValues(1, 2, 3, 4) @@ -319,7 +337,7 @@ public void column_equality_assertion_examples() { */ @Test public void row_equality_assertion_examples() { - Table table = new Table(dataSource, "members"); + Table table = assertConnection.table("members").build(); assertThat(table) .row().hasValues(1, "Hewson", "Paul David", "Bono", DateValue.of(1960, 5, 10), 1.75) @@ -333,7 +351,7 @@ public void row_equality_assertion_examples() { */ @Test public void column_nullity_assertion_examples() { - Table table = new Table(dataSource, "members"); + Table table = assertConnection.table("members").build(); assertThat(table) .column().hasOnlyNotNullValues() @@ -349,7 +367,7 @@ public void column_nullity_assertion_examples() { */ @Test public void value_equality_assertion_examples() { - Table table = new Table(dataSource, "members"); + Table table = assertConnection.table("members").build(); assertThat(table) .column() @@ -417,7 +435,7 @@ public void value_equality_assertion_examples() { */ @Test public void value_nullity_assertion_examples() { - Table table = new Table(dataSource, "members"); + Table table = assertConnection.table("members").build(); assertThat(table) .column() @@ -485,7 +503,7 @@ public void value_nullity_assertion_examples() { */ @Test public void value_type_assertion_examples() { - Table table = new Table(dataSource, "members"); + Table table = assertConnection.table("members").build(); assertThat(table) .column() @@ -553,7 +571,7 @@ public void value_type_assertion_examples() { */ @Test public void value_non_equality_assertion_examples() { - Table table = new Table(dataSource, "members"); + Table table = assertConnection.table("members").build(); assertThat(table) .column() @@ -621,7 +639,7 @@ public void value_non_equality_assertion_examples() { */ @Test public void value_comparison_assertion_examples() { - Table table = new Table(dataSource, "members"); + Table table = assertConnection.table("members").build(); assertThat(table) .column() @@ -717,7 +735,7 @@ public void value_comparison_assertion_examples() { */ @Test public void value_chronology_assertion_examples() { - Table table = new Table(dataSource, "members"); + Table table = assertConnection.table("members").build(); assertThat(table) .column("birthdate")