[jboss-cvs] JBossAS SVN: r68472 - trunk/testsuite/src/main/org/jboss/test/profileservice/test.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Dec 20 17:34:23 EST 2007


Author: alex.loubyansky at jboss.com
Date: 2007-12-20 17:34:23 -0500 (Thu, 20 Dec 2007)
New Revision: 68472

Modified:
   trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java
Log:
JBAS-4671 making the ds templates pass

Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java	2007-12-20 22:33:35 UTC (rev 68471)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java	2007-12-20 22:34:23 UTC (rev 68472)
@@ -70,6 +70,7 @@
 {
    ManagementView activeView;
    private Type mapType;
+   private Type mapOfMapsType;
    private MetaValueFactory metaValueFactory;
 
    /**
@@ -492,6 +493,7 @@
 
       addCommonCfProperties(propValues, jndiName, "jms-ra.rar", "org.jboss.resource.adapter.jms.JmsConnectionFactory");
 
+/*
       ArrayList<ManagedConnectionFactoryPropertyMetaData> configPropsValue = new ArrayList<ManagedConnectionFactoryPropertyMetaData>();
       ManagedConnectionFactoryPropertyMetaData configPropMD = new ManagedConnectionFactoryPropertyMetaData();
       configPropMD.setName("SessionDefaultType");
@@ -504,7 +506,22 @@
       configPropMD.setValue("java:/DefaultJMSProvider");
       configPropsValue.add(configPropMD);
       propValues.put("config-property", configPropsValue);
+*/
 
+      Map<String, Map<String, String>> xaProps = new HashMap<String, Map<String, String>>();
+      Map<String, String> value = new HashMap<String, String>();
+      value.put("name", "SessionDefaultType");
+      value.put("type", "java.lang.String");
+      value.put("value", "javax.jms.Topic");
+      xaProps.put(value.get("name"), value);
+      value = new HashMap<String, String>();
+      value.put("name", "JmsProviderAdapterJNDI");
+      value.put("type", "java.lang.String");
+      value.put("value", "java:/DefaultJMSProvider");
+      xaProps.put(value.get("name"), value);
+      MetaValue metaValue = getMetaValueFactory().create(xaProps, getMapOfMapsType());
+      propValues.put("config-property", metaValue);
+
       propValues.put("xa-transaction", Boolean.TRUE);
       propValues.put("xa-resource-timeout", new Integer(256));
 
@@ -556,6 +573,7 @@
 
       addCommonCfProperties(propValues, jndiName, "jms-ra.rar", "org.jboss.resource.adapter.jms.JmsConnectionFactory");
 
+/*
       ArrayList<ManagedConnectionFactoryPropertyMetaData> configPropsValue = new ArrayList<ManagedConnectionFactoryPropertyMetaData>();
       ManagedConnectionFactoryPropertyMetaData configPropMD = new ManagedConnectionFactoryPropertyMetaData();
       configPropMD.setName("SessionDefaultType");
@@ -568,7 +586,22 @@
       configPropMD.setValue("java:/DefaultJMSProvider");
       configPropsValue.add(configPropMD);
       propValues.put("config-property", configPropsValue);
+*/
 
+      Map<String, Map<String, String>> xaProps = new HashMap<String, Map<String, String>>();
+      Map<String, String> value = new HashMap<String, String>();
+      value.put("name", "SessionDefaultType");
+      value.put("type", "java.lang.String");
+      value.put("value", "javax.jms.Topic");
+      xaProps.put(value.get("name"), value);
+      value = new HashMap<String, String>();
+      value.put("name", "JmsProviderAdapterJNDI");
+      value.put("type", "java.lang.String");
+      value.put("value", "java:/DefaultJMSProvider");
+      xaProps.put(value.get("name"), value);
+      MetaValue metaValue = getMetaValueFactory().create(xaProps, getMapOfMapsType());
+      propValues.put("config-property", metaValue);
+
       // todo: how to set the specific domain?
       //ApplicationManagedSecurityMetaData secDomain = new ApplicationManagedSecurityMetaData();
       //props.get("security-domain").setValue(secDomain);
@@ -700,6 +733,8 @@
                Type valueType = expectedValue.getClass();
                if("xa-datasource-properties".equals(prop.getName()))
                   valueType = getMapType();
+               else if("config-property".equals(prop.getName()))
+                  valueType = getMapOfMapsType();
 
                propValue = getMetaValueFactory().unwrap((MetaValue)propValue, valueType);
                expectedValue = getMetaValueFactory().unwrap((MetaValue)expectedValue, valueType);
@@ -798,8 +833,29 @@
       return mapType;
    }
 
+   private Type getMapOfMapsType()
+   {
+      if(mapOfMapsType == null)
+      {
+         try
+         {
+            mapOfMapsType = getClass().getMethod("mapOfMaps").getGenericReturnType();
+         }
+         catch(NoSuchMethodException e)
+         {
+            throw new IllegalStateException("Failed to find compoditeValueMap method.");
+         }
+      }
+      return mapOfMapsType;
+   }
+
    public Map<String, String> compositeValueMap()
    {
       return null;
    }
+
+   public Map<String, Map<String, String>> mapOfMaps()
+   {
+      return null;
+   }
 }




More information about the jboss-cvs-commits mailing list