Skip to content

Commit aa107cb

Browse files
committed
Add tests
1 parent 827a58b commit aa107cb

File tree

4 files changed

+19
-4
lines changed

4 files changed

+19
-4
lines changed

core/esmf-aspect-model-aas-generator/src/main/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ private List<String> seeReferences( final SubmodelElement element ) {
363363
.toList();
364364
}
365365

366-
private String sanitizeValue( String value ) {
366+
private String sanitizeValue( final String value ) {
367367
return value.replace( "/ ", "/" );
368368
}
369369

core/esmf-aspect-model-aas-generator/src/test/java/org/eclipse/esmf/aspectmodel/aas/AasToAspectModelGeneratorTest.java

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,37 @@
3131
import org.eclipse.digitaltwin.aas4j.v3.dataformat.json.JsonDeserializer;
3232
import org.eclipse.digitaltwin.aas4j.v3.dataformat.xml.XmlDeserializer;
3333
import org.eclipse.digitaltwin.aas4j.v3.model.Environment;
34-
import org.junit.jupiter.api.Disabled;
3534
import org.junit.jupiter.api.Test;
3635
import org.junit.jupiter.params.ParameterizedTest;
3736
import org.junit.jupiter.params.provider.EnumSource;
3837

3938
class AasToAspectModelGeneratorTest {
4039

4140
@Test
42-
@Disabled( "IDTA-provided sample files can currently not be read with AAS4J" )
4341
void testTranslateDigitalNameplate() {
4442
final InputStream aasx = AasToAspectModelGeneratorTest.class.getClassLoader()
45-
.getResourceAsStream( "Sample_ZVEI_Digital_Nameplate_V10.aasx" );
43+
.getResourceAsStream( "idta/Sample_ZVEI_Digital_Nameplate_V10.aasx" );
4644
final AasToAspectModelGenerator aspectModelGenerator = AasToAspectModelGenerator.fromAasx( aasx );
4745
assertThatCode( aspectModelGenerator::generateAspects ).doesNotThrowAnyException();
4846
}
4947

48+
@Test
49+
void testSeeReferences() {
50+
final InputStream inputStream = AasToAspectModelGeneratorTest.class.getClassLoader().getResourceAsStream(
51+
"idta/IDTA 02022-1-0_Template_Wireless Communication.aasx" );
52+
final AasToAspectModelGenerator aspectModelGenerator = AasToAspectModelGenerator.fromAasx( inputStream );
53+
final List<Aspect> aspects = aspectModelGenerator.generateAspects();
54+
55+
assertThatCode( aspectModelGenerator::generateAspects ).doesNotThrowAnyException();
56+
57+
aspects.stream()
58+
.flatMap( aspect -> aspect.getProperties().stream() )
59+
.flatMap( property -> property.getSee().stream() )
60+
.forEach( see -> {
61+
assertThat( see ).doesNotContain( "/ " );
62+
} );
63+
}
64+
5065
@ParameterizedTest
5166
@EnumSource( TestAspect.class )
5267
void testRoundtripConversion( final TestAspect testAspect ) throws DeserializationException {
9.11 KB
Binary file not shown.
7.66 KB
Binary file not shown.

0 commit comments

Comments
 (0)