From 38907a93664b9fc2fd633c71abb5c7db366a71da Mon Sep 17 00:00:00 2001 From: Elvys Soares Date: Wed, 19 May 2021 14:54:06 -0300 Subject: [PATCH] Parameterized test in DbPagerTest Signed-off-by: Elvys Soares --- .../test/java/jodd/joy/page/DbPagerTest.java | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/jodd-joy/src/test/java/jodd/joy/page/DbPagerTest.java b/jodd-joy/src/test/java/jodd/joy/page/DbPagerTest.java index 9b5c39fc1..d3b36d9db 100644 --- a/jodd-joy/src/test/java/jodd/joy/page/DbPagerTest.java +++ b/jodd-joy/src/test/java/jodd/joy/page/DbPagerTest.java @@ -26,9 +26,14 @@ package jodd.joy.page; import jodd.joy.page.db.HsqlDbPager; -import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import java.util.stream.Stream; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.params.provider.Arguments.arguments; class DbPagerTest { @@ -38,19 +43,23 @@ public String buildCountSql2(String sql) { } } - @Test - void testHsqlDbPager() { + @ParameterizedTest + @MethodSource("sqlProvider") + void testHsqlDbPager(String query, String expected){ MyHsqlDbPager hsqlDbPager = new MyHsqlDbPager(); - String sql = hsqlDbPager.buildCountSql2("select * from User u where u.id > 10"); - assertEquals("select count(*) from User u where u.id > 10", sql); - - sql = hsqlDbPager.buildCountSql2("select u.id, (select name from Club where...) as cname from User u where u.id > 10"); - assertEquals("select count(*) from User u where u.id > 10", sql); + String sql = hsqlDbPager.buildCountSql2(query); + assertEquals(expected, sql); + } - sql = hsqlDbPager.buildCountSql2( - "select u.id, (select name from Club where...) as cname," + - " (select id from Town...) as townId from User u where u.id > 10"); - assertEquals("select count(*) from User u where u.id > 10", sql); + static Stream sqlProvider() { + return Stream.of( + arguments("select * from User u where u.id > 10", + "select count(*) from User u where u.id > 10"), + arguments("select u.id, (select name from Club where...) as cname from User u where u.id > 10", + "select count(*) from User u where u.id > 10"), + arguments("select u.id, (select name from Club where...) as cname," + + " (select id from Town...) as townId from User u where u.id > 10", + "select count(*) from User u where u.id > 10")); } }