[Exmmt-commit] SF.net SVN: exmmt: [111] net.sourceforge.exmmt.test/trunk

[<lgr...@us...>]

Revision: 111
          http://svn.sourceforge.net/exmmt/?rev=111&view=rev
Author:   lgrammel
Date:     2006-10-12 09:30:12 -0700 (Thu, 12 Oct 2006)

Log Message:
-----------
#1500774 scenario "shopping list"

Modified Paths:
--------------
    net.sourceforge.exmmt.test/trunk/.classpath
    net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/AttributeRendererTest.java
    net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/HorizontalSequenceRendererTest.java

Modified: net.sourceforge.exmmt.test/trunk/.classpath
===================================================================
--- net.sourceforge.exmmt.test/trunk/.classpath	2006-10-12 16:29:21 UTC (rev 110)
+++ net.sourceforge.exmmt.test/trunk/.classpath	2006-10-12 16:30:12 UTC (rev 111)
@@ -5,5 +5,6 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="lib" path="lib/easymock.jar"/>
 	<classpathentry kind="lib" path="lib/junit-4.1.jar"/>
+	<classpathentry kind="lib" path="/net.sourceforge.exmmt/lib/org.jdom.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/AttributeRendererTest.java
===================================================================
--- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/AttributeRendererTest.java	2006-10-12 16:29:21 UTC (rev 110)
+++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/AttributeRendererTest.java	2006-10-12 16:30:12 UTC (rev 111)
@@ -77,7 +77,7 @@
 		renderer = new AttributeRenderer(attribute);
 	}
 
-	// Junit 3.8.1 backward compability
+	// @tag compability: Junit 3.8.1 backward compability
 	public static junit.framework.Test suite() {
 		return new JUnit4TestAdapter(AttributeRendererTest.class);
 	}

Modified: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/HorizontalSequenceRendererTest.java
===================================================================
--- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/HorizontalSequenceRendererTest.java	2006-10-12 16:29:21 UTC (rev 110)
+++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/HorizontalSequenceRendererTest.java	2006-10-12 16:30:12 UTC (rev 111)
@@ -28,16 +28,55 @@
 
 public class HorizontalSequenceRendererTest {
 
+	// @tag compability: Junit 3.8.1
+	public static junit.framework.Test suite() {
+		return new JUnit4TestAdapter(HorizontalSequenceRendererTest.class);
+	}
+
 	private HorizontalSequenceRenderer renderer;
 
 	private IRenderer childRenderer1;
 
 	private IRenderer childRenderer2;
 
-	private Rectangle rectangle1;
+	@Test
+	public void computeSize() {
+		ISizeCalculator sizeCalculator = createMock(ISizeCalculator.class);
 
-	private Rectangle rectangle2;
+		Rectangle rectangle1 = new Rectangle(10, 10, 20, 30);
+		Rectangle rectangle2 = new Rectangle(101, 110, 120, 130);
 
+		expectSizeCalculation(sizeCalculator, childRenderer1, rectangle1);
+		expectSizeCalculation(sizeCalculator, childRenderer2, rectangle2);
+
+		replay(sizeCalculator);
+		replayChildRenderers();
+
+		renderer.calculateSize(sizeCalculator);
+		Rectangle result = renderer.getSize();
+
+		assertEquals(new Rectangle(0, 0, rectangle1.width + rectangle2.width,
+				Math.max(rectangle1.height, rectangle2.height)), result);
+
+		verify(sizeCalculator);
+		verifyChildRenderers();
+	}
+
+	private void expectRendering(IDrawArea drawArea, IRenderer renderer,
+			Rectangle rectangle) {
+
+		renderer.render(drawArea);
+		expect(renderer.getSize()).andReturn(rectangle);
+		drawArea.changePosition(rectangle.width, 0);
+	}
+
+	private void expectSizeCalculation(ISizeCalculator sizeCalculator,
+			IRenderer renderer, Rectangle rectangle) {
+
+		renderer.calculateSize(sizeCalculator);
+		expect(renderer.getSize()).andReturn(rectangle);
+	}
+
 	@Test
 	public void isRenderer() {
 		assertTrue(IRenderer.class
@@ -48,54 +87,29 @@
 	public void render() {
 		IDrawArea drawArea = createMock(IDrawArea.class);
 
-		int oldX = 1;
-		int oldY = 2;
-		Rectangle childSize = new Rectangle(0,0,10,10);
-		Rectangle child2Size = new Rectangle(0,0,11,11);
+		int startingX = 1;
+		int startingY = 2;
 
-		expect(drawArea.getX()).andReturn(oldX);
-		expect(drawArea.getY()).andReturn(oldY);
-		childRenderer1.render(drawArea);		
-		expect(childRenderer1.getSize()).andReturn(childSize);
-		drawArea.changePosition(childSize.width, 0);
-		childRenderer2.render(drawArea);
-		expect(childRenderer2.getSize()).andReturn(child2Size);
-		drawArea.changePosition(child2Size.width, 0);
-		drawArea.setPosition(oldX, oldY);
+		expect(drawArea.getX()).andReturn(startingX);
+		expect(drawArea.getY()).andReturn(startingY);
 
+		drawArea.setPosition(startingX, startingY);
+
+		expectRendering(drawArea, childRenderer1, new Rectangle(0, 0, 10, 10));
+		expectRendering(drawArea, childRenderer2, new Rectangle(0, 0, 11, 11));
+
 		replay(drawArea);
-		replay(childRenderer1);
-		replay(childRenderer2);
+		replayChildRenderers();
 
 		renderer.render(drawArea);
 
 		verify(drawArea);
-		verify(childRenderer1);
-		verify(childRenderer2);
+		verifyChildRenderers();
 	}
 
-	@Test
-	public void computeSize() {
-		ISizeCalculator sizeCalculator = createMock(ISizeCalculator.class);
-
-		childRenderer1.calculateSize(sizeCalculator);
-		expect(childRenderer1.getSize()).andReturn(rectangle1);
-		childRenderer2.calculateSize(sizeCalculator);
-		expect(childRenderer2.getSize()).andReturn(rectangle2);
-
-		replay(sizeCalculator);
+	private void replayChildRenderers() {
 		replay(childRenderer1);
 		replay(childRenderer2);
-
-		renderer.calculateSize(sizeCalculator);
-		Rectangle result = renderer.getSize();
-
-		assertEquals(new Rectangle(0, 0, rectangle1.width + rectangle2.width,
-				Math.max(rectangle1.height, rectangle2.height)), result);
-
-		verify(sizeCalculator);
-		verify(childRenderer1);
-		verify(childRenderer2);
 	}
 
 	@Before
@@ -107,15 +121,11 @@
 
 		renderer.add(childRenderer1);
 		renderer.add(childRenderer2);
-
-		rectangle1 = new Rectangle(10, 10, 20, 30);
-		rectangle2 = new Rectangle(101, 110, 120, 130);
-
 	}
 
-	// Junit 3.8.1 backward compability
-	public static junit.framework.Test suite() {
-		return new JUnit4TestAdapter(HorizontalSequenceRendererTest.class);
+	private void verifyChildRenderers() {
+		verify(childRenderer1);
+		verify(childRenderer2);
 	}
 
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.