Updated tests

2 files changed, 8 insertions, 8 deletions

diff --git a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/tr/CompareTransformationEngineTest.java b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/tr/CompareTransformationEngineTest.java
index 6d0d374..5074db1 100644
--- a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/tr/CompareTransformationEngineTest.java
+++ b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/tr/CompareTransformationEngineTest.java
@@ -389,7 +389,7 @@ public class CompareTransformationEngineTest extends ConfiguredTestCase {
 	}
 	
 	public void testGenLinksAttributes() {		
-		//	GenTopLevelNode
+		//	GenLink
 		EList<GenLink> expected = expectedGenerator.getDiagram().getLinks();
 		EList<GenLink> actual = actualGenerator.getDiagram().getLinks();
 
@@ -411,8 +411,8 @@ public class CompareTransformationEngineTest extends ConfiguredTestCase {
 			assertEquals(expLink.getNotationViewFactoryQualifiedClassName(), actLink.getNotationViewFactoryQualifiedClassName());
 			assertEquals(expLink.getReorientCommandClassName(), actLink.getReorientCommandClassName());
 			assertEquals(expLink.getReorientCommandQualifiedClassName(), actLink.getReorientCommandQualifiedClassName());
-			assertEquals(expLink.getUniqueIdentifier(), actLink.getUniqueIdentifier());
 			assertEquals(expLink.getVisualID(), actLink.getVisualID());
+			assertEquals(expLink.getUniqueIdentifier(), actLink.getUniqueIdentifier());
 		}
 	}
 	
@@ -425,7 +425,7 @@ public class CompareTransformationEngineTest extends ConfiguredTestCase {
 		for (int i=0; i<expCompartments.size(); i++) {
 			GenCompartment exp = expCompartments.get(i);
 			GenCompartment act = findCompartment(exp, actCompartments);
-			assertNotNull("Identical GenCompartment should be found", act);
+			assertNotNull("Compartment with ID "+exp.getVisualID()+" not found", act);
 			
 			assertEquals("Node visualID should be the same", exp.getVisualID(), act.getVisualID());
 			assertEquals(exp.getCanonicalEditPolicyClassName(), act.getCanonicalEditPolicyClassName());
diff --git a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/tr/TransformationTestSupport.java b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/tr/TransformationTestSupport.java
index 34b784c..176044a 100644
--- a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/tr/TransformationTestSupport.java
+++ b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/tr/TransformationTestSupport.java
@@ -12,7 +12,7 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator;
 import org.eclipse.gmf.graphdef.codegen.MapModeCodeGenStrategy;
-import org.eclipse.gmf.internal.bridge.StatefulVisualIdentifierDispencer;
+import org.eclipse.gmf.internal.bridge.VisualIdentifierDispenser;
 import org.eclipse.gmf.internal.bridge.genmodel.BasicDiagramRunTimeModelHelper;
 import org.eclipse.gmf.internal.bridge.genmodel.DiagramGenModelTransformer;
 import org.eclipse.gmf.internal.bridge.genmodel.DiagramRunTimeModelHelper;
@@ -37,13 +37,13 @@ public class TransformationTestSupport {
 	
 	abstract static class Transformation {
 		protected GenEditorGenerator editor;
-		protected StatefulVisualIdentifierDispencer dispenser;
+		protected VisualIdentifierDispenser dispenser;
 				
 		public GenEditorGenerator getEditor() {
 			return editor;
 		}
 		public abstract GenEditorGenerator execute(URI outputURI);
-		public StatefulVisualIdentifierDispencer getDispencer() {return dispenser;}
+		public VisualIdentifierDispenser getDispencer() {return dispenser;}
 	}
 	
 	public static Transformation getJavaTransformation(final GenModel genModel, final Mapping mapping, final boolean useModeledViewmap) {
@@ -53,7 +53,7 @@ public class TransformationTestSupport {
 				VisualIdentifierDispenserProvider provider = new VisualIdentifierDispenserProvider(outputURI); //traceURI.trimFileExtension().appendFileExtension("java.gmfgen")
 				provider.acquire();
 				
-				dispenser = (StatefulVisualIdentifierDispencer) provider.get();
+				dispenser = provider.get();
 				
 				GenModelProducer producer = getJavaGenModelProducer(useModeledViewmap, genModel, provider);
 				try {
@@ -77,7 +77,7 @@ public class TransformationTestSupport {
 				VisualIdentifierDispenserProvider provider = new VisualIdentifierDispenserProvider(outputURI);
 				provider.acquire();
 				
-				dispenser = (StatefulVisualIdentifierDispencer) provider.get();
+				dispenser = provider.get();
 				GenModelProducer producer = getQvtGenModelProducer(useModeledViewmap, genModel, provider, genModel.eResource().getResourceSet());
 				try {
 					editor = producer.process(mapping, null);