[CVS nano] update

Commit in nano/picogui/src/test/org/picoextras/gui on MAIN

model/ComponentRegistrarTestCase.java +45 added 1.1

/EditContainerPanelTestCase.java +85 added 1.1

/Foo.java +17 added 1.1

/NeedsFoo.java +10 added 1.1

swing/BeanPropertyTableModelTestCase.java +63 added 1.1

/PropertyTableCommanderTest.java +36 added 1.1

/PropertyTableCommanderTestCase.java +37 added 1.1

+293

7 added files

update

----------

nano /picogui /src /test /org /picoextras /gui /model

ComponentRegistrarTestCase.java added at 1.1

diff -N ComponentRegistrarTestCase.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ComponentRegistrarTestCase.java 17 Nov 2003 21:03:50 -0000 1.1
@@ -0,0 +1,45 @@

+package org.picoextras.gui.model;
+
+import junit.framework.TestCase;
+
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.*;
+import java.beans.IntrospectionException;
+
+import org.picoextras.gui.swing.ComponentRegistrar;
+
+/**
+ * @author Aslak Hellesøy
+ * @version $Revision: 1.1 $
+ */
+public class ComponentRegistrarTestCase extends TestCase {
+ public void testCreateComponentNode() throws IntrospectionException {
+ ContainerNode containerNode = new ContainerNode();
+ DefaultTreeModel treeModel = new DefaultTreeModel(containerNode);
+ ComponentRegistrar componentRegistrar = new ComponentRegistrar(treeModel, null);
+
+ componentRegistrar.createComponentNodeInTree(containerNode, "somekey", String.class);
+ ComponentNode componentNode = (ComponentNode) containerNode.getChildAt(0);
+ BeanPropertyModel beanPropertyModel = (BeanPropertyModel) componentNode.getUserObject();
+ assertEquals(String.class, beanPropertyModel.getBeanClass());
+ }
+
+ public void testDisplayComponentNode() throws IntrospectionException {
+ ContainerNode containerNode = new ContainerNode();
+ DefaultTreeModel treeModel = new DefaultTreeModel(containerNode);
+
+ JTable table = new JTable();
+
+ ComponentRegistrar componentRegistrar = new ComponentRegistrar(treeModel, table);
+
+ componentRegistrar.createComponentNodeInTree(containerNode, "somekey", String.class);
+ ComponentNode componentNode = (ComponentNode) containerNode.getChildAt(0);
+ BeanPropertyModel beanPropertyModel = (BeanPropertyModel) componentNode.getUserObject();
+
+ componentRegistrar.displayInPropertyTable(beanPropertyModel);
+ BeanPropertyTableModel beanPropertyTableModel = (BeanPropertyTableModel) table.getModel();
+
+ assertSame(beanPropertyModel, beanPropertyTableModel.getBeanPropertyModel());
+ }
+
+}

----------

nano /picogui /src /test /org /picoextras /gui /model

EditContainerPanelTestCase.java added at 1.1

diff -N EditContainerPanelTestCase.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ EditContainerPanelTestCase.java 17 Nov 2003 21:03:50 -0000 1.1
@@ -0,0 +1,85 @@

