feat: removed improper prints and imports

eclipse-tractusx · Jan 8, 2024 · 5d67e28 · 5d67e28
1 parent 8ebb4e7
commit 5d67e28
Show file tree

Hide file tree

Showing 14 changed files with 34 additions and 97 deletions.
diff --git a/dpp-backend/digitalproductpass/src/test/java/managers/DtrSearchManagerTest.java b/dpp-backend/digitalproductpass/src/test/java/managers/DtrSearchManagerTest.java
@@ -1,38 +1,22 @@
 package managers;
 
-import org.eclipse.tractusx.digitalproductpass.Application;
 import org.eclipse.tractusx.digitalproductpass.config.DtrConfig;
 import org.eclipse.tractusx.digitalproductpass.config.ProcessConfig;
-import org.eclipse.tractusx.digitalproductpass.config.VaultConfig;
-import org.eclipse.tractusx.digitalproductpass.exceptions.ServiceInitializationException;
 import org.eclipse.tractusx.digitalproductpass.managers.DtrSearchManager;
 import org.eclipse.tractusx.digitalproductpass.managers.ProcessManager;
 import org.eclipse.tractusx.digitalproductpass.models.catenax.Dtr;
-import org.eclipse.tractusx.digitalproductpass.models.manager.SearchStatus;
-import org.eclipse.tractusx.digitalproductpass.models.negotiation.Catalog;
 import org.eclipse.tractusx.digitalproductpass.services.DataTransferService;
-import org.eclipse.tractusx.digitalproductpass.services.VaultService;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
-import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.core.env.Environment;
-import org.springframework.mock.env.MockEnvironment;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.util.ReflectionTestUtils;
-import utils.*;
-
-import java.io.InputStream;
-import java.nio.file.Paths;
+import utils.DateTimeUtil;
+import utils.FileUtil;
+import utils.HttpUtil;
+import utils.JsonUtil;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -198,35 +182,4 @@ void saveAndLoadDataModel() {
         dtrSearchManager.deleteBpns(dtrSearchManager.getDtrDataModel(), List.of(bpn1, bpn2));
         dtrSearchManager.saveDtrDataModel();
     }
-
-    @Test
-    void updateProcess() { //TODO
-        String bpn1 = "BPN001";
-        String contractId1 = UUID.randomUUID().toString();
-        String assetId1 = UUID.randomUUID().toString();
-        String endpoint1 = "dtr.endpoint1";
-        Long validUntil1 = DateTimeUtil.getTimestamp();
-        Dtr dtr1 = new Dtr(contractId1, endpoint1, assetId1, bpn1, validUntil1);
-
-    }
-
-    @Test
-    void searchEndpoint() { //TODO
-        String file = Paths.get(fileUtil.getBaseClassDir(this.getClass()), testAssetPath).toString();
-        Object contractOffer = jsonUtil.fromJsonFileToObject(file, Object.class);
-        assertNotNull(contractOffer);
-        Catalog catalog = new Catalog();
-        catalog.setContractOffer(contractOffer);
-        String connectionUrl = "test.connection.url";
-        when(dataTransferService.searchDigitalTwinCatalog(connectionUrl)).thenReturn(catalog);
-        String bpn = "BPN000001";
-        String testProcessId = processManager.initProcess();
-
-        dtrSearchManager.searchEndpoint(testProcessId, bpn, connectionUrl);
-
-        SearchStatus searchStatus = processManager.getSearchStatus(testProcessId);
-
-      //  assertEquals(bpn, searchStatus.getDtrs().get(0).getBpn());
-      //  assertEquals(connectionUrl, searchStatus.getDtrs().get(0).getEndpoint());
-    }
 }
diff --git a/dpp-backend/digitalproductpass/src/test/java/managers/ProcessDataModelTest.java b/dpp-backend/digitalproductpass/src/test/java/managers/ProcessDataModelTest.java
@@ -7,7 +7,6 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 
-import java.lang.reflect.UndeclaredThrowableException;
 import java.util.HashMap;
 import java.util.Map;
 

