diff options
2 files changed, 16 insertions, 2 deletions
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/META-INF/MANIFEST.MF index 186d95e85..2bd08326f 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/META-INF/MANIFEST.MF @@ -11,7 +11,6 @@ Bundle-Localization: plugin Require-Bundle: org.junit, org.eclipse.core.runtime, org.eclipse.ocl.examples.codegen.dynamic, - org.eclipse.ocl.examples.xtext.tests, org.eclipse.qvtd.codegen, org.eclipse.qvtd.xtext.qvtimperative, org.eclipse.qvtd.xtext.qvtbase.tests diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiInterpreterTests.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiInterpreterTests.java index 963854448..d1dec9e24 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiInterpreterTests.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiInterpreterTests.java @@ -27,6 +27,7 @@ import org.eclipse.qvtd.pivot.qvtbase.TypedModel; import org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase; import org.eclipse.qvtd.xtext.qvtimperative.QVTimperativeStandaloneSetup; import org.eclipse.qvtd.xtext.qvtimperative.utilities.QVTiXtextEvaluator; +import org.eclipse.xtext.util.EmfFormatter; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -75,11 +76,25 @@ public class QVTiInterpreterTests extends LoadTestCase TypedModel typedModel = entry.getKey(); Resource expectedModel = entry.getValue(); Resource actualModel = modelManager.getModel(typedModel); - org.eclipse.ocl.examples.xtext.tests.XtextTestCase.assertSameModel(expectedModel, actualModel); + assertSameModel(expectedModel, actualModel); } } } +// public static interface Normalizer { +// void denormalize(); +// } + + public static void assertSameModel(Resource expectedResource, Resource actualResource) throws IOException, InterruptedException { +// Set<Normalizer> normalizations = normalize(expectedResource); + String expected = EmfFormatter.listToStr(expectedResource.getContents()); + String actual = EmfFormatter.listToStr(actualResource.getContents()); + assertEquals(expected, actual); +// for (Normalizer normalizer : normalizations) { +// normalizer.denormalize(); +// } + } + @Before public void setUp() throws Exception { |