fix #1109 Admin API Test: /api/admin/dict
This commit is contained in:
parent
ed7d315ba0
commit
03afa113a9
3 changed files with 100 additions and 3 deletions
|
@ -118,6 +118,7 @@ public class ApiResult {
|
|||
|
||||
public ApiConfigsResponse<T> settings(final List<T> settings) {
|
||||
this.settings = settings;
|
||||
this.total = settings.size();
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -33,10 +33,8 @@ public class ApiAdminDictAction extends FessApiAdminAction {
|
|||
protected DictionaryManager dictionaryManager;
|
||||
|
||||
// GET /api/admin/dict
|
||||
// POST /api/admin/dict
|
||||
@Execute
|
||||
public JsonResponse<ApiResult> settings(final ListBody body) {
|
||||
validateApi(body, messages -> {});
|
||||
public JsonResponse<ApiResult> get$index() {
|
||||
final DictionaryFile<? extends DictionaryItem>[] dictFiles = dictionaryManager.getDictionaryFiles();
|
||||
return asJson(new ApiResult.ApiConfigsResponse<ListBody>()
|
||||
.settings(Stream.of(dictFiles).map(dictionaryFile -> createListBody(dictionaryFile)).collect(Collectors.toList()))
|
||||
|
|
98
src/test/java/org/codelibs/fess/it/admin/dict/DictTests.java
Normal file
98
src/test/java/org/codelibs/fess/it/admin/dict/DictTests.java
Normal file
|
@ -0,0 +1,98 @@
|
|||
/*
|
||||
* 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.dict;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
import java.util.List;
|
||||
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 DictTests extends CrudTestBase {
|
||||
|
||||
private static final String NAME_PREFIX = "dictTest_";
|
||||
private static final String API_PATH = "/api/admin/dict";
|
||||
private static final String LIST_ENDPOINT_SUFFIX = "";
|
||||
private static final String ITEM_ENDPOINT_SUFFIX = "";
|
||||
|
||||
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<>();
|
||||
String response = checkGetMethod(searchBody, "").asString();
|
||||
final int total = JsonPath.from(response).getInt("response.total");
|
||||
final List<Map<String, String>> dicts = JsonPath.from(response).getList("response.settings");
|
||||
final int status = JsonPath.from(response).getInt("response.status");
|
||||
assertEquals(total, dicts.size());
|
||||
assertEquals(0, status);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void tearDown() {
|
||||
// do nothing
|
||||
}
|
||||
|
||||
@Test
|
||||
void crudTest() {
|
||||
testRead();
|
||||
}
|
||||
}
|
Loading…
Add table
Reference in a new issue