From ff8c99fa3194147369f920e3b487e098ab6fa03d Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya <shinsuke@apache.org> Date: Wed, 7 Mar 2018 06:41:06 +0900 Subject: [PATCH] imports clean up --- .../transformer/FessXpathTransformerTest.java | 2 +- .../org/codelibs/fess/it/CrawlTestBase.java | 11 +++++---- .../fess/it/admin/CrawlerLogTests.java | 1 - .../fess/it/admin/dict/DictTests.java | 2 +- .../fess/it/search/SearchApiTests.java | 23 +++++++++++-------- .../fess/mylasta/direction/FessPropTest.java | 1 - 6 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/test/java/org/codelibs/fess/crawler/transformer/FessXpathTransformerTest.java b/src/test/java/org/codelibs/fess/crawler/transformer/FessXpathTransformerTest.java index d4f7f4005..121edca7e 100644 --- a/src/test/java/org/codelibs/fess/crawler/transformer/FessXpathTransformerTest.java +++ b/src/test/java/org/codelibs/fess/crawler/transformer/FessXpathTransformerTest.java @@ -40,9 +40,9 @@ import org.codelibs.fess.crawler.entity.RequestData; import org.codelibs.fess.crawler.entity.ResponseData; import org.codelibs.fess.crawler.entity.ResultData; import org.codelibs.fess.crawler.exception.ChildUrlsException; +import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigName; import org.codelibs.fess.es.config.exentity.LabelType; import org.codelibs.fess.es.config.exentity.WebConfig; -import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigName; import org.codelibs.fess.helper.CrawlingConfigHelper; import org.codelibs.fess.helper.CrawlingInfoHelper; import org.codelibs.fess.helper.DocumentHelper; diff --git a/src/test/java/org/codelibs/fess/it/CrawlTestBase.java b/src/test/java/org/codelibs/fess/it/CrawlTestBase.java index a238b2898..648807ddf 100644 --- a/src/test/java/org/codelibs/fess/it/CrawlTestBase.java +++ b/src/test/java/org/codelibs/fess/it/CrawlTestBase.java @@ -15,11 +15,6 @@ */ package org.codelibs.fess.it; -import io.restassured.path.json.JsonPath; -import io.restassured.response.Response; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.equalTo; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -30,6 +25,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import io.restassured.path.json.JsonPath; +import io.restassured.response.Response; + public class CrawlTestBase extends ITBase { private static final Logger logger = LoggerFactory.getLogger(CrawlTestBase.class); 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 50969afc6..4b03e43a5 100644 --- a/src/test/java/org/codelibs/fess/it/admin/CrawlerLogTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/CrawlerLogTests.java @@ -23,7 +23,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.codelibs.fess.Constants; import org.codelibs.fess.it.CrawlTestBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/src/test/java/org/codelibs/fess/it/admin/dict/DictTests.java b/src/test/java/org/codelibs/fess/it/admin/dict/DictTests.java index 4b62aff03..430e9d07c 100644 --- a/src/test/java/org/codelibs/fess/it/admin/dict/DictTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/dict/DictTests.java @@ -18,8 +18,8 @@ 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.List; import java.util.Map; import org.codelibs.fess.it.CrudTestBase; diff --git a/src/test/java/org/codelibs/fess/it/search/SearchApiTests.java b/src/test/java/org/codelibs/fess/it/search/SearchApiTests.java index 6353e8ae8..40c23a278 100644 --- a/src/test/java/org/codelibs/fess/it/search/SearchApiTests.java +++ b/src/test/java/org/codelibs/fess/it/search/SearchApiTests.java @@ -16,21 +16,26 @@ package org.codelibs.fess.it.search; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import io.restassured.RestAssured; -import io.restassured.path.json.JsonPath; -import io.restassured.response.Response; -import org.codelibs.fess.Constants; import org.codelibs.fess.it.CrawlTestBase; -import org.junit.jupiter.api.*; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import io.restassured.RestAssured; +import io.restassured.path.json.JsonPath; +import io.restassured.response.Response; /** * Integration Tests which need an execution of crawler diff --git a/src/test/java/org/codelibs/fess/mylasta/direction/FessPropTest.java b/src/test/java/org/codelibs/fess/mylasta/direction/FessPropTest.java index aca478fec..ca467b448 100644 --- a/src/test/java/org/codelibs/fess/mylasta/direction/FessPropTest.java +++ b/src/test/java/org/codelibs/fess/mylasta/direction/FessPropTest.java @@ -27,7 +27,6 @@ import org.codelibs.fess.unit.UnitFessTestCase; import org.codelibs.fess.util.PrunedTag; import org.cyberneko.html.parsers.DOMParser; import org.lastaflute.di.core.factory.SingletonLaContainerFactory; -import org.w3c.dom.Document; import org.w3c.dom.Node; import org.xml.sax.InputSource; -- GitLab