diff --git a/src/test/java/org/codelibs/fess/it/CrudTestBase.java b/src/test/java/org/codelibs/fess/it/CrudTestBase.java index eed90aa00..16229a95b 100644 --- a/src/test/java/org/codelibs/fess/it/CrudTestBase.java +++ b/src/test/java/org/codelibs/fess/it/CrudTestBase.java @@ -151,6 +151,7 @@ public abstract class CrudTestBase extends ITBase { } checkPostMethod(requestBody, getItemEndpointSuffix()).then().body("response.status", equalTo(0)); + refresh(); } checkUpdate(); diff --git a/src/test/java/org/codelibs/fess/it/admin/CrawlerLogTests.java b/src/test/java/org/codelibs/fess/it/admin/CrawlerLogTests.java index de2dc9506..566a252a5 100644 --- a/src/test/java/org/codelibs/fess/it/admin/CrawlerLogTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/CrawlerLogTests.java @@ -41,7 +41,7 @@ import io.restassured.path.json.JsonPath; import io.restassured.response.Response; /** - * Integration Tests for + * Integration Tests which need an execution of crawler * - /api/admin/joblog * - /api/admin/crawlinginfo * - /api/admin/failureurl @@ -65,7 +65,7 @@ public class CrawlerLogTests extends ITBase { createWebConfig(); logger.info("WebConfig is created"); refresh(); - webConfigId = getWebConfigId(); + webConfigId = getWebConfigIds().get(0); createJob(); logger.info("Job is created"); @@ -74,6 +74,7 @@ public class CrawlerLogTests extends ITBase { startJob(); waitJob(); + refresh(); } catch (InterruptedException e) { e.printStackTrace(); assertTrue(false); @@ -82,6 +83,7 @@ public class CrawlerLogTests extends ITBase { @BeforeEach protected void init() { + refresh(); } @AfterEach @@ -108,9 +110,15 @@ public class CrawlerLogTests extends ITBase { final Map requestBody = new HashMap<>(); requestBody.put("q", "Example Domain"); checkMethodBase(requestBody).delete("/api/admin/searchlist/query"); + refresh(); - deleteMethod("/api/admin/scheduler/setting/" + getSchedulerId()); - deleteMethod("/api/admin/webconfig/setting/" + webConfigId); + for (String sId : getSchedulerIds()) { + deleteMethod("/api/admin/scheduler/setting/" + sId); + } + + for (String wId : getWebConfigIds()) { + deleteMethod("/api/admin/webconfig/setting/" + wId); + } deleteTestToken(); } @@ -177,7 +185,7 @@ public class CrawlerLogTests extends ITBase { private static void startJob() { for (int i = 0; i < 30; i++) { final Map requestBody = new HashMap<>(); - final String schedulerId = getSchedulerId(); + final String schedulerId = getSchedulerIds().get(0); final Response response = checkMethodBase(requestBody).post("/api/admin/scheduler/" + schedulerId + "/start"); if (response.getBody().jsonPath().getInt("response.status") == 0) { logger.info("Start scheduler \"" + schedulerId + "\""); @@ -341,7 +349,7 @@ public class CrawlerLogTests extends ITBase { requestBody.put("q", "Example Domain"); final String response = checkMethodBase(requestBody).get("/api/admin/searchlist/docs").asString(); - final List> results = JsonPath.from(response).getList("response.result"); + final List> results = JsonPath.from(response).getList("response.docs"); return results; } @@ -365,16 +373,16 @@ public class CrawlerLogTests extends ITBase { return "response.settings.findAll {it.name.startsWith(\"" + NAME_PREFIX + "\")}"; } - private static String getWebConfigId() { + private static List getWebConfigIds() { final String response = getJsonResponse("/api/admin/webconfig/settings"); final List idList = JsonPath.from(response).getList(getResponsePath() + ".id"); - return idList.get(0); + return idList; } - private static String getSchedulerId() { + private static List getSchedulerIds() { final String response = getJsonResponse("/api/admin/scheduler/settings"); final List idList = JsonPath.from(response).getList(getResponsePath() + ".id"); - return idList.get(0); + return idList; } private static Map getSchedulerItem() { 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 948d1f532..206cbeb4c 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 @@ -74,7 +74,7 @@ public class MappingTests extends DictCrudTestBase { @Override protected Map getUpdateMap() { final Map updateMap = new HashMap<>(); - updateMap.put(KEY_PROPERTY, "new_inputs"); + updateMap.put(KEY_PROPERTY, "new_inputs_mapping"); updateMap.put("output", "new_output"); return updateMap; } 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 bd9ac5b1b..53b2ff9a6 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 @@ -73,7 +73,7 @@ public class ProtwordsTests extends DictCrudTestBase { @Override protected Map getUpdateMap() { final Map updateMap = new HashMap<>(); - updateMap.put(KEY_PROPERTY, "new_input"); + updateMap.put(KEY_PROPERTY, "new_input_protwords"); return updateMap; } 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 ec73e43c7..ed69cbbf4 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 @@ -73,7 +73,7 @@ public class SeunjeonTests extends DictCrudTestBase { @Override protected Map getUpdateMap() { final Map updateMap = new HashMap<>(); - updateMap.put(KEY_PROPERTY, "new_inputs"); + updateMap.put(KEY_PROPERTY, "new_inputs_Seunjeon"); return updateMap; } 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 b306bb044..56bb1bebd 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 @@ -74,7 +74,7 @@ public class SynonymTests extends DictCrudTestBase { @Override protected Map getUpdateMap() { final Map updateMap = new HashMap<>(); - updateMap.put(KEY_PROPERTY, "new_inputs"); + updateMap.put(KEY_PROPERTY, "new_inputs_Synonym"); updateMap.put("outputs", "new_outputs"); return updateMap; }