Skip to content

Commit 131e1c6

Browse files
RaMisessRaMisess
committed
Fix failed unit tests.
1 parent 9109d1e commit 131e1c6

File tree

1 file changed

+24
-25
lines changed

1 file changed

+24
-25
lines changed

‎core/esmf-aspect-model-java-generator/src/test/java/org/eclipse/esmf/aspectmodel/java/StaticMetaModelJavaGeneratorTest.java‎

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,25 @@
2929
import javax.xml.datatype.DatatypeFactory;
3030
import javax.xml.datatype.XMLGregorianCalendar;
3131

32-
import org.junit.jupiter.params.ParameterizedTest;
33-
import org.junit.jupiter.params.provider.EnumSource;
34-
import org.junit.jupiter.params.provider.MethodSource;
35-
36-
import com.github.javaparser.ast.CompilationUnit;
37-
import com.google.common.collect.ImmutableMap;
38-
import com.google.common.reflect.TypeToken;
39-
40-
import org.eclipse.esmf.samm.KnownVersion;
41-
import org.eclipse.esmf.metamodel.datatypes.Curie;
42-
import org.eclipse.esmf.metamodel.impl.DefaultCharacteristic;
4332
import org.eclipse.esmf.characteristic.impl.DefaultList;
4433
import org.eclipse.esmf.characteristic.impl.DefaultMeasurement;
34+
import org.eclipse.esmf.metamodel.datatypes.Curie;
35+
import org.eclipse.esmf.metamodel.impl.DefaultCharacteristic;
36+
import org.eclipse.esmf.samm.KnownVersion;
4537
import org.eclipse.esmf.staticmetamodel.StaticContainerProperty;
4638
import org.eclipse.esmf.staticmetamodel.StaticProperty;
4739
import org.eclipse.esmf.staticmetamodel.StaticUnitProperty;
4840
import org.eclipse.esmf.staticmetamodel.constraint.StaticConstraintContainerProperty;
4941
import org.eclipse.esmf.staticmetamodel.constraint.StaticConstraintProperty;
5042
import org.eclipse.esmf.test.TestAspect;
5143
import org.eclipse.esmf.test.TestSharedAspect;
44+
import org.junit.jupiter.params.ParameterizedTest;
45+
import org.junit.jupiter.params.provider.EnumSource;
46+
import org.junit.jupiter.params.provider.MethodSource;
47+
48+
import com.github.javaparser.ast.CompilationUnit;
49+
import com.google.common.collect.ImmutableMap;
50+
import com.google.common.reflect.TypeToken;
5251

5352
public class StaticMetaModelJavaGeneratorTest extends StaticMetaModelGeneratorTest {
5453

@@ -83,7 +82,7 @@ ImmutableMap.<String, Object> builder().put( "NAMESPACE", String.class ).put( "M
8382
.put( "CHARACTERISTIC_NAMESPACE", String.class ).put( "INSTANCE", "MetaAspectWithOptionalPropertiesWithEntity" )
8483
.put( "TEST_STRING", new TypeToken<StaticProperty<String>>() {
8584
} ).put( "TEST_OPTIONAL_STRING", new TypeToken<StaticContainerProperty<String, Optional<String>>>() {
86-
} ).put( "TEST_OPTIONAL_ENTITY", "StaticContainerProperty<TestEntity,java.util.Optional<TestEntity>>" ).build(), new HashMap<>() );
85+
} ).put( "TEST_OPTIONAL_ENTITY", "StaticContainerProperty<TestEntity, java.util.Optional<TestEntity>>" ).build(), new HashMap<>() );
8786

