You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2017/04/16 22:32:50 UTC
[59/72] [abbrv] flex-blazeds git commit: - Moved the initialization
of the ClassDeserializationValidator into the SerializationContext (so it is
always initialized). - Adjusted the rest to correctly work with these
changes.
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/11b0aa13/remoting/src/test/java/flex/messaging/io/amf/client/AMFDataTypeIT.java
----------------------------------------------------------------------
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 java.util.Date;
-import java.util.List;
-
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 junit.extensions.TestSetup;
-import org.w3c.dom.Document;
-
+import flex.messaging.util.XMLUtil;
+import flex.messaging.validators.ClassDeserializationValidator;
+import org.junit.AfterClass;
import org.junit.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.w3c.dom.Document;
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;
+import java.util.Date;
+import java.util.List;
/**
* 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 @@ public class AMFDataTypeIT extends TestCase
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;
- }
-
- protected String getStandardValidationConnectionUrl() {
- return String.format(DEFAULT_URL, standardValidationServerPort);
- }
-
- protected String getCustomValidationConnectionUrl() {
- return String.format(DEFAULT_URL, customValidationServerPort);
- }
-
- public AMFDataTypeIT(String name)
- {
- super(name);
+ @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;
}
- 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;
- }
- };
+ @AfterClass
+ public static void teardown() {
+ 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 @@ public class AMFDataTypeIT extends TestCase
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) {
+ Assert.fail(UNEXPECTED_EXCEPTION_STRING + e);
}
- catch (Exception e)
- {
- 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);
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/11b0aa13/remoting/src/test/java/flex/messaging/util/TestServerWrapper.java
----------------------------------------------------------------------
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 @@ public class TestServerWrapper {
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());