Test updates for SonarQube

Author: jeffgbutler

src/test/java/examples/animal/data/AnimalDataTest.java

@@ -1753,9 +1753,9 @@ void testGeneralInsert() {
                     + "values (#{parameters.p1,jdbcType=INTEGER}, 'Fred', 2.2, #{parameters.p2,jdbcType=DOUBLE})";
 
             assertThat(insertStatement.getInsertStatement()).isEqualTo(expected);
-            assertThat(insertStatement.getParameters().size()).isEqualTo(2);
-            assertThat(insertStatement.getParameters().get("p1")).isEqualTo(101);
-            assertThat(insertStatement.getParameters().get("p2")).isEqualTo(4.5);
+            assertThat(insertStatement.getParameters()).hasSize(2);
+            assertThat(insertStatement.getParameters()).containsEntry("p1", 101);
+            assertThat(insertStatement.getParameters()).containsEntry("p2", 4.5);
 
             int rows = mapper.generalInsert(insertStatement);
             assertThat(rows).isEqualTo(1);

src/test/java/org/mybatis/dynamic/sql/insert/GeneralInsertStatementTest.java

@@ -26,7 +26,7 @@
 import org.mybatis.dynamic.sql.insert.render.GeneralInsertStatementProvider;
 import org.mybatis.dynamic.sql.render.RenderingStrategies;
 
-public class GeneralInsertStatementTest {
+class GeneralInsertStatementTest {
 
     private static final SqlTable foo = SqlTable.of("foo");
     private static final SqlColumn<Integer> id = foo.column("id", JDBCType.INTEGER);
@@ -35,7 +35,7 @@ public class GeneralInsertStatementTest {
     private static final SqlColumn<String> occupation = foo.column("occupation", JDBCType.VARCHAR);
 
     @Test
-    public void testFullInsertStatementBuilder() {
+    void testFullInsertStatementBuilder() {
 
         GeneralInsertStatementProvider insertStatement = insertInto(foo)
                 .set(id).equalTo(2)
@@ -52,7 +52,7 @@ public void testFullInsertStatementBuilder() {
     }
 
     @Test
-    public void testInsertStatementBuilderWithNulls() {
+    void testInsertStatementBuilderWithNulls() {
 
         GeneralInsertStatementProvider insertStatement = insertInto(foo)
                 .set(id).equalTo(1)
@@ -68,7 +68,7 @@ public void testInsertStatementBuilderWithNulls() {
     }
 
     @Test
-    public void testInsertStatementBuilderWithConstants() {
+    void testInsertStatementBuilderWithConstants() {
 
         GeneralInsertStatementProvider insertStatement = insertInto(foo)
                 .set(id).equalToConstant("3")
@@ -84,7 +84,7 @@ public void testInsertStatementBuilderWithConstants() {
     }
 
     @Test
-    public void testSelectiveInsertStatementBuilder() {
+    void testSelectiveInsertStatementBuilder() {
         Integer myId = null;
         String myFirstName = null;
         String myLastName = "jones";

src/test/java/org/mybatis/dynamic/sql/insert/InsertStatementTest.java

@@ -176,7 +176,7 @@ void testParallelStreamWithParameters() {
         assertAll(
                 () -> assertThat(collector.columnsPhrase()).isEqualTo(expectedColumnsPhrase),
                 () -> assertThat(collector.valuesPhrase()).isEqualTo(expectedValuesPhrase),
-                () -> assertThat(collector.parameters().size()).isEqualTo(4)
+                () -> assertThat(collector.parameters()).hasSize(4)
         );
     }
 

src/test/java/org/mybatis/dynamic/sql/util/ColumnMappingVisitorTest.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2019 the original author or authors.
+ *    Copyright 2016-2020 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -22,10 +22,10 @@
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
-public class ColumnMappingVisitorTest {
+class ColumnMappingVisitorTest {
 
     @Test
-    public void testThatUnimplementedMethod1ThrowExceptions() {
+    void testThatUnimplementedMethod1ThrowExceptions() {
         TestTable table = new TestTable();
         TestVisitor tv = new TestVisitor();
         ColumnToColumnMapping mapping = ColumnToColumnMapping.of(table.id, table.description);
@@ -34,7 +34,7 @@ public void testThatUnimplementedMethod1ThrowExceptions() {
     }
 
     @Test
-    public void testThatUnimplementedMethod2ThrowExceptions() {
+    void testThatUnimplementedMethod2ThrowExceptions() {
         TestTable table = new TestTable();
         TestVisitor tv = new TestVisitor();
         ValueMapping<Integer> mapping = ValueMapping.of(table.id,  () -> 3);
@@ -43,7 +43,7 @@ public void testThatUnimplementedMethod2ThrowExceptions() {
     }
 
     @Test
-    public void testThatUnimplementedMethod3ThrowExceptions() {
+    void testThatUnimplementedMethod3ThrowExceptions() {
         TestTable table = new TestTable();
         TestVisitor tv = new TestVisitor();
         SelectMapping mapping = SelectMapping.of(table.id, SqlBuilder.select(table.id).from(table));
@@ -52,7 +52,7 @@ public void testThatUnimplementedMethod3ThrowExceptions() {
     }
 
     @Test
-    public void testThatUnimplementedMethod4ThrowExceptions() {
+    void testThatUnimplementedMethod4ThrowExceptions() {
         TestTable table = new TestTable();
         TestVisitor tv = new TestVisitor();
         PropertyMapping mapping = PropertyMapping.of(table.id, "id");