Author: ron.sigal(a)jboss.com
Date: 2009-05-16 19:48:57 -0400 (Sat, 16 May 2009)
New Revision: 5247
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/marshall/config/ConfigurationMapTestParent.java
Log:
JBREM-1102: Made values overrideable for servlet tests.
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/marshall/config/ConfigurationMapTestParent.java
===================================================================
---
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/marshall/config/ConfigurationMapTestParent.java 2009-05-16
23:47:03 UTC (rev 5246)
+++
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/marshall/config/ConfigurationMapTestParent.java 2009-05-16
23:48:57 UTC (rev 5247)
@@ -116,7 +116,7 @@
log.info("connection is good");
// Do tests.
- assertTrue(ConfigTestMarshaller.ok(false, 2));
+ assertTrue(ConfigTestMarshaller.ok(false, marshallerDatatypeUnused()));
assertTrue(ConfigTestUnmarshaller.ok(false, 0));
assertTrue(LocatorTestMarshaller.ok());
assertTrue(LocatorTestUnmarshaller.ok());
@@ -156,7 +156,7 @@
log.info("connection is good");
// Do tests.
- assertTrue(ConfigTestMarshaller.ok(false, 2));
+ assertTrue(ConfigTestMarshaller.ok(false, marshallerDatatypeUnused()));
assertTrue(ConfigTestUnmarshaller.ok(false, 0));
assertTrue(LocatorTestMarshaller.ok());
assertTrue(LocatorTestUnmarshaller.ok());
@@ -196,8 +196,8 @@
log.info("connection is good");
// Do tests.
- assertTrue(ConfigTestMarshaller.ok(true, 6));
- assertTrue(ConfigTestUnmarshaller.ok(true, 4));
+ assertTrue(ConfigTestMarshaller.ok(true, marshallerCountDatatype()));
+ assertTrue(ConfigTestUnmarshaller.ok(true, unmarshallerCountDatatype()));
assertTrue(LocatorTestMarshaller.ok());
assertTrue(LocatorTestUnmarshaller.ok());
@@ -233,7 +233,7 @@
log.info("connection is good");
// Do tests.
- assertTrue(ConfigTestMarshaller.ok(false, 1));
+ assertTrue(ConfigTestMarshaller.ok(false,marshallerFQNUnused()));
assertTrue(ConfigTestUnmarshaller.ok(false, 0));
assertTrue(LocatorTestMarshaller.ok());
assertTrue(LocatorTestUnmarshaller.ok());
@@ -274,7 +274,7 @@
log.info("connection is good");
// Do tests.
- assertTrue(ConfigTestMarshaller.ok(false, 1));
+ assertTrue(ConfigTestMarshaller.ok(false, marshallerFQNUnused()));
assertTrue(ConfigTestUnmarshaller.ok(false, 0));
assertTrue(LocatorTestMarshaller.ok());
assertTrue(LocatorTestUnmarshaller.ok());
@@ -313,8 +313,8 @@
log.info("connection is good");
// Do tests.
- assertTrue(ConfigTestMarshaller.ok(true, configTestMarshallerCount()));
- assertTrue(ConfigTestUnmarshaller.ok(true, configTestUnmarshallerCount()));
+ assertTrue(ConfigTestMarshaller.ok(true, marshallerCountFQN()));
+ assertTrue(ConfigTestUnmarshaller.ok(true, unmarshallerCountFQN()));
assertTrue(LocatorTestMarshaller.ok());
assertTrue(LocatorTestUnmarshaller.ok());
@@ -323,19 +323,37 @@
log.info(getName() + " PASSES");
}
+
+ protected int marshallerCountDatatype()
+ {
+ return 6;
+ }
- protected int configTestMarshallerCount()
+ protected int unmarshallerCountDatatype()
{
+ return 4;
+ }
+
+ protected int marshallerCountFQN()
+ {
return 3;
}
+ protected int unmarshallerCountFQN()
+ {
+ return 2;
+ }
- protected int configTestUnmarshallerCount()
+ protected int marshallerDatatypeUnused()
{
return 2;
}
+
+ protected int marshallerFQNUnused()
+ {
+ return 1;
+ }
-
protected abstract String getTransport();
Show replies by date