+package org.picoextras.gui.model;
+
+import junit.framework.TestCase;
+import org.picoextras.gui.swing.EditContainerPanel;
+
+import javax.swing.*;
+import javax.swing.tree.TreePath;
+
+/**
+ * @author Aslak Hellesøy
+ * @version $Revision: 1.1 $
+ */
+public class EditContainerPanelTestCase extends TestCase {
+ private JTree tree;
+ private EditContainerPanel panel;
+ private ContainerNode root;
+
+// protected void setUp() {
+// root = new ContainerNode();
+// tree = new JTree(root);
+// panel = new EditContainerPanel(tree);
+// }
+//
+// public void testRegisterComponent() {
+// tree.setSelectionPath(new TreePath(root.getPath()));
+//
+// JTextField componentField = panel.getComponentField();
+// componentField.setText(Foo.class.getName());
+//
+// panel.addPicoComponent();
+//
+// assertEquals(1, root.getChildCount());
+// }
+//
+// public void testUnregisterComponent() {
+// testRegisterComponent();
+// ComponentNode fooNode = (ComponentNode) root.getChildAt(0);
+// tree.setSelectionPath(new TreePath(fooNode.getPath()));
+//
+// panel.removeSelected();
+//
+// assertEquals(0, root.getChildCount());
+// }
+//
+// public void testAddContainer() {
+// tree.setSelectionPath(new TreePath(root.getPath()));
+// panel.addPicoContainer();
+// assertEquals(1, root.getChildCount());
+// }
+//
+// public void testRemoveContainer() {
+// testAddContainer();
+// ContainerNode fooNode = (ContainerNode) root.getChildAt(0);
+// tree.setSelectionPath(new TreePath(fooNode.getPath()));
+//
+// panel.removeSelected();
+//
+// assertEquals(0, root.getChildCount());
+// }
+//
+//
+// public void testExecuteContainer() {
+// tree.setSelectionPath(new TreePath(root.getPath()));
+// JTextField componentField = panel.getComponentField();
+//
+// // Make a Foo in the root
+////// componentField.setText(ContainerNodeTestCase.Foo.class.getName());
+// panel.addPicoComponent();
+//
+// // Make a Bar in a child
+// panel.addPicoContainer();
+////// componentField.setText(ContainerNodeTestCase.Bar.class.getName());
+// panel.addPicoComponent();
+//
+// ContainerNode childRegNode = (ContainerNode) root.getChildAt(1);
+// tree.setSelectionPath(new TreePath(childRegNode.getPath()));
+//
+// panel.executeSelected();
+// }
+//
+ public void testIt() {
+
+ }
+
+}

----------

nano /picogui /src /test /org /picoextras /gui /model

Foo.java added at 1.1

diff -N Foo.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Foo.java 17 Nov 2003 21:03:50 -0000 1.1
@@ -0,0 +1,17 @@

+package org.picoextras.gui.model;
+
+/**
+ * @author Aslak Hellesøy
+ * @version $Revision: 1.1 $
+ */
+public class Foo {
+ private String bar;
+
+ public String getBar() {
+ return bar;
+ }
+
+ public void setBar(String bar) {
+ this.bar = bar;
+ }
+}

----------

nano /picogui /src /test /org /picoextras /gui /model

NeedsFoo.java added at 1.1

diff -N NeedsFoo.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ NeedsFoo.java 17 Nov 2003 21:03:50 -0000 1.1
@@ -0,0 +1,10 @@

+package org.picoextras.gui.model;
+
+/**
+ * @author Aslak Hellesøy
+ * @version $Revision: 1.1 $
+ */
+public class NeedsFoo {
+ public NeedsFoo(Foo foo) {
+ }
+}

----------

nano /picogui /src /test /org /picoextras /gui /swing

BeanPropertyTableModelTestCase.java added at 1.1

diff -N BeanPropertyTableModelTestCase.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ BeanPropertyTableModelTestCase.java 17 Nov 2003 21:03:50 -0000 1.1
@@ -0,0 +1,63 @@

+package org.picoextras.gui.swing;
+
+import junit.framework.TestCase;
+import java.beans.IntrospectionException;
+import org.picoextras.gui.model.BeanPropertyTableModel;
+import org.picocontainer.extras.BeanPropertyComponentAdapterFactory;
+import org.picocontainer.defaults.DefaultComponentAdapterFactory;
+import org.picocontainer.PicoIntrospectionException;
+
+/**
+ * @author Aslak Hellesøy
+ * @version $Revision: 1.1 $
+ */
+public class BeanPropertyTableModelTestCase extends TestCase {
+ private BeanPropertyTableModel model;
+
+ public static class Man {
+ public String birth;
+ public String haircolour;
+ public String name;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getBirth() {
+ return birth;
+ }
+
+ public void setBirth(String birth) {
+ this.birth = birth;
+ }
+
+ public String getHaircolour() {
+ return haircolour;
+ }
+
+ public void setHaircolour(String haircolour) {
+ this.haircolour = haircolour;
+ }
+ }
+
+ protected void setUp() throws PicoIntrospectionException {
+ BeanPropertyComponentAdapterFactory factory = new BeanPropertyComponentAdapterFactory(
+ new DefaultComponentAdapterFactory()
+ );
+// BeanPropertyComponentAdapterFactory.Adapter adapter =
+// (BeanPropertyComponentAdapterFactory.Adapter) factory.createComponentAdapter("whatever", Man.class, null);
+// model = new BeanPropertyTableModel(adapter);
+ }
+
+ public void testRows() throws IntrospectionException {
+// assertEquals(4, model.getRowCount());
+//
+// // they are automatically alphabetically sorted, and there is class too
+// assertEquals("name", model.getValueAt(3,0));
+ }
+
+}

