From: zhangfan345 Date: Mon, 5 Sep 2022 02:58:36 +0000 (+0800) Subject: Modify the path of test X-Git-Tag: 5.1.0~13 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0bd4e89deda32fe8bc606f5b624020eb97d1667f;p=usecase-ui%2Fintent-analysis.git Modify the path of test Issue-ID: USECASEUI-716 Signed-off-by: zhangfan345 Change-Id: I284bb1dd4176743a9277a00827857400b5d8f390 --- diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/test/IntentAnalysisApplicationTests.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/IntentAnalysisApplicationTests.java similarity index 97% rename from intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/test/IntentAnalysisApplicationTests.java rename to intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/IntentAnalysisApplicationTests.java index 529f08d..965ec6d 100644 --- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/test/IntentAnalysisApplicationTests.java +++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/IntentAnalysisApplicationTests.java @@ -12,7 +12,7 @@ * the License. */ -package org.onap.usecaseui.intentanalysis.test; +package org.onap.usecaseui.intentanalysis; import java.io.IOException; import javax.servlet.FilterChain; diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/test/adapters/policy/PolicyServiceTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/adapters/policy/PolicyServiceTest.java similarity index 97% rename from intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/test/adapters/policy/PolicyServiceTest.java rename to intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/adapters/policy/PolicyServiceTest.java index 11084e3..ea253e7 100644 --- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/test/adapters/policy/PolicyServiceTest.java +++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/adapters/policy/PolicyServiceTest.java @@ -12,7 +12,7 @@ * the License. */ -package org.onap.usecaseui.intentanalysis.test.adapters.policy; +package org.onap.usecaseui.intentanalysis.adapters.policy; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; @@ -29,8 +29,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.onap.usecaseui.intentanalysis.adapters.policy.apicall.PolicyAPICall; import org.onap.usecaseui.intentanalysis.adapters.policy.impl.PolicyServiceImpl; -import org.onap.usecaseui.intentanalysis.test.IntentAnalysisApplicationTests; -import org.onap.usecaseui.intentanalysis.test.util.TestCall; +import org.onap.usecaseui.intentanalysis.IntentAnalysisApplicationTests; +import org.onap.usecaseui.intentanalysis.util.TestCall; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/test/service/IntentServiceTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/service/IntentServiceTest.java similarity index 97% rename from intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/test/service/IntentServiceTest.java rename to intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/service/IntentServiceTest.java index 6dc1062..9e93b87 100644 --- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/test/service/IntentServiceTest.java +++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/service/IntentServiceTest.java @@ -12,7 +12,7 @@ * the License. */ -package org.onap.usecaseui.intentanalysis.test.service; +package org.onap.usecaseui.intentanalysis.service; import java.io.IOException; import java.util.ArrayList; @@ -30,8 +30,7 @@ import org.onap.usecaseui.intentanalysis.bean.models.Context; import org.onap.usecaseui.intentanalysis.bean.models.Expectation; import org.onap.usecaseui.intentanalysis.bean.models.ExpectationTarget; import org.onap.usecaseui.intentanalysis.bean.models.ExpectationObject; -import org.onap.usecaseui.intentanalysis.service.IntentService; -import org.onap.usecaseui.intentanalysis.test.IntentAnalysisApplicationTests; +import org.onap.usecaseui.intentanalysis.IntentAnalysisApplicationTests; import org.onap.usecaseui.intentanalysis.util.SpringContextUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/test/util/RestFulServicesTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/util/RestFulServicesTest.java similarity index 68% rename from intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/test/util/RestFulServicesTest.java rename to intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/util/RestFulServicesTest.java index 6af9820..b19e9a1 100644 --- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/test/util/RestFulServicesTest.java +++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/util/RestFulServicesTest.java @@ -12,37 +12,17 @@ * the License. */ -package org.onap.usecaseui.intentanalysis.test.util; +package org.onap.usecaseui.intentanalysis.util; -import java.io.BufferedReader; import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.security.Principal; -import java.util.Collection; -import java.util.Enumeration; -import java.util.Locale; -import java.util.Map; -import javax.servlet.AsyncContext; -import javax.servlet.DispatcherType; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpUpgradeHandler; -import javax.servlet.http.Part; + import okhttp3.RequestBody; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.onap.usecaseui.intentanalysis.adapters.policy.apicall.PolicyAPICall; -import org.onap.usecaseui.intentanalysis.test.IntentAnalysisApplicationTests; -import org.onap.usecaseui.intentanalysis.util.RestfulServices; +import org.onap.usecaseui.intentanalysis.IntentAnalysisApplicationTests; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.test.context.junit4.SpringRunner; diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/test/util/TestCall.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/util/TestCall.java similarity index 97% rename from intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/test/util/TestCall.java rename to intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/util/TestCall.java index d9cc4a8..5454097 100644 --- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/test/util/TestCall.java +++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/util/TestCall.java @@ -12,7 +12,7 @@ * the License. */ -package org.onap.usecaseui.intentanalysis.test.util; +package org.onap.usecaseui.intentanalysis.util; import java.io.IOException; import okhttp3.MediaType;