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

Commit 19ca9b2

Browse files
committed
Add common test classes to core project
1 parent cf64dcd commit 19ca9b2

32 files changed

Lines changed: 1919 additions & 4266 deletions

dataformat-aasx/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@
1717
<version>${revision}</version>
1818
<scope>compile</scope>
1919
</dependency>
20+
<dependency>
21+
<groupId>io.admin-shell.aas</groupId>
22+
<artifactId>dataformat-core</artifactId>
23+
<version>${revision}</version>
24+
<classifier>tests</classifier>
25+
<scope>test</scope>
26+
</dependency>
2027
<dependency>
2128
<groupId>io.admin-shell.aas</groupId>
2229
<artifactId>model</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import io.adminshell.aas.v3.dataformat.aasx.AASXDeserializer;
3939
import io.adminshell.aas.v3.dataformat.aasx.AASXSerializer;
4040
import io.adminshell.aas.v3.dataformat.aasx.InMemoryFile;
41-
import io.adminshell.aas.v3.dataformat.aasx.serialization.AASSimple;
41+
import io.adminshell.aas.v3.dataformat.core.AASSimple;
4242

4343
public class AASXDeserializerTest {
4444

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

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,30 @@
1616
package io.adminshell.aas.v3.dataformat.aasx.deserialization;
1717

1818
import static org.junit.Assert.assertEquals;
19-
import static org.junit.Assert.assertNull;
2019

21-
import io.adminshell.aas.v3.dataformat.DeserializationException;
22-
import io.adminshell.aas.v3.dataformat.SerializationException;
23-
import io.adminshell.aas.v3.dataformat.aasx.AASXDeserializer;
24-
import io.adminshell.aas.v3.dataformat.aasx.AASXSerializer;
25-
import io.adminshell.aas.v3.dataformat.aasx.AASXValidator;
26-
import io.adminshell.aas.v3.dataformat.aasx.InMemoryFile;
27-
import io.adminshell.aas.v3.dataformat.aasx.serialization.AASSimple;
20+
import java.io.File;
21+
import java.io.FileInputStream;
22+
import java.io.FileOutputStream;
23+
import java.io.IOException;
24+
import java.io.InputStream;
25+
import java.util.ArrayList;
26+
import java.util.List;
27+
import java.util.Set;
28+
29+
import javax.xml.parsers.ParserConfigurationException;
30+
2831
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
2932
import org.junit.Rule;
3033
import org.junit.Test;
3134
import org.junit.rules.TemporaryFolder;
3235
import org.xml.sax.SAXException;
3336

34-
import javax.xml.parsers.ParserConfigurationException;
35-
import java.io.*;
36-
import java.util.ArrayList;
37-
import java.util.List;
38-
import java.util.Set;
37+
import io.adminshell.aas.v3.dataformat.DeserializationException;
38+
import io.adminshell.aas.v3.dataformat.SerializationException;
39+
import io.adminshell.aas.v3.dataformat.aasx.AASXSerializer;
40+
import io.adminshell.aas.v3.dataformat.aasx.AASXValidator;
41+
import io.adminshell.aas.v3.dataformat.aasx.InMemoryFile;
42+
import io.adminshell.aas.v3.dataformat.core.AASSimple;
3943

4044
public class ValidationTest {
4145

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

Lines changed: 0 additions & 183 deletions
This file was deleted.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package io.adminshell.aas.v3.dataformat.aasx.serialization;
1717

18+
1819
import static org.junit.Assert.assertEquals;
1920
import static org.junit.Assert.assertTrue;
2021

@@ -35,6 +36,7 @@
3536
import io.adminshell.aas.v3.dataformat.SerializationException;
3637
import io.adminshell.aas.v3.dataformat.aasx.AASXSerializer;
3738
import io.adminshell.aas.v3.dataformat.aasx.InMemoryFile;
39+
import io.adminshell.aas.v3.dataformat.core.AASSimple;
3840

3941
public class AASXSerializerTest {
4042

0 commit comments

Comments
 (0)