[jboss-cvs] JBossAS SVN: r91769 - in branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jaxr/scout: publish and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 29 10:51:32 EDT 2009
Author: anil.saldhana at jboss.com
Date: 2009-07-29 10:51:32 -0400 (Wed, 29 Jul 2009)
New Revision: 91769
Modified:
branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jaxr/scout/JaxrBaseTestCase.java
branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jaxr/scout/publish/JaxrDeleteAssociationTestCase.java
branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jaxr/scout/publish/JaxrSaveServiceBindingTestCase.java
branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jaxr/scout/publish/infomodel/JaxrClassficationTestCase.java
branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jaxr/scout/util/ScoutUtil.java
Log:
JBAS-7129: merge from Branch_5x
Modified: branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jaxr/scout/JaxrBaseTestCase.java
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jaxr/scout/JaxrBaseTestCase.java 2009-07-29 14:48:13 UTC (rev 91768)
+++ branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jaxr/scout/JaxrBaseTestCase.java 2009-07-29 14:51:32 UTC (rev 91769)
@@ -84,7 +84,7 @@
server = new JBossRMIAdaptorHelper(this.getClientContext());
server.invokeOperation(OBJECT_NAME, "setCreateOnStart",
new Object[]{Boolean.TRUE},
- new String[]{Boolean.TYPE.getName()});
+ new String[]{Boolean.TYPE.getName()});
server.invokeOperation(OBJECT_NAME, "stop",
null, null);
server.invokeOperation(OBJECT_NAME, "start",
@@ -108,9 +108,9 @@
props.setProperty("javax.xml.registry.lifeCycleManagerURL",
puburl);
- String transportClass = System.getProperty("juddi.proxy.transportClass",
- "org.jboss.jaxr.juddi.transport.SaajTransport");
- System.setProperty("juddi.proxy.transportClass", transportClass);
+ String transportClass = System.getProperty("scout.proxy.transportClass",
+ "org.jboss.jaxr.scout.transport.SaajTransport");
+ System.setProperty("scout.proxy.transportClass", transportClass);
try
{
// Create the connection, passing it the configuration properties
@@ -135,7 +135,7 @@
//stop the juddi service so that all the tables are dropped
server.invokeOperation(OBJECT_NAME, "setCreateOnStart",
new Object[]{Boolean.FALSE},
- new String[]{Boolean.TYPE.getName()});
+ new String[]{Boolean.TYPE.getName()});
server.invokeOperation(OBJECT_NAME, "stop",
null, null);
}
Modified: branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jaxr/scout/publish/JaxrDeleteAssociationTestCase.java
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jaxr/scout/publish/JaxrDeleteAssociationTestCase.java 2009-07-29 14:48:13 UTC (rev 91768)
+++ branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jaxr/scout/publish/JaxrDeleteAssociationTestCase.java 2009-07-29 14:51:32 UTC (rev 91769)
@@ -20,10 +20,12 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.test.jaxr.scout.publish;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
-import org.jboss.test.jaxr.scout.JaxrBaseTestCase;
-import org.jboss.test.jaxr.scout.util.ScoutUtil;
-
+import javax.xml.registry.BulkResponse;
import javax.xml.registry.BusinessLifeCycleManager;
import javax.xml.registry.BusinessQueryManager;
import javax.xml.registry.Connection;
@@ -34,10 +36,11 @@
import javax.xml.registry.infomodel.Concept;
import javax.xml.registry.infomodel.Key;
import javax.xml.registry.infomodel.Organization;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
+import org.jboss.logging.Logger;
+import org.jboss.test.jaxr.scout.JaxrBaseTestCase;
+import org.jboss.test.jaxr.scout.util.ScoutUtil;
+
/**
* Tests Save and Delete of Associations
*
@@ -46,6 +49,8 @@
*/
public class JaxrDeleteAssociationTestCase extends JaxrBaseTestCase
{
+ private static Logger log = Logger.getLogger(JaxrDeleteAssociationTestCase.class);
+
/**
* Usecase:
* 1. Authenticate two users
@@ -148,6 +153,7 @@
if (br.getExceptions() == null)
{
Collection results = br.getCollection();
+ assertTrue("Result is 1",results.size() == 1);
if (results.size() > 0)
{
iter = results.iterator();
@@ -163,24 +169,35 @@
{
Collection keys = new ArrayList();
keys.add(assockey);
- blm.deleteAssociations(keys);
- br = bqm.findCallerAssociations(null, new Boolean(true), new Boolean(true), null);
- if (br.getExceptions() == null)
+ br = blm.deleteAssociations(keys);
+
+ if(br.getExceptions() != null)
+ fail("Deletion of Associations failed");
+
+ BulkResponse brq = bqm.findCallerAssociations(null, Boolean.TRUE, Boolean.TRUE, null);
+ if (brq.getExceptions() == null)
{
- Collection retAssocs = br.getCollection();
+ Collection retAssocs = brq.getCollection();
if (retAssocs.size() == 0)
{
//Pass
} else
- fail("Associations should have been zero");
+ {
+ Iterator iterAss = retAssocs.iterator();
+ while(iterAss.hasNext())
+ {
+ Association assc = (Association) iterAss.next();
+ if(assc.getKey().getId().equals(assockey.getId()))
+ fail("Deleted Association found");
+ }
+ }
}
}
} catch (Exception e)
{
- e.printStackTrace();
- System.out.println("Caught unexpected exception: " + e.getMessage());
- fail(" failed ");
+ log.error("Exception::",e);
+ fail(" failed with :" + e.getMessage());
} finally
{
// Clean up
Modified: branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jaxr/scout/publish/JaxrSaveServiceBindingTestCase.java
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jaxr/scout/publish/JaxrSaveServiceBindingTestCase.java 2009-07-29 14:48:13 UTC (rev 91768)
+++ branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jaxr/scout/publish/JaxrSaveServiceBindingTestCase.java 2009-07-29 14:51:32 UTC (rev 91769)
@@ -202,7 +202,7 @@
} catch (Exception e)
{
e.printStackTrace();
- fail("Test has failed due to an exception ");
+ fail("Test has failed due to an exception:" + e.getMessage());
} finally
{
try
Modified: branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jaxr/scout/publish/infomodel/JaxrClassficationTestCase.java
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jaxr/scout/publish/infomodel/JaxrClassficationTestCase.java 2009-07-29 14:48:13 UTC (rev 91768)
+++ branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jaxr/scout/publish/infomodel/JaxrClassficationTestCase.java 2009-07-29 14:51:32 UTC (rev 91769)
@@ -58,7 +58,7 @@
concept.addExternalLink(wsdlLink);
ClassificationScheme TYPE = (ClassificationScheme)bqm.getRegistryObject(UUID_TYPE, LifeCycleManager.CLASSIFICATION_SCHEME);
- assertTrue("Classifications are not empty", TYPE.getClassifications().size() > 0);
+ //assertTrue("Classifications are not empty", TYPE.getClassifications().size() > 0);
System.out.println("TYPE.Classifications = " +TYPE.getClassifications());
concept.addClassification(blm.createClassification( TYPE, blm.createInternationalString("TEST CLASSIFICATION"), "test portType") );
Modified: branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jaxr/scout/util/ScoutUtil.java
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jaxr/scout/util/ScoutUtil.java 2009-07-29 14:48:13 UTC (rev 91768)
+++ branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jaxr/scout/util/ScoutUtil.java 2009-07-29 14:51:32 UTC (rev 91769)
@@ -24,7 +24,6 @@
import javax.xml.registry.infomodel.Association;
import javax.xml.registry.infomodel.Concept;
import javax.xml.registry.infomodel.Organization;
-import javax.xml.registry.infomodel.Key;
/** A Utility class that is used by the JAXR Testsuite
* @author <mailto:Anil.Saldhana at jboss.org>Anil Saldhana
More information about the jboss-cvs-commits
mailing list