Applying checkstyle updates to test sources

This commit is contained in:
2024-07-17 20:31:41 -05:00
parent 22d5bc547c
commit 840e1aada3
34 changed files with 353 additions and 226 deletions

View File

@ -200,8 +200,7 @@ public class TestUtils
.withName(TABLE_NAME_PERSON)
.withType(QPossibleValueSourceType.TABLE)
.withTableName(TABLE_NAME_PERSON)
.withValueFormatAndFields(PVSValueFormatAndFields.LABEL_ONLY)
);
.withValueFormatAndFields(PVSValueFormatAndFields.LABEL_ONLY));
}

View File

@ -103,7 +103,8 @@ public class RDBMSDeleteActionTest extends RDBMSActionTest
DeleteOutput deleteResult = new RDBMSDeleteAction().execute(deleteInput);
assertEquals(3, deleteResult.getDeletedRecordCount(), "Should delete one row");
assertEquals(0, deleteResult.getRecordsWithErrors().size(), "should have no errors");
runTestSql("SELECT id FROM person", (rs -> {
runTestSql("SELECT id FROM person", (rs ->
{
int rowsFound = 0;
while(rs.next())
{
@ -177,7 +178,8 @@ public class RDBMSDeleteActionTest extends RDBMSActionTest
assertTrue(deleteResult.getRecordsWithErrors().stream().noneMatch(r -> r.getErrors().isEmpty()), "All we got back should have errors");
assertEquals(3, deleteResult.getDeletedRecordCount(), "Should get back that 3 were deleted");
runTestSql("SELECT id FROM child_table", (rs -> {
runTestSql("SELECT id FROM child_table", (rs ->
{
int rowsFound = 0;
while(rs.next())
{
@ -223,7 +225,8 @@ public class RDBMSDeleteActionTest extends RDBMSActionTest
assertEquals(1, queryStats.get(QueryManager.STAT_QUERIES_RAN), "Number of queries ran");
assertEquals(3, deleteResult.getDeletedRecordCount(), "Should get back that 3 were deleted");
runTestSql("SELECT id FROM child_table", (rs -> {
runTestSql("SELECT id FROM child_table", (rs ->
{
int rowsFound = 0;
while(rs.next())
{
@ -275,7 +278,8 @@ public class RDBMSDeleteActionTest extends RDBMSActionTest
assertTrue(deleteResult.getRecordsWithErrors().stream().noneMatch(r -> r.getErrors().isEmpty()), "All we got back should have errors");
assertEquals(3, deleteResult.getDeletedRecordCount(), "Should get back that 3 were deleted");
runTestSql("SELECT id FROM child_table", (rs -> {
runTestSql("SELECT id FROM child_table", (rs ->
{
int rowsFound = 0;
while(rs.next())
{

View File

@ -188,9 +188,13 @@ public class RDBMSInsertActionTest extends RDBMSActionTest
/***************************************************************************
**
***************************************************************************/
private void assertAnInsertedPersonRecord(String firstName, String lastName, Integer id) throws Exception
{
runTestSql("SELECT * FROM person WHERE last_name = '" + lastName + "'", (rs -> {
runTestSql("SELECT * FROM person WHERE last_name = '" + lastName + "'", (rs ->
{
int rowsFound = 0;
while(rs.next())
{

View File

@ -118,7 +118,8 @@ public class RDBMSUpdateActionTest extends RDBMSActionTest
assertEquals(1, updateResult.getRecords().size(), "Should return 1 row");
assertEquals(2, updateResult.getRecords().get(0).getValue("id"), "Should have id=2 in the row");
// todo - add errors to QRecord? assertTrue(updateResult.getRecords().stream().noneMatch(qrs -> CollectionUtils.nullSafeHasContents(qrs.getErrors())), "There should be no errors");
runTestSql("SELECT * FROM person WHERE last_name = 'Kirk'", (rs -> {
runTestSql("SELECT * FROM person WHERE last_name = 'Kirk'", (rs ->
{
int rowsFound = 0;
while(rs.next())
{
@ -129,7 +130,8 @@ public class RDBMSUpdateActionTest extends RDBMSActionTest
}
assertEquals(1, rowsFound);
}));
runTestSql("SELECT * FROM person WHERE last_name = 'Maes'", (rs -> {
runTestSql("SELECT * FROM person WHERE last_name = 'Maes'", (rs ->
{
if(rs.next())
{
fail("Should not have found Maes any more.");
@ -176,7 +178,8 @@ public class RDBMSUpdateActionTest extends RDBMSActionTest
assertEquals(3, updateResult.getRecords().get(1).getValue("id"), "Should have expected ids in the row");
assertEquals(5, updateResult.getRecords().get(2).getValue("id"), "Should have expected ids in the row");
// todo - add errors to QRecord? assertTrue(updateResult.getRecords().stream().noneMatch(qrs -> CollectionUtils.nullSafeHasContents(qrs.getErrors())), "There should be no errors");
runTestSql("SELECT * FROM person WHERE last_name = 'From Bewitched'", (rs -> {
runTestSql("SELECT * FROM person WHERE last_name = 'From Bewitched'", (rs ->
{
int rowsFound = 0;
while(rs.next())
{
@ -188,7 +191,8 @@ public class RDBMSUpdateActionTest extends RDBMSActionTest
}
assertEquals(1, rowsFound);
}));
runTestSql("SELECT * FROM person WHERE last_name = 'Chamberlain'", (rs -> {
runTestSql("SELECT * FROM person WHERE last_name = 'Chamberlain'", (rs ->
{
int rowsFound = 0;
while(rs.next())
{
@ -199,7 +203,8 @@ public class RDBMSUpdateActionTest extends RDBMSActionTest
}
assertEquals(1, rowsFound);
}));
runTestSql("SELECT * FROM person WHERE last_name = 'Richardson'", (rs -> {
runTestSql("SELECT * FROM person WHERE last_name = 'Richardson'", (rs ->
{
int rowsFound = 0;
while(rs.next())
{
@ -243,7 +248,8 @@ public class RDBMSUpdateActionTest extends RDBMSActionTest
assertEquals(1, updateResult.getRecords().get(0).getValue("id"), "Should have expected ids in the row");
assertEquals(3, updateResult.getRecords().get(1).getValue("id"), "Should have expected ids in the row");
// todo - add errors to QRecord? assertTrue(updateResult.getRecords().stream().noneMatch(qrs -> CollectionUtils.nullSafeHasContents(qrs.getErrors())), "There should be no errors");
runTestSql("SELECT * FROM person WHERE last_name = 'From Bewitched'", (rs -> {
runTestSql("SELECT * FROM person WHERE last_name = 'From Bewitched'", (rs ->
{
int rowsFound = 0;
while(rs.next())
{
@ -255,7 +261,8 @@ public class RDBMSUpdateActionTest extends RDBMSActionTest
}
assertEquals(1, rowsFound);
}));
runTestSql("SELECT * FROM person WHERE last_name = 'Tim''s Uncle'", (rs -> {
runTestSql("SELECT * FROM person WHERE last_name = 'Tim''s Uncle'", (rs ->
{
int rowsFound = 0;
while(rs.next())
{
@ -294,7 +301,8 @@ public class RDBMSUpdateActionTest extends RDBMSActionTest
assertEquals(5, updateResult.getRecords().size(), "Should return 5 rows");
// todo - add errors to QRecord? assertTrue(updateResult.getRecords().stream().noneMatch(qrs -> CollectionUtils.nullSafeHasContents(qrs.getErrors())), "There should be no errors");
runTestSql("SELECT * FROM person WHERE id <= 5", (rs -> {
runTestSql("SELECT * FROM person WHERE id <= 5", (rs ->
{
int rowsFound = 0;
while(rs.next())
{
@ -414,7 +422,8 @@ public class RDBMSUpdateActionTest extends RDBMSActionTest
private String selectModifyDate(Integer id) throws Exception
{
StringBuilder modifyDate = new StringBuilder();
runTestSql("SELECT modify_date FROM person WHERE id = " + id, (rs -> {
runTestSql("SELECT modify_date FROM person WHERE id = " + id, (rs ->
{
if(rs.next())
{
modifyDate.append(rs.getString("modify_date"));

View File

@ -39,6 +39,9 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
@Disabled("This was okay for POC, but shouldn't run in CI")
class ConnectionManagerTest extends BaseTest
{
/***************************************************************************
**
***************************************************************************/
@Test
public void test() throws SQLException
{
@ -101,6 +104,9 @@ class ConnectionManagerTest extends BaseTest
/***************************************************************************
**
***************************************************************************/
private RDBMSBackendMetaData getAuroraBacked()
{
QMetaDataVariableInterpreter interpreter = new QMetaDataVariableInterpreter();