Skip to content

Commit 53d1476

Browse files
committed
Style update from Sonar Suggestion
1 parent 516870f commit 53d1476

File tree

1 file changed

+18
-14
lines changed

1 file changed

+18
-14
lines changed

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

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import java.util.Objects;
3636

3737
import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
38-
import org.apache.ibatis.exceptions.PersistenceException;
3938
import org.apache.ibatis.jdbc.ScriptRunner;
4039
import org.apache.ibatis.mapping.Environment;
4140
import org.apache.ibatis.session.Configuration;
@@ -56,6 +55,7 @@
5655
import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
5756
import org.mybatis.dynamic.sql.render.RenderingStrategies;
5857
import org.mybatis.dynamic.sql.render.TableAliasCalculator;
58+
import org.mybatis.dynamic.sql.select.SelectModel;
5959
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
6060
import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
6161
import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils;
@@ -598,23 +598,25 @@ void testInConditionWithEventuallyEmptyListForceRendering() {
598598
inValues.add(22);
599599
inValues.add(null);
600600

601-
assertThatExceptionOfType(RuntimeException.class).describedAs("Fred").isThrownBy(() ->
602-
select(id, animalName, bodyWeight, brainWeight)
601+
SelectModel selectModel = select(id, animalName, bodyWeight, brainWeight)
603602
.from(animalData)
604603
.where(id, isInRequired(inValues).then(s -> s.filter(Objects::nonNull).filter(i -> i != 22)))
605-
.build()
606-
.render(RenderingStrategies.MYBATIS3)
604+
.build();
605+
606+
assertThatExceptionOfType(RuntimeException.class).describedAs("Fred").isThrownBy(() ->
607+
selectModel.render(RenderingStrategies.MYBATIS3)
607608
);
608609
}
609610

610611
@Test
611612
void testInConditionWithEmptyList() {
613+
SelectModel selectModel = select(id, animalName, bodyWeight, brainWeight)
614+
.from(animalData)
615+
.where(id, isInRequired(Collections.emptyList()))
616+
.build();
617+
612618
assertThatExceptionOfType(RuntimeException.class).describedAs("Fred").isThrownBy(() ->
613-
select(id, animalName, bodyWeight, brainWeight)
614-
.from(animalData)
615-
.where(id, isInRequired(Collections.emptyList()))
616-
.build()
617-
.render(RenderingStrategies.MYBATIS3)
619+
selectModel.render(RenderingStrategies.MYBATIS3)
618620
);
619621
}
620622

@@ -706,13 +708,15 @@ void testNotInConditionWithEventuallyEmptyList() {
706708

707709
@Test
708710
void testNotInConditionWithEventuallyEmptyListForceRendering() {
709-
assertThatExceptionOfType(RuntimeException.class).describedAs("Fred").isThrownBy(() ->
710-
select(id, animalName, bodyWeight, brainWeight)
711+
SelectModel selectModel = select(id, animalName, bodyWeight, brainWeight)
711712
.from(animalData)
712713
.where(id, isNotInRequired(null, 22, null)
713714
.then(s -> s.filter(Objects::nonNull).filter(i -> i != 22)))
714-
.build()
715-
.render(RenderingStrategies.MYBATIS3));
715+
.build();
716+
717+
assertThatExceptionOfType(RuntimeException.class).describedAs("Fred").isThrownBy(() ->
718+
selectModel.render(RenderingStrategies.MYBATIS3)
719+
);
716720
}
717721

718722
@SafeVarargs

0 commit comments

Comments
 (0)