fix #1037
This commit is contained in:
parent
6ef0176f00
commit
2a3771c4fc
2 changed files with 123 additions and 1 deletions
|
@ -216,7 +216,7 @@ public abstract class CrudTestBase extends ITBase {
|
|||
return "response." + getListEndpointSuffix() + ".findAll {it." + getKeyProperty() + ".startsWith(\"" + getNamePrefix() + "\")}";
|
||||
}
|
||||
|
||||
private RequestSpecification checkMethodBase(final Map<String, Object> body) {
|
||||
protected RequestSpecification checkMethodBase(final Map<String, Object> body) {
|
||||
return given().header("Authorization", getTestToken()).body(body, ObjectMapperType.JACKSON_2).when();
|
||||
}
|
||||
|
||||
|
|
122
src/test/java/org/codelibs/fess/it/admin/ReqHeaderTests.java
Normal file
122
src/test/java/org/codelibs/fess/it/admin/ReqHeaderTests.java
Normal file
|
@ -0,0 +1,122 @@
|
|||
/*
|
||||
* 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 java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.codelibs.fess.it.CrudTestBase;
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Tag;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import io.restassured.path.json.JsonPath;
|
||||
|
||||
@Tag("it")
|
||||
public class ReqHeaderTests extends CrudTestBase {
|
||||
|
||||
private static final String NAME_PREFIX = "reqHeaderTest_";
|
||||
private static final String API_PATH = "/api/admin/reqheader";
|
||||
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;
|
||||
}
|
||||
|
||||
@BeforeEach
|
||||
void createWebConfig() {
|
||||
final Map<String, Object> requestBody = new HashMap<>();
|
||||
requestBody.put("name", "test_webconfig");
|
||||
requestBody.put("urls", "http://www.example.com");
|
||||
requestBody.put("user_agent", "Mozilla/5.0");
|
||||
requestBody.put("num_of_thread", 5);
|
||||
requestBody.put("interval_time", 1000);
|
||||
requestBody.put("boost", 100.0);
|
||||
requestBody.put("available", true);
|
||||
requestBody.put("sort_order", 1);
|
||||
checkMethodBase(requestBody).put("/api/admin/webconfig/setting").then().body("response.created", equalTo(true))
|
||||
.body("response.status", equalTo(0));
|
||||
}
|
||||
|
||||
String getWebConfigId() {
|
||||
final Map<String, Object> searchBody = new HashMap<>();
|
||||
searchBody.put("name", "test_webconfig");
|
||||
String res = checkMethodBase(searchBody).get("/api/admin/webconfig/settings").asString();
|
||||
List<String> webConfigList = JsonPath.from(res).getList("response.settings.findAll {it.name.startsWith(\"test_webconfig\")}.id");
|
||||
return webConfigList.get(0);
|
||||
}
|
||||
|
||||
@AfterEach
|
||||
void deleteWebConfig() {
|
||||
final Map<String, Object> searchBody = new HashMap<>();
|
||||
searchBody.put("size", NUM * 2);
|
||||
final String webConfigId = getWebConfigId();
|
||||
checkMethodBase(searchBody).delete("/api/admin/webconfig/setting/" + webConfigId).then().body("response.status", equalTo(0));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Map<String, Object> createTestParam(int id) {
|
||||
final Map<String, Object> requestBody = new HashMap<>();
|
||||
final String keyProp = NAME_PREFIX + id;
|
||||
requestBody.put(KEY_PROPERTY, keyProp);
|
||||
requestBody.put("value", "val" + id);
|
||||
requestBody.put("web_config_id", getWebConfigId());
|
||||
return requestBody;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Map<String, Object> getUpdateMap() {
|
||||
final Map<String, Object> updateMap = new HashMap<>();
|
||||
updateMap.put("value", "new_value");
|
||||
return updateMap;
|
||||
}
|
||||
|
||||
@Test
|
||||
void crudTest() {
|
||||
testCreate();
|
||||
testRead();
|
||||
testUpdate();
|
||||
testDelete();
|
||||
}
|
||||
}
|
Loading…
Add table
Reference in a new issue