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

Bugfix/validator lang tag and qulifier value type #44

Merged
sebbader merged 7 commits into from
Nov 3, 2021
Merged

Bugfix/validator lang tag and qulifier value type #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fc5821b
Resolving a wrong lang tag in the Simple Example and removing the XSD…
sebbader Oct 22, 2021
9b8c2fe
Merge branch 'feature/example-validation' of https://github.com/admin…
sebbader Oct 22, 2021
835f1a7
updating JSON and AML examples for unit tests
mjacoby Oct 22, 2021
cc04eae
updated AAS test fixtures to not only provide static instances of AAS…
mjacoby Oct 25, 2021
10be7b8
fixed JSON example to match latest changes
mjacoby Oct 28, 2021
ff22f03
Fixes tests for JSON and AASX dataformat
Daespen Oct 28, 2021
fe4fa70
Merge pull request #43 from Daespen/bugfix/validator-lang-tag-and-qul…
sebbader Oct 29, 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
6 changes: 3 additions & 3 deletions ...ml/src/test/java/io/adminshell/aas/v3/dataformat/aml/deserialize/AmlDeserializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ public class AmlDeserializerTest {

private final AmlDeserializer deserializer = new AmlDeserializer();

AssetAdministrationShellEnvironment actual;
AssetAdministrationShellEnvironment expected;
private AssetAdministrationShellEnvironment actual;
private AssetAdministrationShellEnvironment expected;

@Before
public void init() throws FileNotFoundException, DeserializationException {
actual = deserializer.read(FullExample.FILE);
expected = AASFull.ENVIRONMENT;
expected = AASFull.createEnvironment();
}

@Test
Expand Down
80 changes: 46 additions & 34 deletions dataformat-aml/src/test/resources/test_demo_full_example.aml
View file
Open in desktop

Large diffs are not rendered by default.

3,476 changes: 1,761 additions & 1,715 deletions dataformat-core/src/test/java/io/adminshell/aas/v3/dataformat/core/AASFull.java
View file
Open in desktop

Large diffs are not rendered by default.

529 changes: 335 additions & 194 deletions dataformat-core/src/test/java/io/adminshell/aas/v3/dataformat/core/AASSimple.java
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dataformat-json/src/test/resources/assetAdministrationShellList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
]
},
{
"idShort": "",
"idShort": "Test_AssetAdministrationShell_Mandatory",
"modelType": {
"name": "AssetAdministrationShell"
},
Expand Down
Loading