Make the Tests Pass

Author: jeffgbutler

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

@@ -672,7 +672,7 @@ void testInConditionWithEventuallyEmptyList() {
 
             SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
                     .from(animalData)
-                    .where(id, isIn(null, 22, null).filter(Objects::nonNull).filter(i -> i != 22))
+                    .where(id, isInWhenPresent(null, 22, null).filter(i -> i != 22))
                     .configureStatement(c -> c.setNonRenderingWhereClauseAllowed(true))
                     .build()
                     .render(RenderingStrategies.MYBATIS3);
@@ -694,6 +694,7 @@ void testInConditionWithEventuallyEmptyListForceRendering() {
         SelectModel selectModel = select(id, animalName, bodyWeight, brainWeight)
                 .from(animalData)
                 .where(id, isIn(inValues).filter(Objects::nonNull).filter(i -> i != 22))
+                .configureStatement(c -> c.setEmptyListConditionRenderingAllowed(false))
                 .build();
 
         assertThatExceptionOfType(NonRenderingWhereClauseException.class).isThrownBy(() ->
@@ -706,6 +707,7 @@ void testInConditionWithEmptyList() {
         SelectModel selectModel = select(id, animalName, bodyWeight, brainWeight)
                 .from(animalData)
                 .where(id, isIn(Collections.emptyList()))
+                .configureStatement(c -> c.setEmptyListConditionRenderingAllowed(false))
                 .build();
 
         assertThatExceptionOfType(NonRenderingWhereClauseException.class).isThrownBy(() ->
@@ -784,7 +786,7 @@ void testNotInConditionWithEventuallyEmptyList() {
 
             SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
                     .from(animalData)
-                    .where(id, isNotIn(null, 22, null).filter(Objects::nonNull).filter(i -> i != 22))
+                    .where(id, isNotInWhenPresent(null, 22, null).filter(i -> i != 22))
                     .configureStatement(c -> c.setNonRenderingWhereClauseAllowed(true))
                     .build()
                     .render(RenderingStrategies.MYBATIS3);
@@ -802,6 +804,7 @@ void testNotInConditionWithEventuallyEmptyListForceRendering() {
                 .from(animalData)
                 .where(id, isNotIn(null, 22, null)
                         .filter(Objects::nonNull).filter(i -> i != 22))
+                .configureStatement(c -> c.setEmptyListConditionRenderingAllowed(false))
                 .build();
 
         assertThatExceptionOfType(NonRenderingWhereClauseException.class).isThrownBy(() ->

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

@@ -522,7 +522,7 @@ void testIsInCaseInsensitiveWhenWithNoValues() {
             AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
             SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
                     .from(animalData)
-                    .where(animalName, isInCaseInsensitive())
+                    .where(animalName, isInCaseInsensitiveWhenPresent())
                     .and(id, isLessThanOrEqualTo(10))
                     .orderBy(id)
                     .build()
@@ -602,7 +602,7 @@ void testIsNotInCaseInsensitiveWhenWithNoValues() {
             AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
             SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
                     .from(animalData)
-                    .where(animalName, isNotInCaseInsensitive())
+                    .where(animalName, isNotInCaseInsensitiveWhenPresent())
                     .and(id, isLessThanOrEqualTo(10))
                     .orderBy(id)
                     .build()

src/test/java/org/mybatis/dynamic/sql/select/SelectStatementTest.java

@@ -291,6 +291,7 @@ void testInEmptyList() {
         SelectModel selectModel = select(column1, column3)
                 .from(table, "a")
                 .where(column3, isIn(emptyList))
+                .configureStatement(c -> c.setEmptyListConditionRenderingAllowed(false))
                 .build();
 
         assertThatExceptionOfType(RuntimeException.class).isThrownBy(() ->
@@ -304,6 +305,7 @@ void testNotInEmptyList() {
         SelectModel selectModel = select(column1, column3)
                 .from(table, "a")
                 .where(column3, isNotIn(emptyList))
+                .configureStatement(c -> c.setEmptyListConditionRenderingAllowed(false))
                 .build();
 
         assertThatExceptionOfType(RuntimeException.class).isThrownBy(() ->
@@ -329,6 +331,7 @@ void testInCaseInsensitiveEmptyList() {
         SelectModel selectModel = select(column1, column3)
                 .from(table, "a")
                 .where(column3, isInCaseInsensitive(Collections.emptyList()))
+                .configureStatement(c -> c.setEmptyListConditionRenderingAllowed(false))
                 .build();
 
         assertThatExceptionOfType(RuntimeException.class).isThrownBy(() ->
@@ -366,6 +369,7 @@ void testNotInCaseInsensitiveEmptyList() {
         SelectModel selectModel = select(column1, column3)
                 .from(table, "a")
                 .where(column3, isNotInCaseInsensitive(Collections.emptyList()))
+                .configureStatement(c -> c.setEmptyListConditionRenderingAllowed(false))
                 .build();
 
         assertThatExceptionOfType(NonRenderingWhereClauseException.class).isThrownBy(() ->