feat: add tests for submodel methods

basyx.submodelrepository/basyx.submodelrepository-client/src/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/client/ConnectedSubmodelRepository.java

@@ -207,7 +207,11 @@ public SubmodelValueOnly getSubmodelByIdValueOnly(String submodelId) throws Elem
 
 	@Override
 	public Submodel getSubmodelByIdMetadata(String submodelId) throws ElementDoesNotExistException {
-		return repoApi.getSubmodelById(submodelId, null, null);
+		try {
+			return repoApi.getSubmodelById(submodelId, null, null);
+		} catch (ApiException e) {
+			throw mapExceptionSubmodelAccess(submodelId, e); 
+		}
 	}
 
 	@Override

basyx.submodelrepository/basyx.submodelrepository-core/src/test/java/org/eclipse/digitaltwin/basyx/submodelrepository/core/SubmodelRepositorySuite.java

@@ -340,6 +340,44 @@ public void invokeNonOperation() {
 
 		submodelRepo.invokeOperation(DummySubmodelFactory.SUBMODEL_TECHNICAL_DATA_ID, SubmodelServiceHelper.SUBMODEL_TECHNICAL_DATA_ANNOTATED_RELATIONSHIP_ELEMENT_ID_SHORT, new OperationVariable[0]);
 	}
+
+	@Test
+    public void getSubmodelByIdValueOnlyExistingSubmodel() {
+		SubmodelRepository repo = getSubmodelRepositoryWithDummySubmodels();
+
+        String submodelId = DummySubmodelFactory.SUBMODEL_OPERATIONAL_DATA_ID;
+        Submodel expectedSubmodel = DummySubmodelFactory.createOperationalDataSubmodel();
+        SubmodelValueOnly expectedValueOnly = new SubmodelValueOnly(expectedSubmodel.getSubmodelElements());
+
+        SubmodelValueOnly valueOnly = repo.getSubmodelByIdValueOnly(submodelId);
+
+        assertEquals(expectedValueOnly.getIdShort(), valueOnly.getIdShort());
+        assertEquals(expectedValueOnly.getValuesOnlyMap(), valueOnly.getValuesOnlyMap());
+    }
+
+    @Test(expected = ElementDoesNotExistException.class)
+    public void getSubmodelByIdValueOnlyNonExistingSubmodel() {
+        SubmodelRepository repo = getSubmodelRepositoryWithDummySubmodels();
+        repo.getSubmodelByIdValueOnly("nonExistingSubmodelId");
+    }
+
+    @Test
+    public void getSubmodelByIdMetadataExistingSubmodel() {
+        SubmodelRepository repo = getSubmodelRepositoryWithDummySubmodels();
+
+        Submodel expectedMetadata = DummySubmodelFactory.createOperationalDataSubmodel();
+        String submodelId = expectedMetadata.getId();
+
+        Submodel metadata = repo.getSubmodelByIdMetadata(submodelId);
+
+        assertEquals(expectedMetadata.getId(), metadata.getId());
+    }
+
+    @Test(expected = ElementDoesNotExistException.class)
+    public void getSubmodelByIdMetadataNonExistingSubmodel() {
+        SubmodelRepository repo = getSubmodelRepositoryWithDummySubmodels();
+        repo.getSubmodelByIdMetadata("nonExistingSubmodelId");
+    }
 
 	private Submodel buildDummySubmodel(String id) {
 		return new DefaultSubmodel.Builder().id(id).submodelElements(new DefaultProperty.Builder().idShort("prop").value("testValue").valueType(DataTypeDefXsd.STRING).build()).build();

basyx.submodelrepository/basyx.submodelrepository-http/src/test/java/org/eclipse/digitaltwin/basyx/submodelrepository/http/SubmodelRepositorySubmodelHTTPTestSuite.java

@@ -384,6 +384,21 @@ public void getFileFromNotExistElement() throws FileNotFoundException, Unsupport
 		assertEquals(HttpStatus.NOT_FOUND.value(), response.getCode());
 	}
 
