feature: #586 refactor

catenax-ng · May 3, 2024 · 41c7d39 · 41c7d39
1 parent e398a20
commit 41c7d39
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 13 deletions.
diff --git a/...va/org/eclipse/tractusx/traceability/integration/assets/AssetAsBuiltControllerByIdIT.java b/...va/org/eclipse/tractusx/traceability/integration/assets/AssetAsBuiltControllerByIdIT.java
@@ -106,7 +106,6 @@ void givenAlertsForAsset_whenCallAssetById_thenReturnProperCount() throws JoseEx
     @Test
     void givenInvestigationsForAsset_whenCallAssetById_thenReturnProperCount() throws JoseException {
         // Given
-
         assetsSupport.defaultAssetsStored();
         AssetAsBuiltEntity assetAsBuilt = jpaAssetAsBuiltRepository.findById("urn:uuid:d387fa8e-603c-42bd-98c3-4d87fef8d2bb").orElseThrow();
         investigationsSupport.storeInvestigationWithStatusAndAssets(CREATED, List.of(assetAsBuilt));

diff --git a/...bility/integration/assets/asbuilt/infrastructure/repository/AssetAsBuiltRepositoryIT.java b/...bility/integration/assets/asbuilt/infrastructure/repository/AssetAsBuiltRepositoryIT.java
@@ -49,9 +49,6 @@ class AssetAsBuiltRepositoryIT extends IntegrationTestSpecification {
     @Autowired
     JpaAssetAsBuiltRepository jpaAssetAsBuiltRepository;
 
-    @Autowired
-    BpnSupport bpnSupport;
-
     @ParameterizedTest
     @MethodSource("fieldNameTestProvider")
     void givenIdField_whenGetFieldValues_thenSorted(
@@ -61,7 +58,6 @@ void givenIdField_whenGetFieldValues_thenSorted(
             Integer expectedSize
     ) {
         // given
-        bpnSupport.providesBpdmLookup();
         assetsSupport.defaultAssetsStored();
 
         // when
@@ -76,7 +72,6 @@ void givenIdField_whenGetFieldValues_thenSorted(
     @Test
     void givenAssets_whenGetByImportStateIn_thenReturnProperAssets() {
         // given
-        bpnSupport.providesBpdmLookup();
         assetsSupport.defaultAssetsStored();
         AssetAsBuiltEntity entityInSyncState = jpaAssetAsBuiltRepository.findById("urn:uuid:d387fa8e-603c-42bd-98c3-4d87fef8d2bb").get();
         entityInSyncState.setImportState(ImportState.IN_SYNCHRONIZATION);

diff --git a/...tractusx/traceability/integration/assets/infrastructure/base/IrsCallbackControllerIT.java b/...tractusx/traceability/integration/assets/infrastructure/base/IrsCallbackControllerIT.java
@@ -292,7 +292,6 @@ void givenNoAssets_whenCallbackReceived_thenSaveThem_withoutManufacturerName() t
         // given
 
         bpnSupport.returnsBpdmLookup401Unauthorized();
-        oAuth2ApiSupport.oauth2ApiReturnsTechnicalUserToken();
         irsApiSupport.irsApiReturnsJobDetails();
         String jobId = "ebb79c45-7bba-4169-bf17-3e719989ab54";
         String jobState = "COMPLETED";
@@ -312,7 +311,7 @@ void givenNoAssets_whenCallbackReceived_thenSaveThem_withoutManufacturerName() t
         // then
         assetsSupport.assertAssetAsBuiltSize(16);
         assetsSupport.assertAssetAsPlannedSize(0);
-        String contractAgreementId = given()
+        String manufacturerName = given()
                 .header(oAuth2Support.jwtAuthorization(JwtRole.ADMIN))
                 .contentType(ContentType.JSON)
                 .log().all()
@@ -322,8 +321,8 @@ void givenNoAssets_whenCallbackReceived_thenSaveThem_withoutManufacturerName() t
                 .then()
                 .log().all()
                 .statusCode(200)
-                .extract().path("contractAgreementId");
-        assertThat(contractAgreementId).isNotEmpty();
+                .extract().path("manufacturerName");
+        assertThat(manufacturerName).isNull();
     }
 
 

diff --git a/...test/java/org/eclipse/tractusx/traceability/integration/common/support/AssetTestData.java b/...test/java/org/eclipse/tractusx/traceability/integration/common/support/AssetTestData.java
@@ -23,7 +23,6 @@
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import lombok.extern.slf4j.Slf4j;
 import org.eclipse.tractusx.traceability.assets.domain.base.model.AssetBase;
 import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.IRSResponse;
 import org.eclipse.tractusx.traceability.assets.infrastructure.base.irs.model.response.factory.AssetMapperFactory;
@@ -38,7 +37,6 @@
 import java.util.List;
 
 @Component
-@Slf4j
 public class AssetTestData {
 
     @Autowired
@@ -55,7 +53,6 @@ List<AssetBase> readAndConvertAssetsForTests() {
             IRSResponse response = mapper.readValue(file, IRSResponse.class);
             return assetMapperFactory.mapToAssetBaseList(response);
         } catch (IOException e) {
-            log.error("unable to read and convert assets", e);
             return Collections.emptyList();
         }
     }