fix

INRIA · May 23, 2018 · 09a1237 · 09a1237
1 parent 2d5047e
commit 09a1237
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/test/java/spoon/test/api/MetamodelTest.java b/src/test/java/spoon/test/api/MetamodelTest.java
@@ -45,6 +45,7 @@
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
@@ -195,7 +196,12 @@ public void testMetamodelWithoutSources() {
 
 	private void assertConceptsEqual(MetamodelConcept expectedConcept, MetamodelConcept runtimeConcept) {
 		assertEquals(expectedConcept.getName(), runtimeConcept.getName());
-		assertEquals(expectedConcept.getModelClass().getActualClass(), runtimeConcept.getModelClass().getActualClass());
+		if (expectedConcept.getModelClass() == null) {
+			assertNull(runtimeConcept.getModelClass());
+		} else {
+			assertNotNull(runtimeConcept.getModelClass());
+			assertEquals(expectedConcept.getModelClass().getActualClass(), runtimeConcept.getModelClass().getActualClass());
+		}
 		assertEquals(expectedConcept.getModelInterface().getActualClass(), runtimeConcept.getModelInterface().getActualClass());
 		assertEquals(expectedConcept.getKind(), runtimeConcept.getKind());
 		assertEquals(expectedConcept.getSuperConcepts().size(), runtimeConcept.getSuperConcepts().size());

diff --git a/src/test/java/spoon/test/metamodel/SpoonMetaModel.java b/src/test/java/spoon/test/metamodel/SpoonMetaModel.java
@@ -114,7 +114,9 @@ public SpoonMetaModel(Factory factory) {
 	public SpoonMetaModel() {
 		this.factory = new FactoryImpl(new DefaultCoreFactory(), new StandardEnvironment());
 		for (CtType<?> iface : Metamodel.getAllMetamodelInterfaces()) {
-			getOrCreateConcept(iface);
+			if (iface instanceof CtInterface) {
+				getOrCreateConcept(iface);
+			}
 		}
 	}