diff --git a/src/test/java/org/codelibs/fess/it/CrudTestBase.java b/src/test/java/org/codelibs/fess/it/CrudTestBase.java index d3aaff913..0f8d5e27a 100644 --- a/src/test/java/org/codelibs/fess/it/CrudTestBase.java +++ b/src/test/java/org/codelibs/fess/it/CrudTestBase.java @@ -40,6 +40,7 @@ import io.restassured.specification.RequestSpecification; public abstract class CrudTestBase extends ITBase { protected static final int NUM = 20; + protected static final int SEARCH_ALL_NUM = 1000; // ================ // Abstract Methods @@ -73,7 +74,7 @@ public abstract class CrudTestBase extends ITBase { @AfterEach protected void tearDown() { final Map searchBody = new HashMap<>(); - searchBody.put("size", NUM * 10); + searchBody.put("size", SEARCH_ALL_NUM); List idList = getPropList(searchBody, "id"); idList.forEach(id -> { checkDeleteMethod(getItemEndpointSuffix() + "/" + id); @@ -98,14 +99,14 @@ public abstract class CrudTestBase extends ITBase { // Test: number of settings. final Map searchBody = new HashMap<>(); - searchBody.put("size", NUM * 2); + searchBody.put("size", SEARCH_ALL_NUM); checkGetMethod(searchBody, getListEndpointSuffix()).then().body(getJsonPath() + ".size()", equalTo(NUM)); } protected void testRead() { // Test: get settings api. final Map searchBody = new HashMap<>(); - searchBody.put("size", NUM * 2); + searchBody.put("size", SEARCH_ALL_NUM); List nameList = getPropList(searchBody, getKeyProperty()); assertEquals(NUM, nameList.size()); @@ -136,7 +137,7 @@ public abstract class CrudTestBase extends ITBase { final Set keySet = createTestParam(0).keySet(); final Map updateMap = getUpdateMap(); Map searchBody = new HashMap<>(); - searchBody.put("size", NUM * 2); + searchBody.put("size", SEARCH_ALL_NUM); List> settings = getItemList(searchBody); for (Map setting : settings) { @@ -160,7 +161,7 @@ public abstract class CrudTestBase extends ITBase { protected void checkUpdate() { final Map updateMap = getUpdateMap(); Map searchBody = new HashMap<>(); - searchBody.put("size", NUM * 2); + searchBody.put("size", SEARCH_ALL_NUM); for (Map.Entry entry : updateMap.entrySet()) { List updatedList = getPropList(searchBody, entry.getKey()); for (String val : updatedList) { @@ -171,7 +172,7 @@ public abstract class CrudTestBase extends ITBase { protected void testDelete() { final Map searchBody = new HashMap<>(); - searchBody.put("size", NUM * 2); + searchBody.put("size", SEARCH_ALL_NUM); List idList = getPropList(searchBody, "id"); idList.forEach(id -> { diff --git a/src/test/java/org/codelibs/fess/it/admin/dict/DictCrudTestBase.java b/src/test/java/org/codelibs/fess/it/admin/dict/DictCrudTestBase.java index 574c7da31..d7c992372 100644 --- a/src/test/java/org/codelibs/fess/it/admin/dict/DictCrudTestBase.java +++ b/src/test/java/org/codelibs/fess/it/admin/dict/DictCrudTestBase.java @@ -15,6 +15,7 @@ */ package org.codelibs.fess.it.admin.dict; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.HashMap; @@ -66,4 +67,15 @@ public abstract class DictCrudTestBase extends CrudTestBase { protected String getJsonPath() { return "response." + LIST_ENDPOINT_SUFFIX + ".findAll {it." + getKeyProperty() + ".startsWith(\"" + getNamePrefix() + "\")}"; } + + @Override + protected void testRead() { + final Map searchBody = new HashMap<>(); + String response = checkGetMethod(searchBody, getListEndpointSuffix()).asString(); + final int total = JsonPath.from(response).getInt("response.total"); + final List> items = JsonPath.from(response).getList("response.settings"); + final int status = JsonPath.from(response).getInt("response.status"); + assertEquals(total, items.size()); + assertEquals(0, status); + } } diff --git a/src/test/java/org/codelibs/fess/it/admin/dict/KuromojiTests.java b/src/test/java/org/codelibs/fess/it/admin/dict/KuromojiTests.java index 6e8944cca..26cc0574e 100644 --- a/src/test/java/org/codelibs/fess/it/admin/dict/KuromojiTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/dict/KuromojiTests.java @@ -15,17 +15,12 @@ */ package org.codelibs.fess.it.admin.dict; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.List; import java.util.HashMap; import java.util.Map; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -import io.restassured.path.json.JsonPath; - @Tag("it") public class KuromojiTests extends DictCrudTestBase { @@ -88,17 +83,6 @@ public class KuromojiTests extends DictCrudTestBase { return updateMap; } - @Override - protected void testRead() { - final Map searchBody = new HashMap<>(); - String response = checkGetMethod(searchBody, getListEndpointSuffix()).asString(); - final int total = JsonPath.from(response).getInt("response.total"); - final List> dicts = JsonPath.from(response).getList("response.settings"); - final int status = JsonPath.from(response).getInt("response.status"); - assertEquals(total, dicts.size()); - assertEquals(0, status); - } - @Test void crudTest() { testCreate(); diff --git a/src/test/java/org/codelibs/fess/it/admin/dict/MappingTests.java b/src/test/java/org/codelibs/fess/it/admin/dict/MappingTests.java index 22c4ab554..948d1f532 100644 --- a/src/test/java/org/codelibs/fess/it/admin/dict/MappingTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/dict/MappingTests.java @@ -15,17 +15,12 @@ */ package org.codelibs.fess.it.admin.dict; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.List; import java.util.HashMap; import java.util.Map; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -import io.restassured.path.json.JsonPath; - @Tag("it") public class MappingTests extends DictCrudTestBase { @@ -84,17 +79,6 @@ public class MappingTests extends DictCrudTestBase { return updateMap; } - @Override - protected void testRead() { - final Map searchBody = new HashMap<>(); - String response = checkGetMethod(searchBody, getListEndpointSuffix()).asString(); - final int total = JsonPath.from(response).getInt("response.total"); - final List> dicts = JsonPath.from(response).getList("response.settings"); - final int status = JsonPath.from(response).getInt("response.status"); - assertEquals(total, dicts.size()); - assertEquals(0, status); - } - @Test void crudTest() { testCreate(); diff --git a/src/test/java/org/codelibs/fess/it/admin/dict/ProtwordsTests.java b/src/test/java/org/codelibs/fess/it/admin/dict/ProtwordsTests.java index 702c1ab0a..bd9ac5b1b 100644 --- a/src/test/java/org/codelibs/fess/it/admin/dict/ProtwordsTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/dict/ProtwordsTests.java @@ -15,17 +15,12 @@ */ package org.codelibs.fess.it.admin.dict; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.List; import java.util.HashMap; import java.util.Map; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -import io.restassured.path.json.JsonPath; - @Tag("it") public class ProtwordsTests extends DictCrudTestBase { @@ -82,17 +77,6 @@ public class ProtwordsTests extends DictCrudTestBase { return updateMap; } - @Override - protected void testRead() { - final Map searchBody = new HashMap<>(); - String response = checkGetMethod(searchBody, getListEndpointSuffix()).asString(); - final int total = JsonPath.from(response).getInt("response.total"); - final List> dicts = JsonPath.from(response).getList("response.settings"); - final int status = JsonPath.from(response).getInt("response.status"); - assertEquals(total, dicts.size()); - assertEquals(0, status); - } - @Test void crudTest() { testCreate(); diff --git a/src/test/java/org/codelibs/fess/it/admin/dict/SeunjeonTests.java b/src/test/java/org/codelibs/fess/it/admin/dict/SeunjeonTests.java index bca93058e..ec73e43c7 100644 --- a/src/test/java/org/codelibs/fess/it/admin/dict/SeunjeonTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/dict/SeunjeonTests.java @@ -15,17 +15,12 @@ */ package org.codelibs.fess.it.admin.dict; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.List; import java.util.HashMap; import java.util.Map; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -import io.restassured.path.json.JsonPath; - @Tag("it") public class SeunjeonTests extends DictCrudTestBase { @@ -82,17 +77,6 @@ public class SeunjeonTests extends DictCrudTestBase { return updateMap; } - @Override - protected void testRead() { - final Map searchBody = new HashMap<>(); - String response = checkGetMethod(searchBody, getListEndpointSuffix()).asString(); - final int total = JsonPath.from(response).getInt("response.total"); - final List> dicts = JsonPath.from(response).getList("response.settings"); - final int status = JsonPath.from(response).getInt("response.status"); - assertEquals(total, dicts.size()); - assertEquals(0, status); - } - @Test void crudTest() { testCreate(); diff --git a/src/test/java/org/codelibs/fess/it/admin/dict/SynonymTests.java b/src/test/java/org/codelibs/fess/it/admin/dict/SynonymTests.java index 85c7a3669..b306bb044 100644 --- a/src/test/java/org/codelibs/fess/it/admin/dict/SynonymTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/dict/SynonymTests.java @@ -15,17 +15,12 @@ */ package org.codelibs.fess.it.admin.dict; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.List; import java.util.HashMap; import java.util.Map; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -import io.restassured.path.json.JsonPath; - @Tag("it") public class SynonymTests extends DictCrudTestBase { @@ -84,17 +79,6 @@ public class SynonymTests extends DictCrudTestBase { return updateMap; } - @Override - protected void testRead() { - final Map searchBody = new HashMap<>(); - String response = checkGetMethod(searchBody, getListEndpointSuffix()).asString(); - final int total = JsonPath.from(response).getInt("response.total"); - final List> dicts = JsonPath.from(response).getList("response.settings"); - final int status = JsonPath.from(response).getInt("response.status"); - assertEquals(total, dicts.size()); - assertEquals(0, status); - } - @Test void crudTest() { testCreate();