Author: allain.lalonde
Date: Mon Jul 13 08:30:35 2009
New Revision: 451
Added:
piccolo2d.java/trunk/core/src/test/java/edu/umd/cs/piccolo/MockPropertyChangeListener.java
Modified:
piccolo2d.java/trunk/core/src/main/java/edu/umd/cs/piccolo/PCamera.java
piccolo2d.java/trunk/core/src/test/java/edu/umd/cs/piccolo/PCameraTest.java
piccolo2d.java/trunk/core/src/test/java/edu/umd/cs/piccolo/PNodeTest.java
Log:
Added some more tests for PCamera and broke MockPropertyChangeListener out
into its own top level class. Also, cleared up some wording in comments.
Modified:
piccolo2d.java/trunk/core/src/main/java/edu/umd/cs/piccolo/PCamera.java
==============================================================================
--- piccolo2d.java/trunk/core/src/main/java/edu/umd/cs/piccolo/PCamera.java
(original)
+++ piccolo2d.java/trunk/core/src/main/java/edu/umd/cs/piccolo/PCamera.java
Mon Jul 13 08:30:35 2009
@@ -258,8 +258,8 @@
}
/**
- * Paint all the layers that the camera is looking at, this method is
only
- * called when the cameras view transform and clip are applied to the
+ * Paint all the layers that the camera is looking at, this method is
+ * called after the cameras view transform and clip are applied to the
* paintContext.
*/
protected void paintCameraView(PPaintContext paintContext) {
@@ -376,8 +376,8 @@
}
/**
- * Pick all the layers that the camera is looking at, this method is
only
- * called when the cameras view transform and clip are applied to the
+ * Pick all the layers that the camera is looking at, this method is
+ * called after the cameras view transform and clip are applied to the
* pickPath.
*/
protected boolean pickCameraView(PPickPath pickPath) {
@@ -409,7 +409,7 @@
/**
* Translates and scales the camera's view transform so that the given
- * bounds (in camera layer's coordinate system)are centered withing the
+ * bounds (in camera layer's coordinate system)are centered within the
* cameras view bounds. Use this method to point the camera at a given
* location.
*/
Added:
piccolo2d.java/trunk/core/src/test/java/edu/umd/cs/piccolo/MockPropertyChangeListener.java
==============================================================================
--- (empty file)
+++
piccolo2d.java/trunk/core/src/test/java/edu/umd/cs/piccolo/MockPropertyChangeListener.java
Mon Jul 13 08:30:35 2009
@@ -0,0 +1,21 @@
+/**
+ *
+ */
+package edu.umd.cs.piccolo;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.ArrayList;
+import java.util.List;
+
+public class MockPropertyChangeListener implements PropertyChangeListener {
+ private List changes = new ArrayList();
+
+ public void propertyChange(PropertyChangeEvent evt) {
+ changes.add(evt);
+ }
+
+ public int getPropertyChangeCount() {
+ return changes.size();
+ }
+}
\ No newline at end of file
Modified:
piccolo2d.java/trunk/core/src/test/java/edu/umd/cs/piccolo/PCameraTest.java
==============================================================================
---
piccolo2d.java/trunk/core/src/test/java/edu/umd/cs/piccolo/PCameraTest.java
(original)
+++
piccolo2d.java/trunk/core/src/test/java/edu/umd/cs/piccolo/PCameraTest.java
Mon Jul 13 08:30:35 2009
@@ -28,39 +28,248 @@
*/
package edu.umd.cs.piccolo;
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.Graphics2D;
+import java.awt.GraphicsEnvironment;
+import java.awt.image.BufferedImage;
+
import junit.framework.TestCase;
+import edu.umd.cs.piccolo.activities.PActivity;
+import edu.umd.cs.piccolo.util.PAffineTransform;
+import edu.umd.cs.piccolo.util.PBounds;
+import edu.umd.cs.piccolo.util.PPickPath;
public class PCameraTest extends TestCase {
- public PCameraTest(String name) {
- super(name);
- }
+ private PCamera camera;
- public void testCopy() {
- PNode n = new PNode();
+ public PCameraTest(String name) {
+ super(name);
+ }
+
+ public void setUp() {
+ camera = new PCamera();
+ }
+
+ public void testClone() {
+ PNode n = new PNode();
+
+ PLayer layer1 = new PLayer();
+ PLayer layer2 = new PLayer();
+
+ PCamera camera1 = new PCamera();
+ PCamera camera2 = new PCamera();
+
+ n.addChild(layer1);
+ n.addChild(layer2);
+ n.addChild(camera1);
+ n.addChild(camera2);
+
+ camera1.addLayer(layer1);
+ camera1.addLayer(layer2);
+ camera2.addLayer(layer1);
+ camera2.addLayer(layer2);
+
+ // no layers should be written out since they are written
conditionally.
+ PCamera cameraCopy = (PCamera) camera1.clone();
+ assertEquals(cameraCopy.getLayerCount(), 0);
+
+ n.clone();
+ assertEquals(((PCamera) n.getChildrenReference().get(2))
+ .getLayerCount(), 2);
+ assertEquals(((PLayer) n.getChildrenReference().get(1))
+ .getCameraCount(), 2);
+ }
+
+ public void testCameraShouldHaveNullComponentUntilAssigned() {
+ assertNull(camera.getComponent());
+
+ MockPComponent component = new MockPComponent();
+ camera.setComponent(component);
+
+ assertNotNull(camera.getComponent());
+ assertEquals(component, camera.getComponent());
+ }
+
+ public void testLayersReferenceIsNotNullByDefault() {
+ assertNotNull(camera.getLayersReference());
+ }
+
+ public void testCameraHasNoLayersByDefault() {
+ assertEquals(0, camera.getLayerCount());
+ }
+
+ public void testIndexOfLayerReturnsMinusOneWhenLayerNotFound() {
+ PLayer orphanLayer = new PLayer();
+ assertEquals(-1, camera.indexOfLayer(orphanLayer));
+
+ camera.addLayer(new PLayer());
+ assertEquals(-1, camera.indexOfLayer(orphanLayer));
+ }
+
+ public void testRemoveLayerByReferenceWorks() {
+ PLayer layer = new PLayer();
+ camera.addLayer(layer);
+ camera.removeLayer(layer);
+ assertEquals(0, camera.getLayerCount());
+ }
+
+ // I believe this should pass. It'd make it behave
+ // more like the standard Java Collections
+ /*
+ * public void
testRemoveLayerByReferenceDoesNothingWithStrangeLayerWorks()
+ * { PLayer strangeLayer = new PLayer();
camera.removeLayer(strangeLayer);
+ * assertEquals(0, camera.getLayerCount()); }
+ */
+
+ public void testGetFullUnionOfLayerFullBoundsWorks() {
+ PLayer layer1 = new PLayer();
+ layer1.setBounds(0, 0, 10, 10);
+ camera.addLayer(layer1);
+
+ PLayer layer2 = new PLayer();
+ layer2.setBounds(10, 10, 10, 10);
+ camera.addLayer(layer2);
+
+ PBounds fullLayerBounds = camera.getUnionOfLayerFullBounds();
+ assertEquals(new PBounds(0, 0, 20, 20), fullLayerBounds);
+ }
+
+ public void testPaintPaintsAllLayers() {
+ PCanvas canvas = new PCanvas();
+ PCamera camera = canvas.getCamera();
+
+ BufferedImage img = new BufferedImage(100, 100,
+ BufferedImage.TYPE_INT_RGB);
+ Graphics2D g2 =
GraphicsEnvironment.getLocalGraphicsEnvironment()
+ .createGraphics(img);
+
+ PLayer layer1 = canvas.getLayer();
+ PNode blueSquare = new PNode();
+ blueSquare.setPaint(Color.BLUE);
+ blueSquare.setBounds(0, 0, 10, 10);
+ layer1.addChild(blueSquare );
+ camera.addLayer(layer1);
+
+ PLayer layer2 = new PLayer();
+ canvas.getLayer().getRoot().addChild(layer2);
+ layer2.setOffset(10, 10);
+ PNode redSquare = new PNode();
+ redSquare.setPaint(Color.RED);
+ redSquare.setBounds(0, 0, 10, 10);
+ layer2.addChild(redSquare);
+ camera.addLayer(layer2);
+
+ canvas.setBounds(0, 0, 20, 20);
+ canvas.paint(g2);
+
+ assertEquals(Color.BLUE.getRGB(), img.getRGB(5, 5));
+ assertEquals(Color.RED.getRGB(), img.getRGB(15, 15));
+ }
+
+ public void testPickPackWorksInSimpleCases() {
+ PLayer layer = new PLayer();
+ camera.addChild(layer);
+
+ PNode node1 = new PNode();
+ node1.setBounds(0, 0, 10, 10);
+ layer.addChild(node1);
+
+
+ PNode node2 = new PNode();
+ node2.setBounds(0, 0, 10, 10);
+ node2.setOffset(10, 10);
+ layer.addChild(node2);
+
+ PPickPath path1 = camera.pick(5, 5, 1);
+ assertEquals(node1, path1.getPickedNode());
+
+ PPickPath path2 = camera.pick(15, 15, 1);
+ assertEquals(node2, path2.getPickedNode());
+ }
+
+ public void testDefaultViewScaleIsOne() {
+ assertEquals(1, camera.getViewScale(), 0.0001);
+ }
+
+ public void testGetViewBoundsTransformsCamerasBounds() {
+ camera.setBounds(0, 0, 100, 100);
+ camera.getViewTransformReference().scale(10, 10);
+ assertEquals(new PBounds(0, 0, 10, 10), camera.getViewBounds());
+ }
+
+ public void testScaleViewIsCummulative() {
+ camera.scaleView(2);
+ assertEquals(2, camera.getViewScale(), 0.001);
+ camera.scaleView(2);
+ assertEquals(4, camera.getViewScale(), 0.001);
+ }
+
+ public void testSetViewScalePersists() {
+ camera.setViewScale(2);
+ assertEquals(2, camera.getViewScale(), 0.001);
+ camera.setViewScale(2);
+ assertEquals(2, camera.getViewScale(), 0.001);
+ }
+
+ public void testTranslateViewIsCummulative() {
+ camera.translateView(100, 100);
+ assertEquals(100, camera.getViewTransform().getTranslateX(),
0.001);
+ camera.translateView(100, 100);
+ assertEquals(200, camera.getViewTransform().getTranslateX(),
0.001);
+ }
+
+ public void testViewTransformedFiresChangeEvent() {
+ MockPropertyChangeListener mockListener = new
MockPropertyChangeListener();
+
camera.addPropertyChangeListener(PCamera.PROPERTY_VIEW_TRANSFORM,
mockListener);
+ camera.setViewTransform(PAffineTransform.getScaleInstance(2,
2));
+ assertEquals(1, mockListener.getPropertyChangeCount());
+ }
+
+ public void
testAnimateViewToCenterBoundsIsImmediateWhenDurationIsZero() {
+ camera.setViewBounds(new PBounds(0, 0, 10, 10));
+ PBounds targetBounds = new PBounds(-5, -5, 10, 10);
+ PActivity activity =
camera.animateViewToCenterBounds(targetBounds,
true, 0);
+ assertNull(activity);
+
+ assertEquals(-5, camera.getViewTransform().getTranslateX(),
0.001);
+ assertEquals(-5, camera.getViewTransform().getTranslateY(),
0.001);
+ }
+
+ public void testAnimateViewToCenterBoundsCreatesValidActivity() {
+ camera.setViewBounds(new PBounds(0, 0, 10, 10));
+ PBounds targetBounds = new PBounds(-5, -5, 10, 10);
+ PActivity activity =
camera.animateViewToCenterBounds(targetBounds,
true, 100);
+ assertNotNull(activity);
+
+ assertEquals(100, activity.getDuration());
+ assertFalse(activity.isStepping());
+ }
+
+ public void testAnimateViewToPanToBoundsDoesNotAffectScale() {
+ camera.setViewBounds(new PBounds(0, 0, 10, 10));
+ camera.animateViewToPanToBounds(new PBounds(10, 10, 10, 30), 0);
+
+ assertEquals(1, camera.getViewScale(), 0.0001);
+ }
+
+ class MockPComponent implements PComponent {
+
+ public void paintImmediately() {
+ }
+
+ public void popCursor() {
+ }
+
+ public void pushCursor(Cursor cursor) {
+ }
- PLayer layer1 = new PLayer();
- PLayer layer2 = new PLayer();
+ public void repaint(PBounds bounds) {
+ }
- PCamera camera1 = new PCamera();
- PCamera camera2 = new PCamera();
+ public void setInteracting(boolean interacting) {
+ }
- n.addChild(layer1);
- n.addChild(layer2);
- n.addChild(camera1);
- n.addChild(camera2);
-
- camera1.addLayer(layer1);
- camera1.addLayer(layer2);
- camera2.addLayer(layer1);
- camera2.addLayer(layer2);
-
- // no layers should be written out since they are written
conditionally.
- PCamera cameraCopy = (PCamera) camera1.clone();
- assertEquals(cameraCopy.getLayerCount(), 0);
-
- n.clone();
- assertEquals(((PCamera)
n.getChildrenReference().get(2)).getLayerCount(), 2);
- assertEquals(((PLayer)
n.getChildrenReference().get(1)).getCameraCount(), 2);
- }
+ }
}
Modified:
piccolo2d.java/trunk/core/src/test/java/edu/umd/cs/piccolo/PNodeTest.java
==============================================================================
---
piccolo2d.java/trunk/core/src/test/java/edu/umd/cs/piccolo/PNodeTest.java
(original)
+++
piccolo2d.java/trunk/core/src/test/java/edu/umd/cs/piccolo/PNodeTest.java
Mon Jul 13 08:30:35 2009
@@ -35,13 +35,10 @@
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Enumeration;
import java.util.Iterator;
-import java.util.List;
import java.util.ListIterator;
import javax.swing.text.MutableAttributeSet;
@@ -1271,17 +1268,5 @@
public void testSetOccludedPersistes() {
node.setOccluded(true);
assertTrue(node.getOccluded());
- }
-
- private class MockPropertyChangeListener implements
PropertyChangeListener {
- private List changes = new ArrayList();
-
- public void propertyChange(PropertyChangeEvent evt) {
- changes.add(evt);
- }
-
- public int getPropertyChangeCount() {
- return changes.size();
- }
}
}
--~--~---------~--~----~------------~-------~--~----~
Piccolo2D Developers Group: http://groups.google.com/group/piccolo2d-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
