From 9fd5129943e99bc2c47f0dca6303e01db18da517 Mon Sep 17 00:00:00 2001 From: mateusmolina Date: Mon, 9 Dec 2024 08:40:07 +0100 Subject: [PATCH] test: refactor DummyAasDescriptorFactory to include AdmInfo in the constructor --- .../aasenvironment/client/TestFixture.java | 6 ++--- .../mapper/DummyAasDescriptorFactory.java | 24 ++++++++++--------- .../AasRepositoryRegistryLinkTestSuite.java | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/basyx.aasenvironment/basyx.aasenvironment-client/src/test/java/org/eclipse/digitaltwin/basyx/aasenvironment/client/TestFixture.java b/basyx.aasenvironment/basyx.aasenvironment-client/src/test/java/org/eclipse/digitaltwin/basyx/aasenvironment/client/TestFixture.java index 5d9468fa1..a6f6c2343 100644 --- a/basyx.aasenvironment/basyx.aasenvironment-client/src/test/java/org/eclipse/digitaltwin/basyx/aasenvironment/client/TestFixture.java +++ b/basyx.aasenvironment/basyx.aasenvironment-client/src/test/java/org/eclipse/digitaltwin/basyx/aasenvironment/client/TestFixture.java @@ -91,7 +91,7 @@ public AssetInformation buildAasPre1AssetInformation() { } public AssetAdministrationShellDescriptor buildAasPre1Descriptor() { - return DummyAasDescriptorFactory.createDummyDescriptor(AAS_PRE1_ID, AAS_PRE1_IDSHORT, AAS_PRE1_GLOBALASSETID, aasRepositoryBasePath); + return DummyAasDescriptorFactory.createDummyDescriptor(AAS_PRE1_ID, AAS_PRE1_IDSHORT, AAS_PRE1_GLOBALASSETID, null, aasRepositoryBasePath); } public AssetAdministrationShellDescriptor buildAasPre1Descriptor_withMultipleInterfaces() { @@ -100,7 +100,7 @@ public AssetAdministrationShellDescriptor buildAasPre1Descriptor_withMultipleInt endpoints.add(DummyAasDescriptorFactory.createEndpoint(aasRepositoryBasePath, "AAS-REPOSITORY-3.0")); endpoints.add(DummyAasDescriptorFactory.createEndpoint(AAS_PRE1_ID, aasRepositoryBasePath, "AAS-3.0")); - return DummyAasDescriptorFactory.createDummyDescriptor(AAS_PRE1_ID, AAS_PRE1_IDSHORT, AAS_PRE1_GLOBALASSETID, endpoints); + return DummyAasDescriptorFactory.createDummyDescriptor(AAS_PRE1_ID, AAS_PRE1_IDSHORT, AAS_PRE1_GLOBALASSETID, null, endpoints); } public Reference buildSmPre1Ref() { @@ -133,7 +133,7 @@ public AssetInformation buildAasPos1AssetInformation() { } public AssetAdministrationShellDescriptor buildAasPos1Descriptor() { - return DummyAasDescriptorFactory.createDummyDescriptor(AAS_POS1_ID, AAS_POS1_IDSHORT, AAS_POS1_GLOBALASSETID, aasRepositoryBasePath); + return DummyAasDescriptorFactory.createDummyDescriptor(AAS_POS1_ID, AAS_POS1_IDSHORT, AAS_POS1_GLOBALASSETID, null, aasRepositoryBasePath); } public SubmodelDescriptor buildSmPos1Descriptor() { diff --git a/basyx.aasregistry/basyx.aasregistry-client-native/src/test/java/org/eclipse/digitaltwin/basyx/aasregistry/main/client/mapper/DummyAasDescriptorFactory.java b/basyx.aasregistry/basyx.aasregistry-client-native/src/test/java/org/eclipse/digitaltwin/basyx/aasregistry/main/client/mapper/DummyAasDescriptorFactory.java index 5c5c0055e..ef1f44e2e 100644 --- a/basyx.aasregistry/basyx.aasregistry-client-native/src/test/java/org/eclipse/digitaltwin/basyx/aasregistry/main/client/mapper/DummyAasDescriptorFactory.java +++ b/basyx.aasregistry/basyx.aasregistry-client-native/src/test/java/org/eclipse/digitaltwin/basyx/aasregistry/main/client/mapper/DummyAasDescriptorFactory.java @@ -47,7 +47,7 @@ public class DummyAasDescriptorFactory { private static final String AAS_REPOSITORY_PATH = "/shells"; - public static AssetAdministrationShellDescriptor createDummyDescriptor(String aasId, String idShort, String globalAssetId, List endpoints) { + public static AssetAdministrationShellDescriptor createDummyDescriptor(String aasId, String idShort, String globalAssetId, AdministrativeInformation administrativeInformation, List endpoints) { AssetAdministrationShellDescriptor descriptor = new AssetAdministrationShellDescriptor(); @@ -56,19 +56,27 @@ public static AssetAdministrationShellDescriptor createDummyDescriptor(String aa descriptor.setAssetKind(AssetKind.INSTANCE); descriptor.setGlobalAssetId(globalAssetId); descriptor.setEndpoints(endpoints); - descriptor.setAdministration(buildAdministrationInformation()); + descriptor.setAdministration(administrativeInformation); return descriptor; } - public static AssetAdministrationShellDescriptor createDummyDescriptor(String aasId, String idShort, String globalAssetId, String... aasRepoBaseUrls) { + public static AssetAdministrationShellDescriptor createDummyDescriptor(String aasId, String idShort, String globalAssetId, AdministrativeInformation administrativeInformation, String... aasRepoBaseUrls) { LinkedList endpoints = new LinkedList<>(); for (String eachUrl : aasRepoBaseUrls) { endpoints.add(createEndpoint(aasId, eachUrl, "AAS-3.0")); } - return createDummyDescriptor(aasId, idShort, globalAssetId, endpoints); + return createDummyDescriptor(aasId, idShort, globalAssetId, administrativeInformation, endpoints); + } + + public static AdministrativeInformation buildAdministrationInformation(String version, String revision, String templateId) { + AdministrativeInformation administrativeInformation = new AdministrativeInformation(); + administrativeInformation.setVersion(version); + administrativeInformation.setRevision(revision); + administrativeInformation.setTemplateId(templateId); + return administrativeInformation; } public static Endpoint createEndpoint(String endpointUrl, String endpointInterface) { @@ -85,6 +93,7 @@ public static Endpoint createEndpoint(String aasId, String aasRepoBaseUrl, Strin return createEndpoint(href, endpointInterface); } + private static ProtocolInformation createProtocolInformation(String href) { ProtocolInformation protocolInformation = new ProtocolInformation(); protocolInformation.setHref(href); @@ -105,12 +114,5 @@ private static String getProtocol(String endpoint) { } } - private static AdministrativeInformation buildAdministrationInformation() { - AdministrativeInformation administrativeInformation = new AdministrativeInformation(); - administrativeInformation.setVersion("0"); - administrativeInformation.setRevision("9"); - administrativeInformation.setTemplateId("testTemplateId"); - return administrativeInformation; - } } diff --git a/basyx.aasrepository/basyx.aasrepository-feature-registry-integration/src/test/java/org/eclipse/digitaltwin/basyx/aasrepository/feature/registry/integration/AasRepositoryRegistryLinkTestSuite.java b/basyx.aasrepository/basyx.aasrepository-feature-registry-integration/src/test/java/org/eclipse/digitaltwin/basyx/aasrepository/feature/registry/integration/AasRepositoryRegistryLinkTestSuite.java index 09c55e696..e1c9d06f9 100644 --- a/basyx.aasrepository/basyx.aasrepository-feature-registry-integration/src/test/java/org/eclipse/digitaltwin/basyx/aasrepository/feature/registry/integration/AasRepositoryRegistryLinkTestSuite.java +++ b/basyx.aasrepository/basyx.aasrepository-feature-registry-integration/src/test/java/org/eclipse/digitaltwin/basyx/aasrepository/feature/registry/integration/AasRepositoryRegistryLinkTestSuite.java @@ -67,7 +67,7 @@ public abstract class AasRepositoryRegistryLinkTestSuite { protected abstract RegistryAndDiscoveryInterfaceApi getAasRegistryApi(); private final AssetAdministrationShellDescriptor DUMMY_DESCRIPTOR = DummyAasDescriptorFactory - .createDummyDescriptor(DUMMY_AAS_ID, DUMMY_IDSHORT, DUMMY_GLOBAL_ASSETID, getAasRepoBaseUrls()); + .createDummyDescriptor(DUMMY_AAS_ID, DUMMY_IDSHORT, DUMMY_GLOBAL_ASSETID, DummyAasDescriptorFactory.buildAdministrationInformation("0", "9", "testTemplateId"), getAasRepoBaseUrls()); @Test public void createAas() throws FileNotFoundException, IOException, ApiException {