----------

nano /picogui /src /test /org /picoextras /gui /swing

PropertyTableCommanderTest.java added at 1.1

diff -N PropertyTableCommanderTest.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ PropertyTableCommanderTest.java 17 Nov 2003 21:03:50 -0000 1.1
@@ -0,0 +1,36 @@

+package org.picoextras.gui.swing;
+
+import junit.framework.TestCase;
+
+import javax.swing.*;
+import javax.swing.table.TableModel;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.tree.TreeModel;
+import javax.swing.tree.TreePath;
+import javax.swing.tree.DefaultTreeModel;
+
+import org.picoextras.gui.model.ComponentNode;
+import org.picoextras.gui.model.BeanPropertyTableModel;
+
+/**
+ * @author Aslak Hellesøy
+ * @version $Revision: 1.1 $
+ */
+public class PropertyTableCommanderTest extends TestCase {
+
+ public void testTreeSelectionUpdatesTable() {
+// JTree tree = new JTree();
+// TableModel defaultModel = new DefaultTableModel();
+// JTable table = new JTable(defaultModel);
+//
+// PropertyTableCommander propertyTableCommander = new PropertyTableCommander(tree, table);
+//
+// DefaultTreeModel treeModel = (DefaultTreeModel) tree.getModel();
+// treeModel.setRoot(new ComponentNode(BeanPropertyTableModelTestCase.Man.class));
+//
+// tree.setSelectionPath(new TreePath(treeModel.getRoot()));
+// BeanPropertyTableModel model = (BeanPropertyTableModel) table.getModel();
+//
+// assertEquals("birth", model.getValueAt(0,0));
+ }
+}

----------

nano /picogui /src /test /org /picoextras /gui /swing

PropertyTableCommanderTestCase.java added at 1.1

diff -N PropertyTableCommanderTestCase.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ PropertyTableCommanderTestCase.java 17 Nov 2003 21:03:50 -0000 1.1
@@ -0,0 +1,37 @@

+package org.picoextras.gui.swing;
+
+import junit.framework.TestCase;
+
+import javax.swing.*;
+import javax.swing.table.TableModel;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.tree.TreeModel;
+import javax.swing.tree.TreePath;
+import javax.swing.tree.DefaultTreeModel;
+
+import org.picoextras.gui.model.ComponentNode;
+import org.picoextras.gui.model.BeanPropertyTableModel;
+import org.picocontainer.defaults.DefaultComponentAdapter;
+
+/**
+ * @author Aslak Hellesøy
+ * @version $Revision: 1.1 $
+ */
+public class PropertyTableCommanderTestCase extends TestCase {
+
+ public void testTreeSelectionUpdatesTable() {
+// JTree tree = new JTree();
+// TableModel defaultModel = new DefaultTableModel();
+// JTable table = new JTable(defaultModel);
+//
+// PropertyTableCommander propertyTableCommander = new PropertyTableCommander(tree, null);
+//
+// DefaultTreeModel treeModel = (DefaultTreeModel) tree.getModel();
+//// treeModel.setRoot(new ComponentNode(new DefaultComponentAdapter("abc", BeanPropertyTableModelTestCase.Man.class)));
+//
+// tree.setSelectionPath(new TreePath(treeModel.getRoot()));
+// BeanPropertyTableModel model = (BeanPropertyTableModel) table.getModel();
+//
+// assertEquals("birth", model.getValueAt(0,0));
+ }
+}