[jboss-cvs] JBossAS SVN: r82810 - in projects/metadata/trunk/src/test: resources/org/jboss/test/metadata/rar and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 13 08:06:40 EST 2009
Author: jeff.zhang
Date: 2009-01-13 08:06:39 -0500 (Tue, 13 Jan 2009)
New Revision: 82810
Added:
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/BaseRAUnitTestCase.java
Modified:
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA15EverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA15Everything_testEverything.xml
Log:
[JBMETA-158] refactor to use BaseRAUnitTestCase
Added: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/BaseRAUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/BaseRAUnitTestCase.java (rev 0)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/BaseRAUnitTestCase.java 2009-01-13 13:06:39 UTC (rev 82810)
@@ -0,0 +1,123 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.metadata.rar;
+
+import java.util.List;
+
+import org.jboss.metadata.rar.spec.ActivationspecMetaData;
+import org.jboss.metadata.rar.spec.AdminObjectMetaData;
+import org.jboss.metadata.rar.spec.ConnectionDefinitionMetaData;
+import org.jboss.metadata.rar.spec.ConnectorMetaData;
+import org.jboss.metadata.rar.spec.InboundRaMetaData;
+import org.jboss.metadata.rar.spec.MessageListenerMetaData;
+import org.jboss.metadata.rar.spec.OutboundRaMetaData;
+import org.jboss.metadata.rar.spec.ResourceAdapterMetaData;
+import org.jboss.metadata.rar.spec.TransactionSupportMetaData;
+import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
+
+/**
+ * Base Test ResourceAdapter ra.xml metadata.
+ *
+ * @author Jeff Zhang
+ * @version $Revision:$
+ */
+public abstract class BaseRAUnitTestCase extends AbstractJavaEEEverythingTest {
+
+ public BaseRAUnitTestCase(String name) {
+ super(name);
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ enableTrace("org.jboss.xb");
+ }
+
+ abstract protected String getRAVersion();
+
+ protected void assertGeneralInfo(ConnectorMetaData connector)
+ {
+ assertTrue(connector.getVendorName().startsWith("Red"));
+ assertTrue(connector.getEISType().startsWith("JMS"));
+ assertEquals(connector.getRAVersion(), getRAVersion());
+ assertNotNull(connector.getLicense());
+ assertTrue(connector.getLicense().getRequired());
+ }
+
+ protected void assertRA(ResourceAdapterMetaData ra) {
+ assertNotNull(ra.getRaClass());
+ assertNotNull(ra.getConfigProperty());
+ assertEquals(ra.getConfigProperty().size(), 1);
+ assertTrue(ra.getConfigProperty().get(0).getDescription().startsWith("Log"));
+ assertEquals(ra.getConfigProperty().get(0).getValue(), "DEBUG");
+ assertOutboundAdapter(ra.getOutboundRa());
+ assertInoundAdapter(ra.getInboundRa());
+ assertAdminObject(ra.getAdminObjects());
+ assertNotNull(ra.getSecurityPermissions());
+ assertEquals(ra.getSecurityPermissions().get(0).getSecurityPermissionSpec(), "sa");
+ }
+
+ private void assertOutboundAdapter(OutboundRaMetaData outboundRa) {
+ assertNotNull(outboundRa.getConDefs());
+ ConnectionDefinitionMetaData conDef = outboundRa.getConDefs().get(0);
+ assertTrue(conDef.getManagedConnectionFactoryClass().endsWith("JmsManagedConnectionFactory"));
+ assertEquals(conDef.getConfigProps().size(), 7);
+ assertEquals(conDef.getConfigProps().get(6).getName(), "UseTryLock");
+ assertTrue(conDef.getConnectionFactoryInterfaceClass().endsWith("JmsConnectionFactory"));
+ assertTrue(conDef.getConnectionFactoryImplementationClass().endsWith("JmsConnectionFactoryImpl"));
+ assertTrue(conDef.getConnectionInterfaceClass().endsWith("Session"));
+ assertTrue(conDef.getConnectionImplementationClass().endsWith("JmsSession"));
+ assertEquals(outboundRa.getTransSupport(), TransactionSupportMetaData.XATransaction);
+ assertNotNull(outboundRa.getAuthMechanisms().get(0));
+ assertEquals(outboundRa.getAuthMechanisms().get(0).getDescription(), "authentication-mechanism");
+ assertEquals(outboundRa.getAuthMechanisms().get(0).getAuthenticationMechanismType(), "BasicPassword");
+ assertTrue(outboundRa.getAuthMechanisms().get(0).getCredentialInterfaceClass().endsWith("PasswordCredential"));
+ assertEquals(outboundRa.getAuthMechanisms().get(0).getId(), "amid");
+ assertFalse(outboundRa.isReAuthSupport());
+
+ }
+
+ private void assertInoundAdapter(InboundRaMetaData inboundRa) {
+ assertNotNull(inboundRa.getMessageAdapter());
+ assertNotNull(inboundRa.getMessageAdapter().getMessageListeners());
+ MessageListenerMetaData msgListener = inboundRa.getMessageAdapter().getMessageListeners().get(0);
+ assertNotNull(msgListener);
+ assertTrue(msgListener.getType().endsWith("MessageListener"));
+ assertTrue(msgListener.getActivationSpecType().getAsClass().endsWith("JmsActivationSpec"));
+ assertNotNull(msgListener.getActivationSpecType().getRequiredConfigProps());
+ assertFalse(msgListener.getActivationSpecType().getRequiredConfigProps().isEmpty());
+ assertConfigPropsInAS(msgListener.getActivationSpecType());
+
+ }
+
+ abstract protected void assertConfigPropsInAS(ActivationspecMetaData as);
+
+ private void assertAdminObject(List<AdminObjectMetaData> adminObjects) {
+ assertEquals(adminObjects.size(), 1);
+ assertTrue(adminObjects.get(0).getAdminObjectInterfaceClass().endsWith("TestInterface"));
+ assertTrue(adminObjects.get(0).getAdminObjectImplementationClass().endsWith("TestImplementation"));
+ assertEquals(adminObjects.get(0).getConfigProps().size(), 2);
+ assertEquals(adminObjects.get(0).getConfigProps().get(0).getName(), "StringProperty");
+ }
+
+}
+
Property changes on: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/BaseRAUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Reversion Date
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA15EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA15EverythingUnitTestCase.java 2009-01-13 12:54:35 UTC (rev 82809)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA15EverythingUnitTestCase.java 2009-01-13 13:06:39 UTC (rev 82810)
@@ -23,6 +23,7 @@
import java.util.List;
+import org.jboss.metadata.rar.spec.ActivationspecMetaData;
import org.jboss.metadata.rar.spec.AdminObjectMetaData;
import org.jboss.metadata.rar.spec.ConnectionDefinitionMetaData;
import org.jboss.metadata.rar.spec.ConnectorMetaData;
@@ -41,7 +42,7 @@
* @author Jeff Zhang
* @version $Revision:$
*/
-public class RA15EverythingUnitTestCase extends AbstractJavaEEEverythingTest {
+public class RA15EverythingUnitTestCase extends BaseRAUnitTestCase {
public static SchemaBindingResolver initResolver()
{
@@ -57,7 +58,6 @@
protected void setUp() throws Exception
{
super.setUp();
- enableTrace("org.jboss.xb");
}
public void testEverything() throws Exception
@@ -78,58 +78,13 @@
assertGeneralInfo(connector);
assertRA(connector.getRa());
}
-
- private void assertGeneralInfo(ConnectorMetaData connector)
+ @Override
+ protected String getRAVersion()
{
- assertNotNull(connector.getVendorName());
- assertNotNull(connector.getEISType());
- assertEquals(connector.getRAVersion(), "5.0");
- assertNotNull(connector.getLicense());
- assertTrue(connector.getLicense().getRequired());
+ return "5.0";
}
-
- private void assertRA(ResourceAdapterMetaData ra) {
- assertNotNull(ra.getRaClass());
- assertNotNull(ra.getConfigProperty());
- assertEquals(ra.getConfigProperty().size(), 1);
- assertEquals(ra.getConfigProperty().get(0).getValue(), "DEBUG");
- assertOutboundAdapter(ra.getOutboundRa());
- assertInoundAdapter(ra.getInboundRa());
- assertAdminObject(ra.getAdminObjects());
- assertNotNull(ra.getSecurityPermissions());
- assertEquals(ra.getSecurityPermissions().get(0).getSecurityPermissionSpec(), "sa");
+ @Override
+ protected void assertConfigPropsInAS(ActivationspecMetaData as)
+ {
}
-
- private void assertOutboundAdapter(OutboundRaMetaData outboundRa) {
- assertNotNull(outboundRa.getConDefs());
- ConnectionDefinitionMetaData conDef = outboundRa.getConDefs().get(0);
- assertTrue(conDef.getManagedConnectionFactoryClass().endsWith("JmsManagedConnectionFactory"));
- assertEquals(conDef.getConfigProps().size(), 7);
- assertTrue(conDef.getConnectionFactoryInterfaceClass().endsWith("JmsConnectionFactory"));
- assertTrue(conDef.getConnectionFactoryImplementationClass().endsWith("JmsConnectionFactoryImpl"));
- assertTrue(conDef.getConnectionInterfaceClass().endsWith("Session"));
- assertTrue(conDef.getConnectionImplementationClass().endsWith("JmsSession"));
- assertEquals(outboundRa.getTransSupport(), TransactionSupportMetaData.XATransaction);
- assertNotNull(outboundRa.getAuthMechanisms());
- assertFalse(outboundRa.isReAuthSupport());
-
- }
-
- private void assertInoundAdapter(InboundRaMetaData inboundRa) {
- assertNotNull(inboundRa.getMessageAdapter());
- assertNotNull(inboundRa.getMessageAdapter().getMessageListeners());
- MessageListenerMetaData msgListener = inboundRa.getMessageAdapter().getMessageListeners().get(0);
- assertNotNull(msgListener);
- assertTrue(msgListener.getType().endsWith("MessageListener"));
- assertTrue(msgListener.getActivationSpecType().getAsClass().endsWith("JmsActivationSpec"));
- assertNotNull(msgListener.getActivationSpecType().getRequiredConfigProps());
- assertFalse(msgListener.getActivationSpecType().getRequiredConfigProps().isEmpty());
- }
-
- private void assertAdminObject(List<AdminObjectMetaData> adminObjects) {
- assertEquals(adminObjects.size(), 1);
- assertTrue(adminObjects.get(0).getAdminObjectInterfaceClass().endsWith("TestInterface"));
-
- }
-
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java 2009-01-13 12:54:35 UTC (rev 82809)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java 2009-01-13 13:06:39 UTC (rev 82810)
@@ -23,6 +23,7 @@
import java.util.List;
+import org.jboss.metadata.rar.spec.ActivationspecMetaData;
import org.jboss.metadata.rar.spec.AdminObjectMetaData;
import org.jboss.metadata.rar.spec.ConnectionDefinitionMetaData;
import org.jboss.metadata.rar.spec.Connector16MetaData;
@@ -41,7 +42,7 @@
* @author Jeff Zhang
* @version $Revision:$
*/
-public class RA16EverythingUnitTestCase extends AbstractJavaEEEverythingTest {
+public class RA16EverythingUnitTestCase extends BaseRAUnitTestCase {
public static SchemaBindingResolver initResolver()
{
@@ -57,7 +58,6 @@
protected void setUp() throws Exception
{
super.setUp();
- enableTrace("org.jboss.xb");
}
public void testEverything() throws Exception
@@ -74,66 +74,20 @@
protected void assertEverything(Connector16MetaData connector) throws Exception
{
- //assertDescriptionGroup("connector", connector.getDescription());
assertGeneralInfo(connector);
+ assertTrue(connector.isMetadataComplete());
assertRA(connector.getRa());
}
-
- private void assertGeneralInfo(Connector16MetaData connector)
+ @Override
+ protected String getRAVersion()
{
- assertNotNull(connector.getVendorName());
- assertNotNull(connector.getEISType());
- assertEquals(connector.getRAVersion(), "6.0");
- assertNotNull(connector.getLicense());
- assertTrue(connector.getLicense().getRequired());
- assertTrue(connector.isMetadataComplete());
+ return "6.0";
}
-
- private void assertRA(ResourceAdapterMetaData ra) {
- assertNotNull(ra.getRaClass());
- assertNotNull(ra.getConfigProperty());
- assertEquals(ra.getConfigProperty().size(), 1);
- assertTrue(ra.getConfigProperty().get(0).getDescription().startsWith("Log"));
- assertEquals(ra.getConfigProperty().get(0).getValue(), "DEBUG");
- assertOutboundAdapter(ra.getOutboundRa());
- assertInoundAdapter(ra.getInboundRa());
- assertAdminObject(ra.getAdminObjects());
- assertNotNull(ra.getSecurityPermissions());
- assertEquals(ra.getSecurityPermissions().get(0).getSecurityPermissionSpec(), "sa");
+ @Override
+ protected void assertConfigPropsInAS(ActivationspecMetaData as)
+ {
+ assertNotNull(as.getConfigProps());
+ assertFalse(as.getConfigProps().isEmpty());
}
-
- private void assertOutboundAdapter(OutboundRaMetaData outboundRa) {
- assertNotNull(outboundRa.getConDefs());
- ConnectionDefinitionMetaData conDef = outboundRa.getConDefs().get(0);
- assertTrue(conDef.getManagedConnectionFactoryClass().endsWith("JmsManagedConnectionFactory"));
- assertEquals(conDef.getConfigProps().size(), 7);
- assertTrue(conDef.getConnectionFactoryInterfaceClass().endsWith("JmsConnectionFactory"));
- assertTrue(conDef.getConnectionFactoryImplementationClass().endsWith("JmsConnectionFactoryImpl"));
- assertTrue(conDef.getConnectionInterfaceClass().endsWith("Session"));
- assertTrue(conDef.getConnectionImplementationClass().endsWith("JmsSession"));
- assertEquals(outboundRa.getTransSupport(), TransactionSupportMetaData.XATransaction);
- assertNotNull(outboundRa.getAuthMechanisms());
- assertFalse(outboundRa.isReAuthSupport());
- }
-
- private void assertInoundAdapter(InboundRaMetaData inboundRa) {
- assertNotNull(inboundRa.getMessageAdapter());
- assertNotNull(inboundRa.getMessageAdapter().getMessageListeners());
- MessageListenerMetaData msgListener = inboundRa.getMessageAdapter().getMessageListeners().get(0);
- assertNotNull(msgListener);
- assertTrue(msgListener.getType().endsWith("MessageListener"));
- assertTrue(msgListener.getActivationSpecType().getAsClass().endsWith("JmsActivationSpec"));
- assertNotNull(msgListener.getActivationSpecType().getRequiredConfigProps());
- assertFalse(msgListener.getActivationSpecType().getRequiredConfigProps().isEmpty());
- assertNotNull(msgListener.getActivationSpecType().getConfigProps());
- assertFalse(msgListener.getActivationSpecType().getConfigProps().isEmpty());
- }
-
- private void assertAdminObject(List<AdminObjectMetaData> adminObjects) {
- assertEquals(adminObjects.size(), 1);
- assertTrue(adminObjects.get(0).getAdminObjectInterfaceClass().endsWith("TestInterface"));
-
- }
-
}
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA15Everything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA15Everything_testEverything.xml 2009-01-13 12:54:35 UTC (rev 82809)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA15Everything_testEverything.xml 2009-01-13 13:06:39 UTC (rev 82810)
@@ -117,7 +117,8 @@
<connection-impl-class>org.jboss.resource.adapter.jms.JmsSession</connection-impl-class>
</connection-definition>
<transaction-support>XATransaction</transaction-support>
- <authentication-mechanism>
+ <authentication-mechanism id="amid">
+ <description>authentication-mechanism</description>
<authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
<credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
</authentication-mechanism>
@@ -138,7 +139,7 @@
</messageadapter>
</inbound-resourceadapter>
- <adminobject>
+ <adminobject id="aoid">
<adminobject-interface>org.jboss.test.jca.adminobject.TestInterface</adminobject-interface>
<adminobject-class>org.jboss.test.jca.adminobject.TestImplementation</adminobject-class>
<config-property>
@@ -155,4 +156,4 @@
<security-permission-spec>sa</security-permission-spec>
</security-permission>
</resourceadapter>
-</connector>
\ No newline at end of file
+</connector>
More information about the jboss-cvs-commits
mailing list