Skip to content

Commit 4dd9161

Browse files
committed
Improvements from PR review.
1 parent e08f7c7 commit 4dd9161

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

core/esmf-aspect-meta-model-java/src/test/java/org/eclipse/esmf/metamodel/visitor/LanguageCollectorModelVisitorTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
import org.apache.jena.rdf.model.Model;
1313
import org.apache.jena.rdf.model.ModelFactory;
1414
import org.apache.jena.riot.RDFLanguages;
15-
import org.eclipse.esmf.aspectmodel.VersionNumber;
1615
import org.eclipse.esmf.aspectmodel.resolver.services.SammAspectMetaModelResourceResolver;
1716
import org.eclipse.esmf.aspectmodel.resolver.services.VersionedModel;
1817
import org.eclipse.esmf.metamodel.Aspect;
1918
import org.eclipse.esmf.metamodel.loader.AspectModelLoader;
19+
import org.eclipse.esmf.samm.KnownVersion;
2020
import org.junit.jupiter.api.Test;
2121

2222
class LanguageCollectorModelVisitorTest {
@@ -45,12 +45,12 @@ void testLanguageCollector() {
4545
4646
:AEntity a samm:Entity ;
4747
samm:preferredName "A name"@pt ;
48-
samm:preferredName "Ein name"@de ;
48+
samm:preferredName "Ein Name"@de ;
4949
samm:properties ( :AProperty ) .
5050
5151
:AProperty a samm:Property ;
5252
samm:preferredName "Common Property"@en ;
53-
samm:description "Bon idee"@fr ;
53+
samm:description "Descriptif de l'objet"@fr ;
5454
samm:characteristic :ACharacteristic .
5555
5656
:ACharacteristic a samm-c:Code ;
@@ -66,7 +66,7 @@ private VersionedModel model( final String ttlRepresentation ) {
6666
final Model model = ModelFactory.createDefaultModel();
6767
final InputStream in = new ByteArrayInputStream( ttlRepresentation.getBytes( StandardCharsets.UTF_8 ) );
6868
model.read( in, "", RDFLanguages.strLangTurtle );
69-
return new SammAspectMetaModelResourceResolver().mergeMetaModelIntoRawModel( model, VersionNumber.parse( "2.0.0" ) )
69+
return new SammAspectMetaModelResourceResolver().mergeMetaModelIntoRawModel( model, KnownVersion.SAMM_2_0_0 )
7070
.get();
7171
}
7272
}

core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/docu/AspectModelDocumentationGeneratorTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@
4040
public class AspectModelDocumentationGeneratorTest extends MetaModelVersions {
4141

4242
@ParameterizedTest
43-
@EnumSource( value = TestAspect.class, mode = EnumSource.Mode.EXCLUDE, names = { "MODEL_WITH_CYCLES" } )
43+
@EnumSource( value = TestAspect.class, mode = EnumSource.Mode.EXCLUDE,
44+
names = { "MODEL_WITH_CYCLES" // contains cycles, the calculation of used languages would run into an infinite loop
45+
} )
4446
public void testGeneration( final TestAspect testAspect ) {
4547
assertThatCode( () -> {
4648
final String html = generateHtmlDocumentation( testAspect, KnownVersion.getLatest() );

0 commit comments

Comments
 (0)