From 3659ba847d4e32d8bc86f8a3c3594234762049ea Mon Sep 17 00:00:00 2001 From: jpadhiyar Date: Tue, 19 Mar 2024 23:50:29 -0300 Subject: [PATCH] fix: resolve PMD Checks, unnecessary imports, unused package. --- sofa-boot-project/sofa-boot/pom.xml | 7 +----- .../VerificationResultTests.java | 5 ++-- .../SofaGenericApplicationContextTests.java | 2 -- .../boot/startup/StartupReporterTests.java | 12 ++++------ .../sofa/boot/util/SofaBootEnvUtilsTests.java | 24 ++++++------------- 5 files changed, 14 insertions(+), 36 deletions(-) diff --git a/sofa-boot-project/sofa-boot/pom.xml b/sofa-boot-project/sofa-boot/pom.xml index 441089bcc..46ea0a1d2 100644 --- a/sofa-boot-project/sofa-boot/pom.xml +++ b/sofa-boot-project/sofa-boot/pom.xml @@ -45,12 +45,7 @@ logback-classic test - - org.testng - testng - RELEASE - test - + diff --git a/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/compatibility/VerificationResultTests.java b/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/compatibility/VerificationResultTests.java index 2f2673828..43e76e2a1 100644 --- a/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/compatibility/VerificationResultTests.java +++ b/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/compatibility/VerificationResultTests.java @@ -1,9 +1,8 @@ package com.alipay.sofa.boot.compatibility; -import com.alipay.sofa.boot.compatibility.VerificationResult; -import com.alipay.sofa.boot.util.SofaBootEnvUtils; import org.junit.jupiter.api.Test; -import static org.assertj.core.api.Assertions.*; + +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for {@link VerificationResult}. diff --git a/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/context/SofaGenericApplicationContextTests.java b/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/context/SofaGenericApplicationContextTests.java index 6d94baa76..1a0ae1ab7 100644 --- a/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/context/SofaGenericApplicationContextTests.java +++ b/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/context/SofaGenericApplicationContextTests.java @@ -132,8 +132,6 @@ public void afterRefresh(SofaGenericApplicationContext context, Throwable throwa failed = throwable != null; } - - public boolean isStarted() { return started; } diff --git a/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/startup/StartupReporterTests.java b/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/startup/StartupReporterTests.java index d2994aa85..6ce82a34f 100644 --- a/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/startup/StartupReporterTests.java +++ b/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/startup/StartupReporterTests.java @@ -1,16 +1,14 @@ package com.alipay.sofa.boot.startup; -import com.alipay.sofa.boot.env.SofaBootEnvironmentPostProcessor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.env.ConfigurableEnvironment; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * Tests for {@link StartupReporter}. @@ -24,12 +22,13 @@ public class StartupReporterTests { ConfigurableApplicationContext mockContext; @Mock - ConfigurableEnvironment mockEnvironment; + ConfigurableEnvironment mockEnvironment; @BeforeEach public void setup() { MockitoAnnotations.openMocks(this); } + @Test public void testApplicationBootFinish() { StartupReporter startupReporter = new StartupReporter(); @@ -45,13 +44,10 @@ public void testAddCommonStartupStat() { }); } - @Test public void testDrainStartupStaticsModel() { StartupReporter startupReporter = new StartupReporter(); assertNotNull(startupReporter.drainStartupStaticsModel()); } - - } \ No newline at end of file diff --git a/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/util/SofaBootEnvUtilsTests.java b/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/util/SofaBootEnvUtilsTests.java index 338a3f1aa..29b8e84e3 100644 --- a/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/util/SofaBootEnvUtilsTests.java +++ b/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/util/SofaBootEnvUtilsTests.java @@ -17,15 +17,10 @@ package com.alipay.sofa.boot.util; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; -import org.springframework.cloud.util.PropertyUtils; -import org.springframework.core.env.ConfigurableEnvironment; -import org.springframework.core.env.Environment; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; /** * Tests for {@link SofaBootEnvUtils}. @@ -73,16 +68,16 @@ public void testInitSpringTestEnv() { } private boolean isInitSpringTestEnv() { - StackTraceElement[] stackTrace = new StackTraceElement[]{ + StackTraceElement[] stackTrace = new StackTraceElement[] { new StackTraceElement("SomeClass", "someMethod", "SomeClass.java", 10), new StackTraceElement("AnotherClass", "loadContext", "AnotherClass.java", 20), - new StackTraceElement("org.springframework.boot.test.context.SpringBootContextLoader", - "loadContext", "SpringBootContextLoader.java", 30) - }; + new StackTraceElement( + "org.springframework.boot.test.context.SpringBootContextLoader", "loadContext", + "SpringBootContextLoader.java", 30) }; boolean TEST_ENV = false; for (StackTraceElement stackTraceElement : stackTrace) { if ("loadContext".equals(stackTraceElement.getMethodName()) - && "org.springframework.boot.test.context.SpringBootContextLoader" + && "org.springframework.boot.test.context.SpringBootContextLoader" .equals(stackTraceElement.getClassName())) { TEST_ENV = true; break; @@ -91,8 +86,3 @@ private boolean isInitSpringTestEnv() { return TEST_ENV; } } - - - - -