[#1026] Fix junit tests in streampipes-connect-management

apache · Jan 3, 2023 · 069bfc8 · 069bfc8
1 parent 86f87af
commit 069bfc8
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 469 deletions.
diff --git a/streampipes-connect-management/pom.xml b/streampipes-connect-management/pom.xml
@@ -79,16 +79,6 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito2</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/...rc/test/java/org/apache/streampipes/connect/management/health/AdapterHealthCheckTest.java b/...rc/test/java/org/apache/streampipes/connect/management/health/AdapterHealthCheckTest.java
diff --git a/...ava/org/apache/streampipes/connect/management/management/AdapterMasterManagementTest.java b/...ava/org/apache/streampipes/connect/management/management/AdapterMasterManagementTest.java
@@ -26,7 +26,6 @@
 
 import org.junit.Test;
 
-import java.util.Arrays;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
@@ -49,7 +48,7 @@ public void getAdapterFailNull() throws AdapterException {
 
   @Test(expected = AdapterException.class)
   public void getAdapterFail() throws AdapterException {
-    List<AdapterDescription> adapterDescriptions = Arrays.asList(new GenericAdapterStreamDescription());
+    List<AdapterDescription> adapterDescriptions = List.of(new GenericAdapterStreamDescription());
     AdapterInstanceStorageImpl adapterStorage = mock(AdapterInstanceStorageImpl.class);
     AdapterResourceManager resourceManager = mock(AdapterResourceManager.class);
     when(adapterStorage.getAllAdapters()).thenReturn(adapterDescriptions);
@@ -62,7 +61,7 @@ public void getAdapterFail() throws AdapterException {
 
   @Test
   public void getAllAdaptersSuccess() throws AdapterException {
-    List<AdapterDescription> adapterDescriptions = Arrays.asList(new GenericAdapterStreamDescription());
+    List<AdapterDescription> adapterDescriptions = List.of(new GenericAdapterStreamDescription());
     AdapterInstanceStorageImpl adapterStorage = mock(AdapterInstanceStorageImpl.class);
     AdapterResourceManager resourceManager = mock(AdapterResourceManager.class);
     when(adapterStorage.getAllAdapters()).thenReturn(adapterDescriptions);

diff --git a/.../java/org/apache/streampipes/connect/management/management/DescriptionManagementTest.java b/.../java/org/apache/streampipes/connect/management/management/DescriptionManagementTest.java
diff --git a/...t/java/org/apache/streampipes/connect/management/management/UnitMasterManagementTest.java b/...t/java/org/apache/streampipes/connect/management/management/UnitMasterManagementTest.java