From 6cac125220551ed74cdbc772c7c0574ce6afc5fd Mon Sep 17 00:00:00 2001 From: kaixiliu Date: Tue, 30 Jan 2024 09:42:55 +0800 Subject: Upgrade java 17 Issue-ID: USECASEUI-820 Change-Id: I8faa131749d39f4592fd9b7840ff7017f00ccc5f Signed-off-by: kaixiliu --- .../intentanalysis/IntentAnalysisApplicationTests.java | 8 ++++---- .../intentanalysis/adapters/policy/PolicyServiceTest.java | 3 --- .../usecaseui/intentanalysis/adapters/so/SOServiceTest.java | 10 ---------- .../usecaseui/intentanalysis/util/RestFulServicesTest.java | 2 +- intentanalysis/src/test/resources/application.yaml | 1 + 5 files changed, 6 insertions(+), 18 deletions(-) (limited to 'intentanalysis/src/test') diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/IntentAnalysisApplicationTests.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/IntentAnalysisApplicationTests.java index 965ec6d..a725be5 100644 --- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/IntentAnalysisApplicationTests.java +++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/IntentAnalysisApplicationTests.java @@ -15,10 +15,10 @@ package org.onap.usecaseui.intentanalysis; import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.mybatis.spring.annotation.MapperScan; import org.onap.usecaseui.intentanalysis.util.SpringContextUtil; import org.springframework.boot.SpringApplication; diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/adapters/policy/PolicyServiceTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/adapters/policy/PolicyServiceTest.java index 2f9cf20..4786ee9 100644 --- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/adapters/policy/PolicyServiceTest.java +++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/adapters/policy/PolicyServiceTest.java @@ -21,7 +21,6 @@ import static org.mockito.Mockito.when; import java.io.IOException; -import mockit.MockUp; import okhttp3.MediaType; import okhttp3.ResponseBody; import org.junit.Assert; @@ -60,8 +59,6 @@ public class PolicyServiceTest { private PolicyAPICall policyAPICall; - private MockUp mockup; - @Test public void testCreateAndDeployCLLPolicySuccess() throws IOException { mockUpPolicyApiCall(0); diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/adapters/so/SOServiceTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/adapters/so/SOServiceTest.java index 727c47f..a14a1c1 100644 --- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/adapters/so/SOServiceTest.java +++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/adapters/so/SOServiceTest.java @@ -22,22 +22,14 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.*; - -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import java.io.IOException; -import okhttp3.MediaType; -import okhttp3.RequestBody; -import okhttp3.ResponseBody; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import mockit.Mock; -import org.mockito.junit.MockitoJUnitRunner; import org.onap.usecaseui.intentanalysis.IntentAnalysisApplicationTests; import org.onap.usecaseui.intentanalysis.adapters.aai.apicall.AAIAPICall; -import org.onap.usecaseui.intentanalysis.adapters.policy.apicall.PolicyAPICall; import org.onap.usecaseui.intentanalysis.adapters.so.apicall.SOAPICall; import org.onap.usecaseui.intentanalysis.adapters.so.impl.SOServiceImpl; import org.onap.usecaseui.intentanalysis.bean.models.CCVPNInstance; @@ -45,8 +37,6 @@ import org.onap.usecaseui.intentanalysis.util.TestCall; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import retrofit2.Response; -import org.mockito.MockitoAnnotations; @SpringBootTest(classes = IntentAnalysisApplicationTests.class) @RunWith(SpringRunner.class) diff --git a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/util/RestFulServicesTest.java b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/util/RestFulServicesTest.java index b19e9a1..605bf6f 100644 --- a/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/util/RestFulServicesTest.java +++ b/intentanalysis/src/test/java/org/onap/usecaseui/intentanalysis/util/RestFulServicesTest.java @@ -15,7 +15,7 @@ package org.onap.usecaseui.intentanalysis.util; import java.io.IOException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import okhttp3.RequestBody; import org.junit.Assert; diff --git a/intentanalysis/src/test/resources/application.yaml b/intentanalysis/src/test/resources/application.yaml index 6cbba91..641ac82 100644 --- a/intentanalysis/src/test/resources/application.yaml +++ b/intentanalysis/src/test/resources/application.yaml @@ -31,6 +31,7 @@ spring: driver-class-name: org.h2.Driver main: allow-bean-definition-overriding: true + allow-circular-references: true sql: init: schema-locations: classpath:intentdb-test-init.sql -- cgit 1.2.3-korg