Author: allain.lalonde Date: Mon Jul 13 13:50:28 2009 New Revision: 456 Added: piccolo2d.java/trunk/extras/src/test/java/edu/umd/cs/piccolox/pswing/PComboBoxTest.java Modified: piccolo2d.java/trunk/extras/src/main/java/edu/umd/cs/piccolox/pswing/PComboBox.java
Log: Added some tests for PComboBox and added getters for canvas and pSwing Modified: piccolo2d.java/trunk/extras/src/main/java/edu/umd/cs/piccolox/pswing/PComboBox.java ============================================================================== --- piccolo2d.java/trunk/extras/src/main/java/edu/umd/cs/piccolox/pswing/PComboBox.java (original) +++ piccolo2d.java/trunk/extras/src/main/java/edu/umd/cs/piccolox/pswing/PComboBox.java Mon Jul 13 13:50:28 2009 @@ -191,4 +191,12 @@ return r1c; } + public PSwing getPSwing() { + return pSwing; + } + + public PSwingCanvas getCanvas() { + return canvas; + } + } Added: piccolo2d.java/trunk/extras/src/test/java/edu/umd/cs/piccolox/pswing/PComboBoxTest.java ============================================================================== --- (empty file) +++ piccolo2d.java/trunk/extras/src/test/java/edu/umd/cs/piccolox/pswing/PComboBoxTest.java Mon Jul 13 13:50:28 2009 @@ -0,0 +1,51 @@ +package edu.umd.cs.piccolox.pswing; + +import java.util.Vector; + +import javax.swing.DefaultComboBoxModel; + +import junit.framework.TestCase; + +public class PComboBoxTest extends TestCase { + public void testPComboInstallsItsOwnUI() { + PComboBox combo = new PComboBox(); + assertTrue(combo.getUI() instanceof PComboBox.PBasicComboBoxUI); + } + + public void testConstructsWithVector() { + Vector items = new Vector(); + items.add("A"); + items.add("B"); + PComboBox combo = new PComboBox(items); + assertEquals(2, combo.getModel().getSize()); + } + + public void testConstructsWithArray() { + String[] items = new String[] { "A", "B" }; + PComboBox combo = new PComboBox(items); + assertEquals(2, combo.getModel().getSize()); + } + + public void testConstructsWithComboBoxModel() { + DefaultComboBoxModel model = new DefaultComboBoxModel(); + model.addElement("A"); + model.addElement("B"); + PComboBox combo = new PComboBox(model); + assertEquals(2, combo.getModel().getSize()); + } + + public void testSetEnvironmentPersists() { + PComboBox combo = new PComboBox(); + + PSwingCanvas canvas = new PSwingCanvas(); + PSwing pCombo = new PSwing(combo); + combo.setEnvironment(pCombo, canvas); + + assertEquals(pCombo, combo.getPSwing()); + assertEquals(canvas, combo.getCanvas()); + } + + public void testPopupIsRepositioned() { + // Need a way of dispatching mock events to canvas before this can be tested + } +} --~--~---------~--~----~------------~-------~--~----~ Piccolo2D Developers Group: http://groups.google.com/group/piccolo2d-dev?hl=en -~----------~----~----~----~------~----~------~--~---