exmmt-commit Mailing List for Eclipse XML Meta-Modeling Tools (Page 2)
Status: Inactive
Brought to you by:
lgrammel
Menu
▾
▴
exmmt-commit — svn commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(28) |
Jun
(81) |
Jul
|
Aug
|
Sep
|
Oct
(15) |
Nov
|
Dec
|
|---|
|
From: <lgr...@us...> - 2006-06-06 02:18:27
|
Revision: 80 Author: lgrammel Date: 2006-06-05 05:00:19 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=80&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/AttributeRendererTest.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 11:28:51 UTC (rev 79) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/AttributeRendererTest.java 2006-06-05 12:00:19 UTC (rev 80) @@ -12,38 +12,70 @@ */ package net.sourceforge.exmmt.renderer; -import static org.junit.Assert.*; import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import junit.framework.JUnit4TestAdapter; import net.sourceforge.exmmt.graphics.IOutputArea; +import net.sourceforge.exmmt.graphics.ISizeCalculator; +import org.eclipse.swt.graphics.Rectangle; import org.jdom.Attribute; +import org.junit.Before; import org.junit.Test; public class AttributeRendererTest { - - @Test public void isRenderer() { + + private AttributeRenderer renderer; + + private String value; + + @Test + public void isRenderer() { assertTrue(IRenderer.class.isAssignableFrom(AttributeRenderer.class)); } - - @Test public void render() { - String value = "value"; - Attribute attribute = new Attribute("name", value); - - AttributeRenderer renderer = new AttributeRenderer(attribute); + + @Test + public void render() { IOutputArea outputArea = createMock(IOutputArea.class); - + outputArea.drawText(value, 0, 0); - + replay(outputArea); - + renderer.render(outputArea); - + verify(outputArea); } - + + @Test + public void computeSize() { + Rectangle rectangle = new Rectangle(10, 10, 20, 20); + + ISizeCalculator sizeCalculator = createMock(ISizeCalculator.class); + + expect(sizeCalculator.calculateSize(value)).andReturn(rectangle); + + replay(sizeCalculator); + + Rectangle result = renderer.calculateSize(sizeCalculator); + + assertEquals(rectangle, result); + + verify(sizeCalculator); + } + + @Before + public void setUp() { + value = "value"; + Attribute attribute = new Attribute("name", value); + + renderer = new AttributeRenderer(attribute); + } + // Junit 3.8.1 backward compability public static junit.framework.Test suite() { return new JUnit4TestAdapter(AttributeRendererTest.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:17:27
|
Revision: 92 Author: lgrammel Date: 2006-06-05 05:50:43 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=92&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/HorizontalSequenceRendererTest.java 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 12:48:38 UTC (rev 91) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/HorizontalSequenceRendererTest.java 2006-06-05 12:50:43 UTC (rev 92) @@ -22,10 +22,17 @@ import net.sourceforge.exmmt.graphics.ISizeCalculator; import org.eclipse.swt.graphics.Rectangle; +import org.junit.Before; import org.junit.Test; public class HorizontalSequenceRendererTest { + private HorizontalSequenceRenderer renderer; + private IRenderer childRenderer1; + private IRenderer childRenderer2; + private Rectangle rectangle1; + private Rectangle rectangle2; + @Test public void isRenderer() { assertTrue(IRenderer.class @@ -34,19 +41,8 @@ @Test public void computeSize() { - HorizontalSequenceRenderer renderer = new HorizontalSequenceRenderer(); - - IRenderer childRenderer1 = createMock(IRenderer.class); - IRenderer childRenderer2 = createMock(IRenderer.class); - - renderer.add(childRenderer1); - renderer.add(childRenderer2); - ISizeCalculator sizeCalculator = createMock(ISizeCalculator.class); - Rectangle rectangle1 = new Rectangle(10, 10, 20, 30); - Rectangle rectangle2 = new Rectangle(101, 110, 120, 130); - expect(childRenderer1.calculateSize(sizeCalculator)).andReturn( rectangle1); expect(childRenderer2.calculateSize(sizeCalculator)).andReturn( @@ -63,7 +59,22 @@ verify(sizeCalculator); } - + + @Before + public void setUp() { + renderer = new HorizontalSequenceRenderer(); + + childRenderer1 = createMock(IRenderer.class); + childRenderer2 = createMock(IRenderer.class); + + 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); 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:08:48
|
Revision: 69 Author: lgrammel Date: 2006-06-05 03:36:03 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=69&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AttributeRenderer.java Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AttributeRenderer.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AttributeRenderer.java 2006-06-05 10:35:56 UTC (rev 68) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AttributeRenderer.java 2006-06-05 10:36:03 UTC (rev 69) @@ -12,14 +12,20 @@ */ package net.sourceforge.exmmt.renderer; +import org.jdom.Attribute; + import net.sourceforge.exmmt.graphics.IOutputArea; public class AttributeRenderer { - public void render(IOutputArea outputArea, String text) { + public void render(IOutputArea outputArea, Object model) { assert outputArea != null; + assert model != null; + assert model instanceof Attribute; - outputArea.drawText(text, 0, 0); + Attribute attribute = (Attribute) model; + + outputArea.drawText(attribute.getValue(), 0, 0); } } 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:08:46
|
Revision: 67 Author: lgrammel Date: 2006-06-05 03:33:51 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=67&view=rev Log Message: ----------- #1500774 scenario "shopping list" Added Paths: ----------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AttributeRenderer.java Removed Paths: ------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/SimpleTextRenderer.java Copied: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AttributeRenderer.java (from rev 29, net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/SimpleTextRenderer.java) =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AttributeRenderer.java (rev 0) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AttributeRenderer.java 2006-06-05 10:33:51 UTC (rev 67) @@ -0,0 +1,25 @@ +/* $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 net.sourceforge.exmmt.graphics.IOutputArea; + +public class AttributeRenderer { + + public void render(IOutputArea outputArea, String text) { + assert outputArea != null; + + outputArea.drawText(text, 0, 0); + } + +} Deleted: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/SimpleTextRenderer.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/SimpleTextRenderer.java 2006-06-05 10:33:40 UTC (rev 66) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/SimpleTextRenderer.java 2006-06-05 10:33:51 UTC (rev 67) @@ -1,25 +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 net.sourceforge.exmmt.graphics.IOutputArea; - -public class SimpleTextRenderer { - - public void render(IOutputArea outputArea, String text) { - assert outputArea != null; - - outputArea.drawText(text, 0, 0); - } - -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 01:59:44
|
Revision: 65 Author: lgrammel Date: 2006-06-05 02:58:40 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=65&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java 2006-06-05 09:55:54 UTC (rev 64) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java 2006-06-05 09:58:40 UTC (rev 65) @@ -51,6 +51,9 @@ child.setParent(this); children.add(child); + + assert child.getParent() == this; + assert children.contains(child); } public boolean isRoot() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 01:49:07
|
Revision: 96 Author: lgrammel Date: 2006-06-05 06:10:18 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=96&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/ControllerTreeBuilderTest.java Modified: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/ControllerTreeBuilderTest.java =================================================================== --- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/ControllerTreeBuilderTest.java 2006-06-05 13:10:08 UTC (rev 95) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/ControllerTreeBuilderTest.java 2006-06-05 13:10:18 UTC (rev 96) @@ -18,7 +18,7 @@ import static org.junit.Assert.assertTrue; import junit.framework.JUnit4TestAdapter; import net.sourceforge.exmmt.renderer.AttributeRenderer; -import net.sourceforge.exmmt.renderer.NullRenderer; +import net.sourceforge.exmmt.renderer.HorizontalSequenceRenderer; import org.jdom.Element; import org.junit.Test; @@ -37,7 +37,7 @@ assertNotNull(composite.getChildren()); assertEquals(0, composite.getChildren().size()); assertNull(composite.getParent()); - assertTrue(composite.getRenderer() instanceof NullRenderer); + assertTrue(composite.getRenderer() instanceof HorizontalSequenceRenderer); } @Test This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 01:49:07
|
Revision: 88 Author: lgrammel Date: 2006-06-05 05:42:36 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=88&view=rev Log Message: ----------- #1500774 scenario "shopping list" Added Paths: ----------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/HorizontalSequenceRenderer.java Added: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/HorizontalSequenceRenderer.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/HorizontalSequenceRenderer.java (rev 0) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/HorizontalSequenceRenderer.java 2006-06-05 12:42:36 UTC (rev 88) @@ -0,0 +1,53 @@ +/* $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 java.util.ArrayList; +import java.util.List; + +import net.sourceforge.exmmt.graphics.IOutputArea; +import net.sourceforge.exmmt.graphics.ISizeCalculator; + +import org.eclipse.swt.graphics.Rectangle; + +public class HorizontalSequenceRenderer implements IRenderer { + + private final List<IRenderer> subRenderers = new ArrayList<IRenderer>(); + + public Rectangle calculateSize(ISizeCalculator sizeCalculator) { + int height = 0; + int width = 0; + + for (IRenderer renderer : subRenderers) { + Rectangle bounds = renderer.calculateSize(sizeCalculator); + + if (bounds.height > height) { + height = bounds.height; + } + + width += bounds.width; + } + + return new Rectangle(0, 0, width, height); + } + + public void render(IOutputArea outputArea) { + } + + public void add(IRenderer subRenderer) { + assert subRenderer != null; + + subRenderers.add(subRenderer); + } + +} \ No newline at end of file Property changes on: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/HorizontalSequenceRenderer.java ___________________________________________________________________ Name: svn:keywords + HeadURL Id LastChangedBy LastChangedDate LastChangedRevision This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 01:28:58
|
Revision: 37 Author: lgrammel Date: 2006-06-05 01:46:35 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=37&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java 2006-06-05 08:40:32 UTC (rev 36) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java 2006-06-05 08:46:35 UTC (rev 37) @@ -19,6 +19,8 @@ private final Object model; + private Composite parent; + private final List<Composite> children = new ArrayList<Composite>(); public Composite(final Object model) { @@ -35,4 +37,12 @@ return children; } + public Composite getParent() { + return parent; + } + + void setParent(Composite parent) { + this.parent = parent; + } + } Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java 2006-06-05 08:40:32 UTC (rev 36) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java 2006-06-05 08:46:35 UTC (rev 37) @@ -26,14 +26,18 @@ for (Element childElement : childElements) { // TODO getChildren should return immutable, create add method in // Composite - composite.getChildren().add(build(childElement)); + Composite child = build(childElement); + child.setParent(composite); + composite.getChildren().add(child); } List<Attribute> attributes = element.getAttributes(); for (Attribute attribute : attributes) { // TODO getChildren should return immutable, create add method in // Composite - composite.getChildren().add(build(attribute)); + Composite child = build(attribute); + child.setParent(composite); + composite.getChildren().add(child); } return composite; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 01:27:31
|
Revision: 39 Author: lgrammel Date: 2006-06-05 01:48:30 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=39&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/TreeBuilderTest.java Modified: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/TreeBuilderTest.java =================================================================== --- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/TreeBuilderTest.java 2006-06-05 08:46:44 UTC (rev 38) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/TreeBuilderTest.java 2006-06-05 08:48:30 UTC (rev 39) @@ -35,25 +35,36 @@ assertNull(composite.getParent()); } - @Test public void buildOneElementWithAttribute() { + @Test public void buildOneElementWithAttributes() { + String nameOfAttribute1 = "item"; + String nameOfAttribute2 = "count"; + TreeBuilder builder = new TreeBuilder(); Element element = new Element("entry"); - element.setAttribute("item", "testItem"); + element.setAttribute(nameOfAttribute1, "testItem"); + element.setAttribute(nameOfAttribute2, "2"); Composite composite = builder.build(element); assertEquals(element, composite.getModel()); assertNotNull(composite.getChildren()); - assertEquals(1, composite.getChildren().size()); + assertEquals(2, composite.getChildren().size()); assertNull(composite.getParent()); - Composite childComposite = composite.getChildren().get(0); + Composite childComposite1 = composite.getChildren().get(0); - assertEquals(element.getAttribute("item"), childComposite.getModel()); - assertNotNull(childComposite.getChildren()); - assertEquals(0, childComposite.getChildren().size()); - assertEquals(composite, childComposite.getParent()); + assertEquals(element.getAttribute(nameOfAttribute1), childComposite1.getModel()); + assertNotNull(childComposite1.getChildren()); + assertEquals(0, childComposite1.getChildren().size()); + assertEquals(composite, childComposite1.getParent()); + + Composite childComposite2 = composite.getChildren().get(1); + + assertEquals(element.getAttribute(nameOfAttribute2), childComposite2.getModel()); + assertNotNull(childComposite2.getChildren()); + assertEquals(0, childComposite2.getChildren().size()); + assertEquals(composite, childComposite2.getParent()); } @Test public void buildElementWithChildElement() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 00:55:48
|
Revision: 54 Author: lgrammel Date: 2006-06-05 02:39:28 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=54&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java 2006-06-05 09:37:54 UTC (rev 53) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java 2006-06-05 09:39:28 UTC (rev 54) @@ -33,6 +33,7 @@ return model; } + // TODO result should be immutable or a copy public List<Composite> getChildren() { return children; } @@ -45,7 +46,7 @@ this.parent = parent; } - public void add(Composite child) { + public void addChild(Composite child) { assert child != null; child.setParent(this); Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java 2006-06-05 09:37:54 UTC (rev 53) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java 2006-06-05 09:39:28 UTC (rev 54) @@ -24,16 +24,12 @@ List<Element> childElements = element.getChildren(); for (Element childElement : childElements) { - // TODO getChildren should return immutable - Composite child = build(childElement); - composite.add(child); + composite.addChild(build(childElement)); } List<Attribute> attributes = element.getAttributes(); for (Attribute attribute : attributes) { - // TODO getChildren should return immutable - Composite child = build(attribute); - composite.add(child); + composite.addChild(build(attribute)); } return composite; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 00:55:44
|
Revision: 85 Author: lgrammel Date: 2006-06-05 05:25:16 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=85&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Controller.java net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/ControllerTreeBuilder.java Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Controller.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Controller.java 2006-06-05 12:25:07 UTC (rev 84) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Controller.java 2006-06-05 12:25:16 UTC (rev 85) @@ -25,11 +25,19 @@ private Controller parent; private final List<Controller> children = new ArrayList<Controller>(); + + private final IRenderer renderer; - public Controller(final Object model) { - assert model != null; + public Controller(Object model) { + this(model, new NullRenderer()); + } + + public Controller(Object model, IRenderer renderer) { + assert model != null; + assert renderer != null; this.model = model; + this.renderer = renderer; } public Object getModel() { @@ -68,7 +76,9 @@ } public IRenderer getRenderer() { - return new NullRenderer(); + assert renderer != null; + + return renderer; } } \ No newline at end of file Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/ControllerTreeBuilder.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/ControllerTreeBuilder.java 2006-06-05 12:25:07 UTC (rev 84) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/ControllerTreeBuilder.java 2006-06-05 12:25:16 UTC (rev 85) @@ -14,6 +14,9 @@ import java.util.List; +import net.sourceforge.exmmt.renderer.AttributeRenderer; +import net.sourceforge.exmmt.renderer.NullRenderer; + import org.jdom.Attribute; import org.jdom.Element; @@ -36,7 +39,7 @@ } private Controller build(Attribute attribute) { - return new Controller(attribute); + return new Controller(attribute, new AttributeRenderer(attribute)); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 00:55:29
|
Revision: 56 Author: lgrammel Date: 2006-06-05 02:45:10 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=56&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:39:37 UTC (rev 55) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:45:10 UTC (rev 56) @@ -40,4 +40,7 @@ } } + public void moveToNextSibling() { + } + } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 00:55:23
|
Revision: 46 Author: lgrammel Date: 2006-06-05 02:25:28 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=46&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:24:04 UTC (rev 45) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:25:28 UTC (rev 46) @@ -40,4 +40,8 @@ focusedElement = children.get(0); } + public void moveToParent() { + focusedElement = focusedElement.getParent(); + } + } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 00:55:17
|
Revision: 74 Author: lgrammel Date: 2006-06-05 04:09:44 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=74&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/AttributeRendererTest.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 11:06:20 UTC (rev 73) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/AttributeRendererTest.java 2006-06-05 11:09:44 UTC (rev 74) @@ -27,14 +27,14 @@ String value = "value"; Attribute attribute = new Attribute("name", value); - AttributeRenderer renderer = new AttributeRenderer(); + AttributeRenderer renderer = new AttributeRenderer(attribute); IOutputArea outputArea = createMock(IOutputArea.class); outputArea.drawText(value, 0, 0); replay(outputArea); - renderer.render(outputArea, attribute); + renderer.render(outputArea); verify(outputArea); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 00:55:16
|
Revision: 91 Author: lgrammel Date: 2006-06-05 05:48:38 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=91&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/IDrawArea.java Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/IDrawArea.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/IDrawArea.java 2006-06-05 12:46:03 UTC (rev 90) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/IDrawArea.java 2006-06-05 12:48:38 UTC (rev 91) @@ -12,6 +12,7 @@ */ package net.sourceforge.exmmt.graphics; +// TODO check introduction of Point class public interface IDrawArea { void drawText(String text); @@ -20,4 +21,7 @@ void changePosition(int deltaX, int deltaY); + int getX(); + + int getY(); } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 00:55:14
|
Revision: 35 Author: lgrammel Date: 2006-06-05 01:40:25 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=35&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java 2006-06-05 08:34:49 UTC (rev 34) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java 2006-06-05 08:40:25 UTC (rev 35) @@ -22,6 +22,13 @@ public Composite build(Element element) { Composite composite = new Composite(element); + List<Element> childElements = element.getChildren(); + for (Element childElement : childElements) { + // TODO getChildren should return immutable, create add method in + // Composite + composite.getChildren().add(build(childElement)); + } + List<Attribute> attributes = element.getAttributes(); for (Attribute attribute : attributes) { // TODO getChildren should return immutable, create add method in This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 00:55:12
|
Revision: 30 Author: lgrammel Date: 2006-06-04 23:37:27 -0700 (Sun, 04 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=30&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt.test/trunk/.classpath net.sourceforge.exmmt.test/trunk/META-INF/MANIFEST.MF Added Paths: ----------- net.sourceforge.exmmt.test/trunk/lib/ net.sourceforge.exmmt.test/trunk/lib/easymock.jar net.sourceforge.exmmt.test/trunk/lib/junit-4.1.jar net.sourceforge.exmmt.test/trunk/src/net/ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/SimpleTextRendererTest.java Modified: net.sourceforge.exmmt.test/trunk/.classpath =================================================================== --- net.sourceforge.exmmt.test/trunk/.classpath 2006-06-05 06:37:13 UTC (rev 29) +++ net.sourceforge.exmmt.test/trunk/.classpath 2006-06-05 06:37:27 UTC (rev 30) @@ -3,5 +3,7 @@ <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <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="output" path="bin"/> </classpath> Modified: net.sourceforge.exmmt.test/trunk/META-INF/MANIFEST.MF =================================================================== --- net.sourceforge.exmmt.test/trunk/META-INF/MANIFEST.MF 2006-06-05 06:37:13 UTC (rev 29) +++ net.sourceforge.exmmt.test/trunk/META-INF/MANIFEST.MF 2006-06-05 06:37:27 UTC (rev 30) @@ -5,6 +5,7 @@ Bundle-Version: 0.0.1 Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime + org.eclipse.core.runtime, + net.sourceforge.exmmt Eclipse-LazyStart: true Bundle-Vendor: exmmt.sourceforge.net project Added: net.sourceforge.exmmt.test/trunk/lib/easymock.jar =================================================================== (Binary files differ) Property changes on: net.sourceforge.exmmt.test/trunk/lib/easymock.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: net.sourceforge.exmmt.test/trunk/lib/junit-4.1.jar =================================================================== (Binary files differ) Property changes on: net.sourceforge.exmmt.test/trunk/lib/junit-4.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/SimpleTextRendererTest.java =================================================================== --- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/SimpleTextRendererTest.java (rev 0) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/SimpleTextRendererTest.java 2006-06-05 06:37:27 UTC (rev 30) @@ -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 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); + } +} Property changes on: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/SimpleTextRendererTest.java ___________________________________________________________________ Name: svn:keywords + HeadURL Id LastChangedBy LastChangedDate LastChangedRevision This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 00:54:56
|
Revision: 38 Author: lgrammel Date: 2006-06-05 01:46:44 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=38&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/TreeBuilderTest.java Modified: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/TreeBuilderTest.java =================================================================== --- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/TreeBuilderTest.java 2006-06-05 08:46:35 UTC (rev 37) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/TreeBuilderTest.java 2006-06-05 08:46:44 UTC (rev 38) @@ -14,6 +14,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import junit.framework.JUnit4TestAdapter; import org.jdom.Element; @@ -31,6 +32,7 @@ assertEquals(element, composite.getModel()); assertNotNull(composite.getChildren()); assertEquals(0, composite.getChildren().size()); + assertNull(composite.getParent()); } @Test public void buildOneElementWithAttribute() { @@ -44,12 +46,14 @@ assertEquals(element, composite.getModel()); assertNotNull(composite.getChildren()); assertEquals(1, composite.getChildren().size()); + assertNull(composite.getParent()); Composite childComposite = composite.getChildren().get(0); assertEquals(element.getAttribute("item"), childComposite.getModel()); assertNotNull(childComposite.getChildren()); assertEquals(0, childComposite.getChildren().size()); + assertEquals(composite, childComposite.getParent()); } @Test public void buildElementWithChildElement() { @@ -64,11 +68,14 @@ assertEquals(listElement, composite.getModel()); assertNotNull(composite.getChildren()); assertEquals(1, composite.getChildren().size()); + assertNull(composite.getParent()); Composite childComposite = composite.getChildren().get(0); + assertEquals(entryElement, childComposite.getModel()); assertNotNull(childComposite.getChildren()); assertEquals(0, childComposite.getChildren().size()); + assertEquals(composite, childComposite.getParent()); } // Junit 3.8.1 backward compability This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 00:54:51
|
Revision: 89 Author: lgrammel Date: 2006-06-05 05:45:55 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=89&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/AttributeRendererTest.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 12:42:36 UTC (rev 88) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/AttributeRendererTest.java 2006-06-05 12:45:55 UTC (rev 89) @@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import junit.framework.JUnit4TestAdapter; -import net.sourceforge.exmmt.graphics.IOutputArea; +import net.sourceforge.exmmt.graphics.IDrawArea; import net.sourceforge.exmmt.graphics.ISizeCalculator; import org.eclipse.swt.graphics.Rectangle; @@ -40,9 +40,9 @@ @Test public void render() { - IOutputArea outputArea = createMock(IOutputArea.class); + IDrawArea outputArea = createMock(IDrawArea.class); - outputArea.drawText(value, 0, 0); + outputArea.drawText(value); replay(outputArea); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 00:54:48
|
Revision: 87 Author: lgrammel Date: 2006-06-05 05:42:28 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=87&view=rev Log Message: ----------- #1500774 scenario "shopping list" Added Paths: ----------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/HorizontalSequenceRendererTest.java Added: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/HorizontalSequenceRendererTest.java =================================================================== --- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/HorizontalSequenceRendererTest.java (rev 0) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/HorizontalSequenceRendererTest.java 2006-06-05 12:42:28 UTC (rev 87) @@ -0,0 +1,72 @@ +/* $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.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import junit.framework.JUnit4TestAdapter; +import net.sourceforge.exmmt.graphics.ISizeCalculator; + +import org.eclipse.swt.graphics.Rectangle; +import org.junit.Test; + +public class HorizontalSequenceRendererTest { + + @Test + public void isRenderer() { + assertTrue(IRenderer.class + .isAssignableFrom(HorizontalSequenceRenderer.class)); + } + + @Test + public void computeSize() { + HorizontalSequenceRenderer renderer = new HorizontalSequenceRenderer(); + + IRenderer childRenderer1 = createMock(IRenderer.class); + IRenderer childRenderer2 = createMock(IRenderer.class); + + renderer.add(childRenderer1); + renderer.add(childRenderer2); + + ISizeCalculator sizeCalculator = createMock(ISizeCalculator.class); + + Rectangle rectangle1 = new Rectangle(10, 10, 20, 30); + Rectangle rectangle2 = new Rectangle(101, 110, 120, 130); + + expect(childRenderer1.calculateSize(sizeCalculator)).andReturn( + rectangle1); + expect(childRenderer2.calculateSize(sizeCalculator)).andReturn( + rectangle2); + + replay(sizeCalculator); + replay(childRenderer1); + replay(childRenderer2); + + Rectangle result = renderer.calculateSize(sizeCalculator); + + assertEquals(new Rectangle(0, 0, rectangle1.width + rectangle2.width, + Math.max(rectangle1.height, rectangle2.height)), result); + + verify(sizeCalculator); + } + + // Junit 3.8.1 backward compability + public static junit.framework.Test suite() { + return new JUnit4TestAdapter(HorizontalSequenceRendererTest.class); + } + +} \ No newline at end of file Property changes on: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/HorizontalSequenceRendererTest.java ___________________________________________________________________ Name: svn:keywords + HeadURL Id LastChangedBy LastChangedDate LastChangedRevision This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 00:54:37
|
Revision: 84 Author: lgrammel Date: 2006-06-05 05:25:07 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=84&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/ControllerTreeBuilderTest.java Modified: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/ControllerTreeBuilderTest.java =================================================================== --- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/ControllerTreeBuilderTest.java 2006-06-05 12:09:03 UTC (rev 83) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/ControllerTreeBuilderTest.java 2006-06-05 12:25:07 UTC (rev 84) @@ -15,7 +15,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import junit.framework.JUnit4TestAdapter; +import net.sourceforge.exmmt.renderer.AttributeRenderer; +import net.sourceforge.exmmt.renderer.NullRenderer; import org.jdom.Element; import org.junit.Test; @@ -34,6 +37,7 @@ assertNotNull(composite.getChildren()); assertEquals(0, composite.getChildren().size()); assertNull(composite.getParent()); + assertTrue(composite.getRenderer() instanceof NullRenderer); } @Test @@ -52,7 +56,6 @@ assertEquals(element, composite.getModel()); assertNotNull(composite.getChildren()); assertEquals(2, composite.getChildren().size()); - assertNull(composite.getParent()); Controller childComposite1 = composite.getChildren().get(0); @@ -61,6 +64,7 @@ assertNotNull(childComposite1.getChildren()); assertEquals(0, childComposite1.getChildren().size()); assertEquals(composite, childComposite1.getParent()); + assertTrue(childComposite1.getRenderer() instanceof AttributeRenderer); Controller childComposite2 = composite.getChildren().get(1); @@ -69,6 +73,7 @@ assertNotNull(childComposite2.getChildren()); assertEquals(0, childComposite2.getChildren().size()); assertEquals(composite, childComposite2.getParent()); + assertTrue(childComposite2.getRenderer() instanceof AttributeRenderer); } @Test @@ -84,7 +89,6 @@ assertEquals(listElement, composite.getModel()); assertNotNull(composite.getChildren()); assertEquals(1, composite.getChildren().size()); - assertNull(composite.getParent()); Controller childComposite = composite.getChildren().get(0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 00:54:33
|
Revision: 55 Author: lgrammel Date: 2006-06-05 02:39:37 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=55&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/navigation/FocusTest.java Modified: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/navigation/FocusTest.java =================================================================== --- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/navigation/FocusTest.java 2006-06-05 09:39:28 UTC (rev 54) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/navigation/FocusTest.java 2006-06-05 09:39:37 UTC (rev 55) @@ -67,7 +67,7 @@ public void setUp() { composite = new Composite(new Element("test")); childComposite = new Composite(new Element("child")); - composite.add(childComposite); + composite.addChild(childComposite); focus = new Focus(composite); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 00:54:09
|
Revision: 32 Author: lgrammel Date: 2006-06-05 00:40:55 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=32&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt.test/trunk/META-INF/MANIFEST.MF Added Paths: ----------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/TreeBuilderTest.java Modified: net.sourceforge.exmmt.test/trunk/META-INF/MANIFEST.MF =================================================================== --- net.sourceforge.exmmt.test/trunk/META-INF/MANIFEST.MF 2006-06-05 07:40:41 UTC (rev 31) +++ net.sourceforge.exmmt.test/trunk/META-INF/MANIFEST.MF 2006-06-05 07:40:55 UTC (rev 32) @@ -9,3 +9,4 @@ net.sourceforge.exmmt Eclipse-LazyStart: true Bundle-Vendor: exmmt.sourceforge.net project +Import-Package: org.jdom Added: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/TreeBuilderTest.java =================================================================== --- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/TreeBuilderTest.java (rev 0) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/TreeBuilderTest.java 2006-06-05 07:40:55 UTC (rev 32) @@ -0,0 +1,38 @@ +/* $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.builder; + +import static org.junit.Assert.assertEquals; +import junit.framework.JUnit4TestAdapter; + +import org.jdom.Element; +import org.junit.Test; + +public class TreeBuilderTest { + + @Test public void build() { + Element element = new Element("entry"); + + TreeBuilder builder = new TreeBuilder(); + + Composite composite = builder.build(element); + + assertEquals(element, composite.getModel()); + } + + // Junit 3.8.1 backward compability + public static junit.framework.Test suite() { + return new JUnit4TestAdapter(TreeBuilderTest.class); + } + +} Property changes on: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/TreeBuilderTest.java ___________________________________________________________________ Name: svn:keywords + HeadURL Id LastChangedBy LastChangedDate LastChangedRevision This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 00:53:53
|
Revision: 99 Author: lgrammel Date: 2006-06-05 08:04:44 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=99&view=rev Log Message: ----------- #1500774 scenario "shopping list" Added Paths: ----------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/DelegatingRenderer.java Added: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/DelegatingRenderer.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/DelegatingRenderer.java (rev 0) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/DelegatingRenderer.java 2006-06-05 15:04:44 UTC (rev 99) @@ -0,0 +1,17 @@ +/* $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; + +public abstract class DelegatingRenderer implements IRenderer { + +} Property changes on: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/DelegatingRenderer.java ___________________________________________________________________ Name: svn:keywords + HeadURL Id LastChangedBy LastChangedDate LastChangedRevision This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 00:53:53
|
Revision: 34 Author: lgrammel Date: 2006-06-05 01:34:49 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=34&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/TreeBuilderTest.java Modified: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/TreeBuilderTest.java =================================================================== --- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/TreeBuilderTest.java 2006-06-05 08:34:40 UTC (rev 33) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/TreeBuilderTest.java 2006-06-05 08:34:49 UTC (rev 34) @@ -13,6 +13,7 @@ package net.sourceforge.exmmt.builder; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import junit.framework.JUnit4TestAdapter; import org.jdom.Element; @@ -20,16 +21,31 @@ public class TreeBuilderTest { - @Test public void build() { + @Test public void buildOneElement() { + TreeBuilder builder = new TreeBuilder(); + Element element = new Element("entry"); + Composite composite = builder.build(element); + + assertEquals(element, composite.getModel()); + assertNotNull(composite.getChildren()); + assertEquals(0, composite.getChildren().size()); + } + + @Test public void buildOneElementWithAttribute() { TreeBuilder builder = new TreeBuilder(); + + Element element = new Element("entry"); + element.setAttribute("item", "testItem"); Composite composite = builder.build(element); assertEquals(element, composite.getModel()); + assertNotNull(composite.getChildren()); + assertEquals(1, composite.getChildren().size()); } - + // Junit 3.8.1 backward compability public static junit.framework.Test suite() { return new JUnit4TestAdapter(TreeBuilderTest.class); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
