Attachment 50167 Details for Bug 156702 – Corrected tests for the (obsolete) fix

[patch] Corrected tests for the (obsolete) fix

patch_156702_02.txt (text/plain), 3.45 KB, created by Michael Golubev

on 2006-09-14 12:37:14 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Golubev

Created: 2006-09-14 12:37:14 EDT

Size: 3.45 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.gmf.tests
>Index: src/org/eclipse/gmf/tests/setup/figures/AbstractFigureGeneratorSetup.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/setup/figures/AbstractFigureGeneratorSetup.java,v
>retrieving revision 1.1
>diff -u -r1.1 AbstractFigureGeneratorSetup.java
>--- src/org/eclipse/gmf/tests/setup/figures/AbstractFigureGeneratorSetup.java	27 Jul 2006 14:08:14 -0000	1.1
>+++ src/org/eclipse/gmf/tests/setup/figures/AbstractFigureGeneratorSetup.java	14 Sep 2006 16:36:26 -0000
>@@ -13,10 +13,10 @@
> 
> import junit.framework.Assert;
> 
>+import org.eclipse.gmf.gmfgraph.ColorConstants;
> import org.eclipse.gmf.gmfgraph.Figure;
> import org.eclipse.gmf.gmfgraph.FigureGallery;
> import org.eclipse.gmf.gmfgraph.GMFGraphFactory;
>-import org.eclipse.gmf.gmfgraph.Point;
> import org.eclipse.gmf.gmfgraph.PolygonDecoration;
> import org.eclipse.gmf.gmfgraph.PolylineConnection;
> import org.eclipse.gmf.graphdef.codegen.StandaloneGenerator.Config;
>@@ -85,31 +85,23 @@
> 		if (myEcoreContainmentRef == null) {
> 			myEcoreContainmentRef = GMFGraphFactory.eINSTANCE.createPolylineConnection();
> 			myEcoreContainmentRef.setName("ContainmentRef");
>-			PolygonDecoration df = createRhomb();
>+			PolygonDecoration df = createBlueRhomb();
> 			df.setFill(true);
> 			myEcoreContainmentRef.setSourceDecoration(df);
> 		}
> 		return myEcoreContainmentRef;
> 	}
> 	
>-	private PolygonDecoration createRhomb() {
>+	private PolygonDecoration createBlueRhomb() {
> 		PolygonDecoration df = GMFGraphFactory.eINSTANCE.createPolygonDecoration();
>-		Point p = GMFGraphFactory.eINSTANCE.createPoint();
>-		p.setX(-1);
>-		p.setY(1);
>-		df.getTemplate().add(p);
>-		p = GMFGraphFactory.eINSTANCE.createPoint();
>-		p.setX(0);
>-		p.setY(0);
>-		df.getTemplate().add(p);
>-		p = GMFGraphFactory.eINSTANCE.createPoint();
>-		p.setX(-1);
>-		p.setY(-1);
>-		df.getTemplate().add(p);
>-		p = GMFGraphFactory.eINSTANCE.createPoint();
>-		p.setX(-2);
>-		p.setY(0);
>-		df.getTemplate().add(p);
>+		df.setName("BlueRhombDecoration");
>+		df.getTemplate().add(FigureGeneratorUtil.createPoint(-1, 1));
>+		df.getTemplate().add(FigureGeneratorUtil.createPoint(0, 0));
>+		df.getTemplate().add(FigureGeneratorUtil.createPoint(-1, -1));
>+		df.getTemplate().add(FigureGeneratorUtil.createPoint(-2, 0));
>+		
>+		df.setBackgroundColor(FigureGeneratorUtil.createConstantColor(ColorConstants.BLUE_LITERAL));
>+		df.setForegroundColor(FigureGeneratorUtil.createRGBColor(0, 0, 255));
> 		return df;
> 	}
> 	
>Index: src/org/eclipse/gmf/tests/gen/FigureCodegenTest.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gen/FigureCodegenTest.java,v
>retrieving revision 1.11
>diff -u -r1.11 FigureCodegenTest.java
>--- src/org/eclipse/gmf/tests/gen/FigureCodegenTest.java	27 Jul 2006 14:08:14 -0000	1.11
>+++ src/org/eclipse/gmf/tests/gen/FigureCodegenTest.java	14 Sep 2006 16:36:26 -0000
>@@ -40,6 +40,9 @@
> 	}
> 
> 	private FigureCodegenSetup getSessionSetup() {
>+		if (mySessionSetup == null){
>+			mySessionSetup = new FigureCodegenSetup();
>+		}
> 		Assert.assertTrue("Incorrect session setup was used, use FigureCodegenSetup instead of: " + mySessionSetup, mySessionSetup instanceof FigureCodegenSetup);
> 		return (FigureCodegenSetup) mySessionSetup;
> 	}

Actions: View | Diff

Attachments on bug 156702: 49719 | 49737 | 50167