Merge pull request #1664 from igarash1/master

Admin API Test : backup(#1016), joblog(#1032), log(#1035), searchlist(#1054)

src/test/java/org/codelibs/fess/it/admin/BackupTests.java

@@ -0,0 +1,93 @@
+/*
+ * Copyright 2012-2018 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.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.codelibs.fess.it.CrudTestBase;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+import io.restassured.path.json.JsonPath;
+
+@Tag("it")
+public class BackupTests extends CrudTestBase {
+
+    private static final String NAME_PREFIX = "backupTest_";
+    private static final String API_PATH = "/api/admin/backup";
+    private static final String LIST_ENDPOINT_SUFFIX = "files";
+    private static final String ITEM_ENDPOINT_SUFFIX = "file";
+
+    private static final String KEY_PROPERTY = "";
+
+    @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;
+    }
+
+    @Override
+    protected Map<String, Object> createTestParam(int id) {
+        assertTrue(false); // Unreachable
+        return null;
+    }
+
+    @Override
+    protected Map<String, Object> getUpdateMap() {
+        assertTrue(false); // Unreachable
+        return null;
+    }
+
+    @Override
+    protected void testRead() {
+        final Map<String, Object> searchBody = new HashMap<>();
+        final String response = checkMethodBase(searchBody).get(API_PATH + "/" + LIST_ENDPOINT_SUFFIX).asString();
+        assertEquals(new Integer(0), JsonPath.from(response).get("response.status"));
+    }
+
+    @Override
+    protected void tearDown() {
+        // do nothing
+    }
+
+    @Test
+    void crudTest() {
+        testRead();
+    }
+}

src/test/java/org/codelibs/fess/it/admin/JobLogTests.java

@@ -0,0 +1,93 @@
+/*
+ * Copyright 2012-2018 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.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.codelibs.fess.it.CrudTestBase;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+import io.restassured.path.json.JsonPath;
+
+@Tag("it")
+public class JobLogTests extends CrudTestBase {
+
+    private static final String NAME_PREFIX = "joblogTest_";
+    private static final String API_PATH = "/api/admin/joblog";
+    private static final String LIST_ENDPOINT_SUFFIX = "logs";
+    private static final String ITEM_ENDPOINT_SUFFIX = "log";
+
+    private static final String KEY_PROPERTY = "";
+
+    @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;
+    }
+
+    @Override
+    protected Map<String, Object> createTestParam(int id) {
+        assertTrue(false); // Unreachable
+        return null;
+    }
+
+    @Override
+    protected Map<String, Object> getUpdateMap() {
+        assertTrue(false); // Unreachable
+        return null;
+    }
+
+    @Override
+    protected void testRead() {
+        final Map<String, Object> searchBody = new HashMap<>();
+        final String response = checkMethodBase(searchBody).get(API_PATH + "/" + LIST_ENDPOINT_SUFFIX).asString();
+        assertEquals(new Integer(0), JsonPath.from(response).get("response.status"));
+    }
+
+    @Override
+    protected void tearDown() {
+        // do nothing
+    }
+
+    @Test
+    void crudTest() {
+        testRead();
+    }
+}

src/test/java/org/codelibs/fess/it/admin/LogTests.java

@@ -0,0 +1,93 @@
+/*
+ * Copyright 2012-2018 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.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.codelibs.fess.it.CrudTestBase;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+import io.restassured.path.json.JsonPath;
+
+@Tag("it")
+public class LogTests extends CrudTestBase {
+
+    private static final String NAME_PREFIX = "logTest_";
+    private static final String API_PATH = "/api/admin/log";
+    private static final String LIST_ENDPOINT_SUFFIX = "files";
+    private static final String ITEM_ENDPOINT_SUFFIX = "file";
+
+    private static final String KEY_PROPERTY = "";
+
+    @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;
+    }
+
+    @Override
+    protected Map<String, Object> createTestParam(int id) {
+        assertTrue(false); // Unreachable
+        return null;
+    }
+
+    @Override
+    protected Map<String, Object> getUpdateMap() {
+        assertTrue(false); // Unreachable
+        return null;
+    }
+
+    @Override
+    protected void testRead() {
+        final Map<String, Object> searchBody = new HashMap<>();
+        final String response = checkMethodBase(searchBody).get(API_PATH + "/" + LIST_ENDPOINT_SUFFIX).asString();
+        assertEquals(new Integer(0), JsonPath.from(response).get("response.status"));
+    }
+
+    @Override
+    protected void tearDown() {
+        // do nothing
+    }
+
+    @Test
+    void crudTest() {
+        testRead();
+    }
+}

src/test/java/org/codelibs/fess/it/admin/SearchListTests.java

@@ -16,14 +16,19 @@
 package org.codelibs.fess.it.admin;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.hamcrest.Matchers.equalTo;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.List;
+import java.util.Set;
 
 import org.codelibs.fess.it.CrudTestBase;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
+import io.restassured.path.json.JsonPath;
+
 @Tag("it")
 public class SearchListTests extends CrudTestBase {
 
@@ -66,15 +71,13 @@ public class SearchListTests extends CrudTestBase {
 
     @Override
     protected Map<String, Object> createTestParam(int id) {
-
+        final Map<String, Object> requestBody = new HashMap<>();
         final Map<String, Object> doc = new HashMap<>();
         final String keyProp = NAME_PREFIX + id;
         doc.put(KEY_PROPERTY, keyProp);
         doc.put("url", "http://example.com/" + id);
         doc.put("boost", id);
         doc.put("role", "Rguest");
-
-        final Map<String, Object> requestBody = new HashMap<>();
         requestBody.put("doc", doc);
         return requestBody;
     }
@@ -89,19 +92,58 @@ public class SearchListTests extends CrudTestBase {
 
     @Override
     protected Map<String, Object> getUpdateMap() {
-        // TODO
-        assertTrue(false);
-
         final Map<String, Object> updateMap = new HashMap<>();
-        updateMap.put("click_count", 100);
+//        updateMap.put("click_count", 100);
         return updateMap;
     }
 
+    @Override
+    protected void testUpdate() {
+
+        // Test: update settings api
+        final Map<String, Object> updateMap = getUpdateMap();
+        final Map<String, Object> searchBody = createSearchBody(SEARCH_ALL_NUM);
+        List<Map<String, Object>> settings = getItemList(searchBody);
+
+        for (Map<String, Object> setting : settings) {
+            final Map<String, Object> requestBody = new HashMap<>(updateMap);
+            final String idKey = getIdKey();
+
+            requestBody.put("version", 1);
+            requestBody.put("crud_mode", 2);
+
+            if (setting.containsKey(idKey)) {
+                requestBody.put(idKey, setting.get(idKey));
+            }
+
+            final Map<String, Object> doc = new HashMap<>();
+            doc.put("doc_id", setting.get("doc_id"));
+            doc.put("url", setting.get("url_link"));
+            doc.put("title", setting.get("title"));
+            doc.put("role", "Rguest");
+            doc.put("boost", setting.get("boost"));
+            //            doc.put("click_count", 100);  // Validation Error
+            requestBody.put("doc", doc);
+
+            checkPostMethod(requestBody, getItemEndpointSuffix()).then().body("response.status", equalTo(0));
+            refresh();
+        }
+
+        checkUpdate();
+    }
+
+    @Override
+    protected List<Map<String, Object>> getItemList(final Map<String, Object> body) {
+        final String response = checkMethodBase(body).get(getApiPath() + "/" + getListEndpointSuffix()).asString();
+        final List<Map<String, Object>> results = JsonPath.from(response).getList("response.docs");
+        return results;
+    }
+
     @Test
     void crudTest() {
         testCreate();
         testRead();
-        //testUpdate(); // TODO
+        testUpdate();
         testDelete();
     }
 }