From 5d67e28ae48abf73fba0b75b01d2e12d61819ff7 Mon Sep 17 00:00:00 2001 From: Mathias Brunkow Moser Date: Mon, 8 Jan 2024 18:08:50 +0100 Subject: [PATCH] feat: removed improper prints and imports --- .../java/managers/DtrSearchManagerTest.java | 57 ++----------------- .../java/managers/ProcessDataModelTest.java | 1 - .../java/managers/ProcessManagerTest.java | 8 +-- .../test/java/mocks/MockedHttpSession.java | 5 +- .../test/java/services/AasServiceTest.java | 11 ++-- .../services/AuthenticationServiceTest.java | 8 +-- .../java/services/CatenaXServiceTest.java | 5 +- .../java/services/DataPlaneServiceTest.java | 5 +- .../test/java/services/IrsServiceTest.java | 8 +-- .../src/test/java/utils/CrypUtilTest.java | 4 +- .../src/test/java/utils/JsonUtilTest.java | 2 - .../src/test/java/utils/LogUtilTest.java | 6 +- .../src/test/java/utils/SystemUtilTest.java | 5 +- .../src/test/java/utils/YamlUtilTest.java | 6 -- 14 files changed, 34 insertions(+), 97 deletions(-) diff --git a/dpp-backend/digitalproductpass/src/test/java/managers/DtrSearchManagerTest.java b/dpp-backend/digitalproductpass/src/test/java/managers/DtrSearchManagerTest.java index 827453f64..07354c928 100644 --- 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 index 2a678792e..9195a86a2 100644 --- 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 index 4638c967a..5a2c5d458 100644 --- 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 init = (Map) 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 init = (Map) 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 index 9f79688c1..8a1dbe2b6 100644 --- 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 index 11a6b8350..8eb82e0a5 100644 --- 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 index dcfcc0107..0d1d845e8 100644 --- 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 index e4b13b352..d43ece639 100644 --- 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 index 9ad8fa995..6a7938ac6 100644 --- 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 index 6d5521243..821d1838b 100644 --- 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 index e43627b32..7e69e01c9 100644 --- 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 index e3d53c413..dc750163a 100644 --- 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 index b444329fe..8783b6b2a 100644 --- 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 index 87e62b5f8..75c584622 100644 --- 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 index a6d64a24a..2676d9620 100644 --- 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.*;