[Exmmt-commit] SF.net SVN: exmmt: [114] net.sourceforge.exmmt

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

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

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

Modified Paths:
--------------
    net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/DelegatingRenderer.java
    net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/DelegatingRendererTest.java

Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/DelegatingRenderer.java
===================================================================
--- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/DelegatingRenderer.java	2006-10-12 17:27:46 UTC (rev 113)
+++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/DelegatingRenderer.java	2006-10-12 17:38:20 UTC (rev 114)
@@ -12,9 +12,12 @@
  */
 package net.sourceforge.exmmt.renderer;
 
+import java.util.List;
+
 import net.sourceforge.exmmt.graphics.IDrawArea;
 import net.sourceforge.exmmt.graphics.ISizeCalculator;
 
+import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 
 public abstract class DelegatingRenderer extends AbstractRenderer {
@@ -22,6 +25,16 @@
 	public void calculateSize(ISizeCalculator sizeCalculator) {
 		getDelegate().calculateSize(sizeCalculator);
 	}
+	
+	@Override
+	public List<Point> getLocations(IRenderer renderer) {
+		List<Point> list = super.getLocations(renderer);
+		List<Point> subLocations = getDelegate().getLocations(renderer);
+		
+		list.addAll(subLocations);
+		
+		return list;
+	}
 
 	protected abstract IRenderer getDelegate();
 

Modified: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/DelegatingRendererTest.java
===================================================================
--- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/DelegatingRendererTest.java	2006-10-12 17:27:46 UTC (rev 113)
+++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/DelegatingRendererTest.java	2006-10-12 17:38:20 UTC (rev 114)
@@ -17,10 +17,15 @@
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.List;
+
 import junit.framework.JUnit4TestAdapter;
 import net.sourceforge.exmmt.graphics.IDrawArea;
 import net.sourceforge.exmmt.graphics.ISizeCalculator;
 
+import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 import org.junit.Before;
 import org.junit.Test;
@@ -35,28 +40,53 @@
 
 		mockRenderer.render(drawArea);
 
-		replay(drawArea);
-		replay(mockRenderer);
+		replay(mockRenderer, drawArea);
 
 		renderer.render(drawArea);
 
-		verify(drawArea);
+		verify(mockRenderer, drawArea);
+	}
+
+	@Override
+	public void getSelfLocation() {
+		expect(mockRenderer.getLocations(renderer)).andReturn(
+				new ArrayList<Point>());
+		replay(mockRenderer);
+
+		super.getSelfLocation();
+
 		verify(mockRenderer);
 	}
 
 	@Test
+	public void getSubLocations() {
+		Point point = new Point(2, 2);
+
+		List<Point> list = new ArrayList<Point>();
+		list.add(point);
+
+		expect(mockRenderer.getLocations(mockRenderer)).andReturn(list);
+		replay(mockRenderer);
+
+		List<Point> locations = renderer.getLocations(mockRenderer);
+
+		assertEquals(1, locations.size());
+		assertEquals(point, locations.get(0));
+
+		verify(mockRenderer);
+	}
+
+	@Test
 	public void calculateSize() {
 		ISizeCalculator sizeCalculator = createMock(ISizeCalculator.class);
 
 		mockRenderer.calculateSize(sizeCalculator);
 
-		replay(sizeCalculator);
-		replay(mockRenderer);
+		replay(sizeCalculator, mockRenderer);
 
 		renderer.calculateSize(sizeCalculator);
 
-		verify(sizeCalculator);
-		verify(mockRenderer);
+		verify(sizeCalculator, mockRenderer);
 	}
 
 	@Test


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