Fixes docker build issue with SM Repo (#134)

* Fixes docker build issue with SM Repo Signed-off-by: Mohammad Ghazanfar Ali Danish <[email protected]> * Adds missing test file Signed-off-by: Mohammad Ghazanfar Ali Danish <[email protected]> --------- Signed-off-by: Mohammad Ghazanfar Ali Danish <[email protected]>
eclipse-basyx · Nov 13, 2023 · 07a0303 · 07a0303
1 parent a591764
commit 07a0303
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 21 deletions.
diff --git a/...se/digitaltwin/basyx/submodelrepository/http/SubmodelRepositorySubmodelHTTPTestSuite.java b/...se/digitaltwin/basyx/submodelrepository/http/SubmodelRepositorySubmodelHTTPTestSuite.java
@@ -240,7 +240,7 @@ public void deleteFileFromNotExistElement() throws FileNotFoundException, Unsupp
 
 	@Test
 	public void getFile() throws FileNotFoundException, IOException, ParseException {
-		String fileName = "BaSyx-Logo.png";
+		String fileName = DummySubmodelFactory.FILE_NAME;
 
 		byte[] expectedFile = readBytesFromClasspath(fileName);
 
@@ -281,9 +281,9 @@ private String createSMEFileGetURL(String submodelId, String submodelElementIdSh
 	private CloseableHttpResponse uploadFileToSubmodelElement(String submodelId, String submodelElementIdShort) throws IOException {
 		CloseableHttpClient client = HttpClients.createDefault();
 
-		String fileName = "BaSyx-Logo.png";
+		String fileName = DummySubmodelFactory.FILE_NAME;
 
-		java.io.File file = ResourceUtils.getFile("src/test/resources/" + fileName);
+		java.io.File file = ResourceUtils.getFile("classpath:" + fileName);
 
 		HttpPut putRequest = createPutRequestWithFile(submodelId, submodelElementIdShort, fileName, file);
 
@@ -382,7 +382,7 @@ private byte[] readBytesFromClasspath(String fileName) throws FileNotFoundExcept
 	}
 
 	protected List<Submodel> createSubmodels() {
-		return Arrays.asList(DummySubmodelFactory.createTechnicalDataSubmodel(), DummySubmodelFactory.createOperationalDataSubmodel(), DummySubmodelFactory.createSimpleDataSubmodel());
+		return Arrays.asList(DummySubmodelFactory.createTechnicalDataSubmodel(), DummySubmodelFactory.createOperationalDataSubmodel(), DummySubmodelFactory.createSimpleDataSubmodel(), DummySubmodelFactory.createSubmodelWithFileElement());
 	}
 
 }
diff --git a/...eclipse/digitaltwin/basyx/submodelrepository/http/TestSubmodelRepositorySubmodelHTTP.java b/...eclipse/digitaltwin/basyx/submodelrepository/http/TestSubmodelRepositorySubmodelHTTP.java
@@ -25,13 +25,10 @@
 
 package org.eclipse.digitaltwin.basyx.submodelrepository.http;
 
-import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.util.Collection;
 
 import org.eclipse.digitaltwin.aas4j.v3.model.Submodel;
 import org.eclipse.digitaltwin.basyx.core.pagination.PaginationInfo;
-import org.eclipse.digitaltwin.basyx.http.serialization.BaSyxHttpTestUtils;
 import org.eclipse.digitaltwin.basyx.submodelrepository.SubmodelRepository;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -46,7 +43,6 @@
  */
 public class TestSubmodelRepositorySubmodelHTTP extends SubmodelRepositorySubmodelHTTPTestSuite {
 	private static final PaginationInfo NO_LIMIT_PAGINATION_INFO = new PaginationInfo(0, null);
-	private static final String SUBMODEL_JSON = "SingleSubmodel4FileTest.json";
 	private static ConfigurableApplicationContext appContext;
 
 	@BeforeClass
@@ -65,12 +61,6 @@ public void populateRepository() {
 		SubmodelRepository repo = appContext.getBean(SubmodelRepository.class);
 		Collection<Submodel> submodels = createSubmodels();
 		submodels.forEach(repo::createSubmodel);
-		try {
-			createSubmodel4FileTest();
-		} catch (IOException e) {
-			System.out.println("Cannot load " + SUBMODEL_JSON + " for testing file-upload feature.");
-			e.printStackTrace();
-		}
 	}
 
 	@AfterClass
@@ -83,10 +73,4 @@ protected String getURL() {
 		return "http://localhost:8080/submodels";
 	}
 
-	private void createSubmodel4FileTest() throws FileNotFoundException, IOException {
-		String submodelJSON = BaSyxHttpTestUtils.readJSONStringFromClasspath(SUBMODEL_JSON);
-
-		BaSyxSubmodelHttpTestUtils.createSubmodel(getURL(), submodelJSON);
-	}
-
 }
diff --git a/basyx.submodelrepository/basyx.submodelrepository.component/pom.xml b/basyx.submodelrepository/basyx.submodelrepository.component/pom.xml
@@ -95,7 +95,6 @@
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>

diff --git a/...repository/basyx.submodelrepository.component/src/test/resources/BaSyx-Logo.png b/...repository/basyx.submodelrepository.component/src/test/resources/BaSyx-Logo.png
diff --git a/...ore/src/test/java/org/eclipse/digitaltwin/basyx/submodelservice/DummySubmodelFactory.java b/...ore/src/test/java/org/eclipse/digitaltwin/basyx/submodelservice/DummySubmodelFactory.java
@@ -33,7 +33,9 @@
 import java.util.stream.Stream;
 
 import org.eclipse.digitaltwin.aas4j.v3.model.DataTypeDefXSD;
+import org.eclipse.digitaltwin.aas4j.v3.model.File;
 import org.eclipse.digitaltwin.aas4j.v3.model.KeyTypes;
+import org.eclipse.digitaltwin.aas4j.v3.model.Property;
 import org.eclipse.digitaltwin.aas4j.v3.model.ReferenceTypes;
 import org.eclipse.digitaltwin.aas4j.v3.model.Submodel;
 import org.eclipse.digitaltwin.aas4j.v3.model.SubmodelElement;
@@ -100,8 +102,10 @@ public class DummySubmodelFactory {
 
 	//SUBMODEL_FOR_FILE_TEST
 	public static final String SUBMODEL_FOR_FILE_TEST = "8A6344BDAB57E184";
+	public static final String SUBMODEL_FOR_FILE_TEST_ID_SHORT = "FileTests";
 	public static final String SUBMODEL_ELEMENT_FILE_ID_SHORT = "FileData";
 	public static final String SUBMODEL_ELEMENT_NON_FILE_ID_SHORT = "NonFileParameter";
+	public static final String FILE_NAME = "BaSyx-Logo.png";
 
 	public static Collection<Submodel> getSubmodels() {
 		return Arrays.asList(createTechnicalDataSubmodel(), createOperationalDataSubmodel(), createSimpleDataSubmodel());
@@ -129,6 +133,18 @@ public static Submodel createTechnicalDataSubmodel() {
 				.submodelElements(SubmodelServiceHelper.getAllSubmodelElements())
 				.build();
 	}
+
+	public static Submodel createSubmodelWithFileElement() {
+		return new DefaultSubmodel.Builder().semanticID(new DefaultReference.Builder().keys(new DefaultKey.Builder().type(KeyTypes.GLOBAL_REFERENCE)
+				.value(SUBMODEL_TECHNICAL_DATA_SEMANTIC_ID)
+				.build())
+				.type(ReferenceTypes.EXTERNAL_REFERENCE)
+				.build())
+				.idShort(SUBMODEL_FOR_FILE_TEST_ID_SHORT)
+				.id(SUBMODEL_FOR_FILE_TEST)
+				.submodelElements(Arrays.asList(createFileElement(), createNonFileElement()))
+				.build();
+	}
 
 	public static Submodel createOperationalDataSubmodel() {
 		return new DefaultSubmodel.Builder().idShort(SUBMODEL_OPERATIONAL_DATA_ID_SHORT)
@@ -254,5 +270,19 @@ private static List<SubmodelElement> createSimpleSubmodelElements() {
 		list.add(createProperty(SUBMODEL_ELEMENT_SIMPLE_DATA_ID_SHORT));
 		return list;
 	}
+
+	private static Property createNonFileElement() {
+		Property simpleProperty = SubmodelServiceHelper.createPropertySubmodelElement();
+		simpleProperty.setIdShort(SUBMODEL_ELEMENT_NON_FILE_ID_SHORT);
+
+		return simpleProperty;
+	}
+
+	private static File createFileElement() {
+		File simpleFile = SubmodelServiceHelper.createFileSubmodelElement();
+		simpleFile.setValue(FILE_NAME);
+
+		return simpleFile;
+	}
 
 }