8887
result.assertFields( "MetaTestEntity", ImmutableMap.<String, Object> builder().put( "NAMESPACE", String.class ).put( "MODEL_ELEMENT_URN", String.class )
8988
.put( "CHARACTERISTIC_NAMESPACE", String.class ).put( "INSTANCE", "MetaTestEntity" )
@@ -125,7 +124,7 @@ public void testGenerateStaticMetaModelWithEither( final KnownVersion metaModelV
125124
result.assertFields( "MetaAspectWithEitherWithComplexTypes",
126125
ImmutableMap.<String, Object> builder().put( "NAMESPACE", String.class ).put( "MODEL_ELEMENT_URN", String.class )
127126
.put( "CHARACTERISTIC_NAMESPACE", String.class ).put( "INSTANCE", "MetaAspectWithEitherWithComplexTypes" )
128-
.put( "TEST_PROPERTY", "StaticProperty<Either<LeftEntity,RightEntity>>" ).build(), new HashMap<>() );
127+
.put( "TEST_PROPERTY", "StaticProperty<Either<LeftEntity, RightEntity>>" ).build(), new HashMap<>() );
129128

130129
result.assertFields( "MetaLeftEntity", ImmutableMap.<String, Object> builder().put( "NAMESPACE", String.class ).put( "MODEL_ELEMENT_URN", String.class )
131130
.put( "CHARACTERISTIC_NAMESPACE", String.class ).put( "INSTANCE", "MetaLeftEntity" ).put( "RESULT", new TypeToken<StaticProperty<String>>() {
@@ -158,7 +157,7 @@ public void testGenerateStaticMetaModelWithMeasurementTwo( final KnownVersion me
158157
result.assertFields( "MetaAspectWithExtendedEntity",
159158
ImmutableMap.<String, Object> builder().put( "NAMESPACE", String.class ).put( "MODEL_ELEMENT_URN", String.class )
160159
.put( "CHARACTERISTIC_NAMESPACE", String.class ).put( "INSTANCE", "MetaAspectWithExtendedEntity" )
161-
.put( "TEST_PROPERTY", "StaticContainerProperty<TestEntity,java.util.LinkedHashSet<TestEntity>>" ).build(), new HashMap<>() );
160+
.put( "TEST_PROPERTY", "StaticContainerProperty<TestEntity, java.util.LinkedHashSet<TestEntity>>" ).build(), new HashMap<>() );
162161
}
163162

164163
@ParameterizedTest
@@ -173,7 +172,7 @@ ImmutableMap.<String, Object> builder().put( "NAMESPACE", String.class ).put( "M
173172
.put( "TEST_PROPERTY", "StaticProperty<TestEntity>" ).build(), new HashMap<>() );
174173
result.assertFields( "MetaTestEntity", ImmutableMap.<String, Object> builder().put( "NAMESPACE", String.class ).put( "MODEL_ELEMENT_URN", String.class )
175174
.put( "CHARACTERISTIC_NAMESPACE", String.class ).put( "INSTANCE", "MetaTestEntity" )
176-
.put( "TEST_PROPERTY", "StaticContainerProperty<TestEntity,java.util.Optional<TestEntity>>" ).build(), new HashMap<>() );
175+
.put( "TEST_PROPERTY", "StaticContainerProperty<TestEntity, java.util.Optional<TestEntity>>" ).build(), new HashMap<>() );
177176
}
178177

179178
@ParameterizedTest
@@ -317,7 +316,7 @@ public void testGenerateStaticMetaModelWithErrorCollection( final KnownVersion m
317316
result.assertFields( "MetaAspectWithErrorCollection",
318317
ImmutableMap.<String, Object> builder().put( "NAMESPACE", String.class ).put( "MODEL_ELEMENT_URN", String.class )
319318
.put( "CHARACTERISTIC_NAMESPACE", String.class ).put( "INSTANCE", "MetaAspectWithErrorCollection" )
320-
.put( "ITEMS", "StaticContainerProperty<Error,java.util.Collection<Error>>" ).put( "_datatypeFactory", DatatypeFactory.class ).build(),
319+
.put( "ITEMS", "StaticContainerProperty<Error, java.util.Collection<Error>>" ).put( "_datatypeFactory", DatatypeFactory.class ).build(),
321320
new HashMap<>() );
322321
}
323322

@@ -331,7 +330,7 @@ public void testGenerateStaticMetaModelWithCollectionAndSimpleElementCharacteris
331330
result.assertFields( "MetaAspectWithCollectionAndSimpleElementCharacteristic",
332331
ImmutableMap.<String, Object> builder().put( "NAMESPACE", String.class ).put( "MODEL_ELEMENT_URN", String.class )
333332
.put( "CHARACTERISTIC_NAMESPACE", String.class ).put( "INSTANCE", "MetaAspectWithCollectionAndSimpleElementCharacteristic" )
334-
.put( "ITEMS", "StaticContainerProperty<String,java.util.Collection<String>>" ).build(), new HashMap<>() );
333+
.put( "ITEMS", "StaticContainerProperty<String, java.util.Collection<String>>" ).build(), new HashMap<>() );
335334
}
336335

