implements comments on PR

geso02 · Jun 5, 2024 · 29a2858 · 29a2858
1 parent d7f9b3d
commit 29a2858
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/...se/digitaltwin/basyx/submodelrepository/http/SubmodelRepositorySubmodelHTTPTestSuite.java b/...se/digitaltwin/basyx/submodelrepository/http/SubmodelRepositorySubmodelHTTPTestSuite.java
@@ -230,14 +230,15 @@ public void updateNonFileSME() throws FileNotFoundException, IOException, ParseE
 	}
 
 	@Test
-	public void updateNonNestedSME() throws FileNotFoundException, IOException, ParseException {
-
+	public void updateNonNestedSME() throws FileNotFoundException, IOException, ParseException {        
 	    String submodelJSON = getJSONValueAsString("SingleSubmodelNew.json");
+
+	    String element = getJSONValueAsString("PropertySubmodelElementUpdate.json");
+
+	    String idShortPathPropertyInRootSme = "MaxRotationSpeed";
+
 	    CloseableHttpResponse creationResponse = BaSyxSubmodelHttpTestUtils.createSubmodel(getURL(), submodelJSON);
 	    assertSubmodelCreationReponse(submodelJSON, creationResponse);
-
-	    String element = getJSONValueAsString("PropertySubmodelElementUpdate.json");  
-	    String idShortPathPropertyInRootSme = "MaxRotationSpeed";
 
 	    CloseableHttpResponse updatedResponse = updateElement(createSpecificSubmodelElementURL(DummySubmodelFactory.SUBMODEL_TECHNICAL_DATA_ID,idShortPathPropertyInRootSme), element);
 	    assertEquals(HttpStatus.NO_CONTENT.value(), updatedResponse.getCode());

diff --git a/...ore/src/test/java/org/eclipse/digitaltwin/basyx/submodelservice/SubmodelServiceSuite.java b/...ore/src/test/java/org/eclipse/digitaltwin/basyx/submodelservice/SubmodelServiceSuite.java
@@ -366,16 +366,19 @@ public void updateNonFileSME() {
     public void updateNonNestedSME() {
         Submodel technicalSubmodel = DummySubmodelFactory.createTechnicalDataSubmodel();
         SubmodelService submodelService = getSubmodelService(technicalSubmodel);
+
         Property property = createDummyProperty("test123");
 
         submodelService.createSubmodelElement(property);
 
         String idShortPathRootSME = "test123";
 
-        Property newProperty = SubmodelServiceHelper.createDummyProperty("test123", "arbitraryValue", DataTypeDefXsd.STRING);
+        Property expectedUpdatedProperty = SubmodelServiceHelper.createDummyProperty("test123", "arbitraryValue", DataTypeDefXsd.STRING);
+
         submodelService.updateSubmodelElement(idShortPathRootSME, newProperty);
 
-        Property updatedProperty = (Property) submodelService.getSubmodelElement(idShortPathRootSME);
+        Property actualUpdatedProperty = (Property) submodelService.getSubmodelElement(idShortPathRootSME);
+
         assertEquals(newProperty, updatedProperty);
     }