diff --git a/dpp-backend/digitalproductpass/src/test/java/managers/ProcessManagerTest.java b/dpp-backend/digitalproductpass/src/test/java/managers/ProcessManagerTest.java
@@ -486,8 +486,6 @@ void saveNegotiationRequestAndNegotiation() {
         assertFalse(updatedNegotiation.isEmpty());
         assertEquals(2, updatedNegotiation.size());
 
-        LogUtil.printTest("NEGOTIATION: " + jsonUtil.toJson(updatedNegotiation, true));
-
         Map<String, Object> init = (Map<String, Object>) updatedNegotiation.get("init");
         NegotiationRequest updatedNegotiationRequest = (NegotiationRequest) jsonUtil.bindObject(init.get("request"), NegotiationRequest.class);
 
@@ -511,11 +509,11 @@ void cancelProcessAndSetDecline() {
             public void run() {
                 try {
                     while(true) {
-                        LogUtil.printMessage("NEGOTIATING....!");
+                        LogUtil.printTest("NEGOTIATING....!");
                         sleep(1);
                     }
                 } catch (InterruptedException e) {
-                    LogUtil.printMessage("PROCESS STOPED!");
+                    LogUtil.printTest("PROCESS STOPED!");
                 }
             }
         });
@@ -604,8 +602,6 @@ void saveTransferRequestAndTransfer() {
         assertFalse(updatedTransfer.isEmpty());
         assertEquals(2, updatedTransfer.size());
 
-        LogUtil.printTest("TRANSFER: " + jsonUtil.toJson(updatedTransfer, true));
-
         Map<String, Object> init = (Map<String, Object>) updatedTransfer.get("init");
         TransferRequest updatedTransferRequest = (TransferRequest) jsonUtil.bindObject(init.get("request"), TransferRequest.class);
 

diff --git a/dpp-backend/digitalproductpass/src/test/java/mocks/MockedHttpSession.java b/dpp-backend/digitalproductpass/src/test/java/mocks/MockedHttpSession.java
@@ -4,7 +4,10 @@
 import jakarta.servlet.http.HttpSession;
 import utils.DateTimeUtil;
 
-import java.util.*;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 public class MockedHttpSession implements HttpSession {

diff --git a/dpp-backend/digitalproductpass/src/test/java/services/AasServiceTest.java b/dpp-backend/digitalproductpass/src/test/java/services/AasServiceTest.java
@@ -3,7 +3,6 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpSession;
 import mocks.MockedHttpSession;
-import org.bouncycastle.asn1.x509.GeneralName;
 import org.eclipse.tractusx.digitalproductpass.config.DtrConfig;
 import org.eclipse.tractusx.digitalproductpass.config.PassportConfig;
 import org.eclipse.tractusx.digitalproductpass.config.ProcessConfig;
@@ -12,14 +11,11 @@
 import org.eclipse.tractusx.digitalproductpass.managers.DtrSearchManager;
 import org.eclipse.tractusx.digitalproductpass.managers.ProcessManager;
 import org.eclipse.tractusx.digitalproductpass.models.auth.JwtToken;
-import org.eclipse.tractusx.digitalproductpass.models.catenax.Discovery;
 import org.eclipse.tractusx.digitalproductpass.models.dtregistry.DigitalTwin;
 import org.eclipse.tractusx.digitalproductpass.models.dtregistry.SubModel;
 import org.eclipse.tractusx.digitalproductpass.models.edc.AssetSearch;
-import org.eclipse.tractusx.digitalproductpass.models.edc.DataPlaneEndpoint;
 import org.eclipse.tractusx.digitalproductpass.models.http.requests.Search;
 import org.eclipse.tractusx.digitalproductpass.models.manager.History;
-import org.eclipse.tractusx.digitalproductpass.models.manager.Status;
 import org.eclipse.tractusx.digitalproductpass.services.AasService;
 import org.eclipse.tractusx.digitalproductpass.services.AuthenticationService;
 import org.eclipse.tractusx.digitalproductpass.services.DataTransferService;
@@ -31,19 +27,20 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
 import org.springframework.core.env.Environment;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.mock.env.MockEnvironment;
-import utils.*;
+import utils.FileUtil;
+import utils.HttpUtil;
+import utils.JsonUtil;
+import utils.YamlUtil;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Map;
-import java.util.UUID;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;

diff --git a/dpp-backend/digitalproductpass/src/test/java/services/AuthenticationServiceTest.java b/dpp-backend/digitalproductpass/src/test/java/services/AuthenticationServiceTest.java
@@ -1,6 +1,5 @@
 package services;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import jakarta.servlet.http.HttpServletRequest;
 import org.eclipse.tractusx.digitalproductpass.config.SecurityConfig;
 import org.eclipse.tractusx.digitalproductpass.exceptions.ServiceInitializationException;
@@ -9,18 +8,19 @@
 import org.eclipse.tractusx.digitalproductpass.services.AuthenticationService;
 import org.eclipse.tractusx.digitalproductpass.services.VaultService;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.springframework.core.env.Environment;
-import utils.*;
+import utils.FileUtil;
+import utils.HttpUtil;
+import utils.JsonUtil;
+import utils.YamlUtil;
 
 import java.nio.file.Paths;
 import java.util.Map;
-import java.util.UUID;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.doReturn;

diff --git a/dpp-backend/digitalproductpass/src/test/java/services/CatenaXServiceTest.java b/dpp-backend/digitalproductpass/src/test/java/services/CatenaXServiceTest.java
@@ -28,7 +28,10 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.mock.env.MockEnvironment;
-import utils.*;
+import utils.FileUtil;
+import utils.HttpUtil;
+import utils.JsonUtil;
+import utils.YamlUtil;
 
 import java.nio.file.Paths;
 import java.util.ArrayList;

diff --git a/dpp-backend/digitalproductpass/src/test/java/services/DataPlaneServiceTest.java b/dpp-backend/digitalproductpass/src/test/java/services/DataPlaneServiceTest.java
@@ -7,10 +7,8 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.springframework.core.env.Environment;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -23,7 +21,8 @@
 import java.util.HashMap;
 import java.util.UUID;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.when;
 

diff --git a/dpp-backend/digitalproductpass/src/test/java/services/IrsServiceTest.java b/dpp-backend/digitalproductpass/src/test/java/services/IrsServiceTest.java
@@ -15,7 +15,10 @@
 import org.eclipse.tractusx.digitalproductpass.services.AuthenticationService;
 import org.eclipse.tractusx.digitalproductpass.services.IrsService;
 import org.eclipse.tractusx.digitalproductpass.services.VaultService;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
@@ -29,10 +32,7 @@
 import utils.JsonUtil;
 import utils.YamlUtil;
 
-import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 

diff --git a/dpp-backend/digitalproductpass/src/test/java/utils/CrypUtilTest.java b/dpp-backend/digitalproductpass/src/test/java/utils/CrypUtilTest.java
@@ -23,10 +23,10 @@
 
 package utils;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 class CrypUtilTest {
 

diff --git a/dpp-backend/digitalproductpass/src/test/java/utils/JsonUtilTest.java b/dpp-backend/digitalproductpass/src/test/java/utils/JsonUtilTest.java
@@ -28,10 +28,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
-import org.sonarsource.scanner.api.internal.shaded.minimaljson.Json;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.stereotype.Component;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.HashMap;

diff --git a/dpp-backend/digitalproductpass/src/test/java/utils/LogUtilTest.java b/dpp-backend/digitalproductpass/src/test/java/utils/LogUtilTest.java
@@ -24,12 +24,8 @@
 package utils;
 
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.stereotype.Component;
 
-import static org.junit.Assert.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.fail;
 class LogUtilTest {
 
     @Test

diff --git a/dpp-backend/digitalproductpass/src/test/java/utils/SystemUtilTest.java b/dpp-backend/digitalproductpass/src/test/java/utils/SystemUtilTest.java
@@ -24,10 +24,9 @@
 package utils;
 
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 class SystemUtilTest {
 

diff --git a/dpp-backend/digitalproductpass/src/test/java/utils/YamlUtilTest.java b/dpp-backend/digitalproductpass/src/test/java/utils/YamlUtilTest.java
@@ -27,15 +27,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.stereotype.Component;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.junit4.SpringRunner;
-import org.yaml.snakeyaml.Yaml;
 
-import java.util.HashMap;
 import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.*;