[jboss-cvs] JBossAS SVN: r92246 - in branches/Branch_5_x: testsuite and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2009-08-11 15:31:30 -0400 (Tue, 11 Aug 2009)
New Revision: 92246

Modified:
   branches/Branch_5_x/component-matrix/pom.xml
   branches/Branch_5_x/testsuite/build.xml
   branches/Branch_5_x/testsuite/src/main/org/jboss/test/jaxr/scout/JaxrBaseTestCase.java
   branches/Branch_5_x/testsuite/src/main/org/jboss/test/jaxr/scout/publish/JaxrDeleteAssociationTestCase.java
Log:
JBAS-7127: upgrade to JBoss JAXR 2.0.1 and comment out the Association Tests that need to be discarded

Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml	2009-08-11 19:15:16 UTC (rev 92245)
+++ branches/Branch_5_x/component-matrix/pom.xml	2009-08-11 19:31:30 UTC (rev 92246)
@@ -34,7 +34,7 @@
     <version.jacorb>2.3.1jboss.patch01-brew</version.jacorb>
     <version.javax.faces>2.0.0-Beta2</version.javax.faces>
     <version.javax.validation>1.0.CR3</version.javax.validation>
-    <version.jboss.jaxr>2.0.0</version.jboss.jaxr>
+    <version.jboss.jaxr>2.0.1</version.jboss.jaxr>
     <version.jboss.jbossts>4.6.1.GA</version.jboss.jbossts>
     <version.jboss.jbossws-common>1.2.0.Beta2</version.jboss.jbossws-common>
     <version.jboss.jbossws-framework>3.2.0.Beta2</version.jboss.jbossws-framework>
@@ -241,7 +241,7 @@
       <dependency>
         <groupId>apache-scout</groupId>
         <artifactId>scout</artifactId>
-        <version>1.1</version>
+        <version>1.1.1</version>
       </dependency>
       
       <dependency>

Modified: branches/Branch_5_x/testsuite/build.xml
===================================================================
--- branches/Branch_5_x/testsuite/build.xml	2009-08-11 19:15:16 UTC (rev 92245)
+++ branches/Branch_5_x/testsuite/build.xml	2009-08-11 19:31:30 UTC (rev 92246)
@@ -718,7 +718,7 @@
    </patternset>
    <patternset id="jaxr.includes">
       <include name="org/jboss/test/jaxr/scout/**/*TestCase.class"/>
-      <exclude name="org/jboss/test/jaxr/scout/**/JaxrDeleteAssociationTestCase.class"/>
+      <exclude name="org/jboss/test/jaxr/scout/**/Jaxr*Association*TestCase.class"/>
    </patternset>
    <!-- jbossmessaging includes -->
    <patternset id="jbossmessaging.includes">

Modified: branches/Branch_5_x/testsuite/src/main/org/jboss/test/jaxr/scout/JaxrBaseTestCase.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/jaxr/scout/JaxrBaseTestCase.java	2009-08-11 19:15:16 UTC (rev 92245)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/jaxr/scout/JaxrBaseTestCase.java	2009-08-11 19:31:30 UTC (rev 92246)
@@ -133,9 +133,12 @@
     {
         if (connection != null) connection.close();
         //stop the juddi service so that all the tables are dropped
-        server.invokeOperation(OBJECT_NAME, "setCreateOnStart",
+        /*server.invokeOperation(OBJECT_NAME, "setCreateOnStart",
                 new Object[]{Boolean.FALSE},
-                new String[]{Boolean.TYPE.getName()}); 
+                new String[]{Boolean.TYPE.getName()});*/
+        server.invokeOperation(OBJECT_NAME, "setDropDB",
+              new Object[]{Boolean.TRUE},
+              new String[]{Boolean.TYPE.getName()});
         server.invokeOperation(OBJECT_NAME, "stop",
                 null, null);
     }

Modified: branches/Branch_5_x/testsuite/src/main/org/jboss/test/jaxr/scout/publish/JaxrDeleteAssociationTestCase.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/jaxr/scout/publish/JaxrDeleteAssociationTestCase.java	2009-08-11 19:15:16 UTC (rev 92245)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/jaxr/scout/publish/JaxrDeleteAssociationTestCase.java	2009-08-11 19:31:30 UTC (rev 92246)
@@ -25,6 +25,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
+import javax.xml.registry.BulkResponse;
 import javax.xml.registry.BusinessLifeCycleManager;
 import javax.xml.registry.BusinessQueryManager;
 import javax.xml.registry.Connection;
@@ -96,6 +97,8 @@
             {
                 fail(" Source::Save Organizations failed");
             }
+            log.debug("Saved Source Organization");
+            
             sourceKeys = br.getCollection();
             Iterator iter = sourceKeys.iterator();
             while (iter.hasNext())
@@ -135,6 +138,8 @@
             blm.confirmAssociation(a);
             blm2.confirmAssociation(a);
 
+            log.debug("Confirmed the association");
+            
             // publish the Association
             Collection associations = new ArrayList();
             associations.add(a);
@@ -145,6 +150,8 @@
                 fail("Second User :save Association failed");
             }
 
+            log.debug("Second User: saved the association");
+            
             br = bqm.findCallerAssociations(null,
                     new Boolean(true),
                     new Boolean(true),
@@ -175,8 +182,8 @@
                    fail("Deletion of Associations failed");
 
                 System.out.println("JBAS-7129 needs to be fixed");
-                /*
                 
+                
                 BulkResponse brq = bqm.findCallerAssociations(null, Boolean.TRUE, Boolean.TRUE, null);
                 if (brq.getExceptions() == null)
                 {
@@ -195,7 +202,7 @@
                        }
                     } 
                 }
-               */
+               
             }
 
         } catch (Exception e)