- Moved the initialization of the ClassDeserializationValidator into the SerializationContext (so it is always initialized).
- Adjusted the rest to correctly work with these changes.
diff --git a/core/src/main/java/flex/messaging/MessageBroker.java b/core/src/main/java/flex/messaging/MessageBroker.java
index 3ffd2e4..23b308c 100644
--- a/core/src/main/java/flex/messaging/MessageBroker.java
+++ b/core/src/main/java/flex/messaging/MessageBroker.java
@@ -186,6 +186,9 @@
factories = new HashMap<String, FlexFactory>();
registeredEndpoints = new HashMap<String, String>();
+ // Initialize the default validator.
+ deserializationValidator = new ClassDeserializationValidator();
+
// Add the built-in java factory
addFactory("java", new JavaFactory());
diff --git a/core/src/main/java/flex/messaging/config/FlexConfigurationManager.java b/core/src/main/java/flex/messaging/config/FlexConfigurationManager.java
index 313cb87..480b122 100644
--- a/core/src/main/java/flex/messaging/config/FlexConfigurationManager.java
+++ b/core/src/main/java/flex/messaging/config/FlexConfigurationManager.java
@@ -44,11 +44,11 @@
*/
public class FlexConfigurationManager implements ConfigurationManager
{
- static final String DEFAULT_CONFIG_PATH = "/WEB-INF/flex/services-config.xml";
+ private static final String DEFAULT_CONFIG_PATH = "/WEB-INF/flex/services-config.xml";
- protected String configurationPath = null;
- protected ConfigurationFileResolver configurationResolver = null;
- protected ConfigurationParser parser = null;
+ private String configurationPath = null;
+ private ConfigurationFileResolver configurationResolver = null;
+ private ConfigurationParser parser = null;
public MessagingConfiguration getMessagingConfiguration(ServletConfig servletConfig)
{
@@ -88,10 +88,10 @@
parser.reportTokens();
}
- protected ConfigurationParser getConfigurationParser(ServletConfig servletConfig)
+ private ConfigurationParser getConfigurationParser(ServletConfig servletConfig)
{
ConfigurationParser parser = null;
- Class parserClass = null;
+ Class parserClass;
String className = null;
// Check for Custom Parser Specification
@@ -175,7 +175,7 @@
*
* @param servletConfig configuration
*/
- protected void setupConfigurationPathAndResolver(ServletConfig servletConfig)
+ private void setupConfigurationPathAndResolver(ServletConfig servletConfig)
{
if (servletConfig != null)
{
@@ -229,7 +229,7 @@
}
- protected void verifyMinimumJavaVersion() throws ConfigurationException
+ private void verifyMinimumJavaVersion() throws ConfigurationException
{
try
{
@@ -262,7 +262,7 @@
}
else if (third == 2)
{
- if ((vendor != null) && (vendor.indexOf("Sun") != -1))
+ if ((vendor != null) && vendor.contains("Sun"))
{
// test at least 1.4.2_06 on Sun
int fourth = Integer.parseInt(split[3]);
@@ -284,7 +284,7 @@
{
ConfigurationException cx = new ConfigurationException();
- if ((vendor != null) && (vendor.indexOf("Sun") != -1))
+ if ((vendor != null) && vendor.contains("Sun"))
{
// The minimum required Java version was not found. Please install JDK 1.4.2_06 or above. Current version is XX.
cx.setMessage(10139, new Object[] { System.getProperty("java.version")});
diff --git a/core/src/main/java/flex/messaging/config/MessagingConfiguration.java b/core/src/main/java/flex/messaging/config/MessagingConfiguration.java
index 70987a2..b73222b 100644
--- a/core/src/main/java/flex/messaging/config/MessagingConfiguration.java
+++ b/core/src/main/java/flex/messaging/config/MessagingConfiguration.java
@@ -591,14 +591,6 @@
// Only set the DeserializationValidator types for now.
if (validator instanceof DeserializationValidator)
{
- // there can only be one deserialization validator, throw an error if there is more than one.
- DeserializationValidator existingValidator = broker.getDeserializationValidator();
- if (existingValidator != null)
- {
- ConfigurationException cx = new ConfigurationException();
- cx.setMessage(11400, new Object[]{existingValidator.getClass().getCanonicalName(), className});
- throw cx;
- }
DeserializationValidator deserializationValidator = (DeserializationValidator)validator;
deserializationValidator.initialize(null, settings.getProperties());
broker.setDeserializationValidator(deserializationValidator);
diff --git a/core/src/main/java/flex/messaging/config/ServerConfigurationParser.java b/core/src/main/java/flex/messaging/config/ServerConfigurationParser.java
index e8eb1a9..c9134b5 100644
--- a/core/src/main/java/flex/messaging/config/ServerConfigurationParser.java
+++ b/core/src/main/java/flex/messaging/config/ServerConfigurationParser.java
@@ -1867,8 +1867,6 @@
{
Node validatorsNode = selectSingleNode(root, VALIDATORS_ELEMENT);
if (validatorsNode == null) {
- // Default to the ClassDeserializationValidator
- defaultValidator();
return;
}
@@ -1882,21 +1880,9 @@
Node validator = validators.item(i);
validator(validator);
}
- } else {
- // Default to the ClassDeserializationValidator
- defaultValidator();
}
}
- /**
- * Initialize a efault validator that protects BlazeDS against the most obvious attacks.
- */
- private void defaultValidator() {
- ValidatorSettings validatorSettings = new ValidatorSettings();
- validatorSettings.setClassName(ClassDeserializationValidator.class.getName());
- ((MessagingConfiguration)config).addValidatorSettings(validatorSettings);
- }
-
private void validator(Node validator)
{
// Validation
diff --git a/core/src/main/java/flex/messaging/io/SerializationContext.java b/core/src/main/java/flex/messaging/io/SerializationContext.java
index 64196cc..90b421d 100644
--- a/core/src/main/java/flex/messaging/io/SerializationContext.java
+++ b/core/src/main/java/flex/messaging/io/SerializationContext.java
@@ -26,8 +26,7 @@
* A simple context to get settings from an endpoint to a deserializer
* or serializer.
*/
-public class SerializationContext implements Serializable, Cloneable
-{
+public class SerializationContext implements Serializable, Cloneable {
static final long serialVersionUID = -3020985035377116475L;
// Endpoint serialization configuration flags
@@ -54,7 +53,7 @@
* Provides a way to control whether small messages should be sent even
* if the client can support them. If set to false, small messages
* will not be sent.
- *
+ * <p>
* The default is true.
*/
public boolean enableSmallMessages = true;
@@ -63,10 +62,10 @@
* Determines whether type information will be used to instantiate a new instance.
* If set to false, types will be deserialized as flex.messaging.io.ASObject instances
* with type information retained but not used to create an instance.
- *
+ * <p>
* Note that types in the flex.* package (and any subpackage) will always be
* instantiated.
- *
+ * <p>
* The default is true.
*/
public boolean instantiateTypes = true;
@@ -76,7 +75,7 @@
// How deep level of nest object in the object graph that we support
public int maxObjectNestLevel = 512;
-
+
// How deep level of nest collection objects in the object graph that we support
// Similarly like how many dimensional matrix that we support for serialization.
public int maxCollectionNestLevel = 15;
@@ -99,8 +98,9 @@
/**
* The default constructor.
*/
- public SerializationContext()
- {
+ public SerializationContext() {
+ // Initialize the default validator.
+ deserializationValidator = new ClassDeserializationValidator();
}
/**
@@ -108,8 +108,7 @@
*
* @return The deserializer class.
*/
- public Class getDeserializerClass()
- {
+ public Class getDeserializerClass() {
return deserializer;
}
@@ -118,8 +117,7 @@
*
* @param c The deserializer class.
*/
- public void setDeserializerClass(Class c)
- {
+ public void setDeserializerClass(Class c) {
deserializer = c;
}
@@ -128,8 +126,7 @@
*
* @return The serializer class.
*/
- public Class getSerializerClass()
- {
+ public Class getSerializerClass() {
return serializer;
}
@@ -138,8 +135,7 @@
*
* @param c The serializer class.
*/
- public void setSerializerClass(Class c)
- {
+ public void setSerializerClass(Class c) {
serializer = c;
}
@@ -148,16 +144,13 @@
*
* @return A new message deserializer instance.
*/
- public MessageDeserializer newMessageDeserializer()
- {
+ public MessageDeserializer newMessageDeserializer() {
Class deserializerClass = getDeserializerClass();
- if (deserializerClass == null)
- {
+ if (deserializerClass == null) {
deserializerClass = ClassUtil.createClass("flex.messaging.io.amf.AmfMessageDeserializer");
this.setDeserializerClass(deserializerClass);
}
- MessageDeserializer deserializer = (MessageDeserializer)ClassUtil.createDefaultInstance(deserializerClass, MessageDeserializer.class);
- return deserializer;
+ return (MessageDeserializer) ClassUtil.createDefaultInstance(deserializerClass, MessageDeserializer.class);
}
/**
@@ -165,16 +158,13 @@
*
* @return A new message serializer instance.
*/
- public MessageSerializer newMessageSerializer()
- {
+ public MessageSerializer newMessageSerializer() {
Class serializerClass = getSerializerClass();
- if (serializerClass == null)
- {
+ if (serializerClass == null) {
serializerClass = ClassUtil.createClass("flex.messaging.io.amf.AmfMessageSerializer");
this.setSerializerClass(serializerClass);
}
- MessageSerializer serializer = (MessageSerializer)ClassUtil.createDefaultInstance(serializerClass, MessageSerializer.class);
- return serializer;
+ return (MessageSerializer) ClassUtil.createDefaultInstance(serializerClass, MessageSerializer.class);
}
/**
@@ -182,8 +172,7 @@
*
* @return The deserialization validator.
*/
- public DeserializationValidator getDeserializationValidator()
- {
+ public DeserializationValidator getDeserializationValidator() {
return deserializationValidator;
}
@@ -192,20 +181,15 @@
*
* @param deserializationValidator The deserialization validator.
*/
- public void setDeserializationValidator(DeserializationValidator deserializationValidator)
- {
+ public void setDeserializationValidator(DeserializationValidator deserializationValidator) {
this.deserializationValidator = deserializationValidator;
}
@Override
- public Object clone()
- {
- try
- {
+ public Object clone() {
+ try {
return super.clone();
- }
- catch (CloneNotSupportedException e)
- {
+ } catch (CloneNotSupportedException e) {
// this should never happen since this class extends object
// but just in case revert to manual clone
SerializationContext context = new SerializationContext();
@@ -244,57 +228,52 @@
/**
* Establishes a SerializationContext for the current thread.
* Users are not expected to call this function.
+ *
* @param context The current SerializationContext.
*/
- public static void setSerializationContext(SerializationContext context)
- {
- if (context == null)
+ public static void setSerializationContext(SerializationContext context) {
+ if (context == null) {
contexts.remove();
- else
+ } else {
contexts.set(context);
+ }
}
/**
* @return The current thread's SerializationContext.
*/
- public static SerializationContext getSerializationContext()
- {
+ public static SerializationContext getSerializationContext() {
SerializationContext sc = contexts.get();
- if (sc == null)
- {
+ if (sc == null) {
sc = new SerializationContext();
SerializationContext.setSerializationContext(sc);
}
return sc;
}
+
/**
* Clears out the thread local state after the request completes.
*/
- public static void clearThreadLocalObjects()
- {
- if (contexts != null)
- {
+ public static void clearThreadLocalObjects() {
+ if (contexts != null) {
contexts.remove();
}
}
/**
- *
* Create thread local storage.
*/
- public static void createThreadLocalObjects()
- {
- if (contexts == null)
- contexts = new ThreadLocal();
+ public static void createThreadLocalObjects() {
+ if (contexts == null) {
+ contexts = new ThreadLocal<SerializationContext>();
+ }
}
/**
- *
* Destroy thread local storage.
* Call ONLY on shutdown.
*/
- public static void releaseThreadLocalObjects()
- {
+ public static void releaseThreadLocalObjects() {
clearThreadLocalObjects();
contexts = null;
diff --git a/core/src/main/java/flex/messaging/validators/ClassDeserializationValidator.java b/core/src/main/java/flex/messaging/validators/ClassDeserializationValidator.java
index ed2ac80..4bc0857 100644
--- a/core/src/main/java/flex/messaging/validators/ClassDeserializationValidator.java
+++ b/core/src/main/java/flex/messaging/validators/ClassDeserializationValidator.java
@@ -40,19 +40,21 @@
public static final String PROPERTY_NAME_ATTR = "name";
private static final String[] DEFAULT_ALLOW_CLASSES = {
+ "flex.messaging.io.amf.ASObject",
"flex.messaging.io.amf.SerializedObject",
"flex.messaging.io.ArrayCollection",
- "flex.messaging.io.ObjectProxy",
- "flex.messaging.io.SerializationProxy",
+ "flex.messaging.io.ArrayList",
+ "flex.messaging.messages.AcknowledgeMessage",
"flex.messaging.messages.AcknowledgeMessageExt",
+ "flex.messaging.messages.AsyncMessage",
"flex.messaging.messages.AsyncMessageExt",
+ "flex.messaging.messages.CommandMessage",
"flex.messaging.messages.CommandMessageExt",
- "flex.data.messages.DataMessageExt",
- "flex.data.messages.ManagedRemotingMessageExt",
- "flex.data.messages.PagedMessageExt",
- "flex.data.messages.SequencedMessageExt",
- "flex.data.messages.UpdateCollectionMessageExt",
- "flex.data.ChangedItems",
+ "flex.messaging.messages.ErrorMessage",
+ "flex.messaging.messages.HTTPMessage",
+ "flex.messaging.messages.RemotingMessage",
+ "flex.messaging.messages.SOAPMessage",
+ "java.io.Externalizable",
"java.lang.Boolean",
"java.lang.Byte",
"java.lang.Character",
@@ -63,8 +65,9 @@
"java.lang.Object",
"java.lang.Short",
"java.lang.String",
- "java.io.Externalizable",
+ "java.util.ArrayList",
"java.util.Date",
+ "java.util.HashMap",
"org.w3c.dom.Document",
"\\[B",
"\\[Ljava.lang.Object;"
@@ -94,6 +97,10 @@
private Map<String, Pattern> disallowClassPatterns;
public ClassDeserializationValidator() {
+ // Apply default allow classes
+ for (String defaultAllowClassPattern : DEFAULT_ALLOW_CLASSES) {
+ addAllowClassPattern(defaultAllowClassPattern);
+ }
}
@@ -110,8 +117,9 @@
*/
public void addAllowClassPattern(String classNamePattern) {
synchronized (lock) {
- if (allowClassPatterns == null)
+ if (allowClassPatterns == null) {
allowClassPatterns = new HashMap<String, Pattern>();
+ }
allowClassPatterns.put(classNamePattern, Pattern.compile(classNamePattern));
@@ -126,8 +134,9 @@
*/
public void removeAllowClassPattern(String classNamePattern) {
synchronized (lock) {
- if (allowClassPatterns != null)
+ if (allowClassPatterns != null) {
allowClassPatterns.remove(classNamePattern);
+ }
clearClassCache();
}
@@ -140,8 +149,9 @@
*/
public void addDisallowClassPattern(String classNamePattern) {
synchronized (lock) {
- if (disallowClassPatterns == null)
+ if (disallowClassPatterns == null) {
disallowClassPatterns = new HashMap<String, Pattern>();
+ }
disallowClassPatterns.put(classNamePattern, Pattern.compile(classNamePattern));
@@ -156,8 +166,9 @@
*/
public void removeDisallowClassPattern(String classNamePattern) {
synchronized (lock) {
- if (disallowClassPatterns != null)
+ if (disallowClassPatterns != null) {
disallowClassPatterns.remove(classNamePattern);
+ }
clearClassCache();
}
@@ -201,16 +212,19 @@
*/
public boolean validateCreation(Class<?> c) {
String className = c == null ? null : c.getName();
- if (className == null)
+ if (className == null) {
return true;
+ }
// First, check against the encountered disallow-classes list.
- if (disallowClasses != null && disallowClasses.contains(className))
+ if (disallowClasses != null && disallowClasses.contains(className)) {
return false;
+ }
// Then, check against the encountered allow-classes list.
- if (allowClasses != null && allowClasses.contains(className))
+ if (allowClasses != null && allowClasses.contains(className)) {
return true;
+ }
// Otherwise, the class was encountered for the first time, need to
// go through the disallow and allow class patterns list.
@@ -247,13 +261,9 @@
* {@inheritDoc}
*/
public void initialize(String id, ConfigMap properties) {
- // Apply default allow classes
- for (String defaultAllowClassPattern : DEFAULT_ALLOW_CLASSES) {
- addAllowClassPattern(defaultAllowClassPattern);
- }
-
- if (properties == null || properties.size() == 0)
+ if (properties == null || properties.size() == 0) {
return;
+ }
// Process allow-classes.
ConfigMap allowedClassesMap = properties.getPropertyAsMap(PROPERTY_ALLOW_CLASSES, null);
@@ -288,21 +298,25 @@
protected void addAllowClass(String className) {
synchronized (lock) {
- if (allowClasses == null)
+ if (allowClasses == null) {
allowClasses = new HashSet<String>();
+ }
- if (!allowClasses.contains(className))
+ if (!allowClasses.contains(className)) {
allowClasses.add(className);
+ }
}
}
protected void addDisallowClass(String className) {
synchronized (lock) {
- if (disallowClasses == null)
+ if (disallowClasses == null) {
disallowClasses = new HashSet<String>();
+ }
- if (!disallowClasses.contains(className))
+ if (!disallowClasses.contains(className)) {
disallowClasses.add(className);
+ }
}
}
diff --git a/core/src/test/java/flex/messaging/io/amf/validators/AmfDeserializationValidatorTest.java b/core/src/test/java/flex/messaging/io/amf/validators/AmfDeserializationValidatorTest.java
index 4fad1b0..f1114e4 100644
--- a/core/src/test/java/flex/messaging/io/amf/validators/AmfDeserializationValidatorTest.java
+++ b/core/src/test/java/flex/messaging/io/amf/validators/AmfDeserializationValidatorTest.java
@@ -95,7 +95,7 @@
URL resource = ClassLoader.getSystemResource(sample);
URI uri = new URI(resource.toString());
File testData = new File(uri.getPath());
- String testDataLocation = testData.getCanonicalPath();
+ String testDataLocation = testData.getCanonicalPath();
// Generate sample AMF request from the data file.
PipedOutputStream pout = new PipedOutputStream();
diff --git a/core/src/test/java/flex/messaging/io/amfx/AmfxSerializationTest.java b/core/src/test/java/flex/messaging/io/amfx/AmfxSerializationTest.java
index 1e6965a..eb3b32b 100644
--- a/core/src/test/java/flex/messaging/io/amfx/AmfxSerializationTest.java
+++ b/core/src/test/java/flex/messaging/io/amfx/AmfxSerializationTest.java
@@ -16,6 +16,7 @@
*/
package flex.messaging.io.amfx;
+import flex.messaging.validators.ClassDeserializationValidator;
import junit.framework.TestCase;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -69,7 +70,10 @@
protected void setUp() throws Exception
{
super.setUp();
+ ClassDeserializationValidator classDeserializationValidator = new ClassDeserializationValidator();
+ classDeserializationValidator.addAllowClassPattern("flex.messaging.io.amfx.testtypes.*");
serializationContext = new SerializationContext();
+ serializationContext.setDeserializationValidator(classDeserializationValidator);
SerializationContext.setSerializationContext(serializationContext);
//trace = new AmfTrace();
}
diff --git a/remoting/src/main/java/flex/messaging/services/RemotingService.java b/remoting/src/main/java/flex/messaging/services/RemotingService.java
index c018ace..b817c45 100755
--- a/remoting/src/main/java/flex/messaging/services/RemotingService.java
+++ b/remoting/src/main/java/flex/messaging/services/RemotingService.java
@@ -164,10 +164,12 @@
{
RemotingMessage message = (RemotingMessage)msg;
RemotingDestination destination = (RemotingDestination)getDestination(msg);
- RemotingDestinationControl destinationControl = (destination.isManaged()) ? (RemotingDestinationControl)destination.getControl() : null;
if (destination != null)
{
+ RemotingDestinationControl destinationControl = (destination.isManaged()) ?
+ (RemotingDestinationControl) destination.getControl() : null;
+
ServiceAdapter adapter = destination.getAdapter();
long startTime = 0;
if (destinationControl != null)
diff --git a/remoting/src/test/java/flex/messaging/io/amf/client/AMFConnectionIT.java b/remoting/src/test/java/flex/messaging/io/amf/client/AMFConnectionIT.java
index b2d3bef..230005c 100644
--- a/remoting/src/test/java/flex/messaging/io/amf/client/AMFConnectionIT.java
+++ b/remoting/src/test/java/flex/messaging/io/amf/client/AMFConnectionIT.java
@@ -17,35 +17,33 @@
package flex.messaging.io.amf.client;
-import java.net.HttpURLConnection;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-
-import flex.messaging.util.TestServerWrapper;
-import junit.extensions.TestSetup;
-import org.junit.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import remoting.amfclient.ClientCustomType;
-
import flex.messaging.MessageException;
-import flex.messaging.messages.RemotingMessage;
+import flex.messaging.io.MessageIOConstants;
+import flex.messaging.io.SerializationContext;
import flex.messaging.io.amf.ASObject;
import flex.messaging.io.amf.AmfTrace;
import flex.messaging.io.amf.client.AMFConnection.HttpResponseInfo;
import flex.messaging.io.amf.client.exceptions.ClientStatusException;
import flex.messaging.io.amf.client.exceptions.ServerStatusException;
-import flex.messaging.io.MessageIOConstants;
+import flex.messaging.messages.RemotingMessage;
+import flex.messaging.util.TestServerWrapper;
+import flex.messaging.validators.ClassDeserializationValidator;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import remoting.amfclient.ClientCustomType;
+
+import java.net.HttpURLConnection;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
/**
* JUnit tests for AMFConnection. Note that most of the tests require a running
* server with the specified destination.
*/
-public class AMFConnectionIT extends TestCase
-{
+public class AMFConnectionIT {
private static final String DEFAULT_DESTINATION_ID = "amfConnectionTestService";
private static final String DEFAULT_METHOD_NAME = "echoString";
private static final String DEFAULT_METHOD_ARG = "echo me";
@@ -57,102 +55,51 @@
private static TestServerWrapper serverWrapper;
private static int serverPort;
+ private static SerializationContext serializationContext;
- /**
- * Given a remote method name, returns the AMF connection call needed using
- * the default destination id.
- */
- private static String getOperationCall(String method)
- {
- return DEFAULT_DESTINATION_ID + "." + method;
+ @BeforeClass
+ public static void setup() {
+ serverWrapper = new TestServerWrapper();
+ serverPort = serverWrapper.startServer("classpath:/WEB-INF/flex/services-config.xml");
+ if (serverPort == -1) {
+ Assert.fail("Couldn't start server process");
+ }
+
+ AMFConnection.registerAlias(
+ "remoting.amfclient.ServerCustomType" /* server type */,
+ "remoting.amfclient.ClientCustomType" /* client type */);
+
+ serializationContext = SerializationContext.getSerializationContext();
+ ClassDeserializationValidator deserializationValidator =
+ (ClassDeserializationValidator) serializationContext.getDeserializationValidator();
+ deserializationValidator.addAllowClassPattern("remoting.amfclient.*");
}
- protected String getConnectionUrl() {
- return String.format(DEFAULT_URL, serverPort);
- }
-
-
- public AMFConnectionIT(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- //TestSuite suite = new TestSuite(AMFConnectionIT.class);
- TestSuite suite = new TestSuite();
- suite.addTest(new AMFConnectionIT("testConnect"));
- suite.addTest(new AMFConnectionIT("testConnectAndClose"));
- suite.addTest(new AMFConnectionIT("testConnectBadUrl"));
- suite.addTest(new AMFConnectionIT("testCallMultipleTimes"));
- suite.addTest(new AMFConnectionIT("testCallNoConnect"));
- suite.addTest(new AMFConnectionIT("testCallNoConnectStringMsg"));
- suite.addTest(new AMFConnectionIT("testCallUnreachableConnectUrl"));
- suite.addTest(new AMFConnectionIT("testCallNonexistantMethod"));
- suite.addTest(new AMFConnectionIT("testHttpResponseInfoWithNonexistantMethod"));
- suite.addTest(new AMFConnectionIT("testCloseNoConnect"));
- suite.addTest(new AMFConnectionIT("testSetGetObjectEncoding"));
- suite.addTest(new AMFConnectionIT("testSetGetDefaultObjectEncoding"));
- suite.addTest(new AMFConnectionIT("testSetGetAMFHeaderProcessor"));
- suite.addTest(new AMFConnectionIT("testAddRemoveAMFHeaderTwoParam"));
- suite.addTest(new AMFConnectionIT("testAddRemoveAMFHeader"));
- suite.addTest(new AMFConnectionIT("testAddRemoveAllAMFHeaders"));
- suite.addTest(new AMFConnectionIT("testAddRemoveHTTPRequestHeader"));
- suite.addTest(new AMFConnectionIT("testAddRemoveAllHTTPRequestHeaders"));
- suite.addTest(new AMFConnectionIT("testRemoveAMFHeader"));
- suite.addTest(new AMFConnectionIT("testRemoveAllAMFHeaders"));
- suite.addTest(new AMFConnectionIT("testRemoveHTTPRequestHeader"));
- suite.addTest(new AMFConnectionIT("testRemoveAllHTTPRequestHeaders"));
- suite.addTest(new AMFConnectionIT("testInstantiateTypes"));
- suite.addTest(new AMFConnectionIT("testSetGetAMFTrace"));
- suite.addTest(new AMFConnectionIT("testHTTPProxy"));
-
- return new TestSetup(suite) {
- protected void setUp() throws Exception {
- serverWrapper = new TestServerWrapper();
- serverPort = serverWrapper.startServer("classpath:/WEB-INF/flex/services-config.xml");
- if(serverPort == -1) {
- Assert.fail("Couldn't start server process");
- }
- AMFConnection.registerAlias(
- "remoting.amfclient.ServerCustomType" /* server type */,
- "remoting.amfclient.ClientCustomType" /* client type */);
- }
- protected void tearDown() throws Exception {
- serverWrapper.stopServer();
- serverWrapper = null;
- }
- };
+ @AfterClass
+ public static void teardown() {
+ serverWrapper.stopServer();
+ serverWrapper = null;
}
// Not a test, just an example to show how to use AMFConnection.
- public void example()
- {
+ public void example() {
// Create the AMF connection.
AMFConnection amfConnection = new AMFConnection();
// Connect to the remote url.
- try
- {
- amfConnection.connect(getConnectionUrl());
- }
- catch (ClientStatusException cse)
- {
+ try {
+ amfConnection.connect(getConnectionUrl(), serializationContext);
+ } catch (ClientStatusException cse) {
return;
}
// Make a remoting call and retrieve the result.
- try
- {
+ try {
Object result = amfConnection.call(DEFAULT_AMF_OPERATION, DEFAULT_METHOD_ARG);
Assert.assertEquals(DEFAULT_METHOD_ARG, result);
- }
- catch (ClientStatusException cse)
- {
+ } catch (ClientStatusException cse) {
// Ignore.
- }
- catch (ServerStatusException sse)
- {
+ } catch (ServerStatusException sse) {
// Ignore.
}
@@ -160,282 +107,209 @@
amfConnection.close();
}
- public void testConnect()
- {
+ @Test
+ public void testConnect() {
AMFConnection amfConnection = new AMFConnection();
- try
- {
- amfConnection.connect(getConnectionUrl());
+ try {
+ amfConnection.connect(getConnectionUrl(), serializationContext);
Assert.assertEquals(getConnectionUrl(), amfConnection.getUrl());
- }
- catch (ClientStatusException cse)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + cse);
- }
- finally
- {
+ } catch (ClientStatusException cse) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + cse);
+ } finally {
amfConnection.close();
}
}
- public void testConnectAndClose()
- {
+ @Test
+ public void testConnectAndClose() {
AMFConnection amfConnection = new AMFConnection();
- try
- {
- amfConnection.connect(getConnectionUrl());
+ try {
+ amfConnection.connect(getConnectionUrl(), serializationContext);
Assert.assertEquals(getConnectionUrl(), amfConnection.getUrl());
- }
- catch (ClientStatusException cse)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + cse);
- }
- finally
- {
+ } catch (ClientStatusException cse) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + cse);
+ } finally {
amfConnection.close();
Assert.assertEquals(null, amfConnection.getUrl());
}
}
- public void testConnectBadUrl()
- {
+ @Test
+ public void testConnectBadUrl() {
String badUrl = "badUrl";
AMFConnection amfConnection = new AMFConnection();
- try
- {
+ try {
amfConnection.connect(badUrl);
- fail("ClientStatusException expected");
- }
- catch (ClientStatusException cse)
- {
+ Assert.fail("ClientStatusException expected");
+ } catch (ClientStatusException cse) {
Assert.assertEquals(ClientStatusException.AMF_CONNECT_FAILED_CODE, cse.getCode());
- }
- finally
- {
+ } finally {
amfConnection.close();
}
}
- public void testCallMultipleTimes()
- {
+ @Test
+ public void testCallMultipleTimes() {
AMFConnection amfConnection = new AMFConnection();
- try
- {
- amfConnection.connect(getConnectionUrl());
- }
- catch (ClientStatusException cse)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + cse);
+ try {
+ amfConnection.connect(getConnectionUrl(), serializationContext);
+ } catch (ClientStatusException cse) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + cse);
}
// Make a remoting call and retrieve the result.
- try
- {
- for (int i = 1; i < 4; i++)
- {
+ try {
+ for (int i = 1; i < 4; i++) {
String stringToEcho = DEFAULT_METHOD_ARG + i;
Object result = amfConnection.call(DEFAULT_AMF_OPERATION, stringToEcho);
Assert.assertEquals(stringToEcho, result);
}
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
- }
- finally
- {
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } finally {
amfConnection.close();
}
}
- public void testCallNoConnect()
- {
+ @Test
+ public void testCallNoConnect() {
AMFConnection amfConnection = new AMFConnection();
// Make a remoting call without connect.
- try
- {
+ try {
Object result = amfConnection.call(DEFAULT_AMF_OPERATION, DEFAULT_METHOD_ARG);
Assert.assertEquals(DEFAULT_METHOD_ARG, result);
- }
- catch (ClientStatusException cse)
- {
+ } catch (ClientStatusException cse) {
Assert.assertEquals(ClientStatusException.AMF_CALL_FAILED_CODE, cse.getCode());
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
- }
- finally
- {
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } finally {
amfConnection.close();
}
}
- public void testCallNoConnectStringMsg()
- {
+ @Test
+ public void testCallNoConnectStringMsg() {
AMFConnection amfConnection = new AMFConnection();
// Make a remoting call without connect.
- try
- {
+ try {
Object result = amfConnection.call(DEFAULT_AMF_OPERATION, DEFAULT_METHOD_ARG);
Assert.assertEquals(DEFAULT_METHOD_ARG, result);
- }
- catch (ClientStatusException cse)
- {
+ } catch (ClientStatusException cse) {
Assert.assertEquals(ClientStatusException.AMF_CALL_FAILED_CODE, cse.getCode());
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
- }
- finally
- {
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } finally {
amfConnection.close();
}
}
- public void testCallUnreachableConnectUrl()
- {
+ @Test
+ public void testCallUnreachableConnectUrl() {
String unreachableUrl = "http://localhost:8400/team/messagebroker/unreachable";
AMFConnection amfConnection = new AMFConnection();
- try
- {
+ try {
// Connect does not actually connect but simply sets the url.
amfConnection.connect(unreachableUrl);
- }
- catch (ClientStatusException cse)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + cse);
+ } catch (ClientStatusException cse) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + cse);
}
// Make a remoting call and retrieve the result.
- try
- {
+ try {
Object result = amfConnection.call(DEFAULT_AMF_OPERATION, DEFAULT_METHOD_ARG);
Assert.assertEquals(DEFAULT_METHOD_ARG, result);
- }
- catch (ClientStatusException cse)
- {
+ } catch (ClientStatusException cse) {
Assert.assertEquals(ClientStatusException.AMF_CALL_FAILED_CODE, cse.getCode());
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
- }
- finally
- {
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } finally {
amfConnection.close();
}
}
- public void testCallNonexistantMethod()
- {
+ @Test
+ public void testCallNonexistantMethod() {
String method = "nonExistantMethod";
- try
- {
- internalTestCall(getOperationCall(method), "Wombat", new CallResultHandler(){
- public void onResult(Object result)
- {
- fail("Unexcepted result: " + result);
+ try {
+ internalTestCall(getOperationCall(method), "Wombat", new CallResultHandler() {
+ public void onResult(Object result) {
+ Assert.fail("Unexcepted result: " + result);
}
});
- }
- catch (ServerStatusException sse)
- {
- ASObject status = (ASObject)sse.getData();
- String code = (String)status.get("code");
+ } catch (ServerStatusException sse) {
+ ASObject status = (ASObject) sse.getData();
+ String code = (String) status.get("code");
Assert.assertEquals(MessageException.CODE_SERVER_RESOURCE_UNAVAILABLE, code);
HttpResponseInfo info = sse.getHttpResponseInfo();
// AMF status messages are reported as HTTP_OK still.
Assert.assertEquals(HttpURLConnection.HTTP_OK, info.getResponseCode());
Assert.assertEquals("OK", info.getResponseMessage());
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
}
}
- public void testHttpResponseInfoWithNonexistantMethod()
- {
+ @Test
+ public void testHttpResponseInfoWithNonexistantMethod() {
String method = "nonExistantMethod";
final ClientCustomType methodArg = new ClientCustomType();
methodArg.setId(1);
- try
- {
- internalTestCall(getOperationCall(method), methodArg, new CallResultHandler(){
- public void onResult(Object result)
- {
- fail("Unexcepted result: " + result);
+ try {
+ internalTestCall(getOperationCall(method), methodArg, new CallResultHandler() {
+ public void onResult(Object result) {
+ Assert.fail("Unexcepted result: " + result);
}
});
- }
- catch (ServerStatusException sse)
- {
+ } catch (ServerStatusException sse) {
HttpResponseInfo info = sse.getHttpResponseInfo();
// AMF status messages are reported as HTTP_OK still.
Assert.assertEquals(HttpURLConnection.HTTP_OK, info.getResponseCode());
Assert.assertEquals("OK", info.getResponseMessage());
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
}
}
- public void testCloseNoConnect()
- {
+ @Test
+ public void testCloseNoConnect() {
AMFConnection amfConnection = new AMFConnection();
// Closing with no connection or call.
- try
- {
+ try {
amfConnection.close();
Assert.assertEquals(null, amfConnection.getUrl());
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
}
}
- public void testSetGetObjectEncoding()
- {
+ @Test
+ public void testSetGetObjectEncoding() {
int retAMF;
AMFConnection amfConnection = new AMFConnection();
- try
- {
- amfConnection.connect(getConnectionUrl());
+ try {
+ amfConnection.connect(getConnectionUrl(), serializationContext);
Assert.assertEquals(getConnectionUrl(), amfConnection.getUrl());
amfConnection.setObjectEncoding(MessageIOConstants.AMF0);
retAMF = amfConnection.getObjectEncoding();
Assert.assertEquals(MessageIOConstants.AMF0, retAMF);
- }
- catch (ClientStatusException cse)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + cse);
- }
- finally
- {
+ } catch (ClientStatusException cse) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + cse);
+ } finally {
amfConnection.close();
}
}
- public void testSetGetDefaultObjectEncoding()
- {
+ @Test
+ public void testSetGetDefaultObjectEncoding() {
int retAMF;
AMFConnection amfConnection = new AMFConnection();
- try
- {
- amfConnection.connect(getConnectionUrl());
+ try {
+ amfConnection.connect(getConnectionUrl(), serializationContext);
Assert.assertEquals(getConnectionUrl(), amfConnection.getUrl());
AMFConnection.setDefaultObjectEncoding(MessageIOConstants.AMF3);
retAMF = AMFConnection.getDefaultObjectEncoding();
Assert.assertEquals(MessageIOConstants.AMF3, retAMF);
- }
- catch (ClientStatusException cse)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + cse);
- }
- finally
- {
+ } catch (ClientStatusException cse) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + cse);
+ } finally {
amfConnection.close();
}
}
@@ -444,233 +318,179 @@
* There doesn't seem to be a single implementation of AMFHeaderProcessor therefore this test
* is pretty useless.
*/
- public void testSetGetAMFHeaderProcessor()
- {
- AMFHeaderProcessor setAMF = null;
- AMFHeaderProcessor retAMF;
+ @Test
+ public void testSetGetAMFHeaderProcessor() {
AMFConnection amfConnection = new AMFConnection();
- try
- {
- amfConnection.connect(getConnectionUrl());
+ try {
+ amfConnection.connect(getConnectionUrl(), serializationContext);
Assert.assertEquals(getConnectionUrl(), amfConnection.getUrl());
- amfConnection.setAMFHeaderProcessor(setAMF);
- retAMF = amfConnection.getAMFHeaderProcessor();
- Assert.assertEquals(setAMF, retAMF);
- }
- catch (ClientStatusException cse)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + cse);
- }
- finally
- {
+ amfConnection.setAMFHeaderProcessor(null);
+ AMFHeaderProcessor retAMF = amfConnection.getAMFHeaderProcessor();
+ Assert.assertNull(retAMF);
+ } catch (ClientStatusException cse) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + cse);
+ } finally {
amfConnection.close();
}
}
- public void testAddRemoveAMFHeaderTwoParam()
- {
+ @Test
+ public void testAddRemoveAMFHeaderTwoParam() {
boolean retAMF;
Object val = 1;
AMFConnection amfConnection = new AMFConnection();
- try
- {
- amfConnection.connect(getConnectionUrl());
+ try {
+ amfConnection.connect(getConnectionUrl(), serializationContext);
Assert.assertEquals(getConnectionUrl(), amfConnection.getUrl());
- amfConnection.addAmfHeader(FOO_STRING,val);
+ amfConnection.addAmfHeader(FOO_STRING, val);
retAMF = amfConnection.removeAmfHeader(FOO_STRING);
Assert.assertTrue(retAMF);
- }
- catch (ClientStatusException cse)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + cse);
- }
- finally
- {
+ } catch (ClientStatusException cse) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + cse);
+ } finally {
amfConnection.close();
}
}
- public void testAddRemoveAMFHeader()
- {
+ @Test
+ public void testAddRemoveAMFHeader() {
boolean retAMF;
Object val = 1;
AMFConnection amfConnection = new AMFConnection();
- try
- {
- amfConnection.connect(getConnectionUrl());
+ try {
+ amfConnection.connect(getConnectionUrl(), serializationContext);
Assert.assertEquals(getConnectionUrl(), amfConnection.getUrl());
- amfConnection.addAmfHeader(FOO_STRING,true,val);
+ amfConnection.addAmfHeader(FOO_STRING, true, val);
retAMF = amfConnection.removeAmfHeader(FOO_STRING);
Assert.assertTrue(retAMF);
- }
- catch (ClientStatusException cse)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + cse);
- }
- finally
- {
+ } catch (ClientStatusException cse) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + cse);
+ } finally {
amfConnection.close();
}
}
- public void testAddRemoveAllAMFHeaders()
- {
+ @Test
+ public void testAddRemoveAllAMFHeaders() {
Object val1 = 1;
Object val2 = 2;
AMFConnection amfConnection = new AMFConnection();
- try
- {
- amfConnection.connect(getConnectionUrl());
+ try {
+ amfConnection.connect(getConnectionUrl(), serializationContext);
Assert.assertEquals(getConnectionUrl(), amfConnection.getUrl());
- amfConnection.addAmfHeader(FOO_STRING,true,val1);
- amfConnection.addAmfHeader(BAR_STRING,true,val2);
+ amfConnection.addAmfHeader(FOO_STRING, true, val1);
+ amfConnection.addAmfHeader(BAR_STRING, true, val2);
amfConnection.removeAllAmfHeaders();
Assert.assertTrue(true);
- }
- catch (ClientStatusException cse)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + cse);
- }
- finally
- {
+ } catch (ClientStatusException cse) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + cse);
+ } finally {
amfConnection.close();
}
}
- public void testAddRemoveHTTPRequestHeader()
- {
+ @Test
+ public void testAddRemoveHTTPRequestHeader() {
boolean retHttp;
AMFConnection amfConnection = new AMFConnection();
- try
- {
- amfConnection.connect(getConnectionUrl());
+ try {
+ amfConnection.connect(getConnectionUrl(), serializationContext);
Assert.assertEquals(getConnectionUrl(), amfConnection.getUrl());
- amfConnection.addHttpRequestHeader(FOO_STRING,BAR_STRING);
+ amfConnection.addHttpRequestHeader(FOO_STRING, BAR_STRING);
retHttp = amfConnection.removeHttpRequestHeader(FOO_STRING);
Assert.assertTrue(retHttp);
- }
- catch (ClientStatusException cse)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + cse);
- }
- finally
- {
+ } catch (ClientStatusException cse) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + cse);
+ } finally {
amfConnection.close();
}
}
- public void testAddRemoveAllHTTPRequestHeaders()
- {
+ @Test
+ public void testAddRemoveAllHTTPRequestHeaders() {
AMFConnection amfConnection = new AMFConnection();
- try
- {
- amfConnection.connect(getConnectionUrl());
+ try {
+ amfConnection.connect(getConnectionUrl(), serializationContext);
Assert.assertEquals(getConnectionUrl(), amfConnection.getUrl());
- amfConnection.addHttpRequestHeader(FOO_STRING,BAR_STRING);
- amfConnection.addHttpRequestHeader(BAR_STRING,FOO_STRING);
+ amfConnection.addHttpRequestHeader(FOO_STRING, BAR_STRING);
+ amfConnection.addHttpRequestHeader(BAR_STRING, FOO_STRING);
amfConnection.removeAllHttpRequestHeaders();
Assert.assertTrue(true);
- }
- catch (ClientStatusException cse)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + cse);
- }
- finally
- {
+ } catch (ClientStatusException cse) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + cse);
+ } finally {
amfConnection.close();
}
}
- public void testRemoveAMFHeader()
- {
+ @Test
+ public void testRemoveAMFHeader() {
boolean retAMF;
AMFConnection amfConnection = new AMFConnection();
- try
- {
- amfConnection.connect(getConnectionUrl());
+ try {
+ amfConnection.connect(getConnectionUrl(), serializationContext);
Assert.assertEquals(getConnectionUrl(), amfConnection.getUrl());
retAMF = amfConnection.removeAmfHeader(FOO_STRING);
Assert.assertFalse(retAMF);
- }
- catch (ClientStatusException cse)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + cse);
- }
- finally
- {
+ } catch (ClientStatusException cse) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + cse);
+ } finally {
amfConnection.close();
}
}
- public void testRemoveAllAMFHeaders()
- {
+ @Test
+ public void testRemoveAllAMFHeaders() {
AMFConnection amfConnection = new AMFConnection();
- try
- {
- amfConnection.connect(getConnectionUrl());
+ try {
+ amfConnection.connect(getConnectionUrl(), serializationContext);
Assert.assertEquals(getConnectionUrl(), amfConnection.getUrl());
amfConnection.removeAllAmfHeaders();
Assert.assertTrue(true);
- }
- catch (ClientStatusException cse)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + cse);
- }
- finally
- {
+ } catch (ClientStatusException cse) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + cse);
+ } finally {
amfConnection.close();
}
}
- public void testRemoveHTTPRequestHeader()
- {
+ @Test
+ public void testRemoveHTTPRequestHeader() {
boolean retHttp;
AMFConnection amfConnection = new AMFConnection();
- try
- {
- amfConnection.connect(getConnectionUrl());
+ try {
+ amfConnection.connect(getConnectionUrl(), serializationContext);
Assert.assertEquals(getConnectionUrl(), amfConnection.getUrl());
retHttp = amfConnection.removeHttpRequestHeader(FOO_STRING);
Assert.assertFalse(retHttp);
- }
- catch (ClientStatusException cse)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + cse);
- }
- finally
- {
+ } catch (ClientStatusException cse) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + cse);
+ } finally {
amfConnection.close();
}
}
- public void testRemoveAllHTTPRequestHeaders()
- {
+ @Test
+ public void testRemoveAllHTTPRequestHeaders() {
AMFConnection amfConnection = new AMFConnection();
- try
- {
- amfConnection.connect(getConnectionUrl());
+ try {
+ amfConnection.connect(getConnectionUrl(), serializationContext);
Assert.assertEquals(getConnectionUrl(), amfConnection.getUrl());
amfConnection.removeAllHttpRequestHeaders();
Assert.assertTrue(true);
- }
- catch (ClientStatusException cse)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + cse);
- }
- finally
- {
+ } catch (ClientStatusException cse) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + cse);
+ } finally {
amfConnection.close();
}
}
-
- public void testInstantiateTypes()
- {
+ @Test
+ public void testInstantiateTypes() {
String method = "getObject2";
- try
- {
+ try {
AMFConnection amfConnection = new AMFConnection();
- amfConnection.connect(getConnectionUrl());
+ amfConnection.connect(getConnectionUrl(), serializationContext);
// First, make sure we get the strong type.
Object result = amfConnection.call(getOperationCall(method));
@@ -681,20 +501,17 @@
result = amfConnection.call(getOperationCall(method));
Assert.assertTrue(!(result instanceof ClientCustomType));
amfConnection.close();
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
}
}
- public void testSetGetAMFTrace()
- {
+ @Test
+ public void testSetGetAMFTrace() {
AMFConnection amfConnection = new AMFConnection();
- try
- {
+ try {
AmfTrace trace = new AmfTrace();
- amfConnection.connect(getConnectionUrl());
+ amfConnection.connect(getConnectionUrl(), serializationContext);
amfConnection.setAmfTrace(trace);
String stringToEcho = DEFAULT_METHOD_ARG + 1;
@@ -702,30 +519,22 @@
Assert.assertEquals(stringToEcho, result);
if (trace.toString().length() > 0) Assert.assertTrue(true);
- else fail("AmfTrace did not get anything: " + trace.toString() + " " + trace.toString().length());
+ else Assert.fail("AmfTrace did not get anything: " + trace.toString() + " " + trace.toString().length());
amfConnection.close();
-
- }
- catch (ClientStatusException cse)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + cse);
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
- }
- finally
- {
+ } catch (ClientStatusException cse) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + cse);
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } finally {
amfConnection.close();
}
}
- public void testHTTPProxy()
- {
+ @Test
+ public void testHTTPProxy() {
AMFConnection amfconn = new AMFConnection();
- try
- {
+ try {
amfconn.setProxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress("localhost", 8888)));
amfconn.connect("http://localhost:8400/team/messagebroker/amf");
RemotingMessage call = new RemotingMessage();
@@ -736,41 +545,50 @@
call.setOperation("echo");
call.setBody("hello");
amfconn.call("foo", call);
- fail("ClientStatusException expected");
- }
- catch (ClientStatusException cse)
- {
+ Assert.fail("ClientStatusException expected");
+ } catch (ClientStatusException cse) {
Assert.assertEquals(ClientStatusException.AMF_CALL_FAILED_CODE, cse.getCode());
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
- }
- finally
- {
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } finally {
amfconn.close();
}
}
+ ///////////////////////////////////////////////////////////////////////////////
+ // Utility methods
+ ///////////////////////////////////////////////////////////////////////////////
+
+ /**
+ * Given a remote method name, returns the AMF connection call needed using
+ * the default destination id.
+ */
+ private static String getOperationCall(String method) {
+ return DEFAULT_DESTINATION_ID + "." + method;
+ }
+
+ private static String getConnectionUrl() {
+ return String.format(DEFAULT_URL, serverPort);
+ }
+
// A simple interface to handle AMF call results.
- private interface CallResultHandler
- {
+ private interface CallResultHandler {
void onResult(Object result);
}
// Helper method used by JUnit tests to pass in an operation and method argument
// When the AMF call returns, CallResultHandler.onResult is called to Assert things.
- private void internalTestCall(String operation, Object methodArg, CallResultHandler resultHandler) throws ClientStatusException, ServerStatusException
- {
+ private void internalTestCall(String operation, Object methodArg, CallResultHandler resultHandler) throws ClientStatusException, ServerStatusException {
AMFConnection amfConnection = new AMFConnection();
// Connect.
- amfConnection.connect(getConnectionUrl());
+ amfConnection.connect(getConnectionUrl(), serializationContext);
// Make a remoting call and retrieve the result.
Object result;
- if (methodArg == null)
+ if (methodArg == null) {
result = amfConnection.call(operation);
- else
+ } else {
result = amfConnection.call(operation, methodArg);
+ }
resultHandler.onResult(result);
amfConnection.close();
}
diff --git a/remoting/src/test/java/flex/messaging/io/amf/client/AMFDataTypeIT.java b/remoting/src/test/java/flex/messaging/io/amf/client/AMFDataTypeIT.java
index d9d9058..21064fa 100644
--- a/remoting/src/test/java/flex/messaging/io/amf/client/AMFDataTypeIT.java
+++ b/remoting/src/test/java/flex/messaging/io/amf/client/AMFDataTypeIT.java
@@ -16,31 +16,27 @@
*/
package flex.messaging.io.amf.client;
+import flex.messaging.io.SerializationContext;
+import flex.messaging.io.amf.client.exceptions.ClientStatusException;
+import flex.messaging.io.amf.client.exceptions.ServerStatusException;
+import flex.messaging.util.TestServerWrapper;
+import flex.messaging.util.XMLUtil;
+import flex.messaging.validators.ClassDeserializationValidator;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.w3c.dom.Document;
+import remoting.amfclient.ClientCustomType;
+
import java.util.Date;
import java.util.List;
-import flex.messaging.io.SerializationContext;
-import flex.messaging.util.TestServerWrapper;
-import junit.extensions.TestSetup;
-import org.w3c.dom.Document;
-
-import org.junit.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import remoting.amfclient.ClientCustomType;
-
-import flex.messaging.io.amf.client.exceptions.ClientStatusException;
-import flex.messaging.io.amf.client.exceptions.ServerStatusException;
-import flex.messaging.util.XMLUtil;
-
/**
* JUnit tests for AMFConnection. Note that most of the tests require a running
- * server with the specified destination.
+ * server with the specified destination.
*/
-public class AMFDataTypeIT extends TestCase
-{
+public class AMFDataTypeIT {
private static final String DEFAULT_DESTINATION_ID = "amfConnectionTestService";
private static final String DEFAULT_METHOD_NAME = "echoString";
private static final String DEFAULT_METHOD_ARG = "echo me";
@@ -55,534 +51,399 @@
private static int customValidationServerPort;
private static SerializationContext serializationContext;
- /**
- * Given a remote method name, returns the AMF connection call needed using
- * the default destination id.
- */
- private static String getOperationCall(String method)
- {
- return DEFAULT_DESTINATION_ID + "." + method;
+ @BeforeClass
+ public static void setup() {
+ standardValidationServerWrapper = new TestServerWrapper();
+ standardValidationServerPort = standardValidationServerWrapper.startServer("classpath:/WEB-INF/flex/services-config.xml");
+ if (standardValidationServerPort == -1) {
+ Assert.fail("Couldn't start server (standard validation) process");
+ }
+
+ customValidationServerWrapper = new TestServerWrapper();
+ customValidationServerPort = customValidationServerWrapper.startServer("classpath:/WEB-INF/flex/services-config-customized-validation.xml");
+ if(customValidationServerPort == -1) {
+ Assert.fail("Couldn't start server (custom validation) process");
+ }
+
+ AMFConnection.registerAlias(
+ "remoting.amfclient.ServerCustomType" /* server type */,
+ "remoting.amfclient.ClientCustomType" /* client type */);
+
+ serializationContext = SerializationContext.getSerializationContext();
+ ClassDeserializationValidator deserializationValidator =
+ (ClassDeserializationValidator) serializationContext.getDeserializationValidator();
+ deserializationValidator.addAllowClassPattern("remoting.amfclient.*");
+ serializationContext.createASObjectForMissingType = true;
+ // Make sure collections are written out as Arrays (vs. ArrayCollection),
+ // in case the server does not recognize ArrayCollections.
+ serializationContext.legacyCollection = true;
+ // When legacyMap is true, Java Maps are serialized as ECMA arrays
+ // instead of anonymous Object.
+ serializationContext.legacyMap = true;
+ // Disable serialization of xml documents.
+ serializationContext.allowXml = false;
}
- protected String getStandardValidationConnectionUrl() {
- return String.format(DEFAULT_URL, standardValidationServerPort);
+ @AfterClass
+ public static void teardown() {
+ standardValidationServerWrapper.stopServer();
+ standardValidationServerWrapper = null;
+ customValidationServerWrapper.stopServer();
+ customValidationServerWrapper = null;
}
- protected String getCustomValidationConnectionUrl() {
- return String.format(DEFAULT_URL, customValidationServerPort);
- }
-
- public AMFDataTypeIT(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- //TestSuite suite = new TestSuite(AMFDataTypeIT.class);
- TestSuite suite = new TestSuite();
- suite.addTest(new AMFDataTypeIT("testCallStringArgStringReturn"));
- suite.addTest(new AMFDataTypeIT("testCallIntArgIntReturn"));
- suite.addTest(new AMFDataTypeIT("testCallBooleanArgBooleanReturn"));
- suite.addTest(new AMFDataTypeIT("testCallObjectArgObjectReturn"));
- suite.addTest(new AMFDataTypeIT("testCallObjectArgCustomReturn"));
- suite.addTest(new AMFDataTypeIT("testCallCustomArgObjectReturn"));
- suite.addTest(new AMFDataTypeIT("testCallCustomArgCustomReturn"));
- suite.addTest(new AMFDataTypeIT("testCallNoArgObjectReturn"));
- suite.addTest(new AMFDataTypeIT("testCallNoArgCustomReturn"));
- suite.addTest(new AMFDataTypeIT("testCallNoArgObjectArrayReturn"));
- suite.addTest(new AMFDataTypeIT("testCallDateArgDateReturn"));
- suite.addTest(new AMFDataTypeIT("testCallShortArgShortReturn"));
- suite.addTest(new AMFDataTypeIT("testCallDoubleArgDoubleReturn"));
- suite.addTest(new AMFDataTypeIT("testCallIntArrayArgIntArrayReturn"));
- suite.addTest(new AMFDataTypeIT("testCallObjectArrayArgObjectArrayReturn"));
- suite.addTest(new AMFDataTypeIT("testXMLDocumentEnabledXml"));
- suite.addTest(new AMFDataTypeIT("testXMLDocumentDisabledXml"));
-
- suite.addTest(new AMFDataTypeIT("testCallObjectArgObjectReturnCustomizedValidation"));
- suite.addTest(new AMFDataTypeIT("testCallCustomArgObjectReturnCustomizedValidation"));
- suite.addTest(new AMFDataTypeIT("testCallObjectArgCustomReturnCustomizedValidation"));
- suite.addTest(new AMFDataTypeIT("testCallCustomArgCustomReturnCustomizedValidation"));
- suite.addTest(new AMFDataTypeIT("testCallObjectArrayArgObjectArrayReturnCustomizedValidation"));
-
- return new TestSetup(suite) {
- protected void setUp() throws Exception {
- standardValidationServerWrapper = new TestServerWrapper();
- standardValidationServerPort = standardValidationServerWrapper.startServer("classpath:/WEB-INF/flex/services-config.xml");
- if(standardValidationServerPort == -1) {
- Assert.fail("Couldn't start server (standard validation) process");
- }
-
- customValidationServerWrapper = new TestServerWrapper();
- customValidationServerPort = customValidationServerWrapper.startServer("classpath:/WEB-INF/flex/services-config-customized-validation.xml");
- if(customValidationServerPort == -1) {
- Assert.fail("Couldn't start server (custom validation) process");
- }
-
- AMFConnection.registerAlias(
- "remoting.amfclient.ServerCustomType" /* server type */,
- "remoting.amfclient.ClientCustomType" /* client type */);
-
- serializationContext = new SerializationContext();
- serializationContext.createASObjectForMissingType = true;
- // Make sure collections are written out as Arrays (vs. ArrayCollection),
- // in case the server does not recognize ArrayCollections.
- serializationContext.legacyCollection = true;
- // When legacyMap is true, Java Maps are serialized as ECMA arrays
- // instead of anonymous Object.
- serializationContext.legacyMap = true;
- // Disable serialization of xml documents.
- serializationContext.allowXml = false;
- }
- protected void tearDown() throws Exception {
- standardValidationServerWrapper.stopServer();
- standardValidationServerWrapper = null;
- customValidationServerWrapper.stopServer();
- customValidationServerWrapper = null;
- }
- };
- }
-
- public void testCallStringArgStringReturn()
- {
- try
- {
- internalTestCall(DEFAULT_AMF_OPERATION, DEFAULT_METHOD_ARG, new CallResultHandler(){
- public void onResult(Object result)
- {
+ @Test
+ public void testCallStringArgStringReturn() {
+ try {
+ internalTestCall(DEFAULT_AMF_OPERATION, DEFAULT_METHOD_ARG, new CallResultHandler() {
+ public void onResult(Object result) {
Assert.assertEquals(DEFAULT_METHOD_ARG, result);
}
}, false);
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
}
}
- public void testCallIntArgIntReturn()
- {
+ @Test
+ public void testCallIntArgIntReturn() {
String method = "echoInt";
final int methodArg = 1;
- try
- {
- internalTestCall(getOperationCall(method), methodArg, new CallResultHandler(){
- public void onResult(Object result)
- {
- Assert.assertEquals(methodArg, ((Double)result).intValue());
+ try {
+ internalTestCall(getOperationCall(method), methodArg, new CallResultHandler() {
+ public void onResult(Object result) {
+ Assert.assertEquals(methodArg, ((Double) result).intValue());
}
}, false);
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
}
}
- public void testCallBooleanArgBooleanReturn()
- {
- try
- {
+ @Test
+ public void testCallBooleanArgBooleanReturn() {
+ try {
String method = "echoBoolean";
final boolean methodArg = true;
- internalTestCall(getOperationCall(method), methodArg, new CallResultHandler(){
- public void onResult(Object result)
- {
+ internalTestCall(getOperationCall(method), methodArg, new CallResultHandler() {
+ public void onResult(Object result) {
Assert.assertEquals(methodArg, result);
}
}, false);
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
}
}
- public void testCallDateArgDateReturn()
- {
+ @Test
+ public void testCallDateArgDateReturn() {
String method = "echoDate";
final Date methodArg = new Date(999991);
- try
- {
- internalTestCall(getOperationCall(method), methodArg, new CallResultHandler(){
- public void onResult(Object result)
- {
+ try {
+ internalTestCall(getOperationCall(method), methodArg, new CallResultHandler() {
+ public void onResult(Object result) {
Assert.assertEquals(methodArg, result);
}
}, false);
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
}
}
- public void testCallShortArgShortReturn()
- {
+ @Test
+ public void testCallShortArgShortReturn() {
String method = "echoShort";
final short methodArg = 32000;
- try
- {
- internalTestCall(getOperationCall(method), methodArg, new CallResultHandler(){
- public void onResult(Object result)
- {
- Assert.assertEquals(methodArg, ((Double)result).shortValue());
+ try {
+ internalTestCall(getOperationCall(method), methodArg, new CallResultHandler() {
+ public void onResult(Object result) {
+ Assert.assertEquals(methodArg, ((Double) result).shortValue());
}
}, false);
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
}
}
- public void testCallDoubleArgDoubleReturn()
- {
+ @Test
+ public void testCallDoubleArgDoubleReturn() {
String method = "echoDouble";
final double methodArg = -95.25;
- try
- {
- internalTestCall(getOperationCall(method), methodArg, new CallResultHandler(){
- public void onResult(Object result)
- {
+ try {
+ internalTestCall(getOperationCall(method), methodArg, new CallResultHandler() {
+ public void onResult(Object result) {
Assert.assertEquals(methodArg, result);
}
}, false);
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
}
}
- public void testCallObjectArgObjectReturn()
- {
+ @Test
+ public void testCallObjectArgObjectReturn() {
String method = "echoObject1";
ClientCustomType temp = new ClientCustomType();
temp.setId(1);
final Object methodArg = temp;
- try
- {
- internalTestCall(getOperationCall(method), methodArg, new CallResultHandler(){
- public void onResult(Object result)
- {
- ClientCustomType temp2 = (ClientCustomType)result;
+ try {
+ internalTestCall(getOperationCall(method), methodArg, new CallResultHandler() {
+ public void onResult(Object result) {
+ ClientCustomType temp2 = (ClientCustomType) result;
Assert.assertEquals(1, temp2.getId());
}
}, false);
- fail(UNEXPECTED_SUCCESS_STRING);
- }
- catch (Exception e)
- {
+ Assert.fail(UNEXPECTED_SUCCESS_STRING);
+ } catch (Exception e) {
// An exception is what we expect here.
}
}
- public void testCallObjectArgObjectReturnCustomizedValidation()
- {
+ @Test
+ public void testCallObjectArgObjectReturnCustomizedValidation() {
String method = "echoObject1";
ClientCustomType temp = new ClientCustomType();
temp.setId(1);
final Object methodArg = temp;
- try
- {
- internalTestCall(getOperationCall(method), methodArg, new CallResultHandler(){
- public void onResult(Object result)
- {
- ClientCustomType temp2 = (ClientCustomType)result;
+ try {
+ internalTestCall(getOperationCall(method), methodArg, new CallResultHandler() {
+ public void onResult(Object result) {
+ ClientCustomType temp2 = (ClientCustomType) result;
Assert.assertEquals(1, temp2.getId());
}
}, true);
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
}
}
- public void testCallObjectArgCustomReturn()
- {
+ @Test
+ public void testCallObjectArgCustomReturn() {
String method = "echoObject2";
ClientCustomType temp = new ClientCustomType();
temp.setId(1);
final Object methodArg = temp;
- try
- {
- internalTestCall(getOperationCall(method), methodArg, new CallResultHandler(){
- public void onResult(Object result)
- {
- ClientCustomType temp2 = (ClientCustomType)result;
+ try {
+ internalTestCall(getOperationCall(method), methodArg, new CallResultHandler() {
+ public void onResult(Object result) {
+ ClientCustomType temp2 = (ClientCustomType) result;
Assert.assertEquals(1, temp2.getId());
}
}, false);
- fail(UNEXPECTED_SUCCESS_STRING);
- }
- catch (Exception e)
- {
+ Assert.fail(UNEXPECTED_SUCCESS_STRING);
+ } catch (Exception e) {
// An exception is what we expect here.
}
}
- public void testCallObjectArgCustomReturnCustomizedValidation()
- {
+ @Test
+ public void testCallObjectArgCustomReturnCustomizedValidation() {
String method = "echoObject2";
ClientCustomType temp = new ClientCustomType();
temp.setId(1);
final Object methodArg = temp;
- try
- {
- internalTestCall(getOperationCall(method), methodArg, new CallResultHandler(){
- public void onResult(Object result)
- {
- ClientCustomType temp2 = (ClientCustomType)result;
+ try {
+ internalTestCall(getOperationCall(method), methodArg, new CallResultHandler() {
+ public void onResult(Object result) {
+ ClientCustomType temp2 = (ClientCustomType) result;
Assert.assertEquals(1, temp2.getId());
}
}, true);
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
}
}
- public void testCallCustomArgObjectReturn()
- {
+ @Test
+ public void testCallCustomArgObjectReturn() {
String method = "echoObject3";
final ClientCustomType methodArg = new ClientCustomType();
methodArg.setId(1);
- try
- {
- internalTestCall(getOperationCall(method), methodArg, new CallResultHandler(){
- public void onResult(Object result)
- {
- ClientCustomType temp2 = (ClientCustomType)result;
+ try {
+ internalTestCall(getOperationCall(method), methodArg, new CallResultHandler() {
+ public void onResult(Object result) {
+ ClientCustomType temp2 = (ClientCustomType) result;
Assert.assertEquals(1, temp2.getId());
}
}, false);
- fail(UNEXPECTED_SUCCESS_STRING);
- }
- catch (Exception e)
- {
+ Assert.fail(UNEXPECTED_SUCCESS_STRING);
+ } catch (Exception e) {
// An exception is what we expect here.
}
}
- public void testCallCustomArgObjectReturnCustomizedValidation()
- {
+ @Test
+ public void testCallCustomArgObjectReturnCustomizedValidation() {
String method = "echoObject3";
final ClientCustomType methodArg = new ClientCustomType();
methodArg.setId(1);
- try
- {
- internalTestCall(getOperationCall(method), methodArg, new CallResultHandler(){
- public void onResult(Object result)
- {
- ClientCustomType temp2 = (ClientCustomType)result;
+ try {
+ internalTestCall(getOperationCall(method), methodArg, new CallResultHandler() {
+ public void onResult(Object result) {
+ ClientCustomType temp2 = (ClientCustomType) result;
Assert.assertEquals(1, temp2.getId());
}
}, true);
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
}
}
- public void testCallCustomArgCustomReturn()
- {
+ @Test
+ public void testCallCustomArgCustomReturn() {
String method = "echoObject4";
final ClientCustomType methodArg = new ClientCustomType();
methodArg.setId(1);
- try
- {
- internalTestCall(getOperationCall(method), methodArg, new CallResultHandler(){
- public void onResult(Object result)
- {
- ClientCustomType temp2 = (ClientCustomType)result;
+ try {
+ internalTestCall(getOperationCall(method), methodArg, new CallResultHandler() {
+ public void onResult(Object result) {
+ ClientCustomType temp2 = (ClientCustomType) result;
Assert.assertEquals(1, temp2.getId());
}
}, false);
- fail(UNEXPECTED_SUCCESS_STRING);
- }
- catch (Exception e)
- {
+ Assert.fail(UNEXPECTED_SUCCESS_STRING);
+ } catch (Exception e) {
// An exception is what we expect here.
}
}
- public void testCallCustomArgCustomReturnCustomizedValidation()
- {
+ @Test
+ public void testCallCustomArgCustomReturnCustomizedValidation() {
String method = "echoObject4";
final ClientCustomType methodArg = new ClientCustomType();
methodArg.setId(1);
- try
- {
- internalTestCall(getOperationCall(method), methodArg, new CallResultHandler(){
- public void onResult(Object result)
- {
- ClientCustomType temp2 = (ClientCustomType)result;
+ try {
+ internalTestCall(getOperationCall(method), methodArg, new CallResultHandler() {
+ public void onResult(Object result) {
+ ClientCustomType temp2 = (ClientCustomType) result;
Assert.assertEquals(1, temp2.getId());
}
}, true);
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
}
}
- public void testCallNoArgObjectReturn()
- {
+ @Test
+ public void testCallNoArgObjectReturn() {
String method = "getObject1";
- try
- {
- internalTestCall(getOperationCall(method), null, new CallResultHandler(){
- public void onResult(Object result)
- {
- ClientCustomType temp2 = (ClientCustomType)result;
+ try {
+ internalTestCall(getOperationCall(method), null, new CallResultHandler() {
+ public void onResult(Object result) {
+ ClientCustomType temp2 = (ClientCustomType) result;
Assert.assertEquals(1, temp2.getId());
}
}, false);
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
}
}
- public void testCallNoArgCustomReturn()
- {
+ @Test
+ public void testCallNoArgCustomReturn() {
String method = "getObject2";
- try
- {
- internalTestCall(getOperationCall(method), null, new CallResultHandler(){
- public void onResult(Object result)
- {
- ClientCustomType temp2 = (ClientCustomType)result;
+ try {
+ internalTestCall(getOperationCall(method), null, new CallResultHandler() {
+ public void onResult(Object result) {
+ ClientCustomType temp2 = (ClientCustomType) result;
Assert.assertEquals(1, temp2.getId());
}
}, false);
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
}
}
- public void testCallNoArgObjectArrayReturn()
- {
+ @Test
+ public void testCallNoArgObjectArrayReturn() {
String method = "getObjectArray1";
- try
- {
- internalTestCall(getOperationCall(method), null, new CallResultHandler(){
- public void onResult(Object result)
- {
- List temp = (List)result;
- for (int i = 0; i < temp.size(); i++)
- {
- ClientCustomType temp2 = (ClientCustomType)temp.get(i);
+ try {
+ internalTestCall(getOperationCall(method), null, new CallResultHandler() {
+ public void onResult(Object result) {
+ List temp = (List) result;
+ for (int i = 0; i < temp.size(); i++) {
+ ClientCustomType temp2 = (ClientCustomType) temp.get(i);
Assert.assertEquals(i, temp2.getId());
}
}
}, false);
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
}
}
- public void testCallIntArrayArgIntArrayReturn()
- {
+ @Test
+ public void testCallIntArrayArgIntArrayReturn() {
String method = "echoObject5";
- final int[] methodArg = new int[] {0,1,2,3};
- try
- {
- internalTestCall(getOperationCall(method), methodArg, new CallResultHandler(){
- public void onResult(Object result)
- {
- List temp = (List)result;
- for (int i = 0; i < temp.size(); i++)
- {
- Assert.assertEquals(i, ((Integer)temp.get(i)).intValue());
+ final int[] methodArg = new int[]{0, 1, 2, 3};
+ try {
+ internalTestCall(getOperationCall(method), methodArg, new CallResultHandler() {
+ public void onResult(Object result) {
+ List temp = (List) result;
+ for (int i = 0; i < temp.size(); i++) {
+ Assert.assertEquals(i, ((Integer) temp.get(i)).intValue());
}
}
}, false);
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
}
}
- public void testCallObjectArrayArgObjectArrayReturn()
- {
+ @Test
+ public void testCallObjectArrayArgObjectArrayReturn() {
String method = "echoObject1";
Object[] temp = new Object[3];
- for (int i = 0; i < temp.length; i++)
- {
+ for (int i = 0; i < temp.length; i++) {
ClientCustomType cct = new ClientCustomType();
cct.setId(i);
temp[i] = cct;
}
final Object[] methodArg = temp;
- try
- {
- internalTestCall(getOperationCall(method), methodArg, new CallResultHandler(){
- public void onResult(Object result)
- {
- List temp = (List)result;
- for (int i = 0; i < temp.size(); i++)
- {
- ClientCustomType temp2 = (ClientCustomType)temp.get(i);
+ try {
+ internalTestCall(getOperationCall(method), methodArg, new CallResultHandler() {
+ public void onResult(Object result) {
+ List temp = (List) result;
+ for (int i = 0; i < temp.size(); i++) {
+ ClientCustomType temp2 = (ClientCustomType) temp.get(i);
Assert.assertEquals(i, temp2.getId());
}
}
}, false);
- fail(UNEXPECTED_SUCCESS_STRING);
- }
- catch (Exception e)
- {
+ Assert.fail(UNEXPECTED_SUCCESS_STRING);
+ } catch (Exception e) {
// An exception is what we expect here.
}
}
- public void testCallObjectArrayArgObjectArrayReturnCustomizedValidation()
- {
+ @Test
+ public void testCallObjectArrayArgObjectArrayReturnCustomizedValidation() {
String method = "echoObject1";
Object[] temp = new Object[3];
- for (int i = 0; i < temp.length; i++)
- {
+ for (int i = 0; i < temp.length; i++) {
ClientCustomType cct = new ClientCustomType();
cct.setId(i);
temp[i] = cct;
}
final Object[] methodArg = temp;
- try
- {
- internalTestCall(getOperationCall(method), methodArg, new CallResultHandler(){
- public void onResult(Object result)
- {
- List temp = (List)result;
- for (int i = 0; i < temp.size(); i++)
- {
- ClientCustomType temp2 = (ClientCustomType)temp.get(i);
+ try {
+ internalTestCall(getOperationCall(method), methodArg, new CallResultHandler() {
+ public void onResult(Object result) {
+ List temp = (List) result;
+ for (int i = 0; i < temp.size(); i++) {
+ ClientCustomType temp2 = (ClientCustomType) temp.get(i);
Assert.assertEquals(i, temp2.getId());
}
}
}, true);
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
}
}
-
- public void testXMLDocumentEnabledXml()
- {
- try
- {
+ @Test
+ public void testXMLDocumentEnabledXml() {
+ try {
// Temporarily enable xml serialization/deserialization.
serializationContext.allowXml = true;
@@ -592,78 +453,81 @@
Document xmlDoc = XMLUtil.stringToDocument(xml.toString());
final Object methodArg = xmlDoc;
- internalTestCall(getOperationCall(method), methodArg, new CallResultHandler(){
- public void onResult(Object result)
- {
- try
- {
- Document retXmlDoc = (Document)result;
+ internalTestCall(getOperationCall(method), methodArg, new CallResultHandler() {
+ public void onResult(Object result) {
+ try {
+ Document retXmlDoc = (Document) result;
String retXML = XMLUtil.documentToString(retXmlDoc);
Assert.assertEquals(xml.toString(), retXML);
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
}
}
}, false);
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
- }
- finally {
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } finally {
// Disable xml serialization/deserialization again.
serializationContext.allowXml = false;
}
}
-
- public void testXMLDocumentDisabledXml()
- {
- try
- {
+ @Test
+ public void testXMLDocumentDisabledXml() {
+ try {
String method = "echoObject1";
final StringBuffer xml = new StringBuffer(512);
xml.append("<test> <item id=\"1\"> <sweet/> </item></test>");
Document xmlDoc = XMLUtil.stringToDocument(xml.toString());
final Object methodArg = xmlDoc;
- internalTestCall(getOperationCall(method), methodArg, new CallResultHandler(){
- public void onResult(Object result)
- {
- try
- {
- Document retXmlDoc = (Document)result;
+ internalTestCall(getOperationCall(method), methodArg, new CallResultHandler() {
+ public void onResult(Object result) {
+ try {
+ Document retXmlDoc = (Document) result;
String retXML = XMLUtil.documentToString(retXmlDoc);
Assert.assertEquals("", retXML);
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
}
}
}, false);
- }
- catch (Exception e)
- {
- fail(UNEXPECTED_EXCEPTION_STRING + e);
+ } catch (Exception e) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
}
}
+ ///////////////////////////////////////////////////////////////////////////////
+ // Utility methods
+ ///////////////////////////////////////////////////////////////////////////////
+
+ /**
+ * Given a remote method name, returns the AMF connection call needed using
+ * the default destination id.
+ */
+ private static String getOperationCall(String method) {
+ return DEFAULT_DESTINATION_ID + "." + method;
+ }
+
+ private static String getStandardValidationConnectionUrl() {
+ return String.format(DEFAULT_URL, standardValidationServerPort);
+ }
+
+ private static String getCustomValidationConnectionUrl() {
+ return String.format(DEFAULT_URL, customValidationServerPort);
+ }
+
// A simple interface to handle AMF call results.
- private interface CallResultHandler
- {
+ private interface CallResultHandler {
void onResult(Object result);
}
// Helper method used by JUnit tests to pass in an operation and method argument
// When the AMF call returns, CallResultHandler.onResult is called to Assert things.
- private void internalTestCall(String operation, Object methodArg, CallResultHandler resultHandler, boolean customizedValidation) throws ClientStatusException, ServerStatusException
- {
+ private void internalTestCall(String operation, Object methodArg, CallResultHandler resultHandler, boolean customizedValidation) throws ClientStatusException, ServerStatusException {
AMFConnection amfConnection = new AMFConnection();
// Connect.
- if(customizedValidation) {
+ if (customizedValidation) {
amfConnection.connect(getCustomValidationConnectionUrl(), serializationContext);
} else {
amfConnection.connect(getStandardValidationConnectionUrl(), serializationContext);
diff --git a/remoting/src/test/java/flex/messaging/util/TestServerWrapper.java b/remoting/src/test/java/flex/messaging/util/TestServerWrapper.java
index 4dc3c02..5f9d954 100644
--- a/remoting/src/test/java/flex/messaging/util/TestServerWrapper.java
+++ b/remoting/src/test/java/flex/messaging/util/TestServerWrapper.java
@@ -42,9 +42,9 @@
final String path = System.getProperty("java.home") + separator + "bin" + separator + "java";
List<String> args = new LinkedList<String>();
args.add(path);
-/* if(configPath.contains("customized-validation")) {
- args.add("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005");
- }*/
+ //if(configPath.contains("customized-validation")) {
+// args.add("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005");
+ //}
args.add("-cp");
args.add(classpath);
args.add(TestServer.class.getCanonicalName());
