Skip to content
This repository was archived by the owner on Feb 15, 2024. It is now read-only.

Feature/test core #22

Merged
br-iosb merged 5 commits into from
Sep 16, 2021
Merged

Feature/test core #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e8ec54a
Increase revision to 1.0.4
Daespen Sep 10, 2021
8e5ba45
Fix AASX dataformat to make use of Serializer default charset
Daespen Sep 1, 2021
cf64dcd
Fix AASSimple in XML-Dataformat
Daespen Sep 1, 2021
19ca9b2
Add common test classes to core project
Daespen Sep 1, 2021
a83f389
Use common test classes in dataformat-uanodeset
Daespen Sep 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions dataformat-aasx/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions dataformat-aasx/src/main/java/io/adminshell/aas/v3/dataformat/aasx/AASXDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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();
}

Expand Down
2 changes: 1 addition & 1 deletion dataformat-aasx/src/main/java/io/adminshell/aas/v3/dataformat/aasx/AASXSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion .../test/java/io/adminshell/aas/v3/dataformat/aasx/deserialization/AASXDeserializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
30 changes: 17 additions & 13 deletions ...sx/src/test/java/io/adminshell/aas/v3/dataformat/aasx/deserialization/ValidationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
183 changes: 0 additions & 183 deletions ...rmat-aasx/src/test/java/io/adminshell/aas/v3/dataformat/aasx/serialization/AASSimple.java
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions .../src/test/java/io/adminshell/aas/v3/dataformat/aasx/serialization/AASXSerializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package io.adminshell.aas.v3.dataformat.aasx.serialization;


import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

Expand All @@ -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 {

Expand Down
Loading