[BAEL-2749] Uses static imports and uses code format

This commit is contained in:
Joao Esperancinha 2020-04-01 19:44:48 +02:00
parent dc75e11440
commit c0abc0ed35
6 changed files with 285 additions and 338 deletions

View File

@ -15,6 +15,7 @@ import org.junit.Test;
import org.junit.platform.commons.logging.Logger;
import org.junit.platform.commons.logging.LoggerFactory;
import java.io.InputStream;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
@ -25,10 +26,9 @@ import static org.assertj.core.api.Assertions.assertThat;
public class DataSourceDBUnitTest extends DataSourceBasedDBTestCase {
private static Logger logger = LoggerFactory.getLogger(DataSourceDBUnitTest.class);
private static final Logger logger = LoggerFactory.getLogger(DataSourceDBUnitTest.class);
@Override
protected javax.sql.DataSource getDataSource() {
@Override protected javax.sql.DataSource getDataSource() {
JdbcDataSource dataSource = new JdbcDataSource();
dataSource.setURL(JDBC_URL);
dataSource.setUser("sa");
@ -36,51 +36,38 @@ public class DataSourceDBUnitTest extends DataSourceBasedDBTestCase {
return dataSource;
}
@Override
protected IDataSet getDataSet() throws Exception {
try (java.io.InputStream resourceAsStream = getClass()
.getClassLoader()
.getResourceAsStream("dbunit/data.xml")) {
@Override protected IDataSet getDataSet() throws Exception {
try (InputStream resourceAsStream = getClass().getClassLoader().getResourceAsStream("dbunit/data.xml")) {
return new FlatXmlDataSetBuilder().build(resourceAsStream);
}
}
@Override
protected DatabaseOperation getSetUpOperation() {
@Override protected DatabaseOperation getSetUpOperation() {
return DatabaseOperation.REFRESH;
}
@Override
protected DatabaseOperation getTearDownOperation() {
@Override protected DatabaseOperation getTearDownOperation() {
return DatabaseOperation.DELETE_ALL;
}
@Before
public void setUp() throws Exception {
@Before public void setUp() throws Exception {
super.setUp();
}
@After
public void tearDown() throws Exception {
@After public void tearDown() throws Exception {
super.tearDown();
}
@Test public void testSimpleDataSet() throws SQLException {
final Connection connection = getDataSource().getConnection();
@Test
public void testSimpleDataSet() throws SQLException {
final Connection connection = getDataSource()
.getConnection();
final ResultSet rs = connection
.createStatement()
.executeQuery("select * from iTEMS where id = 1");
final ResultSet rs = connection.createStatement().executeQuery("select * from ITEMS where id = 1");
assertThat(rs.next()).isTrue();
assertThat(rs.getString("title")).isEqualTo("Grey T-Shirt");
}
@Test
public void testEmptySchema() throws Exception {
@Test public void testEmptySchema() throws Exception {
final IDataSet expectedDataSet = getDataSet();
final ITable expectedTable = expectedDataSet.getTable("CLIENTS");
final IDataSet databaseDataSet = getConnection().createDataSet();
@ -88,32 +75,21 @@ public class DataSourceDBUnitTest extends DataSourceBasedDBTestCase {
Assertion.assertEquals(expectedTable, actualTable);
}
@Test
public void testAssertByQuery() throws Exception {
try (final java.io.InputStream is = getClass()
.getClassLoader()
.getResourceAsStream("dbunit/expected-user.xml")) {
@Test public void testAssertByQuery() throws Exception {
try (final InputStream is = getClass().getClassLoader().getResourceAsStream("dbunit/expected-user.xml")) {
final IDataSet expectedDataSet = new FlatXmlDataSetBuilder().build(is);
final ITable expectedTable = expectedDataSet.getTable("CLIENTS");
final Connection conn = getDataSource().getConnection();
conn.createStatement()
.executeUpdate(
"INSERT INTO CLIENTS (first_name, last_name) VALUES ('John', 'Jansen')");
final ITable actualData = getConnection()
.createQueryTable(
"result_name",
"SELECT * FROM CLIENTS WHERE last_name='Jansen'");
conn.createStatement().executeUpdate("INSERT INTO CLIENTS (first_name, last_name) VALUES ('John', 'Jansen')");
final ITable actualData = getConnection().createQueryTable("result_name", "SELECT * FROM CLIENTS WHERE last_name='Jansen'");
Assertion.assertEqualsIgnoreCols(expectedTable, actualData, new String[]{"id"});
Assertion.assertEqualsIgnoreCols(expectedTable, actualData, new String[] { "id" });
}
}
@Test
public void testMultipleFailures() throws Exception {
try (final java.io.InputStream is = getClass()
.getClassLoader()
.getResourceAsStream("dbunit/expected-multiple-failures.xml")) {
@Test public void testMultipleFailures() throws Exception {
try (final InputStream is = getClass().getClassLoader().getResourceAsStream("dbunit/expected-multiple-failures.xml")) {
final IDataSet expectedDataSet = new FlatXmlDataSetBuilder().build(is);
final ITable expectedTable = expectedDataSet.getTable("ITEMS");
final Connection conn = getDataSource().getConnection();

View File

@ -9,6 +9,7 @@ import org.dbunit.dataset.xml.FlatXmlDataSetBuilder;
import org.dbunit.operation.DatabaseOperation;
import org.junit.Test;
import java.io.InputStream;
import java.sql.Connection;
import java.sql.ResultSet;
@ -28,60 +29,54 @@ public class DbUnitTest extends DBTestCase {
System.setProperty(PropertiesBasedJdbcDatabaseTester.DBUNIT_PASSWORD, PASSWORD);
}
@Override
protected IDataSet getDataSet() throws Exception {
try (final java.io.InputStream is = DbUnitTest.class.getClassLoader().getResourceAsStream("dbunit/data.xml")) {
@Override protected IDataSet getDataSet() throws Exception {
try (final InputStream is = DbUnitTest.class.getClassLoader().getResourceAsStream("dbunit/data.xml")) {
return new FlatXmlDataSetBuilder().build(is);
}
}
@Override
protected DatabaseOperation getSetUpOperation() {
@Override protected DatabaseOperation getSetUpOperation() {
return DatabaseOperation.REFRESH;
}
@Override
protected DatabaseOperation getTearDownOperation() {
@Override protected DatabaseOperation getTearDownOperation() {
return DatabaseOperation.DELETE_ALL;
}
@Test
public void testSelect() throws Exception {
@Test public void testSelect() throws Exception {
final Connection connection = getConnection().getConnection();
final ResultSet rs = connection.createStatement().executeQuery("select * from iTEMS where id = 1");
final ResultSet rs = connection.createStatement().executeQuery("select * from ITEMS where id = 1");
assertThat(rs.next()).isTrue();
assertThat(rs.getString("title")).isEqualTo("Grey T-Shirt");
}
@Test
public void testDelete() throws Exception {
@Test public void testDelete() throws Exception {
final Connection connection = getConnection().getConnection();
try (final java.io.InputStream is = DbUnitTest.class.getClassLoader().getResourceAsStream("dbunit/items_exp_delete.xml")) {
ITable expectedTable = (new FlatXmlDataSetBuilder().build(is)).getTable("items");
try (final InputStream is = DbUnitTest.class.getClassLoader().getResourceAsStream("dbunit/items_exp_delete.xml")) {
ITable expectedTable = (new FlatXmlDataSetBuilder().build(is)).getTable("ITEMS");
connection.createStatement().executeUpdate("delete from ITEMS where id = 2");
final IDataSet databaseDataSet = getConnection().createDataSet();
ITable actualTable = databaseDataSet.getTable("items");
ITable actualTable = databaseDataSet.getTable("ITEMS");
Assertion.assertEquals(expectedTable, actualTable);
}
}
@Test
public void testUpdate() throws Exception {
@Test public void testUpdate() throws Exception {
final Connection connection = getConnection().getConnection();
try (final java.io.InputStream is = DbUnitTest.class.getClassLoader().getResourceAsStream("dbunit/items_exp_rename.xml")) {
ITable expectedTable = (new FlatXmlDataSetBuilder().build(is)).getTable("items");
try (final InputStream is = DbUnitTest.class.getClassLoader().getResourceAsStream("dbunit/items_exp_rename.xml")) {
ITable expectedTable = (new FlatXmlDataSetBuilder().build(is)).getTable("ITEMS");
connection.createStatement().executeUpdate("update ITEMS set title='new name' where id = 1");
final IDataSet databaseDataSet = getConnection().createDataSet();
ITable actualTable = databaseDataSet.getTable("items");
ITable actualTable = databaseDataSet.getTable("ITEMS");
Assertion.assertEquals(expectedTable, actualTable);
}

View File

@ -13,6 +13,7 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import java.io.InputStream;
import java.sql.Connection;
import java.sql.ResultSet;
@ -27,8 +28,7 @@ public class OldSchoolDbUnitTest {
private static IDatabaseTester tester = null;
@BeforeClass
public static void setUp() throws Exception {
@BeforeClass public static void setUp() throws Exception {
tester = initDatabaseTester();
}
@ -41,37 +41,32 @@ public class OldSchoolDbUnitTest {
}
private static IDataSet initDataSet() throws Exception {
try (final java.io.InputStream is = OldSchoolDbUnitTest.class.getClassLoader().getResourceAsStream("dbunit/data.xml")) {
try (final InputStream is = OldSchoolDbUnitTest.class.getClassLoader().getResourceAsStream("dbunit/data.xml")) {
return new FlatXmlDataSetBuilder().build(is);
}
}
@Before
public void setup() throws Exception {
@Before public void setup() throws Exception {
tester.onSetup();
}
@After
public void tearDown() throws Exception {
@After public void tearDown() throws Exception {
tester.onTearDown();
}
@Test
public void testSelect() throws Exception {
@Test public void testSelect() throws Exception {
final Connection connection = tester.getConnection().getConnection();
final ResultSet rs = connection.createStatement().executeQuery("select * from iTEMS where id = 1");
final ResultSet rs = connection.createStatement().executeQuery("select * from ITEMS where id = 1");
assertThat(rs.next()).isTrue();
assertThat(rs.getString("title")).isEqualTo("Grey T-Shirt");
}
@Test
public void testIgnoringProduced() throws Exception {
@Test public void testIgnoringProduced() throws Exception {
final Connection connection = tester.getConnection().getConnection();
final String[] excludedColumns = {"id", "produced"};
try (final java.io.InputStream is = getClass().getClassLoader()
.getResourceAsStream("dbunit/expected-ignoring-registered_at.xml")) {
final String[] excludedColumns = { "id", "produced" };
try (final InputStream is = getClass().getClassLoader().getResourceAsStream("dbunit/expected-ignoring-registered_at.xml")) {
final IDataSet expectedDataSet = new FlatXmlDataSetBuilder().build(is);
final ITable expectedTable = DefaultColumnFilter.excludedColumnsTable(expectedDataSet.getTable("ITEMS"), excludedColumns);
@ -84,75 +79,63 @@ public class OldSchoolDbUnitTest {
}
}
@Test
public void testDelete() throws Exception {
@Test public void testDelete() throws Exception {
final Connection connection = tester.getConnection().getConnection();
try (final java.io.InputStream is =
OldSchoolDbUnitTest.class.getClassLoader()
.getResourceAsStream("dbunit/items_exp_delete.xml");) {
ITable expectedTable = new FlatXmlDataSetBuilder().build(is).getTable("items");
try (final InputStream is = OldSchoolDbUnitTest.class.getClassLoader().getResourceAsStream("dbunit/items_exp_delete.xml")) {
ITable expectedTable = new FlatXmlDataSetBuilder().build(is).getTable("ITEMS");
connection.createStatement().executeUpdate("delete from ITEMS where id = 2");
final IDataSet databaseDataSet = tester.getConnection().createDataSet();
ITable actualTable = databaseDataSet.getTable("items");
ITable actualTable = databaseDataSet.getTable("ITEMS");
assertEquals(expectedTable, actualTable);
}
}
@Test
public void testDeleteWithExcludedColumns() throws Exception {
@Test public void testDeleteWithExcludedColumns() throws Exception {
final Connection connection = tester.getConnection().getConnection();
try (final java.io.InputStream is =
OldSchoolDbUnitTest.class.getClassLoader()
.getResourceAsStream("dbunit/items_exp_delete_no_produced.xml")) {
final ITable expectedTable = new FlatXmlDataSetBuilder().build(is).getTable("items");
try (final InputStream is = OldSchoolDbUnitTest.class.getClassLoader().getResourceAsStream("dbunit/items_exp_delete_no_produced.xml")) {
final ITable expectedTable = new FlatXmlDataSetBuilder().build(is).getTable("ITEMS");
connection.createStatement().executeUpdate("delete from ITEMS where id = 2");
final IDataSet databaseDataSet = tester.getConnection().createDataSet();
ITable actualTable = databaseDataSet.getTable("items");
actualTable = DefaultColumnFilter.excludedColumnsTable(actualTable, new String[]{"produced"});
ITable actualTable = databaseDataSet.getTable("ITEMS");
actualTable = DefaultColumnFilter.excludedColumnsTable(actualTable, new String[] { "produced" });
assertEquals(expectedTable, actualTable);
}
}
@Test
public void testUpdate() throws Exception {
@Test public void testUpdate() throws Exception {
final Connection connection = tester.getConnection().getConnection();
try (final java.io.InputStream is =
OldSchoolDbUnitTest.class.getClassLoader()
.getResourceAsStream("dbunit/items_exp_rename.xml")) {
final ITable expectedTable = new FlatXmlDataSetBuilder().build(is).getTable("items");
try (final InputStream is = OldSchoolDbUnitTest.class.getClassLoader().getResourceAsStream("dbunit/items_exp_rename.xml")) {
final ITable expectedTable = new FlatXmlDataSetBuilder().build(is).getTable("ITEMS");
connection.createStatement().executeUpdate("update ITEMS set title='new name' where id = 1");
final IDataSet databaseDataSet = tester.getConnection().createDataSet();
ITable actualTable = databaseDataSet.getTable("items");
ITable actualTable = databaseDataSet.getTable("ITEMS");
assertEquals(expectedTable, actualTable);
}
}
@Test
public void testUpdateWithExcludedColumns() throws Exception {
@Test public void testUpdateWithExcludedColumns() throws Exception {
final Connection connection = tester.getConnection().getConnection();
try (final java.io.InputStream is =
OldSchoolDbUnitTest.class.getClassLoader()
.getResourceAsStream("dbunit/items_exp_rename_no_produced.xml")) {
ITable expectedTable = new FlatXmlDataSetBuilder().build(is).getTable("items");
try (final InputStream is = OldSchoolDbUnitTest.class.getClassLoader().getResourceAsStream("dbunit/items_exp_rename_no_produced.xml")) {
ITable expectedTable = new FlatXmlDataSetBuilder().build(is).getTable("ITEMS");
connection.createStatement().executeUpdate("update ITEMS set title='new name' where id = 1");
final IDataSet databaseDataSet = tester.getConnection().createDataSet();
ITable actualTable = databaseDataSet.getTable("items");
actualTable = DefaultColumnFilter.excludedColumnsTable(actualTable, new String[]{"produced"});
ITable actualTable = databaseDataSet.getTable("ITEMS");
actualTable = DefaultColumnFilter.excludedColumnsTable(actualTable, new String[] { "produced" });
assertEquals(expectedTable, actualTable);
}

View File

@ -12,6 +12,7 @@ import org.dbunit.util.fileloader.DataFileLoader;
import org.dbunit.util.fileloader.FlatXmlDataFileLoader;
import org.junit.Test;
import java.io.InputStream;
import java.sql.Connection;
import java.sql.ResultSet;
@ -23,8 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat;
public class PrepAndExpectedDbUnitTest extends DefaultPrepAndExpectedTestCase {
@Override
public void setUp() throws Exception {
@Override public void setUp() throws Exception {
setDatabaseTester(initDatabaseTester());
setDataFileLoader(initDataFileLoader());
super.setUp();
@ -38,7 +38,7 @@ public class PrepAndExpectedDbUnitTest extends DefaultPrepAndExpectedTestCase {
}
private IDataSet initDataSet() throws Exception {
try (final java.io.InputStream is = getClass().getClassLoader().getResourceAsStream("dbunit/data.xml")) {
try (final InputStream is = getClass().getClassLoader().getResourceAsStream("dbunit/data.xml")) {
return new FlatXmlDataSetBuilder().build(is);
}
}
@ -47,14 +47,12 @@ public class PrepAndExpectedDbUnitTest extends DefaultPrepAndExpectedTestCase {
return new FlatXmlDataFileLoader();
}
@Test
public void testSelect() throws Exception {
@Test public void testSelect() throws Exception {
final Connection connection = getConnection().getConnection();
final VerifyTableDefinition[] verifyTables = {new VerifyTableDefinition("CLIENTS", new String[]{})};
final String[] prepDataFiles = {"/dbunit/users.xml"};
final String[] expectedDataFiles = {"/dbunit/users.xml"};
final PrepAndExpectedTestCaseSteps testSteps = () -> connection.createStatement()
.executeQuery("select * from CLIENTS where id = 1");
final VerifyTableDefinition[] verifyTables = { new VerifyTableDefinition("CLIENTS", new String[] {}) };
final String[] prepDataFiles = { "/dbunit/users.xml" };
final String[] expectedDataFiles = { "/dbunit/users.xml" };
final PrepAndExpectedTestCaseSteps testSteps = () -> connection.createStatement().executeQuery("select * from CLIENTS where id = 1");
final ResultSet rs = (ResultSet) super.runTest(verifyTables, prepDataFiles, expectedDataFiles, testSteps);
@ -62,26 +60,22 @@ public class PrepAndExpectedDbUnitTest extends DefaultPrepAndExpectedTestCase {
assertThat(rs.getString("last_name")).isEqualTo("Xavier");
}
@Test
public void testUpdate() throws Exception {
@Test public void testUpdate() throws Exception {
final Connection connection = getConnection().getConnection();
final VerifyTableDefinition[] verifyTables = {new VerifyTableDefinition("CLIENTS", new String[]{})}; // define tables to verify
final String[] prepDataFiles = {"/dbunit/users.xml"};
final String[] expectedDataFiles = {"/dbunit/users_exp_rename.xml"};
final PrepAndExpectedTestCaseSteps testSteps = () -> connection.createStatement()
.executeUpdate("update CLIENTS set first_name = 'new name' where id = 1");
final VerifyTableDefinition[] verifyTables = { new VerifyTableDefinition("CLIENTS", new String[] {}) }; // define tables to verify
final String[] prepDataFiles = { "/dbunit/users.xml" };
final String[] expectedDataFiles = { "/dbunit/users_exp_rename.xml" };
final PrepAndExpectedTestCaseSteps testSteps = () -> connection.createStatement().executeUpdate("update CLIENTS set first_name = 'new name' where id = 1");
super.runTest(verifyTables, prepDataFiles, expectedDataFiles, testSteps);
}
@Test
public void testDelete() throws Exception {
@Test public void testDelete() throws Exception {
final Connection connection = getConnection().getConnection();
final VerifyTableDefinition[] verifyTables = {new VerifyTableDefinition("CLIENTS", new String[]{})};
final String[] prepDataFiles = {"/dbunit/users.xml"};
final String[] expectedDataFiles = {"/dbunit/users_exp_delete.xml"};
final PrepAndExpectedTestCaseSteps testSteps = () -> connection.createStatement()
.executeUpdate("delete from CLIENTS where id = 2");
final VerifyTableDefinition[] verifyTables = { new VerifyTableDefinition("CLIENTS", new String[] {}) };
final String[] prepDataFiles = { "/dbunit/users.xml" };
final String[] expectedDataFiles = { "/dbunit/users_exp_delete.xml" };
final PrepAndExpectedTestCaseSteps testSteps = () -> connection.createStatement().executeUpdate("delete from CLIENTS where id = 2");
super.runTest(verifyTables, prepDataFiles, expectedDataFiles, testSteps);
}

View File

@ -601,7 +601,6 @@
</build>
<modules>
<module>dbunit</module>
<module>parent-boot-1</module>
<module>parent-boot-2</module>