337336
@ParameterizedTest
@@ -344,7 +343,7 @@ public void testGenerateStaticMetaModelWithCollectionAndElementCharacteristic( f
344343
result.assertFields( "MetaAspectWithCollectionAndElementCharacteristic",
345344
ImmutableMap.<String, Object> builder().put( "NAMESPACE", String.class ).put( "MODEL_ELEMENT_URN", String.class )
346345
.put( "CHARACTERISTIC_NAMESPACE", String.class ).put( "INSTANCE", "MetaAspectWithCollectionAndElementCharacteristic" )
347-
.put( "ITEMS", "StaticContainerProperty<TestEntity,java.util.Collection<TestEntity>>" ).build(), new HashMap<>() );
346+
.put( "ITEMS", "StaticContainerProperty<TestEntity, java.util.Collection<TestEntity>>" ).build(), new HashMap<>() );
348347
}
349348

350349
@ParameterizedTest
@@ -375,7 +374,7 @@ ImmutableMap.<String, Object> builder().put( "NAMESPACE", String.class ).put( "M
375374

376375
result.assertFields( "MetaMyEntityOne", ImmutableMap.<String, Object> builder().put( "NAMESPACE", String.class ).put( "MODEL_ELEMENT_URN", String.class )
377376
.put( "CHARACTERISTIC_NAMESPACE", String.class ).put( "INSTANCE", "MetaMyEntityOne" )
378-
.put( "ENTITY_PROPERTY_ONE", "StaticContainerProperty<MyEntityTwo,java.util.List<MyEntityTwo>>" ).build(), new HashMap<>() );
377+
.put( "ENTITY_PROPERTY_ONE", "StaticContainerProperty<MyEntityTwo, java.util.List<MyEntityTwo>>" ).build(), new HashMap<>() );
379378

380379
result.assertFields( "MetaMyEntityTwo", ImmutableMap.<String, Object> builder().put( "NAMESPACE", String.class ).put( "MODEL_ELEMENT_URN", String.class )
381380
.put( "CHARACTERISTIC_NAMESPACE", String.class ).put( "INSTANCE", "MetaMyEntityTwo" ).put( "ENTITY_PROPERTY_TWO", "StaticProperty<String>" )
@@ -501,12 +500,12 @@ public void testGenerateStaticMetaModelForAspectModelWithCollectionWithAbstractE
501500
result.assertNumberOfFiles( 6 );
502501

503502
final String expectedTestPropertyCharacteristicConstructorCall =
504-
"new DefaultCollection(MetaModelBaseAttributes.builderFor(\"EntityCollectionCharacteristic\").withMetaModelVersion(KnownVersion.SAMM_2_0_0)"
505-
+ ".withUrn(AspectModelUrn.fromUrn(NAMESPACE + \"EntityCollectionCharacteristic\")).withDescription(Locale.forLanguageTag(\"en\"), "
506-
+ "\"This is an entity collection characteristic\").build(), Optional.of(DefaultAbstractEntity.createDefaultAbstractEntity("
507-
+ "MetaModelBaseAttributes.builderFor(\"AbstractTestEntity\").withMetaModelVersion(KnownVersion.SAMM_2_0_0).withUrn("
508-
+ "AspectModelUrn.fromUrn(NAMESPACE + \"AbstractTestEntity\")).withDescription(Locale.forLanguageTag(\"en\"), "
509-
+ "\"This is an abstract test entity\").build(), MetaAbstractTestEntity.INSTANCE.getProperties(), Optional.empty(), "
503+
"new DefaultCollection(MetaModelBaseAttributes.builderFor(\"EntityCollectionCharacteristic\").withMetaModelVersion(KnownVersion.SAMM_2_0_0)"
504+
+ ".withUrn(AspectModelUrn.fromUrn(NAMESPACE + \"EntityCollectionCharacteristic\")).withDescription(Locale.forLanguageTag(\"en\"), "
505+
+ "\"This is an entity collection characteristic\").build(), Optional.of(DefaultAbstractEntity.createDefaultAbstractEntity("
506+
+ "MetaModelBaseAttributes.builderFor(\"AbstractTestEntity\").withMetaModelVersion(KnownVersion.SAMM_2_0_0).withUrn("
507+
+ "AspectModelUrn.fromUrn(NAMESPACE + \"AbstractTestEntity\")).withDescription(Locale.forLanguageTag(\"en\"), "
508+
+ "\"This is an abstract test entity\").build(), MetaAbstractTestEntity.INSTANCE.getProperties(), Optional.empty(), "
510509
+ "List.of(AspectModelUrn.fromUrn(\"urn:samm:org.eclipse.esmf.test:1.0.0#ExtendingTestEntity\")))), Optional.empty())";
511510

512511
result.assertConstructorArgumentForProperties( "MetaAspectWithCollectionWithAbstractEntity",

0 commit comments

Comments
 (0)