+	@Test
+	public void getSubmodelByIdValueOnly() throws IOException, ParseException {
+	    String submodelIdentifier = Base64UrlEncodedIdentifier.encodeIdentifier(DummySubmodelFactory.createTechnicalDataSubmodel().getId());
+	    String url = getURL() + "/" + submodelIdentifier + "/$value";
+
+	    String expectedSubmodelJSON = getJSONValueAsString("SingleSubmodelValueOnly.json");
+
+	    CloseableHttpResponse response = BaSyxHttpTestUtils.executeGetOnURL(url);
+	    assertEquals(HttpStatus.OK.value(), response.getCode());
+
+	    String actualSubmodelJSON = BaSyxHttpTestUtils.getResponseAsString(response);
+
+	    BaSyxHttpTestUtils.assertSameJSONContent(expectedSubmodelJSON, actualSubmodelJSON);
+	}
+
 	private String getJSONWithoutCursorInfo(String response) throws JsonMappingException, JsonProcessingException {
 		return BaSyxHttpTestUtils.removeCursorFromJSON(response);
 	}

basyx.submodelrepository/basyx.submodelrepository-http/src/test/resources/SingleSubmodelValueOnly.json

@@ -0,0 +1,117 @@
+{
+  "SubmodelElementList": [
+    {
+      "min": 200,
+      "max": 300
+    },
+    "5000"
+  ],
+  "EntityData": {
+    "statements": [
+      {
+        "MaxRotationSpeed": "5000"
+      },
+      {
+        "RotationSpeedRange": {
+          "min": 200,
+          "max": 300
+        }
+      }
+    ],
+    "entityType": "CoManagedEntity",
+    "globalAssetId": "globalAssetID",
+    "specificAssetIds": [
+      {
+        "specificAssetIdName": "specificValue"
+      }
+    ]
+  },
+  "RelationshipElement": {
+    "first": {
+      "type": "ModelReference",
+      "keys": [
+        {
+          "type": "DataElement",
+          "value": "DataElement"
+        }
+      ]
+    },
+    "second": {
+      "type": "ExternalReference",
+      "keys": [
+        {
+          "type": "BasicEventElement",
+          "value": "BasicEventElement"
+        }
+      ]
+    }
+  },
+  "ReferenceElement": {
+    "type": "ModelReference",
+    "keys": [
+      {
+        "type": "DataElement",
+        "value": "DataElement"
+      }
+    ]
+  },
+  "BlobData": {
+    "contentType": "application/xml",
+    "value": "Test content of XML file"
+  },
+  "SubmodelElementCollection": {
+    "MaxRotationSpeed": "5000",
+    "FileData": {
+      "contentType": "application/json",
+      "value": "testFile.json"
+    }
+  },
+  "MultiLanguage": [
+    {
+      "en": "Hello"
+    },
+    {
+      "de": "Hallo"
+    }
+  ],
+  "AnnotatedRelationshipElement": {
+    "first": {
+      "type": "ModelReference",
+      "keys": [
+        {
+          "type": "DataElement",
+          "value": "DataElement"
+        }
+      ]
+    },
+    "second": {
+      "type": "ExternalReference",
+      "keys": [
+        {
+          "type": "BasicEventElement",
+          "value": "BasicEventElement"
+        }
+      ]
+    },
+    "annotation": [
+      {
+        "MaxRotationSpeed": "5000"
+      },
+      {
+        "RotationSpeedRange": {
+          "min": 200,
+          "max": 300
+        }
+      }
+    ]
+  },
+  "MaxRotationSpeed": "5000",
+  "RotationSpeedRange": {
+    "min": 200,
+    "max": 300
+  },
+  "FileData": {
+    "contentType": "application/json",
+    "value": "testFile.json"
+  }
+}

basyx.submodelservice/basyx.submodelservice-core/src/main/java/org/eclipse/digitaltwin/basyx/submodelservice/value/PropertyValue.java

@@ -47,4 +47,12 @@ public PropertyValue(String value) {
 	public String getValue() {
 		return value;
 	}
+
+	@Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (obj == null || getClass() != obj.getClass()) return false;
+        PropertyValue that = (PropertyValue) obj;
+        return value.equals(that.value);
+    }
 }