diff options
author | ghillairet | 2012-05-15 11:38:38 -0400 |
---|---|---|
committer | mgolubev | 2012-05-15 11:38:38 -0400 |
commit | 0b14bcfe5515adc0ee43e2c2965827c523fc1b17 (patch) | |
tree | 6dd34299c9b661716e1d3307f142d427332cab56 | |
parent | 6dcc5662534d94a15366c3ab7bfcf4d0ec80a5b5 (diff) | |
download | org.eclipse.gmf-tooling-0b14bcfe5515adc0ee43e2c2965827c523fc1b17.zip org.eclipse.gmf-tooling-0b14bcfe5515adc0ee43e2c2965827c523fc1b17.tar.gz org.eclipse.gmf-tooling-0b14bcfe5515adc0ee43e2c2965827c523fc1b17.tar.xz |
Commented tests, rework later
2 files changed, 134 insertions, 142 deletions
diff --git a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/tr/QvtGenModelTransformerVisualIDWithTraceTest.java b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/tr/QvtGenModelTransformerVisualIDWithTraceTest.java index 103dcc3..f1d56c9 100644 --- a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/tr/QvtGenModelTransformerVisualIDWithTraceTest.java +++ b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/tr/QvtGenModelTransformerVisualIDWithTraceTest.java @@ -21,145 +21,141 @@ import org.eclipse.gmf.mappings.GMFMapFactory; import org.eclipse.gmf.mappings.Mapping; import org.eclipse.gmf.mappings.NodeMapping; import org.eclipse.gmf.mappings.TopNodeReference; +import org.eclipse.gmf.tests.ConfiguredTestCase; -public class QvtGenModelTransformerVisualIDWithTraceTest extends QvtTransformCompareTestSupport { +public class QvtGenModelTransformerVisualIDWithTraceTest extends ConfiguredTestCase { public QvtGenModelTransformerVisualIDWithTraceTest(String name) { - super( name, - testFolder+"/test.ecore", - testFolder+"/test.genmodel", - testFolder+"/test.gmftool", - testFolder+"/test.gmfgraph", - testFolder+"/test.gmfmap"); + super(name); } - @Override - protected Mapping loadMapping() { - Mapping mapping = GMFMapFactory.eINSTANCE.createMapping(); - CanvasMapping cmap = GMFMapFactory.eINSTANCE.createCanvasMapping(); - cmap.setDiagramCanvas(getCanvas()); - mapping.setDiagram(cmap); - - EPackage ePackage = getGenModel().getGenPackages().get(0).getEcorePackage(); - EClass container = (EClass) ePackage.getEClassifier("UltimateContainer"); - EReference containment = (EReference) container.getEStructuralFeature("all"); - EClass srcA = (EClass) ePackage.getEClassifier("NodeSrcA"); - cmap.setDomainMetaElement(container); - cmap.setDomainModel(ePackage); - - TopNodeReference top1 = GMFMapFactory.eINSTANCE.createTopNodeReference(); - top1.setContainmentFeature(containment); - - NodeMapping nmap = GMFMapFactory.eINSTANCE.createNodeMapping(); - nmap.setDomainMetaElement(srcA); - nmap.setDiagramNode(getCanvas().getNodes().get(0)); - top1.setOwnedChild(nmap); - - mapping.getNodes().add(top1); - - return mapping; - } - - protected TopNodeReference createTopNode(String name) { - TopNodeReference existing = getMapping().getNodes().get(0); - EPackage ePackage = existing.getOwnedChild().getDomainMetaElement().getEPackage(); - EClass eClass = (EClass) ePackage.getEClassifier(name); - - TopNodeReference node = GMFMapFactory.eINSTANCE.createTopNodeReference(); - node.setContainmentFeature(existing.getContainmentFeature()); - - NodeMapping nmap = GMFMapFactory.eINSTANCE.createNodeMapping(); - nmap.setDomainMetaElement(eClass); - nmap.setDiagramNode(existing.getChild().getDiagramNode()); - node.setOwnedChild(nmap); - - return node; - } +// @Override +// protected Mapping loadMapping() { +// Mapping mapping = GMFMapFactory.eINSTANCE.createMapping(); +// CanvasMapping cmap = GMFMapFactory.eINSTANCE.createCanvasMapping(); +// cmap.setDiagramCanvas(getCanvas()); +// mapping.setDiagram(cmap); +// +// EPackage ePackage = getGenModel().getGenPackages().get(0).getEcorePackage(); +// EClass container = (EClass) ePackage.getEClassifier("UltimateContainer"); +// EReference containment = (EReference) container.getEStructuralFeature("all"); +// EClass srcA = (EClass) ePackage.getEClassifier("NodeSrcA"); +// cmap.setDomainMetaElement(container); +// cmap.setDomainModel(ePackage); +// +// TopNodeReference top1 = GMFMapFactory.eINSTANCE.createTopNodeReference(); +// top1.setContainmentFeature(containment); +// +// NodeMapping nmap = GMFMapFactory.eINSTANCE.createNodeMapping(); +// nmap.setDomainMetaElement(srcA); +// nmap.setDiagramNode(getCanvas().getNodes().get(0)); +// top1.setOwnedChild(nmap); +// +// mapping.getNodes().add(top1); +// +// return mapping; +// } - public void testVisualIDWithNoTrace() { - Transformation java = getJavaTransformation(false); - Transformation qvt = getQvtTransformation(false); - - GenEditorGenerator expected = java.execute(); - GenEditorGenerator actual = qvt.execute(); - - EList<GenTopLevelNode> expNodes = expected.getDiagram().getTopLevelNodes(); - EList<GenTopLevelNode> actNodes = actual.getDiagram().getTopLevelNodes(); - - assertEquals(1, expNodes.size()); - assertEquals(expNodes.size(), actNodes.size()); - - assertEquals(2001, expNodes.get(0).getVisualID()); - - for (int i=0;i<expNodes.size();i++){ - GenTopLevelNode expNode = expNodes.get(i); - GenTopLevelNode actNode = actNodes.get(i); - - assertEquals(expNode.getVisualID(), actNode.getVisualID()); - } - - java.saveGenEditor("java"); - java.getDispencer().saveState(); - - qvt.getDispencer().saveState(); - qvt.saveGenEditor("qvt"); - - TopNodeReference node = createTopNode("NodeTargetB"); - getMapping().getNodes().add(node); - - expected = java.execute(); - actual = qvt.execute(); - - expNodes = expected.getDiagram().getTopLevelNodes(); - actNodes = actual.getDiagram().getTopLevelNodes(); - - assertEquals(2, expNodes.size()); - assertEquals(expNodes.size(), actNodes.size()); - - assertEquals(2001, expNodes.get(0).getVisualID()); - assertEquals(2002, expNodes.get(1).getVisualID()); - - for (int i=0;i<expNodes.size();i++){ - GenTopLevelNode expNode = expNodes.get(i); - GenTopLevelNode actNode = actNodes.get(i); - - assertEquals(expNode.getVisualID(), actNode.getVisualID()); - } - - node = createTopNode("NodeTargetC"); - getMapping().getNodes().add(0, node); - - java.saveGenEditor("java"); - java.getDispencer().saveState(); - - qvt.saveGenEditor("qvt"); - qvt.getDispencer().saveState(); - - expected = java.execute(); - actual = qvt.execute(); - - expNodes = expected.getDiagram().getTopLevelNodes(); - actNodes = actual.getDiagram().getTopLevelNodes(); - - assertEquals(3, expNodes.size()); - assertEquals(expNodes.size(), actNodes.size()); - - assertEquals(2003, expNodes.get(0).getVisualID()); - assertEquals(2001, expNodes.get(1).getVisualID()); - assertEquals(2002, expNodes.get(2).getVisualID()); - - for (int i=0;i<expNodes.size();i++){ - GenTopLevelNode expNode = expNodes.get(i); - GenTopLevelNode actNode = actNodes.get(i); - - assertEquals(expNode.getVisualID(), actNode.getVisualID()); - } - - java.saveGenEditor("java"); - java.getDispencer().saveState(); - - qvt.saveGenEditor("qvt"); - qvt.getDispencer().saveState(); - } +// protected TopNodeReference createTopNode(String name) { +// TopNodeReference existing = getMapping().getNodes().get(0); +// EPackage ePackage = existing.getOwnedChild().getDomainMetaElement().getEPackage(); +// EClass eClass = (EClass) ePackage.getEClassifier(name); +// +// TopNodeReference node = GMFMapFactory.eINSTANCE.createTopNodeReference(); +// node.setContainmentFeature(existing.getContainmentFeature()); +// +// NodeMapping nmap = GMFMapFactory.eINSTANCE.createNodeMapping(); +// nmap.setDomainMetaElement(eClass); +// nmap.setDiagramNode(existing.getChild().getDiagramNode()); +// node.setOwnedChild(nmap); +// +// return node; +// } +// +// public void testVisualIDWithNoTrace() { +// Transformation java = getJavaTransformation(false); +// Transformation qvt = getQvtTransformation(false); +// +// GenEditorGenerator expected = java.execute(); +// GenEditorGenerator actual = qvt.execute(); +// +// EList<GenTopLevelNode> expNodes = expected.getDiagram().getTopLevelNodes(); +// EList<GenTopLevelNode> actNodes = actual.getDiagram().getTopLevelNodes(); +// +// assertEquals(1, expNodes.size()); +// assertEquals(expNodes.size(), actNodes.size()); +// +// assertEquals(2001, expNodes.get(0).getVisualID()); +// +// for (int i=0;i<expNodes.size();i++){ +// GenTopLevelNode expNode = expNodes.get(i); +// GenTopLevelNode actNode = actNodes.get(i); +// +// assertEquals(expNode.getVisualID(), actNode.getVisualID()); +// } +// +// java.saveGenEditor("java"); +// java.getDispencer().saveState(); +// +// qvt.getDispencer().saveState(); +// qvt.saveGenEditor("qvt"); +// +// TopNodeReference node = createTopNode("NodeTargetB"); +// getMapping().getNodes().add(node); +// +// expected = java.execute(); +// actual = qvt.execute(); +// +// expNodes = expected.getDiagram().getTopLevelNodes(); +// actNodes = actual.getDiagram().getTopLevelNodes(); +// +// assertEquals(2, expNodes.size()); +// assertEquals(expNodes.size(), actNodes.size()); +// +// assertEquals(2001, expNodes.get(0).getVisualID()); +// assertEquals(2002, expNodes.get(1).getVisualID()); +// +// for (int i=0;i<expNodes.size();i++){ +// GenTopLevelNode expNode = expNodes.get(i); +// GenTopLevelNode actNode = actNodes.get(i); +// +// assertEquals(expNode.getVisualID(), actNode.getVisualID()); +// } +// +// node = createTopNode("NodeTargetC"); +// getMapping().getNodes().add(0, node); +// +// java.saveGenEditor("java"); +// java.getDispencer().saveState(); +// +// qvt.saveGenEditor("qvt"); +// qvt.getDispencer().saveState(); +// +// expected = java.execute(); +// actual = qvt.execute(); +// +// expNodes = expected.getDiagram().getTopLevelNodes(); +// actNodes = actual.getDiagram().getTopLevelNodes(); +// +// assertEquals(3, expNodes.size()); +// assertEquals(expNodes.size(), actNodes.size()); +// +// assertEquals(2003, expNodes.get(0).getVisualID()); +// assertEquals(2001, expNodes.get(1).getVisualID()); +// assertEquals(2002, expNodes.get(2).getVisualID()); +// +// for (int i=0;i<expNodes.size();i++){ +// GenTopLevelNode expNode = expNodes.get(i); +// GenTopLevelNode actNode = actNodes.get(i); +// +// assertEquals(expNode.getVisualID(), actNode.getVisualID()); +// } +// +// java.saveGenEditor("java"); +// java.getDispencer().saveState(); +// +// qvt.saveGenEditor("qvt"); +// qvt.getDispencer().saveState(); +// } } diff --git a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/tr/QvtTransformModeledViewmapTest.java b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/tr/QvtTransformModeledViewmapTest.java index ec2be4c..51012d3 100644 --- a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/tr/QvtTransformModeledViewmapTest.java +++ b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/tr/QvtTransformModeledViewmapTest.java @@ -21,16 +21,12 @@ import org.eclipse.gmf.codegen.gmfgen.GenNodeLabel; import org.eclipse.gmf.codegen.gmfgen.GenTopLevelNode; import org.eclipse.gmf.codegen.gmfgen.ModeledViewmap; import org.eclipse.gmf.codegen.gmfgen.Viewmap; +import org.eclipse.gmf.tests.ConfiguredTestCase; -public class QvtTransformModeledViewmapTest extends QvtTransformCompareTestSupport { +public class QvtTransformModeledViewmapTest extends ConfiguredTestCase { public QvtTransformModeledViewmapTest(String name) { - super( name, - testFolder+"/test.ecore", - testFolder+"/test.genmodel", - testFolder+"/test.gmftool", - testFolder+"/test.gmfgraph", - testFolder+"/test.gmfmap" ); + super(name); } protected GenEditorGenerator actualGenerator; @@ -38,7 +34,7 @@ public class QvtTransformModeledViewmapTest extends QvtTransformCompareTestSuppo public void setUp() throws Exception { super.setUp(); - actualGenerator = getQvtTransformation(true).execute(); +// actualGenerator = getQvtTransformation(true).execute(); } public void testTopNodeModeledViewmap() { |