Menu
▾
▴
[jgb-cvs] jgb/src/java/tests/jgb/handlers/swing TestAbstractControlTagHandler.java,1.3,1.4 TestConstraintsTagHandler.java,1.7,1.8 TestControlTagHandler.java,1.12,1.13 TestGlueTagHandler.java,1.7,1.8 TestStrutTagHandler.java,1.6,1.7
Update of /cvsroot/jgb/jgb/src/java/tests/jgb/handlers/swing
In directory sc8-pr-cvs1:/tmp/cvs-serv31851/src/java/tests/jgb/handlers/swing
Modified Files:
TestAbstractControlTagHandler.java
TestConstraintsTagHandler.java TestControlTagHandler.java
TestGlueTagHandler.java TestStrutTagHandler.java
Log Message:
* src/java/tests/jgb/handlers/swing/TestConstraintsTagHandler.java:
Started implementing new constraints-handling code. Started making
constraints be saved in a Map instead of last defined. The map is
associative with the current object. So constraints are attached to
their parent objects, but are used for children of said parent.
* src/java/core/jgb/handlers/swing/ConstraintsTagHandler.java:
Implemented tests.
* src/java/core/jgb/handlers/swing/AbstractControlTagHandler.java,
src/java/tests/jgb/handlers/swing/TestAbstractControlTagHandler.java,
src/java/tests/jgb/handlers/swing/TestControlTagHandler.java,
src/java/tests/jgb/handlers/swing/TestGlueTagHandler.java,
src/java/tests/jgb/handlers/swing/TestStrutTagHandler.java:
Had to modify tests to take into account new Constraints object
and way of doing things.
* src/examples/webbrowser.xml:
Works, but not exactly right. Problem with constraints that are not
properly associated. All controls are so small as to be useless...
Added a "Dump" menu item to use XMLEncoder to dump the frame.
* src/java/examples/jgb/examples/WebBrowserEventManager.java:
Modified to implement the dump() method required by the register
call of the dump menu item.
* src/java/core/jgb/builder/utils/Constraints.java:
Created implementation that is a data holder for two pieces of
information: value and class. No tests for such a simple class.
Index: TestAbstractControlTagHandler.java
===================================================================
RCS file: /cvsroot/jgb/jgb/src/java/tests/jgb/handlers/swing/TestAbstractControlTagHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestAbstractControlTagHandler.java 27 Jun 2003 16:45:50 -0000 1.3
--- TestAbstractControlTagHandler.java 14 Jul 2003 21:02:31 -0000 1.4
***************
*** 24,27 ****
--- 24,28 ----
import com.mockobjects.util.Verifier;
import jgb.builder.TagHandler;
+ import jgb.builder.utils.Constraints;
import jgb.handlers.TagHandlerAbstractTest;
import jgb.mocks.MockContainer;
***************
*** 32,35 ****
--- 33,37 ----
import java.util.Map;
import java.util.EmptyStackException;
+ import java.util.HashMap;
/**
***************
*** 47,51 ****
super.setUp();
! abstractHandler = (AbstractControlTagHandler)handler;
abstractHandler.tagContext = context;
--- 49,53 ----
super.setUp();
! abstractHandler = (AbstractControlTagHandler) handler;
abstractHandler.tagContext = context;
***************
*** 60,64 ****
GridBagConstraints gridbagConstraints = new GridBagConstraints();
! context.put(TagHandler.CURRENT_CONSTRAINTS_KEY, gridbagConstraints);
JPanel panel = new JPanel();
--- 62,69 ----
GridBagConstraints gridbagConstraints = new GridBagConstraints();
! Map constraintsMap = new HashMap();
! constraintsMap.put(stackManager.getCurrentObject(), new Constraints(
! gridbagConstraints, gridbagConstraints.getClass()));
! context.put(TagHandler.CURRENT_CONSTRAINTS_KEY, constraintsMap);
JPanel panel = new JPanel();
Index: TestConstraintsTagHandler.java
===================================================================
RCS file: /cvsroot/jgb/jgb/src/java/tests/jgb/handlers/swing/TestConstraintsTagHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TestConstraintsTagHandler.java 27 Jun 2003 16:45:50 -0000 1.7
--- TestConstraintsTagHandler.java 14 Jul 2003 21:02:31 -0000 1.8
***************
*** 21,25 ****
--- 21,33 ----
import jgb.builder.TagHandler;
+ import jgb.builder.utils.Constraints;
import jgb.handlers.TagHandlerAbstractTest;
+ import jgb.mocks.MockContainer;
+ import org.xml.sax.SAXException;
+
+ import java.awt.*;
+ import java.util.Collections;
+ import java.util.HashMap;
+ import java.util.Map;
/**
***************
*** 27,51 ****
*/
public class TestConstraintsTagHandler extends TagHandlerAbstractTest {
public TestConstraintsTagHandler(String s) {
super(s);
}
public void testStartElement_NoOp() throws Exception {
! int oldContextSize = context.size();
handler.startElement("constraints", context, atts);
! assertEquals(oldContextSize, context.size());
}
public void testReset() throws Exception {
! atts.put("reset", "1");
!
! context.put(TagHandler.CURRENT_CONSTRAINTS_KEY, "");
! int oldContextSize = context.size();
handler.startElement("constraints", context, atts);
handler.endElement("constraints", context);
- assertEquals(oldContextSize - 1, context.size());
! assertTrue(false == context.containsKey(TagHandler.CURRENT_CONSTRAINTS_KEY));
}
--- 35,72 ----
*/
public class TestConstraintsTagHandler extends TagHandlerAbstractTest {
+ private Map constraintsMap;
+
public TestConstraintsTagHandler(String s) {
super(s);
}
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ stackManager.pushCurrentObject(new MockContainer());
+
+ constraintsMap = new HashMap();
+ context.put(TagHandler.CURRENT_CONSTRAINTS_KEY, constraintsMap);
+ }
+
public void testStartElement_NoOp() throws Exception {
! final Map oldContext = Collections.unmodifiableMap(new HashMap(context));
handler.startElement("constraints", context, atts);
! assertEquals(oldContext, context);
}
public void testReset() throws Exception {
! atts.put("reset", "true");
! constraintsMap.put(
! stackManager.getCurrentObject(),
! new Constraints("CONSTRAINTS_01", String.class));
! assertTrue(context.containsKey(TagHandler.CURRENT_CONSTRAINTS_KEY));
! assertNotNull(context.get(TagHandler.CURRENT_CONSTRAINTS_KEY));
handler.startElement("constraints", context, atts);
handler.endElement("constraints", context);
! assertFalse("constraints were removed from the map",
! constraintsMap.containsKey(stackManager.getCurrentObject()));
}
***************
*** 54,63 ****
context.put(TagHandler.PARAMETER_VALUE_KEY, java.awt.BorderLayout.CENTER);
- int oldContextSize = context.size();
handler.endElement("constraints", context);
! assertEquals(oldContextSize - 2 + 1, context.size());
! assertEquals(java.awt.BorderLayout.CENTER,
! context.get(TagHandler.CURRENT_CONSTRAINTS_KEY));
}
--- 75,95 ----
context.put(TagHandler.PARAMETER_VALUE_KEY, java.awt.BorderLayout.CENTER);
handler.endElement("constraints", context);
! assertFalse("context was cleaned up - parameter class",
! context.containsKey(TagHandler.PARAMETER_CLASS_KEY));
! assertFalse("context was cleaned up - parameter value",
! context.containsKey(TagHandler.PARAMETER_VALUE_KEY));
!
! final Constraints currentConstraints =
! (Constraints) constraintsMap.get(stackManager.getCurrentObject());
! assertNotNull("constraints were saved in map, with current object as key",
! currentConstraints);
! assertEquals("constraint's value was saved in current constraints",
! java.awt.BorderLayout.CENTER,
! currentConstraints.getValue());
! assertEquals("constraint's class was saved in current constraints",
! java.awt.BorderLayout.CENTER.getClass(),
! currentConstraints.getValueClass());
}
Index: TestControlTagHandler.java
===================================================================
RCS file: /cvsroot/jgb/jgb/src/java/tests/jgb/handlers/swing/TestControlTagHandler.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** TestControlTagHandler.java 27 Jun 2003 16:45:50 -0000 1.12
--- TestControlTagHandler.java 14 Jul 2003 21:02:31 -0000 1.13
***************
*** 21,24 ****
--- 21,25 ----
import jgb.builder.TagHandler;
+ import jgb.builder.utils.Constraints;
import jgb.builder.utils.CurrentObjectsStackManager;
import jgb.handlers.TagHandlerAbstractTest;
***************
*** 27,30 ****
--- 28,34 ----
import javax.swing.*;
+ import java.awt.*;
+ import java.util.HashMap;
+ import java.util.Map;
/**
***************
*** 33,36 ****
--- 37,41 ----
public class TestControlTagHandler extends TagHandlerAbstractTest {
private JPanel panel;
+ private Map constraintsMap;
public TestControlTagHandler(String s) {
***************
*** 43,46 ****
--- 48,53 ----
panel = new JPanel();
stackManager.pushCurrentObject(panel);
+
+ constraintsMap = new HashMap();
}
***************
*** 52,56 ****
Object currentObject = stackManager.getCurrentObject();
! JButton button = (JButton)currentObject;
assertEquals(stackManager.getCurrentObjectId(), button.getName());
}
--- 59,63 ----
Object currentObject = stackManager.getCurrentObject();
! JButton button = (JButton) currentObject;
assertEquals(stackManager.getCurrentObjectId(), button.getName());
}
***************
*** 67,71 ****
assertTrue(objectsMap.containsKey("control0"));
! JButton button = (JButton)objectsMap.get("control0");
assertSame(button, stackManager.getCurrentObject());
--- 74,78 ----
assertTrue(objectsMap.containsKey("control0"));
! JButton button = (JButton) objectsMap.get("control0");
assertSame(button, stackManager.getCurrentObject());
***************
*** 92,96 ****
0, objectsMap.size());
! JButton button = (JButton)stackManager.getCurrentObject();
assertNotNull(button);
--- 99,103 ----
0, objectsMap.size());
! JButton button = (JButton) stackManager.getCurrentObject();
assertNotNull(button);
***************
*** 112,116 ****
assertTrue(context.containsKey(TagHandler.OBJECTS_MAP_KEY));
! JButton button = (JButton)stackManager.getCurrentObject();
assertNotNull(button);
assertSame(stackManager.getCurrentObject(), context.get(TagHandler.CURRENT_OBJECT_KEY));
--- 119,123 ----
assertTrue(context.containsKey(TagHandler.OBJECTS_MAP_KEY));
! JButton button = (JButton) stackManager.getCurrentObject();
assertNotNull(button);
assertSame(stackManager.getCurrentObject(), context.get(TagHandler.CURRENT_OBJECT_KEY));
***************
*** 122,126 ****
stackManager.pushCurrentObject(container);
! context.put(TagHandler.CURRENT_CONSTRAINTS_KEY, java.awt.BorderLayout.NORTH);
atts.put("class", "JButton");
--- 129,135 ----
stackManager.pushCurrentObject(container);
! constraintsMap.put(container, new Constraints(
! BorderLayout.NORTH, BorderLayout.NORTH.getClass()));
! context.put(TagHandler.CURRENT_CONSTRAINTS_KEY, constraintsMap);
atts.put("class", "JButton");
***************
*** 149,153 ****
handler.startElement("button", context, atts);
! JLabel refLabel = (JLabel)objectsMap.get("reflabel0");
assertSame(stackManager.getCurrentObject(), refLabel.getLabelFor());
}
--- 158,162 ----
handler.startElement("button", context, atts);
! JLabel refLabel = (JLabel) objectsMap.get("reflabel0");
assertSame(stackManager.getCurrentObject(), refLabel.getLabelFor());
}
Index: TestGlueTagHandler.java
===================================================================
RCS file: /cvsroot/jgb/jgb/src/java/tests/jgb/handlers/swing/TestGlueTagHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TestGlueTagHandler.java 27 Jun 2003 16:45:50 -0000 1.7
--- TestGlueTagHandler.java 14 Jul 2003 21:02:31 -0000 1.8
***************
*** 21,24 ****
--- 21,25 ----
import jgb.builder.TagHandler;
+ import jgb.builder.utils.Constraints;
import jgb.handlers.TagHandlerAbstractTest;
import jgb.mocks.MockContainer;
***************
*** 27,30 ****
--- 28,33 ----
import javax.swing.*;
import java.awt.*;
+ import java.util.Map;
+ import java.util.HashMap;
import org.xml.sax.SAXException;
***************
*** 35,38 ****
--- 38,42 ----
public class TestGlueTagHandler extends TagHandlerAbstractTest {
private JPanel panel;
+ private Map constraintsMap;
public TestGlueTagHandler(String s) {
***************
*** 45,48 ****
--- 49,53 ----
panel = new JPanel();
stackManager.pushCurrentObject(panel);
+ constraintsMap = new HashMap();
}
***************
*** 60,64 ****
stackManager.getCurrentObject().getClass());
! Box.Filler filler = (Box.Filler)stackManager.getCurrentObject();
Dimension d = filler.getMaximumSize();
assertTrue("horizontal box: w=" + d.getWidth() + ", h=" + d.getHeight(),
--- 65,69 ----
stackManager.getCurrentObject().getClass());
! Box.Filler filler = (Box.Filler) stackManager.getCurrentObject();
Dimension d = filler.getMaximumSize();
assertTrue("horizontal box: w=" + d.getWidth() + ", h=" + d.getHeight(),
***************
*** 79,83 ****
stackManager.getCurrentObject().getClass());
! Box.Filler filler = (Box.Filler)stackManager.getCurrentObject();
Dimension d = filler.getMaximumSize();
assertTrue("vertical box: w=" + d.getWidth() + ", h=" + d.getHeight(),
--- 84,88 ----
stackManager.getCurrentObject().getClass());
! Box.Filler filler = (Box.Filler) stackManager.getCurrentObject();
Dimension d = filler.getMaximumSize();
assertTrue("vertical box: w=" + d.getWidth() + ", h=" + d.getHeight(),
***************
*** 90,96 ****
mockContainer.setExpectedConstraints(CONSTRAINTS);
- context.put(TagHandler.CURRENT_CONSTRAINTS_KEY, CONSTRAINTS);
stackManager.pushCurrentObject(mockContainer);
atts.put("orientation", "horiz");
handler.startElement("glue", context, atts);
--- 95,105 ----
mockContainer.setExpectedConstraints(CONSTRAINTS);
stackManager.pushCurrentObject(mockContainer);
+ constraintsMap.put(
+ stackManager.getCurrentObject(),
+ new Constraints(CONSTRAINTS, CONSTRAINTS.getClass()));
+ context.put(TagHandler.CURRENT_CONSTRAINTS_KEY, constraintsMap);
+
atts.put("orientation", "horiz");
handler.startElement("glue", context, atts);
***************
*** 140,144 ****
public void testDefaultPackageThrowsException() {
try {
! ((GlueTagHandler)handler).getDefaultPackagePrefix();
fail("Failed to throw IllegalStateException");
} catch (IllegalStateException success) {
--- 149,153 ----
public void testDefaultPackageThrowsException() {
try {
! ((GlueTagHandler) handler).getDefaultPackagePrefix();
fail("Failed to throw IllegalStateException");
} catch (IllegalStateException success) {
Index: TestStrutTagHandler.java
===================================================================
RCS file: /cvsroot/jgb/jgb/src/java/tests/jgb/handlers/swing/TestStrutTagHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TestStrutTagHandler.java 27 Jun 2003 16:45:50 -0000 1.6
--- TestStrutTagHandler.java 14 Jul 2003 21:02:31 -0000 1.7
***************
*** 21,24 ****
--- 21,25 ----
import jgb.builder.TagHandler;
+ import jgb.builder.utils.Constraints;
import jgb.handlers.TagHandlerAbstractTest;
import jgb.mocks.MockContainer;
***************
*** 26,29 ****
--- 27,32 ----
import javax.swing.*;
import java.awt.*;
+ import java.util.HashMap;
+ import java.util.Map;
import org.xml.sax.SAXException;
***************
*** 34,37 ****
--- 37,41 ----
public class TestStrutTagHandler extends TagHandlerAbstractTest {
private MockContainer mockContainer;
+ private Map constraintsMap;
public TestStrutTagHandler(String s) {
***************
*** 44,47 ****
--- 48,52 ----
mockContainer = new MockContainer();
stackManager.pushCurrentObject(mockContainer);
+ constraintsMap = new HashMap();
}
***************
*** 56,60 ****
assertEquals(1, mockContainer.getComponentCount());
! Component comp = (Component)stackManager.getCurrentObject();
assertEquals("same class as a manual rigid area",
Box.createRigidArea(new Dimension(20, 12)).getClass(),
--- 61,65 ----
assertEquals(1, mockContainer.getComponentCount());
! Component comp = (Component) stackManager.getCurrentObject();
assertEquals("same class as a manual rigid area",
Box.createRigidArea(new Dimension(20, 12)).getClass(),
***************
*** 64,73 ****
size = comp.getMinimumSize();
! assertEquals(20, (int)size.getWidth());
! assertEquals(12, (int)size.getHeight());
size = comp.getMaximumSize();
! assertEquals(20, (int)size.getWidth());
! assertEquals(12, (int)size.getHeight());
}
--- 69,78 ----
size = comp.getMinimumSize();
! assertEquals(20, (int) size.getWidth());
! assertEquals(12, (int) size.getHeight());
size = comp.getMaximumSize();
! assertEquals(20, (int) size.getWidth());
! assertEquals(12, (int) size.getHeight());
}
***************
*** 78,82 ****
assertEquals(1, mockContainer.getComponentCount());
! Component comp = (Component)stackManager.getCurrentObject();
assertEquals("same class as horizontal strut",
Box.createHorizontalStrut(24).getClass(),
--- 83,87 ----
assertEquals(1, mockContainer.getComponentCount());
! Component comp = (Component) stackManager.getCurrentObject();
assertEquals("same class as horizontal strut",
Box.createHorizontalStrut(24).getClass(),
***************
*** 85,94 ****
Dimension size = null;
size = comp.getMinimumSize();
! assertEquals(24, (int)size.getWidth());
! assertEquals(0, (int)size.getHeight());
size = comp.getMaximumSize();
! assertEquals(24, (int)size.getWidth());
! assertEquals(32767, (int)size.getHeight());
}
--- 90,99 ----
Dimension size = null;
size = comp.getMinimumSize();
! assertEquals(24, (int) size.getWidth());
! assertEquals(0, (int) size.getHeight());
size = comp.getMaximumSize();
! assertEquals(24, (int) size.getWidth());
! assertEquals(32767, (int) size.getHeight());
}
***************
*** 99,103 ****
assertEquals(1, mockContainer.getComponentCount());
! Component comp = (Component)stackManager.getCurrentObject();
assertEquals("same class as vertical strut",
Box.createVerticalStrut(13).getClass(),
--- 104,108 ----
assertEquals(1, mockContainer.getComponentCount());
! Component comp = (Component) stackManager.getCurrentObject();
assertEquals("same class as vertical strut",
Box.createVerticalStrut(13).getClass(),
***************
*** 106,115 ****
Dimension size = null;
size = comp.getMinimumSize();
! assertEquals(0, (int)size.getWidth());
! assertEquals(13, (int)size.getHeight());
size = comp.getMaximumSize();
! assertEquals(32767, (int)size.getWidth());
! assertEquals(13, (int)size.getHeight());
}
--- 111,120 ----
Dimension size = null;
size = comp.getMinimumSize();
! assertEquals(0, (int) size.getWidth());
! assertEquals(13, (int) size.getHeight());
size = comp.getMaximumSize();
! assertEquals(32767, (int) size.getWidth());
! assertEquals(13, (int) size.getHeight());
}
***************
*** 119,124 ****
mockContainer.setExpectedConstraints(CONSTRAINTS);
atts.put("height", "2");
! context.put(TagHandler.CURRENT_CONSTRAINTS_KEY, CONSTRAINTS);
handler.startElement("strut", context, atts);
--- 124,131 ----
mockContainer.setExpectedConstraints(CONSTRAINTS);
+ constraintsMap.put(stackManager.getCurrentObject(),
+ new Constraints(CONSTRAINTS, CONSTRAINTS.getClass()));
atts.put("height", "2");
! context.put(TagHandler.CURRENT_CONSTRAINTS_KEY, constraintsMap);
handler.startElement("strut", context, atts);
***************
*** 150,154 ****
public void testDefaultPackageThrowsException() {
try {
! ((StrutTagHandler)handler).getDefaultPackagePrefix();
fail("Failed to throw IllegalStateException");
} catch (IllegalStateException success) {
--- 157,161 ----
public void testDefaultPackageThrowsException() {
try {
! ((StrutTagHandler) handler).getDefaultPackagePrefix();
fail("Failed to throw IllegalStateException");
} catch (IllegalStateException success) {
|
