瀏覽代碼

add integration test for /api/admin/webconfig #1044

Keiichi Watanabe 8 年之前
父節點
當前提交
772d513488

+ 2 - 0
src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/ApiAdminWebconfigAction.java

@@ -57,6 +57,8 @@ public class ApiAdminWebconfigAction extends FessApiAdminAction {
     public JsonResponse<ApiResult> settings(final SearchBody body) {
     public JsonResponse<ApiResult> settings(final SearchBody body) {
         validateApi(body, messages -> {});
         validateApi(body, messages -> {});
         final WebConfigPager pager = new WebConfigPager();
         final WebConfigPager pager = new WebConfigPager();
+        pager.setPageSize(body.size);
+        pager.setCurrentPageNumber(body.page);
         copyBeanToBean(body, pager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
         copyBeanToBean(body, pager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
         final List<WebConfig> list = webConfigService.getWebConfigList(pager);
         final List<WebConfig> list = webConfigService.getWebConfigList(pager);
         return asJson(new ApiResult.ApiConfigsResponse<EditBody>()
         return asJson(new ApiResult.ApiConfigsResponse<EditBody>()

+ 2 - 2
src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/SearchBody.java

@@ -15,8 +15,8 @@
  */
  */
 package org.codelibs.fess.app.web.api.admin.webconfig;
 package org.codelibs.fess.app.web.api.admin.webconfig;
 
 
-import org.codelibs.fess.app.web.admin.webconfig.SearchForm;
+import org.codelibs.fess.app.web.api.admin.BaseSearchBody;
 
 
-public class SearchBody extends SearchForm {
+public class SearchBody extends BaseSearchBody {
 
 
 }
 }

+ 190 - 0
src/test/java/org/codelibs/fess/it/admin/WebConfigTests.java

@@ -0,0 +1,190 @@
+/*
+ * Copyright 2012-2017 CodeLibs Project and the Others.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.codelibs.fess.it.admin;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.startsWith;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.codelibs.fess.it.CrudTestBase;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+@Tag("it")
+public class WebConfigTests extends CrudTestBase {
+
+    private static final int NUM = 20;
+
+    private static final String NAME_PREFIX = "webConfigTest_";
+    private static final String API_PATH = "/api/admin/webconfig";
+    private static final String LIST_ENDPOINT_SUFFIX = "settings";
+    private static final String ITEM_ENDPOINT_SUFFIX = "setting";
+
+    private static final String KEY_PROPERTY = "name";
+
+    @Override
+    protected String getNamePrefix() {
+        return NAME_PREFIX;
+    }
+
+    @Override
+    protected String getApiPath() {
+        return API_PATH;
+    }
+
+    @Override
+    protected String getKeyProperty() {
+        return KEY_PROPERTY;
+    }
+
+    @Override
+    protected String getListEndpointSuffix() {
+        return LIST_ENDPOINT_SUFFIX;
+    }
+
+    @Override
+    protected String getItemEndpointSuffix() {
+        return ITEM_ENDPOINT_SUFFIX;
+    }
+
+    @Test
+    void crudTest() {
+        testCreate();
+        testRead();
+        testUpdate();
+        testDelete();
+    }
+
+    @Override
+    protected void testCreate() {
+        // Test: create setting api.
+        for (int i = 0; i < NUM; i++) {
+            final Map<String, Object> requestBody = new HashMap<>();
+            final String name = NAME_PREFIX + i;
+            final String urls = "http://" + NAME_PREFIX + i;
+            requestBody.put("name", name);
+            requestBody.put("urls", urls);
+            requestBody.put("user_agent", "Mozilla/5.0");
+            requestBody.put("num_of_thread", 5);
+            requestBody.put("interval_time", 1000);
+            requestBody.put("boost", i);
+            requestBody.put("available", true);
+            requestBody.put("sort_order", i);
+
+            checkPutMethod(requestBody, ITEM_ENDPOINT_SUFFIX).then().body("response.created", equalTo(true))
+                    .body("response.status", equalTo(0));
+        }
+
+        // Test: number of settings.
+        final Map<String, Object> searchBody = new HashMap<>();
+        searchBody.put("size", NUM * 2);
+        checkGetMethod(searchBody, LIST_ENDPOINT_SUFFIX).then().body(getJsonPath() + ".size()", equalTo(NUM));
+    }
+
+    @Override
+    protected void testRead() {
+        // Test: get settings api.
+        final Map<String, Object> searchBody = new HashMap<>();
+        searchBody.put("size", NUM * 2);
+        List<String> nameList = getPropList(searchBody, KEY_PROPERTY);
+
+        assertEquals(NUM, nameList.size());
+        for (int i = 0; i < NUM; i++) {
+            final String name = NAME_PREFIX + i;
+            assertTrue(nameList.contains(name), name);
+        }
+
+        List<String> idList = getPropList(searchBody, "id");
+        idList.forEach(id -> {
+            // Test: get setting api
+            checkGetMethod(searchBody, ITEM_ENDPOINT_SUFFIX + "/" + id).then()
+                    .body("response." + ITEM_ENDPOINT_SUFFIX + ".id", equalTo(id))
+                    .body("response." + ITEM_ENDPOINT_SUFFIX + "." + KEY_PROPERTY, startsWith(NAME_PREFIX));
+        });
+
+        // Test: paging
+        searchBody.put("size", 1);
+        for (int i = 0; i < NUM; i++) {
+            searchBody.put("page", i + 1);
+            checkGetMethod(searchBody, LIST_ENDPOINT_SUFFIX).then().body("response." + LIST_ENDPOINT_SUFFIX + ".size()", equalTo(1));
+        }
+
+    }
+
+    @Override
+    protected void testUpdate() {
+        // Test: update settings api
+        Map<String, Object> searchBody = new HashMap<>();
+        searchBody.put("size", NUM * 2);
+        List<Map<String, Object>> settings = getItemList(searchBody);
+
+        final String newUrls = "http://new." + NAME_PREFIX;
+        for (Map<String, Object> setting : settings) {
+            final Map<String, Object> requestBody = new HashMap<>();
+
+            requestBody.put("id", setting.get("id"));
+            requestBody.put("name", setting.get("name"));
+            requestBody.put("urls", newUrls);
+            requestBody.put("user_agent", setting.get("user_agent"));
+            requestBody.put("num_of_thread", setting.get("num_of_thread"));
+            requestBody.put("interval_time", setting.get("interval_time"));
+            requestBody.put("boost", setting.get("boost"));
+            requestBody.put("available", true);
+            requestBody.put("sort_order", setting.get("sort_order"));
+            requestBody.put("version_no", 1);
+
+            checkPostMethod(requestBody, ITEM_ENDPOINT_SUFFIX).then().body("response.status", equalTo(0));
+        }
+
+        searchBody = new HashMap<>();
+        searchBody.put("size", NUM * 2);
+        List<String> valList = getPropList(searchBody, "urls");
+        for (String val : valList) {
+            assertEquals(val, newUrls);
+        }
+    }
+
+    @Override
+    protected void testDelete() {
+        final Map<String, Object> searchBody = new HashMap<>();
+        searchBody.put("size", NUM * 2);
+        List<String> idList = getPropList(searchBody, "id");
+
+        idList.forEach(id -> {
+            //Test: delete setting api
+            checkDeleteMethod(ITEM_ENDPOINT_SUFFIX + "/" + id).then().body("response.status", equalTo(0));
+        });
+
+        // Test: NUMber of settings.
+        checkGetMethod(searchBody, LIST_ENDPOINT_SUFFIX).then().body(getJsonPath() + ".size()", equalTo(0));
+    }
+
+    @Override
+    protected void clearTestData() {
+        final Map<String, Object> searchBody = new HashMap<>();
+        searchBody.put("size", NUM * 10);
+        List<String> idList = getPropList(searchBody, "id");
+        idList.forEach(id -> {
+            checkDeleteMethod(ITEM_ENDPOINT_SUFFIX + "/" + id);
+        });
+    }
+
+}