[jboss-cvs] JBossAS SVN: r81073 - in projects/metadata/trunk/src/test/java/org/jboss/test/metadata: javaee and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 14 11:01:34 EST 2008
Author: alex.loubyansky at jboss.com
Date: 2008-11-14 11:01:34 -0500 (Fri, 14 Nov 2008)
New Revision: 81073
Modified:
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java
Log:
clean-up in passing the DD test Mode value (stick to the method argument)
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java 2008-11-14 15:37:28 UTC (rev 81072)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java 2008-11-14 16:01:34 UTC (rev 81073)
@@ -1054,7 +1054,7 @@
{
assertNotNull(ejbName, securityIdentity);
String prefix = ejbName + type;
- if(mode == Mode.JBOSS)
+ if(mode != Mode.JBOSS_DTD)
{
assertId(prefix, securityIdentity);
assertDescriptions(prefix, securityIdentity.getDescriptions());
@@ -1118,7 +1118,7 @@
{
assertNotNull(clusterConfig);
prefix = prefix + "ClusterConfig";
- if(mode == Mode.JBOSS)
+ if(mode != Mode.JBOSS_DTD)
{
assertId(prefix, clusterConfig);
assertDescriptions(prefix, clusterConfig.getDescriptions());
@@ -1145,7 +1145,7 @@
{
assertNotNull(invalidationConfig);
prefix = prefix + "CacheInvalidationConfig";
- if(mode == Mode.JBOSS)
+ if(mode != Mode.JBOSS_DTD)
{
assertId(prefix, invalidationConfig);
assertDescriptions(prefix, invalidationConfig.getDescriptions());
@@ -1166,7 +1166,7 @@
{
assertNotNull(iorSecurityConfig);
String prefix = ejbName + "IorSecurityConfig";
- if(mode == Mode.JBOSS)
+ if(mode != Mode.JBOSS_DTD)
{
assertId(prefix, iorSecurityConfig);
assertDescriptions(prefix, iorSecurityConfig.getDescriptions());
@@ -1178,7 +1178,7 @@
protected void assertPortComponent(String prefix, PortComponent portComponent, Mode mode)
{
assertNotNull(portComponent);
- if(mode == Mode.JBOSS)
+ if(mode != Mode.JBOSS_DTD)
{
assertId(prefix+"PortComponent", portComponent);
assertEquals(true, portComponent.getSecureWSDLAccess());
@@ -1200,7 +1200,7 @@
{
assertNotNull(iorTransportConfig);
String prefix = ejbName + "TransportConfig";
- if(mode == Mode.JBOSS)
+ if(mode != Mode.JBOSS_DTD)
{
assertId(prefix, iorTransportConfig);
assertDescriptions(prefix, iorTransportConfig.getDescriptions());
@@ -1228,7 +1228,7 @@
{
assertNotNull(asContext);
String prefix = ejbName + "ASContext";
- if(mode == Mode.JBOSS)
+ if(mode != Mode.JBOSS_DTD)
{
assertId(prefix, asContext);
assertDescriptions(prefix, asContext.getDescriptions());
@@ -1251,7 +1251,7 @@
{
assertNotNull(sasContext);
String prefix = ejbName + "SASContext";
- if(mode == Mode.JBOSS)
+ if(mode != Mode.JBOSS_DTD)
{
assertId(prefix, sasContext);
assertDescriptions(prefix, sasContext.getDescriptions());
@@ -1301,7 +1301,7 @@
assertNotNull(ejbName, methodAttributes);
assertEquals(2, methodAttributes.size());
String prefix = ejbName + "MethodAttributes";
- if(mode == Mode.JBOSS)
+ if(mode != Mode.JBOSS_DTD)
assertId(prefix, methodAttributes);
int count = 1;
for (MethodAttributeMetaData methodAttribute : methodAttributes)
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java 2008-11-14 15:37:28 UTC (rev 81072)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java 2008-11-14 16:01:34 UTC (rev 81073)
@@ -100,7 +100,7 @@
ejbJar.assertEverything(ejbJarMetaData, Mode.SPEC);
JBoss50MetaData jbossMetaData = unmarshal("JBoss5xEverything_testEverything.xml", JBoss50MetaData.class, null);
- JBoss5xEverythingUnitTestCase jboss = new JBoss5xEverythingUnitTestCase("jboss", Mode.JBOSS);
+ JBoss5xEverythingUnitTestCase jboss = new JBoss5xEverythingUnitTestCase("jboss");
jboss.assertEverything(jbossMetaData, Mode.JBOSS);
// Create the merged view
@@ -114,7 +114,7 @@
assertNotNull(ejb);
JBossSessionBeanMetaData jejb = (JBossSessionBeanMetaData) ejb;
ejbJar.assertFullSessionBean("session1", jejb, Mode.JBOSS);
- jboss.assertWebservices(jbossMetaData.getWebservices());
+ jboss.assertWebservices(jbossMetaData.getWebservices(), Mode.JBOSS);
{
JBossMessageDrivenBeanMetaData mdb = (JBossMessageDrivenBeanMetaData) jbossMetaData.getEnterpriseBean("mdb1EjbName");
@@ -141,9 +141,9 @@
specMetaData.merge(null, ejbJarMetaData);
JBoss50MetaData jbossMetaData = unmarshal("JBoss5xEverything_testEverything.xml", JBoss50MetaData.class, null);
- JBoss5xEverythingUnitTestCase jboss = new JBoss5xEverythingUnitTestCase("jboss", Mode.JBOSS);
+ JBoss5xEverythingUnitTestCase jboss = new JBoss5xEverythingUnitTestCase("jboss");
jboss.assertEverything(jbossMetaData, Mode.JBOSS);
- jboss.assertWebservices(jbossMetaData.getWebservices());
+ jboss.assertWebservices(jbossMetaData.getWebservices(), Mode.JBOSS);
// Create the merged view
JBossMetaData mergedMetaData = new JBossMetaData();
@@ -156,7 +156,7 @@
assertNotNull(ejb);
JBossSessionBeanMetaData jejb = (JBossSessionBeanMetaData) ejb;
ejbJar.assertFullSessionBean("session1", jejb, Mode.JBOSS);
- jboss.assertWebservices(mergedMetaData.getWebservices());
+ jboss.assertWebservices(mergedMetaData.getWebservices(), Mode.JBOSS);
{
JBossMessageDrivenBeanMetaData mdb = (JBossMessageDrivenBeanMetaData) mergedMetaData.getEnterpriseBean("mdb1EjbName");
@@ -185,7 +185,7 @@
JBoss50DTDMetaData jbossMetaData = unmarshal("JBoss5xEverything_testEverythingDTD.xml", JBoss50DTDMetaData.class, null);
JBoss5xEverythingUnitTestCase jboss = new JBoss5xEverythingUnitTestCase("jboss");
jboss.assertEverything(jbossMetaData, Mode.JBOSS_DTD);
- jboss.assertWebservices(jbossMetaData.getWebservices());
+ jboss.assertWebservices(jbossMetaData.getWebservices(), Mode.JBOSS_DTD);
//jbossMetaData.setOverridenMetaData(ejbJarMetaData);
// Create the merged view
@@ -198,7 +198,7 @@
assertNotNull(ejb);
JBossSessionBeanMetaData jejb = (JBossSessionBeanMetaData) ejb;
ejbJar.assertFullSessionBean("session1", jejb, Mode.JBOSS_DTD);
- jboss.assertWebservices(mergedMetaData.getWebservices());
+ jboss.assertWebservices(mergedMetaData.getWebservices(), Mode.JBOSS_DTD);
// Basic check if EjbReferences.invokerBindings are merged
assertEjbReferenceInvokerBindings(ejb);
assertInvokerBindings(mergedMetaData.getInvokerProxyBindings());
@@ -217,7 +217,7 @@
JBoss50DTDMetaData jbossMetaData = unmarshal("JBoss5xEverything_testEverythingDTD.xml", JBoss50DTDMetaData.class, null);
JBoss5xEverythingUnitTestCase jboss = new JBoss5xEverythingUnitTestCase("jboss");
jboss.assertEverything(jbossMetaData, Mode.JBOSS_DTD);
- jboss.assertWebservices(jbossMetaData.getWebservices());
+ jboss.assertWebservices(jbossMetaData.getWebservices(), Mode.JBOSS_DTD);
//jbossMetaData.setOverridenMetaData(ejbJarMetaData);
// Create the merged view
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java 2008-11-14 15:37:28 UTC (rev 81072)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java 2008-11-14 16:01:34 UTC (rev 81073)
@@ -78,7 +78,6 @@
{
/** Is there a standardjboss.xml default available */
private boolean hasStandardJBoss = false;
- private Mode mode = Mode.JBOSS_DTD;
public static Test suite()
{
@@ -130,12 +129,6 @@
super(name);
}
- public JBoss5xEverythingUnitTestCase(String name, Mode mode)
- {
- super(name);
- this.mode = mode;
- }
-
protected JBoss50DTDMetaData unmarshal() throws Exception
{
return unmarshal(JBoss50DTDMetaData.class);
@@ -145,7 +138,6 @@
{
JBoss50MetaData jbossMetaData = unmarshal(JBoss50MetaData.class);
hasStandardJBoss = false;
- mode = Mode.JBOSS;
assertEverything(jbossMetaData, Mode.JBOSS);
}
@@ -166,7 +158,6 @@
JBoss50DTDMetaData jbossMetaData = unmarshal("JBoss5xEverything_testEverythingDTD.xml", JBoss50DTDMetaData.class, null);
JBossMetaDataWrapper wrapper = new JBossMetaDataWrapper(jbossMetaData, stdMetaData);
hasStandardJBoss = true;
- mode = Mode.JBOSS_DTD;
assertEverything(wrapper, Mode.JBOSS_DTD);
}
@@ -332,17 +323,17 @@
assertFalse(jbossMetaData.isExcludeMissingMethods());
assertEquals("jboss-unauthenticated-principal", jbossMetaData.getUnauthenticatedPrincipal());
assertTrue(jbossMetaData.isExceptionOnRollback());
- assertWebservices(jbossMetaData.getWebservices());
+ assertWebservices(jbossMetaData.getWebservices(), mode);
assertJBossEnterpriseBeans(jbossMetaData, mode);
- assertAssemblyDescriptor(jbossMetaData);
- assertResourceManagers(jbossMetaData.getResourceManagers());
- assertResourceManager("resourceManager1", true, jbossMetaData.getResourceManager("resourceManager1Name"));
- assertResourceManager("resourceManager2", false, jbossMetaData.getResourceManager("resourceManager2Name"));
+ assertAssemblyDescriptor(jbossMetaData, mode);
+ assertResourceManagers(jbossMetaData.getResourceManagers(), mode);
+ assertResourceManager("resourceManager1", true, jbossMetaData.getResourceManager("resourceManager1Name"), mode);
+ assertResourceManager("resourceManager2", false, jbossMetaData.getResourceManager("resourceManager2Name"), mode);
if(hasStandardJBoss == false)
- assertInvokerProxyBindings(jbossMetaData.getInvokerProxyBindings());
- assertInvokerProxyBinding("invokerProxyBinding1", 1, jbossMetaData.getInvokerProxyBinding("invokerProxyBinding1Name"));
- assertInvokerProxyBinding("invokerProxyBinding2", 2, jbossMetaData.getInvokerProxyBinding("invokerProxyBinding2Name"));
- assertContainerConfigurations(jbossMetaData);
+ assertInvokerProxyBindings(jbossMetaData.getInvokerProxyBindings(), mode);
+ assertInvokerProxyBinding("invokerProxyBinding1", 1, jbossMetaData.getInvokerProxyBinding("invokerProxyBinding1Name"), mode);
+ assertInvokerProxyBinding("invokerProxyBinding2", 2, jbossMetaData.getInvokerProxyBinding("invokerProxyBinding2Name"), mode);
+ assertContainerConfigurations(jbossMetaData, mode);
}
private void assertVersion(JBossMetaData jbossMetaData)
@@ -353,7 +344,7 @@
private void assertLoaderRepository(LoaderRepositoryMetaData loaderRepositoryMetaData, Mode mode)
{
assertNotNull(loaderRepositoryMetaData);
- if(mode == Mode.JBOSS)
+ if(mode != Mode.JBOSS_DTD)
assertId("loaderRepository", loaderRepositoryMetaData);
assertEquals("loaderRepositoryClass", loaderRepositoryMetaData.getLoaderRepositoryClass());
assertEquals("loaderRepositoryName", trim(loaderRepositoryMetaData.getName()));
@@ -368,7 +359,7 @@
for (int count = 1; count < configs.size(); ++count)
{
LoaderRepositoryConfigMetaData config = new LoaderRepositoryConfigMetaData();
- if(mode == Mode.JBOSS)
+ if(mode != Mode.JBOSS_DTD)
config.setId("loaderRepositoryConfig" + count + "-id");
config.setConfig("loaderRepositoryConfig" + count);
config.setConfigParserClass("loaderRepositoryConfigParserClass" + count);
@@ -379,10 +370,10 @@
}
}
- public void assertWebservices(WebservicesMetaData webservices)
+ public void assertWebservices(WebservicesMetaData webservices, Mode mode)
{
assertNotNull(webservices);
- if(mode == Mode.JBOSS)
+ if(mode != Mode.JBOSS_DTD)
assertId("webservices", webservices);
assertEquals("webservicesContextRoot", webservices.getContextRoot());
WebserviceDescriptionsMetaData webserviceDescriptionsMetaData = webservices.getWebserviceDescriptions();
@@ -391,7 +382,7 @@
int count = 1;
for (WebserviceDescriptionMetaData description : webserviceDescriptionsMetaData)
{
- if(mode == Mode.JBOSS)
+ if(mode != Mode.JBOSS_DTD)
assertId("webserviceDescription" + count, description);
assertEquals("webserviceDescription" + count + "ConfigName", description.getConfigName());
assertEquals("webserviceDescription" + count + "ConfigFile", description.getConfigFile());
@@ -525,7 +516,7 @@
assertFalse(session.isClustered());
}
- assertInvokerBindings(prefix, session.getInvokerBindings());
+ assertInvokerBindings(prefix, session.getInvokerBindings(), mode);
assertEnvironment(prefix, session.getJndiEnvironmentRefsGroup(), false, mode);
@@ -546,7 +537,7 @@
if (this.hasStandardJBoss)
{
ContainerConfigurationMetaData ccmd = session.determineContainerConfiguration();
- this.assertContainerPoolConf(prefix, ccmd.getContainerPoolConf());
+ this.assertContainerPoolConf(prefix, ccmd.getContainerPoolConf(), mode);
}
//Ensure that we can see the principal versus role map
@@ -645,7 +636,7 @@
assertFalse(entity.isCacheInvalidation());
}
- assertInvokerBindings(prefix, entity.getInvokerBindings());
+ assertInvokerBindings(prefix, entity.getInvokerBindings(), mode);
assertEnvironment(prefix, entity.getJndiEnvironmentRefsGroup(), false, mode);
@@ -836,7 +827,7 @@
assertFalse(mdb.isTimerPersistence());
}
- assertInvokerBindings(prefix, mdb.getInvokerBindings());
+ assertInvokerBindings(prefix, mdb.getInvokerBindings(), mode);
assertEnvironment(prefix, mdb.getJndiEnvironmentRefsGroup(), false, mode);
@@ -889,15 +880,15 @@
assertNull(mdb.getJndiRefs());
}
- private void assertContainerConfigurations(JBossMetaData jbossMetaData)
+ private void assertContainerConfigurations(JBossMetaData jbossMetaData, Mode mode)
{
ContainerConfigurationsMetaData configurations = jbossMetaData.getContainerConfigurations();
assertNotNull(configurations);
int expectedSize = hasStandardJBoss ? 34 : 13;
assertEquals(expectedSize, configurations.size());
assertNullContainerConfiguration("containerConfiguration0", jbossMetaData);
- assertFullContainerConfiguration("containerConfiguration1", jbossMetaData, true);
- assertFullContainerConfiguration("containerConfiguration2", jbossMetaData, false);
+ assertFullContainerConfiguration("containerConfiguration1", jbossMetaData, true, mode);
+ assertFullContainerConfiguration("containerConfiguration2", jbossMetaData, false, mode);
ContainerConfigurationMetaData configuration = assertContainerConfiguration("containerConfiguration3", jbossMetaData);
assertEquals(CommitOption.B, configuration.getCommitOption());
configuration = assertContainerConfiguration("containerConfiguration4", jbossMetaData);
@@ -917,7 +908,7 @@
return configuration;
}
- private void assertFullContainerConfiguration(String prefix, JBossMetaData jBossMetaData, boolean first)
+ private void assertFullContainerConfiguration(String prefix, JBossMetaData jBossMetaData, boolean first, Mode mode)
{
ContainerConfigurationMetaData configuration = assertContainerConfiguration(prefix, jBossMetaData);
if(mode != Mode.JBOSS_DTD)
@@ -955,7 +946,7 @@
Element cacheConf = configuration.getContainerCacheConf();
assertContainerCacheConf(prefix, cacheConf);
Element poolConf = configuration.getContainerPoolConf();
- assertContainerPoolConf(prefix, poolConf);
+ assertContainerPoolConf(prefix, poolConf, mode);
assertEquals(CommitOption.D, configuration.getCommitOption());
assertEquals(10000, configuration.getOptiondRefreshRateMillis());
assertClusterConfig(prefix, configuration.getClusterConfig(), true, mode);
@@ -1054,7 +1045,7 @@
* @param prefix
* @param config
*/
- private void assertContainerPoolConf(String prefix, Element config)
+ private void assertContainerPoolConf(String prefix, Element config, Mode mode)
{
assertNotNull(prefix+" container-pool-conf", config);
String id = config.getAttribute("id");
@@ -1084,7 +1075,7 @@
}
}
- private void assertInvokerProxyBindings(InvokerProxyBindingsMetaData bindings)
+ private void assertInvokerProxyBindings(InvokerProxyBindingsMetaData bindings, Mode mode)
{
assertNotNull(bindings);
if(mode != Mode.JBOSS_DTD)
@@ -1096,12 +1087,12 @@
int count = 1;
for (InvokerProxyBindingMetaData binding : bindings)
{
- assertInvokerProxyBinding("invokerProxyBinding" + count, count, binding);
+ assertInvokerProxyBinding("invokerProxyBinding" + count, count, binding, mode);
++count;
}
}
- private void assertInvokerProxyBinding(String prefix, int count, InvokerProxyBindingMetaData binding)
+ private void assertInvokerProxyBinding(String prefix, int count, InvokerProxyBindingMetaData binding, Mode mode)
{
assertNotNull(binding);
if(mode != Mode.JBOSS_DTD)
@@ -1158,9 +1149,9 @@
}
}
- private void assertInvokerBindings(String prefix, InvokerBindingsMetaData bindings)
+ private void assertInvokerBindings(String prefix, InvokerBindingsMetaData bindings, Mode mode)
{
- if(mode == Mode.JBOSS)
+ if(mode != Mode.JBOSS_DTD)
{
assertId(prefix + "InvokerBindings", bindings);
assertDescriptions(prefix + "InvokerBindings", bindings.getDescriptions());
@@ -1170,16 +1161,16 @@
int count = 1;
for (InvokerBindingMetaData binding : bindings)
{
- assertInvokerBinding(prefix, count, binding);
+ assertInvokerBinding(prefix, count, binding, mode);
++count;
}
}
- private void assertInvokerBinding(String ejbPrefix, int count, InvokerBindingMetaData binding)
+ private void assertInvokerBinding(String ejbPrefix, int count, InvokerBindingMetaData binding, Mode mode)
{
String invokerPrefix = ejbPrefix + "Invoker" + count;
assertNotNull(binding);
- if(mode == Mode.JBOSS)
+ if(mode != Mode.JBOSS_DTD)
{
assertId(invokerPrefix, binding);
assertDescriptions(invokerPrefix, binding.getDescriptions());
@@ -1200,7 +1191,7 @@
}
}
- private void assertResourceManagers(ResourceManagersMetaData resources)
+ private void assertResourceManagers(ResourceManagersMetaData resources, Mode mode)
{
assertNotNull(resources);
if(mode != Mode.JBOSS_DTD)
@@ -1212,12 +1203,12 @@
int count = 1;
for (ResourceManagerMetaData resource : resources)
{
- assertResourceManager("resourceManager" + count, count == 1, resource);
+ assertResourceManager("resourceManager" + count, count == 1, resource, mode);
++count;
}
}
- private void assertResourceManager(String prefix, boolean jndi, ResourceManagerMetaData resource)
+ private void assertResourceManager(String prefix, boolean jndi, ResourceManagerMetaData resource, Mode mode)
{
assertNotNull(resource);
if(mode != Mode.JBOSS_DTD)
@@ -1240,11 +1231,11 @@
}
}
- protected void assertAssemblyDescriptor(JBossMetaData jbossMetaData)
+ protected void assertAssemblyDescriptor(JBossMetaData jbossMetaData, Mode mode)
{
JBossAssemblyDescriptorMetaData assemblyDescriptorMetaData = (JBossAssemblyDescriptorMetaData) jbossMetaData.getAssemblyDescriptor();
assertNotNull(assemblyDescriptorMetaData);
- if(mode == Mode.JBOSS)
+ if(mode != Mode.JBOSS_DTD)
assertId("assembly-descriptor", assemblyDescriptorMetaData);
assertSecurityRoles(2, assemblyDescriptorMetaData.getSecurityRoles(), mode);
assertMessageDestinations(2, assemblyDescriptorMetaData.getMessageDestinations(), mode);
@@ -1283,7 +1274,7 @@
assertPrincipals(prefix, 2, securityRoleMetaData.getPrincipals());
}
*/
- protected void assertMessageDestination(String prefix, MessageDestinationMetaData messageDestinationMetaData)
+ protected void assertMessageDestination(String prefix, MessageDestinationMetaData messageDestinationMetaData, Mode mode)
{
assertMessageDestination14(prefix, messageDestinationMetaData, mode);
assertEquals(prefix + "JndiName", messageDestinationMetaData.getMappedName());
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java 2008-11-14 15:37:28 UTC (rev 81072)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java 2008-11-14 16:01:34 UTC (rev 81073)
@@ -211,7 +211,7 @@
protected void assertSecurityRole(String prefix, int count, SecurityRoleMetaData securityRoleMetaData, Mode mode)
{
assertNotNull(securityRoleMetaData);
- if(mode == Mode.JBOSS)
+ if(mode != Mode.JBOSS_DTD)
{
assertId(prefix+count, securityRoleMetaData);
assertDescriptions(prefix+count, securityRoleMetaData.getDescriptions());
@@ -405,7 +405,7 @@
int count = 1;
for (EJBReferenceMetaData ejbReferenceMetaData : ejbReferencesMetaData)
{
- if(mode == Mode.JBOSS)
+ if(mode != Mode.JBOSS_DTD)
{
assertId(prefix + "EjbRef" + count, ejbReferenceMetaData);
assertDescriptions(prefix + "EjbRef" + count, ejbReferenceMetaData.getDescriptions());
@@ -458,7 +458,7 @@
int count = 1;
for (EJBLocalReferenceMetaData ejbReferenceMetaData : ejbReferencesMetaData)
{
- if(mode == Mode.JBOSS)
+ if(mode != Mode.JBOSS_DTD)
{
assertId(prefix + "EjbLocalRef" + count, ejbReferenceMetaData);
assertDescriptions(prefix + "EjbLocalRef" + count, ejbReferenceMetaData.getDescriptions());
@@ -529,7 +529,7 @@
int count = 1;
for (ResourceReferenceMetaData resourceReferenceMetaData : resourceReferencesMetaData)
{
- if(mode == Mode.JBOSS)
+ if(mode != Mode.JBOSS_DTD)
{
assertId(prefix + "ResourceRef" + count, resourceReferenceMetaData);
assertDescriptions(prefix + "ResourceRef" + count, resourceReferenceMetaData.getDescriptions());
@@ -590,7 +590,7 @@
int count = 1;
for (ResourceEnvironmentReferenceMetaData resourceEnvReferenceMetaData : resourceEnvReferencesMetaData)
{
- if(mode == Mode.JBOSS)
+ if(mode != Mode.JBOSS_DTD)
{
assertId(prefix + "ResourceEnvRef" + count, resourceEnvReferenceMetaData);
assertDescriptions(prefix + "ResourceEnvRef" + count, resourceEnvReferenceMetaData.getDescriptions());
@@ -629,7 +629,7 @@
int count = 1;
for (MessageDestinationReferenceMetaData messageDestinationReferenceMetaData : messageDestinationReferencesMetaData)
{
- if(mode == Mode.JBOSS)
+ if(mode != Mode.JBOSS_DTD)
{
assertId(prefix + "MessageDestinationRef" + count, messageDestinationReferenceMetaData);
assertDescriptions(prefix + "MessageDestinationRef" + count, messageDestinationReferenceMetaData.getDescriptions());
More information about the jboss-cvs-commits
mailing list