Thread: [Exmmt-commit] SF.net SVN: exmmt: [66] net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/r
Status: Inactive
Brought to you by:
lgrammel
From: <lgr...@us...> - 2006-06-06 00:52:54
|
Revision: 66 Author: lgrammel Date: 2006-06-05 03:33:40 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=66&view=rev Log Message: ----------- #1500774 scenario "shopping list" Added Paths: ----------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/AttributeRendererTest.java Removed Paths: ------------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/SimpleTextRendererTest.java Copied: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/AttributeRendererTest.java (from rev 30, net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/SimpleTextRendererTest.java) =================================================================== --- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/AttributeRendererTest.java (rev 0) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/AttributeRendererTest.java 2006-06-05 10:33:40 UTC (rev 66) @@ -0,0 +1,44 @@ +/* $HeadURL$ + * ----------------------------------------------------------------------------- + * + * Copyright (C) Lars Grammel and others. + * + * All rights reserved. This program and the accompanying materials are made + * available under the terms of the Common Public License v1.0 which accompanies + * this distribution, and is available at + * + * http://www.eclipse.org/legal/cpl-v10.html + * + */ +package net.sourceforge.exmmt.renderer; + +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import junit.framework.JUnit4TestAdapter; +import net.sourceforge.exmmt.graphics.IOutputArea; + +import org.junit.Test; + +public class AttributeRendererTest { + + @Test public void render() { + String text = "test"; + + AttributeRenderer renderer = new AttributeRenderer(); + IOutputArea outputArea = createMock(IOutputArea.class); + + outputArea.drawText(text, 0, 0); + + replay(outputArea); + + renderer.render(outputArea, text); + + verify(outputArea); + } + + // Junit 3.8.1 backward compability + public static junit.framework.Test suite() { + return new JUnit4TestAdapter(AttributeRendererTest.class); + } +} Deleted: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/SimpleTextRendererTest.java =================================================================== --- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/SimpleTextRendererTest.java 2006-06-05 09:58:40 UTC (rev 65) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/SimpleTextRendererTest.java 2006-06-05 10:33:40 UTC (rev 66) @@ -1,44 +0,0 @@ -/* $HeadURL$ - * ----------------------------------------------------------------------------- - * - * Copyright (C) Lars Grammel and others. - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Common Public License v1.0 which accompanies - * this distribution, and is available at - * - * http://www.eclipse.org/legal/cpl-v10.html - * - */ -package net.sourceforge.exmmt.renderer; - -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; -import junit.framework.JUnit4TestAdapter; -import net.sourceforge.exmmt.graphics.IOutputArea; - -import org.junit.Test; - -public class SimpleTextRendererTest { - - @Test public void render() { - String text = "test"; - - SimpleTextRenderer renderer = new SimpleTextRenderer(); - IOutputArea outputArea = createMock(IOutputArea.class); - - outputArea.drawText(text, 0, 0); - - replay(outputArea); - - renderer.render(outputArea, text); - - verify(outputArea); - } - - // Junit 3.8.1 backward compability - public static junit.framework.Test suite() { - return new JUnit4TestAdapter(SimpleTextRendererTest.class); - } -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lgr...@us...> - 2006-06-06 02:54:49
|
Revision: 94 Author: lgrammel Date: 2006-06-05 06:05:11 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=94&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/AttributeRendererTest.java net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/HorizontalSequenceRendererTest.java net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/NullRendererTest.java 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-06-05 13:04:57 UTC (rev 93) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/AttributeRendererTest.java 2006-06-05 13:05:11 UTC (rev 94) @@ -61,7 +61,8 @@ replay(sizeCalculator); - Rectangle result = renderer.calculateSize(sizeCalculator); + renderer.calculateSize(sizeCalculator); + Rectangle result = renderer.getSize(); assertEquals(rectangle, result); 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-06-05 13:04:57 UTC (rev 93) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/HorizontalSequenceRendererTest.java 2006-06-05 13:05:11 UTC (rev 94) @@ -19,6 +19,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import junit.framework.JUnit4TestAdapter; +import net.sourceforge.exmmt.graphics.IDrawArea; import net.sourceforge.exmmt.graphics.ISizeCalculator; import org.eclipse.swt.graphics.Rectangle; @@ -28,9 +29,13 @@ public class HorizontalSequenceRendererTest { private HorizontalSequenceRenderer renderer; + private IRenderer childRenderer1; + private IRenderer childRenderer2; + private Rectangle rectangle1; + private Rectangle rectangle2; @Test @@ -40,33 +45,66 @@ } @Test + 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); + + 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); + + replay(drawArea); + replay(childRenderer1); + replay(childRenderer2); + + renderer.render(drawArea); + + verify(drawArea); + verify(childRenderer1); + verify(childRenderer2); + } + + @Test public void computeSize() { ISizeCalculator sizeCalculator = createMock(ISizeCalculator.class); - expect(childRenderer1.calculateSize(sizeCalculator)).andReturn( - rectangle1); - expect(childRenderer2.calculateSize(sizeCalculator)).andReturn( - rectangle2); + childRenderer1.calculateSize(sizeCalculator); + expect(childRenderer1.getSize()).andReturn(rectangle1); + childRenderer2.calculateSize(sizeCalculator); + expect(childRenderer2.getSize()).andReturn(rectangle2); replay(sizeCalculator); replay(childRenderer1); replay(childRenderer2); - Rectangle result = renderer.calculateSize(sizeCalculator); + 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 public void setUp() { renderer = new HorizontalSequenceRenderer(); - + childRenderer1 = createMock(IRenderer.class); childRenderer2 = createMock(IRenderer.class); - + renderer.add(childRenderer1); renderer.add(childRenderer2); Modified: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/NullRendererTest.java =================================================================== --- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/NullRendererTest.java 2006-06-05 13:04:57 UTC (rev 93) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/NullRendererTest.java 2006-06-05 13:05:11 UTC (rev 94) @@ -37,13 +37,13 @@ ISizeCalculator sizeCalculator = createMock(ISizeCalculator.class); replay(sizeCalculator); + + renderer.calculateSize(sizeCalculator); + + assertEquals(new Rectangle(0, 0, 0, 0), renderer.getSize()); - assertEquals(new Rectangle(0, 0, 0, 0), renderer - .calculateSize(sizeCalculator)); - verify(sizeCalculator); } - // Junit 3.8.1 backward compability public static junit.framework.Test suite() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |