Merge pull request #22 from Daespen/feature/test-core

Feature/test core

Author: br-iosb

dataformat-aasx/pom.xml

@@ -17,6 +17,13 @@
             <version>${revision}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>io.admin-shell.aas</groupId>
+            <artifactId>dataformat-core</artifactId>
+            <version>${revision}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.admin-shell.aas</groupId>
             <artifactId>model</artifactId>

dataformat-aasx/src/main/java/io/adminshell/aas/v3/dataformat/aasx/AASXDeserializer.java

@@ -18,7 +18,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringWriter;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -31,6 +30,7 @@
 import org.apache.poi.openxml4j.opc.PackagingURIHelper;
 
 import io.adminshell.aas.v3.dataformat.DeserializationException;
+import io.adminshell.aas.v3.dataformat.Serializer;
 import io.adminshell.aas.v3.dataformat.xml.XmlDeserializer;
 import io.adminshell.aas.v3.model.AssetAdministrationShellEnvironment;
 import io.adminshell.aas.v3.model.File;
@@ -125,7 +125,7 @@ private String getXMLResourceString(OPCPackage aasxPackage) throws InvalidFormat
         // Read the content from the PackagePart
         InputStream stream = xmlPart.getInputStream();
         StringWriter writer = new StringWriter();
-        IOUtils.copy(stream, writer, StandardCharsets.UTF_8);
+        IOUtils.copy(stream, writer, Serializer.DEFAULT_CHARSET);
         return writer.toString();
     }
 

dataformat-aasx/src/main/java/io/adminshell/aas/v3/dataformat/aasx/AASXSerializer.java

@@ -101,7 +101,7 @@ public void write(AssetAdministrationShellEnvironment environment, Collection<In
         String xml = xmlSerializer.write(environment);
 
         // Save the XML to aasx/xml/content.xml
-        PackagePart xmlPart = createAASXPart(rootPackage, origin, XML_PATH, MIME_XML, AASSPEC_RELTYPE, xml.getBytes());
+        PackagePart xmlPart = createAASXPart(rootPackage, origin, XML_PATH, MIME_XML, AASSPEC_RELTYPE, xml.getBytes(Serializer.DEFAULT_CHARSET));
 
         storeFilesInAASX(environment.getSubmodels(), files, rootPackage, xmlPart);
 

dataformat-aasx/src/test/java/io/adminshell/aas/v3/dataformat/aasx/deserialization/AASXDeserializerTest.java

@@ -38,7 +38,7 @@
 import io.adminshell.aas.v3.dataformat.aasx.AASXDeserializer;
 import io.adminshell.aas.v3.dataformat.aasx.AASXSerializer;
 import io.adminshell.aas.v3.dataformat.aasx.InMemoryFile;
-import io.adminshell.aas.v3.dataformat.aasx.serialization.AASSimple;
+import io.adminshell.aas.v3.dataformat.core.AASSimple;
 
 public class AASXDeserializerTest {
 

dataformat-aasx/src/test/java/io/adminshell/aas/v3/dataformat/aasx/deserialization/ValidationTest.java

@@ -16,26 +16,30 @@
 package io.adminshell.aas.v3.dataformat.aasx.deserialization;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 
-import io.adminshell.aas.v3.dataformat.DeserializationException;
-import io.adminshell.aas.v3.dataformat.SerializationException;
-import io.adminshell.aas.v3.dataformat.aasx.AASXDeserializer;
-import io.adminshell.aas.v3.dataformat.aasx.AASXSerializer;
-import io.adminshell.aas.v3.dataformat.aasx.AASXValidator;
-import io.adminshell.aas.v3.dataformat.aasx.InMemoryFile;
-import io.adminshell.aas.v3.dataformat.aasx.serialization.AASSimple;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import javax.xml.parsers.ParserConfigurationException;
+
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.xml.sax.SAXException;
 
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.*;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
+import io.adminshell.aas.v3.dataformat.DeserializationException;
+import io.adminshell.aas.v3.dataformat.SerializationException;
+import io.adminshell.aas.v3.dataformat.aasx.AASXSerializer;
+import io.adminshell.aas.v3.dataformat.aasx.AASXValidator;
+import io.adminshell.aas.v3.dataformat.aasx.InMemoryFile;
+import io.adminshell.aas.v3.dataformat.core.AASSimple;
 
 public class ValidationTest {
 

dataformat-aasx/src/test/java/io/adminshell/aas/v3/dataformat/aasx/serialization/AASSimple.java

@@ -15,6 +15,7 @@
  */
 package io.adminshell.aas.v3.dataformat.aasx.serialization;
 
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -35,6 +36,7 @@
 import io.adminshell.aas.v3.dataformat.SerializationException;
 import io.adminshell.aas.v3.dataformat.aasx.AASXSerializer;
 import io.adminshell.aas.v3.dataformat.aasx.InMemoryFile;
+import io.adminshell.aas.v3.dataformat.core.AASSimple;
 
 public class AASXSerializerTest {