[jboss-cvs] jboss-seam/src/test/misc/org/jboss/seam/test ...
Shane Bryzak
Shane_Bryzak at symantec.com
Wed Dec 20 21:38:29 EST 2006
User: sbryzak2
Date: 06/12/20 21:38:29
Modified: src/test/misc/org/jboss/seam/test Bar.java Foo.java
PhaseListenerTest.java RemotingTest.java
Log:
fixed compiler warnings
Revision Changes Path
1.6 +3 -2 jboss-seam/src/test/misc/org/jboss/seam/test/Bar.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Bar.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/test/misc/org/jboss/seam/test/Bar.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Bar.java 20 Nov 2006 23:44:23 -0000 1.5
+++ Bar.java 21 Dec 2006 02:38:29 -0000 1.6
@@ -21,13 +21,14 @@
/**
* @author <a href="mailto:theute at jboss.org">Thomas Heute </a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
@Name("bar")
@Scope(ScopeType.CONVERSATION)
@Conversational(ifNotBegunOutcome="error")
public class Bar implements Serializable
{
+ private static final long serialVersionUID = -5325217160542604204L;
@In(required=true)
Foo otherFoo;
1.7 +2 -1 jboss-seam/src/test/misc/org/jboss/seam/test/Foo.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Foo.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/test/misc/org/jboss/seam/test/Foo.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- Foo.java 20 Nov 2006 23:44:23 -0000 1.6
+++ Foo.java 21 Dec 2006 02:38:29 -0000 1.7
@@ -20,13 +20,14 @@
/**
* @author <a href="mailto:theute at jboss.org">Thomas Heute </a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
@Name("foo")
@Scope(ScopeType.SESSION)
@SuppressWarnings("deprecation")
public class Foo implements Serializable
{
+ private static final long serialVersionUID = -5448030633067107049L;
private String value;
1.29 +2 -1 jboss-seam/src/test/misc/org/jboss/seam/test/PhaseListenerTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PhaseListenerTest.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/test/misc/org/jboss/seam/test/PhaseListenerTest.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- PhaseListenerTest.java 17 Nov 2006 01:14:31 -0000 1.28
+++ PhaseListenerTest.java 21 Dec 2006 02:38:29 -0000 1.29
@@ -1,4 +1,4 @@
-//$Id: PhaseListenerTest.java,v 1.28 2006/11/17 01:14:31 gavin Exp $
+//$Id: PhaseListenerTest.java,v 1.29 2006/12/21 02:38:29 sbryzak2 Exp $
package org.jboss.seam.test;
import java.util.ArrayList;
@@ -126,6 +126,7 @@
return ScopeType.PAGE.getPrefix() + '$';
}
+ @SuppressWarnings("serial")
@Test
public void testSeamPhaseListenerLongRunning()
{
1.9 +965 -744 jboss-seam/src/test/misc/org/jboss/seam/test/RemotingTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RemotingTest.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/test/misc/org/jboss/seam/test/RemotingTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- RemotingTest.java 18 Nov 2006 00:38:23 -0000 1.8
+++ RemotingTest.java 21 Dec 2006 02:38:29 -0000 1.9
@@ -60,7 +60,9 @@
*/
public class RemotingTest
{
- private class InvalidClass {}
+ private class InvalidClass
+ {
+ }
public Element createElement(String name, String value)
throws UnsupportedEncodingException
@@ -71,11 +73,13 @@
return e;
}
- private enum TestEnum {red, green, blue}
+ private enum TestEnum
+ {
+ red, green, blue
+ }
@Test
- public void testBooleanWrapper()
- throws Exception
+ public void testBooleanWrapper() throws Exception
{
BooleanWrapper wrapper = new BooleanWrapper();
wrapper.setElement(createElement("bool", Boolean.toString(true)));
@@ -83,29 +87,34 @@
assert (Boolean) wrapper.convert(Boolean.class);
assert (Boolean) wrapper.convert(Boolean.TYPE);
- try {
+ try
+ {
// Try an invalid conversion
wrapper.convert(InvalidClass.class);
assert false;
}
- catch (ConversionException ex) { }
+ catch (ConversionException ex)
+ {
+ }
// test the marshal() method
ByteArrayOutputStream out = new ByteArrayOutputStream();
wrapper.marshal(out);
- byte[] expected = ("<bool>" + Boolean.toString(true) + "</bool>").getBytes();
+ byte[] expected = ("<bool>" + Boolean.toString(true) + "</bool>")
+ .getBytes();
assertEquals(expected, out.toByteArray());
// test the conversionScore() method
assert ConversionScore.exact == wrapper.conversionScore(Boolean.class);
assert ConversionScore.exact == wrapper.conversionScore(Boolean.TYPE);
- assert ConversionScore.compatible == wrapper.conversionScore(Object.class);
- assert ConversionScore.nomatch == wrapper.conversionScore(InvalidClass.class);
+ assert ConversionScore.compatible == wrapper
+ .conversionScore(Object.class);
+ assert ConversionScore.nomatch == wrapper
+ .conversionScore(InvalidClass.class);
}
@Test
- public void testDateWrapper()
- throws Exception
+ public void testDateWrapper() throws Exception
{
DateWrapper wrapper = new DateWrapper();
String value = "20061231123045150";
@@ -128,45 +137,57 @@
byte[] expected = ("<date>" + value + "</date>").getBytes();
assertEquals(expected, out.toByteArray());
- try {
+ try
+ {
// this should throw an exception
wrapper.convert(InvalidClass.class);
assert false;
}
- catch (ConversionException ex) { }
+ catch (ConversionException ex)
+ {
+ }
- try {
+ try
+ {
// this should throw an exception
wrapper.setElement(createElement("date", "foobar"));
wrapper.convert(Date.class);
assert false;
}
- catch (ConversionException ex) { }
+ catch (ConversionException ex)
+ {
+ }
// test conversionScore() method
assert ConversionScore.exact == wrapper.conversionScore(Date.class);
- assert ConversionScore.exact == wrapper.conversionScore(java.sql.Date.class);
- assert ConversionScore.compatible == wrapper.conversionScore(Object.class);
- assert ConversionScore.nomatch == wrapper.conversionScore(InvalidClass.class);
+ assert ConversionScore.exact == wrapper
+ .conversionScore(java.sql.Date.class);
+ assert ConversionScore.compatible == wrapper
+ .conversionScore(Object.class);
+ assert ConversionScore.nomatch == wrapper
+ .conversionScore(InvalidClass.class);
}
@Test
- public void testStringWrapper()
- throws Exception
+ public void testStringWrapper() throws Exception
{
- String value = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" +
- "!@#$%^&*()_+-=`~[]{}|;:\"',./<>?\\ ";
+ String value = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
+ + "!@#$%^&*()_+-=`~[]{}|;:\"',./<>?\\ ";
StringWrapper wrapper = new StringWrapper();
wrapper.setElement(createElement("str", value));
assert value.equals(wrapper.convert(String.class));
- assert value.equals(((StringBuilder) wrapper.convert(StringBuilder.class)).toString());
- assert value.equals(((StringBuffer) wrapper.convert(StringBuffer.class)).toString());
+ assert value
+ .equals(((StringBuilder) wrapper.convert(StringBuilder.class))
+ .toString());
+ assert value.equals(((StringBuffer) wrapper.convert(StringBuffer.class))
+ .toString());
ByteArrayOutputStream out = new ByteArrayOutputStream();
wrapper.marshal(out);
- byte[] expected = ("<str>" + URLEncoder.encode(value, StringWrapper.DEFAULT_ENCODING) +
- "</str>").replace("+", "%20").getBytes();
+ byte[] expected = ("<str>"
+ + URLEncoder.encode(value, StringWrapper.DEFAULT_ENCODING) + "</str>")
+ .replace("+", "%20").getBytes();
assertEquals(expected, out.toByteArray());
@@ -198,64 +219,81 @@
assert !(Boolean) wrapper.convert(Boolean.class);
assert !(Boolean) wrapper.convert(Boolean.TYPE);
- try {
+ try
+ {
// Attempt an invalid conversion
wrapper.convert(Integer.class);
assert false;
}
- catch (ConversionException ex) {}
+ catch (ConversionException ex)
+ {
+ }
value = "A";
wrapper.setElement(createElement("str", value));
- assert Character.valueOf(value.charAt(0)).equals(wrapper.convert(Character.class));
- assert Character.valueOf(value.charAt(0)).equals(wrapper.convert(Character.TYPE));
+ assert Character.valueOf(value.charAt(0)).equals(
+ wrapper.convert(Character.class));
+ assert Character.valueOf(value.charAt(0)).equals(
+ wrapper.convert(Character.TYPE));
value = "green";
wrapper.setElement(createElement("str", value));
assert TestEnum.valueOf(value).equals(wrapper.convert(TestEnum.class));
- try {
+ try
+ {
wrapper.setElement(createElement("str", "foo"));
// Attempt an invalid conversion
wrapper.convert(InvalidClass.class);
assert false;
}
- catch (ConversionException ex) {}
+ catch (ConversionException ex)
+ {
+ }
// Test conversionScore() method
wrapper = new StringWrapper();
assert ConversionScore.exact == wrapper.conversionScore(String.class);
- assert ConversionScore.exact == wrapper.conversionScore(StringBuffer.class);
- assert ConversionScore.exact == wrapper.conversionScore(StringBuffer.class);
- assert ConversionScore.compatible == wrapper.conversionScore(Integer.class);
- assert ConversionScore.compatible == wrapper.conversionScore(Integer.TYPE);
+ assert ConversionScore.exact == wrapper
+ .conversionScore(StringBuffer.class);
+ assert ConversionScore.exact == wrapper
+ .conversionScore(StringBuffer.class);
+ assert ConversionScore.compatible == wrapper
+ .conversionScore(Integer.class);
+ assert ConversionScore.compatible == wrapper
+ .conversionScore(Integer.TYPE);
assert ConversionScore.compatible == wrapper.conversionScore(Long.class);
assert ConversionScore.compatible == wrapper.conversionScore(Long.TYPE);
assert ConversionScore.compatible == wrapper.conversionScore(Short.class);
assert ConversionScore.compatible == wrapper.conversionScore(Short.TYPE);
- assert ConversionScore.compatible == wrapper.conversionScore(Boolean.class);
- assert ConversionScore.compatible == wrapper.conversionScore(Boolean.TYPE);
+ assert ConversionScore.compatible == wrapper
+ .conversionScore(Boolean.class);
+ assert ConversionScore.compatible == wrapper
+ .conversionScore(Boolean.TYPE);
assert ConversionScore.compatible == wrapper.conversionScore(Float.class);
assert ConversionScore.compatible == wrapper.conversionScore(Float.TYPE);
- assert ConversionScore.compatible == wrapper.conversionScore(Character.class);
- assert ConversionScore.compatible == wrapper.conversionScore(Character.TYPE);
+ assert ConversionScore.compatible == wrapper
+ .conversionScore(Character.class);
+ assert ConversionScore.compatible == wrapper
+ .conversionScore(Character.TYPE);
assert ConversionScore.compatible == wrapper.conversionScore(Byte.class);
assert ConversionScore.compatible == wrapper.conversionScore(Byte.TYPE);
wrapper.setElement(createElement("str", "green"));
- assert ConversionScore.compatible == wrapper.conversionScore(TestEnum.class);
+ assert ConversionScore.compatible == wrapper
+ .conversionScore(TestEnum.class);
wrapper.setElement(createElement("str", "foo"));
assert ConversionScore.nomatch == wrapper.conversionScore(TestEnum.class);
- assert ConversionScore.nomatch == wrapper.conversionScore(InvalidClass.class);
+ assert ConversionScore.nomatch == wrapper
+ .conversionScore(InvalidClass.class);
}
@Test
- public void testNumberWrapper()
- throws Exception
+ public void testNumberWrapper() throws Exception
{
String value = "123";
@@ -301,15 +339,20 @@
wrapper.convert(InvalidClass.class);
assert false;
}
- catch (ConversionException ex) { }
+ catch (ConversionException ex)
+ {
+ }
assert ConversionScore.exact == wrapper.conversionScore(Integer.class);
assert ConversionScore.exact == wrapper.conversionScore(Integer.TYPE);
- assert ConversionScore.compatible == wrapper.conversionScore(String.class);
- assert ConversionScore.compatible == wrapper.conversionScore(Object.class);
+ assert ConversionScore.compatible == wrapper
+ .conversionScore(String.class);
+ assert ConversionScore.compatible == wrapper
+ .conversionScore(Object.class);
- assert ConversionScore.nomatch == wrapper.conversionScore(InvalidClass.class);
+ assert ConversionScore.nomatch == wrapper
+ .conversionScore(InvalidClass.class);
}
/**
@@ -317,20 +360,30 @@
*
* @return List
*/
- public List<String> dummy() { return null; }
+ public List<String> dummy()
+ {
+ return null;
+ }
- public InvalidList<String> dummyInvalid() { return null; }
+ public InvalidList<String> dummyInvalid()
+ {
+ return null;
+ }
/**
* Used in testBagWrapper()
*/
- private class InvalidList<E> extends ArrayList<E> {
- public InvalidList() { throw new InstantiationError(); }
+ @SuppressWarnings("serial")
+ private class InvalidList<E> extends ArrayList<E>
+ {
+ public InvalidList()
+ {
+ throw new InstantiationError();
+ }
}
@Test
- public void testBagWrapper()
- throws Exception
+ public void testBagWrapper() throws Exception
{
BagWrapper wrapper = new BagWrapper();
wrapper.setCallContext(new CallContext());
@@ -384,20 +437,26 @@
assertEquals(values[0], l.get(0));
assertEquals(values[1], l.get(1));
- try {
+ try
+ {
// This should throw a ConversionException
wrapper.convert(InvalidList.class);
assert false;
}
- catch (ConversionException ex) {}
+ catch (ConversionException ex)
+ {
+ }
t = RemotingTest.class.getMethod("dummyInvalid").getGenericReturnType();
- try {
+ try
+ {
// This should throw a ConversionException also
wrapper.convert(t);
assert false;
}
- catch (ConversionException ex) { }
+ catch (ConversionException ex)
+ {
+ }
int[] intValues = new int[2];
intValues[0] = 44444;
@@ -416,8 +475,9 @@
// Test marshal()
- byte[] expected = ("<bag><element><number>" + intValues[0] + "</number></element>" +
- "<element><number>" + intValues[1] + "</number></element></bag>").getBytes();
+ byte[] expected = ("<bag><element><number>" + intValues[0]
+ + "</number></element>" + "<element><number>" + intValues[1] + "</number></element></bag>")
+ .getBytes();
ByteArrayOutputStream out = new ByteArrayOutputStream();
wrapper.marshal(out);
assertEquals(expected, out.toByteArray());
@@ -430,25 +490,32 @@
wrapper.marshal(out);
assertEquals(expected, out.toByteArray());
- try {
+ try
+ {
// This should throw a RuntimeException
wrapper.setValue(new InvalidClass());
wrapper.marshal(out);
assert false;
}
- catch (RuntimeException ex) { }
+ catch (RuntimeException ex)
+ {
+ }
// test conversionScore() method
- assert ConversionScore.compatible == wrapper.conversionScore(String[].class);
- assert ConversionScore.compatible == wrapper.conversionScore(Object.class);
- assert ConversionScore.compatible == wrapper.conversionScore(Collection.class);
- assert ConversionScore.nomatch == wrapper.conversionScore(InvalidClass.class);
+ assert ConversionScore.compatible == wrapper
+ .conversionScore(String[].class);
+ assert ConversionScore.compatible == wrapper
+ .conversionScore(Object.class);
+ assert ConversionScore.compatible == wrapper
+ .conversionScore(Collection.class);
+ assert ConversionScore.nomatch == wrapper
+ .conversionScore(InvalidClass.class);
}
@Test
public void testBeanWrapper()
{
- BeanWrapper wrapper = new BeanWrapper();
+ // BeanWrapper wrapper = new BeanWrapper();
/** @todo Write tests for BeanWrapper */
}
@@ -456,18 +523,25 @@
/**
* Used in testMapWrapper()
*/
- public Map<String,String> dummyMap() { return null; }
+ public Map<String, String> dummyMap()
+ {
+ return null;
+ }
/**
* Used in testMapWrapper()
*/
- private class InvalidMap extends HashMap {
- public InvalidMap() { throw new InstantiationError(); }
+ @SuppressWarnings("serial")
+ private class InvalidMap extends HashMap
+ {
+ public InvalidMap()
+ {
+ throw new InstantiationError();
+ }
}
@Test
- public void testMapWrapper()
- throws Exception
+ public void testMapWrapper() throws Exception
{
MapWrapper wrapper = new MapWrapper();
wrapper.setCallContext(new CallContext());
@@ -503,22 +577,29 @@
assert "aaaaa".equals(m.get("foo"));
assert "zzzzz".equals(m.get("bar"));
- try {
+ try
+ {
// This should throw a ConversionException
wrapper.convert(InvalidClass.class);
assert false;
}
- catch (ConversionException ex) { }
+ catch (ConversionException ex)
+ {
+ }
- try {
+ try
+ {
// This should throw a ConversionException also
wrapper.convert(InvalidMap.class);
assert false;
}
- catch (ConversionException ex) { }
+ catch (ConversionException ex)
+ {
+ }
- byte[] expected = ("<map><element><k><str>foo</str></k><v><str>aaaaa</str></v></element>" +
- "<element><k><str>bar</str></k><v><str>zzzzz</str></v></element></map>").getBytes();
+ byte[] expected = ("<map><element><k><str>foo</str></k><v><str>aaaaa</str></v></element>"
+ + "<element><k><str>bar</str></k><v><str>zzzzz</str></v></element></map>")
+ .getBytes();
ByteArrayOutputStream out = new ByteArrayOutputStream();
wrapper.marshal(out);
assertEquals(expected, out.toByteArray());
@@ -526,13 +607,14 @@
// test conversionScore() method
assert ConversionScore.exact == wrapper.conversionScore(Map.class);
assert ConversionScore.exact == wrapper.conversionScore(HashMap.class);
- assert ConversionScore.compatible == wrapper.conversionScore(Object.class);
- assert ConversionScore.nomatch == wrapper.conversionScore(InvalidClass.class);
+ assert ConversionScore.compatible == wrapper
+ .conversionScore(Object.class);
+ assert ConversionScore.nomatch == wrapper
+ .conversionScore(InvalidClass.class);
}
@Test
- public void testNullWrapper()
- throws Exception
+ public void testNullWrapper() throws Exception
{
NullWrapper wrapper = new NullWrapper();
assert wrapper.convert(null) == null;
@@ -543,15 +625,28 @@
assertEquals(expected, out.toByteArray());
assert ConversionScore.compatible == wrapper.conversionScore(null);
- assert ConversionScore.compatible == wrapper.conversionScore(Object.class);
+ assert ConversionScore.compatible == wrapper
+ .conversionScore(Object.class);
}
@Test
- public void testBaseWrapper() {
- BaseWrapper wrapper = new BaseWrapper() {
- public ConversionScore conversionScore(Class cls) { return ConversionScore.nomatch; }
- public void marshal(OutputStream out) {}
- public Object convert(Type type) { return null; }
+ public void testBaseWrapper()
+ {
+ BaseWrapper wrapper = new BaseWrapper()
+ {
+ public ConversionScore conversionScore(Class cls)
+ {
+ return ConversionScore.nomatch;
+ }
+
+ public void marshal(OutputStream out)
+ {
+ }
+
+ public Object convert(Type type)
+ {
+ return null;
+ }
};
Object value = new Object();
@@ -566,24 +661,30 @@
{
wrapper.serialize(null);
}
- catch (IOException ex) { }
+ catch (IOException ex)
+ {
+ }
}
@Test
- public void testWrapperFactory() {
+ public void testWrapperFactory()
+ {
try
{
// This should throw a RuntimeException
WrapperFactory.getInstance().createWrapper("invalid");
assert false;
}
- catch (RuntimeException ex){ }
+ catch (RuntimeException ex)
+ {
+ }
assert WrapperFactory.getInstance().getWrapperForObject(null) instanceof NullWrapper;
assert WrapperFactory.getInstance().getWrapperForObject(new HashMap()) instanceof MapWrapper;
assert WrapperFactory.getInstance().getWrapperForObject(new String[2]) instanceof BagWrapper;
assert WrapperFactory.getInstance().getWrapperForObject(new ArrayList()) instanceof BagWrapper;
- assert WrapperFactory.getInstance().getWrapperForObject(new Boolean(true)) instanceof BooleanWrapper;
+ assert WrapperFactory.getInstance()
+ .getWrapperForObject(new Boolean(true)) instanceof BooleanWrapper;
assert WrapperFactory.getInstance().getWrapperForObject(true) instanceof BooleanWrapper;
assert WrapperFactory.getInstance().getWrapperForObject(TestEnum.blue) instanceof StringWrapper;
assert WrapperFactory.getInstance().getWrapperForObject(new Date()) instanceof DateWrapper;
@@ -591,9 +692,12 @@
// All the String types
assert WrapperFactory.getInstance().getWrapperForObject("foo") instanceof StringWrapper;
- assert WrapperFactory.getInstance().getWrapperForObject(new StringBuffer("foo")) instanceof StringWrapper;
- assert WrapperFactory.getInstance().getWrapperForObject(new StringBuilder("foo")) instanceof StringWrapper;
- assert WrapperFactory.getInstance().getWrapperForObject(new Character('a')) instanceof StringWrapper;
+ assert WrapperFactory.getInstance().getWrapperForObject(
+ new StringBuffer("foo")) instanceof StringWrapper;
+ assert WrapperFactory.getInstance().getWrapperForObject(
+ new StringBuilder("foo")) instanceof StringWrapper;
+ assert WrapperFactory.getInstance().getWrapperForObject(
+ new Character('a')) instanceof StringWrapper;
// All the number types
assert WrapperFactory.getInstance().getWrapperForObject(111) instanceof NumberWrapper;
@@ -606,7 +710,8 @@
}
@Test
- public void testConversionScore() {
+ public void testConversionScore()
+ {
// For code-coverage completeness
assert 0 == ConversionScore.nomatch.getScore();
assert 1 == ConversionScore.compatible.getScore();
@@ -615,8 +720,7 @@
}
@Test
- public void testConstraints()
- throws Exception
+ public void testConstraints() throws Exception
{
// Initialize Seam
MockServletContext servletContext = new MockServletContext();
@@ -635,13 +739,16 @@
ByteArrayOutputStream out = new ByteArrayOutputStream();
// Constrain a single field of the result
- List<String> constraints = Arrays.asList(new String[] {"secret"});
- MarshalUtils.marshalResult(null, new CallContext(), out, result, constraints);
+ List<String> constraints = Arrays.asList(new String[] { "secret" });
+ MarshalUtils.marshalResult(null, new CallContext(), out, result,
+ constraints);
SAXReader xmlReader = new SAXReader();
- Document doc = xmlReader.read(new StringReader(new String(out.toByteArray())));
+ Document doc = xmlReader.read(new StringReader(new String(out
+ .toByteArray())));
- Widget widget = (Widget) ParserUtils.unmarshalResult(doc.getRootElement());
+ Widget widget = (Widget) ParserUtils.unmarshalResult(doc
+ .getRootElement());
// value field should equal "foo"
assert "foo".equals(widget.getValue());
@@ -658,8 +765,9 @@
out.reset();
// Now we're going to constrain result.child's secret field
- constraints = Arrays.asList(new String[] {"child.secret"});
- MarshalUtils.marshalResult(null, new CallContext(), out, result, constraints);
+ constraints = Arrays.asList(new String[] { "child.secret" });
+ MarshalUtils.marshalResult(null, new CallContext(), out, result,
+ constraints);
doc = xmlReader.read(new StringReader(new String(out.toByteArray())));
widget = (Widget) ParserUtils.unmarshalResult(doc.getRootElement());
@@ -669,7 +777,7 @@
assert widget.getChild().getSecret() == null;
// Add a map to our result
- result.setWidgetMap(new HashMap<String,Widget>());
+ result.setWidgetMap(new HashMap<String, Widget>());
Widget val = new Widget();
val.setValue("foo");
val.setSecret("bar");
@@ -678,9 +786,12 @@
// Reset our output stream again
out.reset();
- // Constrain the "secret" field of the widgetMap map's values (sounds confusing, I know...)
- constraints = Arrays.asList(new String[] {"widgetMap[value].secret"});
- MarshalUtils.marshalResult(null, new CallContext(), out, result, constraints);
+ // Constrain the "secret" field of the widgetMap map's values (sounds
+ // confusing, I know...)
+ constraints = Arrays
+ .asList(new String[] { "widgetMap[value].secret" });
+ MarshalUtils.marshalResult(null, new CallContext(), out, result,
+ constraints);
doc = xmlReader.read(new StringReader(new String(out.toByteArray())));
widget = (Widget) ParserUtils.unmarshalResult(doc.getRootElement());
@@ -700,8 +811,9 @@
result.getWidgetList().add(item);
// Constraint the "secret" field of widgetList
- constraints = Arrays.asList(new String[] {"widgetList.secret"});
- MarshalUtils.marshalResult(null, new CallContext(), out, result, constraints);
+ constraints = Arrays.asList(new String[] { "widgetList.secret" });
+ MarshalUtils.marshalResult(null, new CallContext(), out, result,
+ constraints);
doc = xmlReader.read(new StringReader(new String(out.toByteArray())));
widget = (Widget) ParserUtils.unmarshalResult(doc.getRootElement());
@@ -714,8 +826,10 @@
out.reset();
// Now constrain all secrets
- constraints = Arrays.asList(new String[] {"[org.jboss.seam.test.Widget].secret"});
- MarshalUtils.marshalResult(null, new CallContext(), out, result, constraints);
+ constraints = Arrays
+ .asList(new String[] { "[org.jboss.seam.test.Widget].secret" });
+ MarshalUtils.marshalResult(null, new CallContext(), out, result,
+ constraints);
doc = xmlReader.read(new StringReader(new String(out.toByteArray())));
widget = (Widget) ParserUtils.unmarshalResult(doc.getRootElement());
@@ -748,32 +862,132 @@
}
}
- static class Dummy {
- enum TestEnum {foo, bar}
- public String getString() { return null; }
- public TestEnum getEnum() { return null; }
- public BigInteger getBigInteger() { return null; }
- public BigDecimal getBigDecimal() { return null; }
- public Boolean getBoolean() { return null; }
- public boolean getBool() { return false; }
- public Short getShort() { return null; }
- public short getSht() { return 0; }
- public Integer getInteger() { return null; }
- public int getInt() { return 0; }
- public Long getLong() { return null; }
- public long getLng() { return 0; }
- public Float getFloat() { return null; }
- public float getFlt() { return 0; }
- public Double getDouble() { return null; }
- public double getDbl() { return 0; }
- public Byte getByte() { return null; }
- public byte getByt() { return 0; }
- public Date getDate() { return null; }
- public int[] getIntArray() { return null; }
- public Map getMap() { return null; }
- public Collection getCollection() { return null; }
- public Map<String,String> getGenericMap() { return null; }
- public Collection<String> getGenericCollection() { return null; }
+ static class Dummy
+ {
+ enum TestEnum
+ {
+ foo, bar
+ }
+
+ public String getString()
+ {
+ return null;
+ }
+
+ public TestEnum getEnum()
+ {
+ return null;
+ }
+
+ public BigInteger getBigInteger()
+ {
+ return null;
+ }
+
+ public BigDecimal getBigDecimal()
+ {
+ return null;
+ }
+
+ public Boolean getBoolean()
+ {
+ return null;
+ }
+
+ public boolean getBool()
+ {
+ return false;
+ }
+
+ public Short getShort()
+ {
+ return null;
+ }
+
+ public short getSht()
+ {
+ return 0;
+ }
+
+ public Integer getInteger()
+ {
+ return null;
+ }
+
+ public int getInt()
+ {
+ return 0;
+ }
+
+ public Long getLong()
+ {
+ return null;
+ }
+
+ public long getLng()
+ {
+ return 0;
+ }
+
+ public Float getFloat()
+ {
+ return null;
+ }
+
+ public float getFlt()
+ {
+ return 0;
+ }
+
+ public Double getDouble()
+ {
+ return null;
+ }
+
+ public double getDbl()
+ {
+ return 0;
+ }
+
+ public Byte getByte()
+ {
+ return null;
+ }
+
+ public byte getByt()
+ {
+ return 0;
+ }
+
+ public Date getDate()
+ {
+ return null;
+ }
+
+ public int[] getIntArray()
+ {
+ return null;
+ }
+
+ public Map getMap()
+ {
+ return null;
+ }
+
+ public Collection getCollection()
+ {
+ return null;
+ }
+
+ public Map<String, String> getGenericMap()
+ {
+ return null;
+ }
+
+ public Collection<String> getGenericCollection()
+ {
+ return null;
+ }
}
private Type getDummyReturnType(String methodName)
@@ -795,29 +1009,36 @@
public void testInterfaceGenerator()
{
ProxyInterfaceGenerator gen = new ProxyInterfaceGenerator();
- assert("str".equals(gen.getFieldType(getDummyReturnType("getString"))));
- assert("str".equals(gen.getFieldType(getDummyReturnType("getEnum"))));
- assert("str".equals(gen.getFieldType(getDummyReturnType("getBigInteger"))));
- assert("str".equals(gen.getFieldType(getDummyReturnType("getBigDecimal"))));
- assert("bool".equals(gen.getFieldType(getDummyReturnType("getBoolean"))));
- assert("bool".equals(gen.getFieldType(getDummyReturnType("getBool"))));
- assert("number".equals(gen.getFieldType(getDummyReturnType("getShort"))));
- assert("number".equals(gen.getFieldType(getDummyReturnType("getSht"))));
- assert("number".equals(gen.getFieldType(getDummyReturnType("getInteger"))));
- assert("number".equals(gen.getFieldType(getDummyReturnType("getInt"))));
- assert("number".equals(gen.getFieldType(getDummyReturnType("getLong"))));
- assert("number".equals(gen.getFieldType(getDummyReturnType("getLng"))));
- assert("number".equals(gen.getFieldType(getDummyReturnType("getFloat"))));
- assert("number".equals(gen.getFieldType(getDummyReturnType("getFlt"))));
- assert("number".equals(gen.getFieldType(getDummyReturnType("getDouble"))));
- assert("number".equals(gen.getFieldType(getDummyReturnType("getDbl"))));
- assert("number".equals(gen.getFieldType(getDummyReturnType("getByte"))));
- assert("number".equals(gen.getFieldType(getDummyReturnType("getByt"))));
- assert("date".equals(gen.getFieldType(getDummyReturnType("getDate"))));
- assert("bag".equals(gen.getFieldType(getDummyReturnType("getIntArray"))));
- assert("map".equals(gen.getFieldType(getDummyReturnType("getMap"))));
- assert("bag".equals(gen.getFieldType(getDummyReturnType("getCollection"))));
- assert("map".equals(gen.getFieldType(getDummyReturnType("getGenericMap"))));
- assert("bag".equals(gen.getFieldType(getDummyReturnType("getGenericCollection"))));
+ assert ("str".equals(gen.getFieldType(getDummyReturnType("getString"))));
+ assert ("str".equals(gen.getFieldType(getDummyReturnType("getEnum"))));
+ assert ("str".equals(gen
+ .getFieldType(getDummyReturnType("getBigInteger"))));
+ assert ("str".equals(gen
+ .getFieldType(getDummyReturnType("getBigDecimal"))));
+ assert ("bool".equals(gen.getFieldType(getDummyReturnType("getBoolean"))));
+ assert ("bool".equals(gen.getFieldType(getDummyReturnType("getBool"))));
+ assert ("number".equals(gen.getFieldType(getDummyReturnType("getShort"))));
+ assert ("number".equals(gen.getFieldType(getDummyReturnType("getSht"))));
+ assert ("number".equals(gen
+ .getFieldType(getDummyReturnType("getInteger"))));
+ assert ("number".equals(gen.getFieldType(getDummyReturnType("getInt"))));
+ assert ("number".equals(gen.getFieldType(getDummyReturnType("getLong"))));
+ assert ("number".equals(gen.getFieldType(getDummyReturnType("getLng"))));
+ assert ("number".equals(gen.getFieldType(getDummyReturnType("getFloat"))));
+ assert ("number".equals(gen.getFieldType(getDummyReturnType("getFlt"))));
+ assert ("number"
+ .equals(gen.getFieldType(getDummyReturnType("getDouble"))));
+ assert ("number".equals(gen.getFieldType(getDummyReturnType("getDbl"))));
+ assert ("number".equals(gen.getFieldType(getDummyReturnType("getByte"))));
+ assert ("number".equals(gen.getFieldType(getDummyReturnType("getByt"))));
+ assert ("date".equals(gen.getFieldType(getDummyReturnType("getDate"))));
+ assert ("bag".equals(gen.getFieldType(getDummyReturnType("getIntArray"))));
+ assert ("map".equals(gen.getFieldType(getDummyReturnType("getMap"))));
+ assert ("bag".equals(gen
+ .getFieldType(getDummyReturnType("getCollection"))));
+ assert ("map".equals(gen
+ .getFieldType(getDummyReturnType("getGenericMap"))));
+ assert ("bag".equals(gen
+ .getFieldType(getDummyReturnType("getGenericCollection"))));
}
}
More information about the jboss-cvs-commits
mailing list