Fix SAAJTransport creation. Move tests to common package

silveringsea · Nov 8, 2011 · c54f7bb · c54f7bb
1 parent 22ccaec
commit c54f7bb
Show file tree

Hide file tree

Showing 13 changed files with 156 additions and 207 deletions.
diff --git a/build/src/main/resources/modules/org/apache/scout/main/module.xml b/build/src/main/resources/modules/org/apache/scout/main/module.xml
@@ -29,7 +29,10 @@
     </resources>
 
     <dependencies>
+        <module name="javax.api"/>
+        <module name="javax.xml.bind.api"/>
         <module name="javax.xml.registry.api"/>
+        <module name="org.apache.commons.logging"/>
     </dependencies>
 
 </module>

diff --git a/build/src/main/resources/modules/org/jboss/as/jaxr/main/module.xml b/build/src/main/resources/modules/org/jboss/as/jaxr/main/module.xml
@@ -13,6 +13,7 @@
         <module name="org.jboss.as.naming"/>
         <module name="org.jboss.as.server"/>
         <module name="org.jboss.as.web"/>
+        <module name="org.jboss.common-core"/>
         <module name="org.jboss.logging"/>
         <module name="org.jboss.msc"/>
         <module name="org.jboss.staxmapper"/>

diff --git a/...JaxrConnectionFactoryBindingTestCase.java → ...JaxrConnectionFactoryBindingTestCase.java b/...JaxrConnectionFactoryBindingTestCase.java → ...JaxrConnectionFactoryBindingTestCase.java
@@ -19,7 +19,7 @@
  * 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.as.test.integration.jaxr.scout.basic;
+package org.jboss.as.test.integration.jaxr;
 
 import junit.framework.TestCase;
 import org.jboss.arquillian.container.test.api.Deployment;

diff --git a/...cout/query/JaxrBusinessQueryTestCase.java → ...jaxr/scout/JaxrBusinessQueryTestCase.java b/...cout/query/JaxrBusinessQueryTestCase.java → ...jaxr/scout/JaxrBusinessQueryTestCase.java
@@ -19,35 +19,59 @@
  * 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.as.test.integration.jaxr.scout.query;
+package org.jboss.as.test.integration.jaxr.scout;
 
-/** Tests Jaxr capability to do business queries
- *  @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
- *  @since Dec 29, 2004
- */
 
-import org.jboss.as.test.integration.jaxr.scout.JaxrBaseTestCase;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.as.jaxr.scout.SaajTransport;
+import org.jboss.as.test.integration.jaxr.scout.JaxrTestBase;
+import org.jboss.osgi.testing.ManifestBuilder;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.Asset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import javax.xml.registry.BulkResponse;
 import javax.xml.registry.JAXRException;
 import javax.xml.registry.JAXRResponse;
 import javax.xml.registry.infomodel.Key;
 import javax.xml.registry.infomodel.Organization;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 
-public class JaxrBusinessQueryTestCase extends JaxrBaseTestCase {
-    protected String querystr = "JBOSS";
+/** Tests Jaxr capability to do business queries
+ *  @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
+ *  @since Dec 29, 2004
+ */
+@RunWith(Arquillian.class)
+public class JaxrBusinessQueryTestCase extends JaxrTestBase {
 
+    private String querystr = "JBOSS";
     private Key orgKey = null;
 
+    @Deployment
+    public static JavaArchive deployment() {
+        JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxr-business-query-test");
+        archive.addClasses(JaxrTestBase.class);
+        archive.setManifest(new Asset() {
+            public InputStream openStream() {
+                ManifestBuilder builder = ManifestBuilder.newInstance();
+                builder.addManifestHeader("Dependencies", "org.apache.scout,org.jboss.as.jaxr");
+                return builder.openStream();
+            }
+        });
+        return archive;
+    }
+
     @Before
-    protected void setUp() throws Exception {
+    public void setUp() throws Exception {
         super.setUp();
         String keyid = "";
         login();
@@ -82,7 +106,7 @@ protected void setUp() throws Exception {
     }
 
     @After
-    protected void tearDown() throws Exception {
+    public void tearDown() throws Exception {
         if (orgKey != null)
             this.deleteOrganization(this.orgKey);
         super.tearDown();

diff --git a/.../infomodel/JaxrClassficationTestCase.java → ...jaxr/scout/JaxrClassficationTestCase.java b/.../infomodel/JaxrClassficationTestCase.java → ...jaxr/scout/JaxrClassficationTestCase.java
@@ -19,7 +19,7 @@
  * 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.as.test.integration.jaxr.scout.publish.infomodel;
+package org.jboss.as.test.integration.jaxr.scout;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -31,9 +31,11 @@
 import javax.xml.registry.infomodel.ExternalLink;
 import javax.xml.registry.infomodel.Key;
 
-import org.jboss.as.test.integration.jaxr.scout.JaxrBaseTestCase;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.as.test.integration.jaxr.scout.JaxrTestBase;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Test the storage of classifications on Concepts and Services
@@ -43,7 +45,8 @@
  * @version $Revision: 98115 $
  * @since Apr 11, 2006
  */
-public class JaxrClassficationTestCase extends JaxrBaseTestCase {
+@RunWith(Arquillian.class)
+public class JaxrClassficationTestCase extends JaxrTestBase {
     private static final String UUID_TYPE = "uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4";
 
     @Test

diff --git a/...omodel/JaxrConfimAssociationTestCase.java → .../scout/JaxrConfimAssociationTestCase.java b/...omodel/JaxrConfimAssociationTestCase.java → .../scout/JaxrConfimAssociationTestCase.java
@@ -19,11 +19,13 @@
  * 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.as.test.integration.jaxr.scout.publish.infomodel;
+package org.jboss.as.test.integration.jaxr.scout;
 
-import org.jboss.as.test.integration.jaxr.scout.JaxrBaseTestCase;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.as.test.integration.jaxr.scout.JaxrTestBase;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import javax.xml.registry.BusinessLifeCycleManager;
 import javax.xml.registry.BusinessQueryManager;
@@ -46,7 +48,8 @@
  * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
  * @since Mar 9, 2005
  */
-public class JaxrConfimAssociationTestCase extends JaxrBaseTestCase {
+@RunWith(Arquillian.class)
+public class JaxrConfimAssociationTestCase extends JaxrTestBase {
     /**
      * Testcase that tests the association between two organizations
      */

diff --git a/...ublish/JaxrDeleteAssociationTestCase.java → .../scout/JaxrDeleteAssociationTestCase.java b/...ublish/JaxrDeleteAssociationTestCase.java → .../scout/JaxrDeleteAssociationTestCase.java
@@ -19,13 +19,13 @@
  * 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.as.test.integration.jaxr.scout.publish;
+package org.jboss.as.test.integration.jaxr.scout;
 
-import org.jboss.as.test.integration.jaxr.scout.JaxrBaseTestCase;
-import org.jboss.as.test.integration.jaxr.scout.util.ScoutUtil;
+import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.logging.Logger;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import javax.xml.registry.BulkResponse;
 import javax.xml.registry.BusinessLifeCycleManager;
@@ -48,7 +48,8 @@
  * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
  * @since Mar 9, 2005
  */
-public class JaxrDeleteAssociationTestCase extends JaxrBaseTestCase
+@RunWith(Arquillian.class)
+public class JaxrDeleteAssociationTestCase extends JaxrTestBase
 {
    private static Logger log = Logger.getLogger(JaxrDeleteAssociationTestCase.class);
 

diff --git a/...blish/JaxrDeleteOrganizationTestCase.java → ...scout/JaxrDeleteOrganizationTestCase.java b/...blish/JaxrDeleteOrganizationTestCase.java → ...scout/JaxrDeleteOrganizationTestCase.java
@@ -19,12 +19,13 @@
  * 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.as.test.integration.jaxr.scout.publish;
+package org.jboss.as.test.integration.jaxr.scout;
 
-import org.jboss.as.test.integration.jaxr.scout.JaxrBaseTestCase;
+import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.logging.Logger;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import javax.xml.registry.BulkResponse;
 import javax.xml.registry.JAXRException;
@@ -41,7 +42,8 @@
  * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
  * @since Jan 3, 2005
  */
-public class JaxrDeleteOrganizationTestCase extends JaxrBaseTestCase
+@RunWith(Arquillian.class)
+public class JaxrDeleteOrganizationTestCase extends JaxrTestBase
 {
    private static Logger log = Logger.getLogger(JaxrDeleteAssociationTestCase.class);
 

diff --git a/...fomodel/JaxrFindAssociationsTestCase.java → ...r/scout/JaxrFindAssociationsTestCase.java b/...fomodel/JaxrFindAssociationsTestCase.java → ...r/scout/JaxrFindAssociationsTestCase.java
@@ -19,12 +19,14 @@
  * 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.as.test.integration.jaxr.scout.query.infomodel;
+package org.jboss.as.test.integration.jaxr.scout;
 
-import org.jboss.as.test.integration.jaxr.scout.JaxrBaseTestCase;
-import org.jboss.as.test.integration.jaxr.scout.util.ScoutUtil;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.as.test.integration.jaxr.scout.JaxrTestBase;
+import org.jboss.as.test.integration.jaxr.scout.ScoutUtil;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import javax.xml.registry.BulkResponse;
 import javax.xml.registry.BusinessLifeCycleManager;
@@ -47,7 +49,9 @@
  * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
  * @since Mar 9, 2005
  */
-public class JaxrFindAssociationsTestCase extends JaxrBaseTestCase {
+@RunWith(Arquillian.class)
+public class JaxrFindAssociationsTestCase extends JaxrTestBase {
+
     @Test
     public void testFindAssociations() throws JAXRException {
 

diff --git a/...publish/JaxrSaveOrganizationTestCase.java → ...r/scout/JaxrSaveOrganizationTestCase.java b/...publish/JaxrSaveOrganizationTestCase.java → ...r/scout/JaxrSaveOrganizationTestCase.java
@@ -19,14 +19,15 @@
  * 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.as.test.integration.jaxr.scout.publish;
+package org.jboss.as.test.integration.jaxr.scout;
 
 
-import org.jboss.as.test.integration.jaxr.scout.JaxrBaseTestCase;
+import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.logging.Logger;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import javax.xml.registry.BulkResponse;
 import javax.xml.registry.JAXRException;
@@ -43,15 +44,15 @@
  * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
  * @since Dec 29, 2004
  */
-
-public class JaxrSaveOrganizationTestCase extends JaxrBaseTestCase {
+@RunWith(Arquillian.class)
+public class JaxrSaveOrganizationTestCase extends JaxrTestBase {
 
     private static Logger log = Logger.getLogger(JaxrSaveOrganizationTestCase.class);
 
     private Key orgKey = null;
 
     @After
-    protected void tearDown() throws Exception {
+    public void tearDown() throws Exception {
         super.tearDown();
         if (this.orgKey != null)
             this.deleteOrganization(orgKey);

diff --git a/...blish/JaxrSaveServiceBindingTestCase.java → ...scout/JaxrSaveServiceBindingTestCase.java b/...blish/JaxrSaveServiceBindingTestCase.java → ...scout/JaxrSaveServiceBindingTestCase.java
@@ -19,12 +19,13 @@
  * 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.as.test.integration.jaxr.scout.publish;
+package org.jboss.as.test.integration.jaxr.scout;
 
-import org.jboss.as.test.integration.jaxr.scout.JaxrBaseTestCase;
+import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.logging.Logger;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import javax.xml.registry.BulkResponse;
 import javax.xml.registry.JAXRException;
@@ -46,7 +47,8 @@
  * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
  * @since Mar 8, 2005
  */
-public class JaxrSaveServiceBindingTestCase extends JaxrBaseTestCase
+@RunWith(Arquillian.class)
+public class JaxrSaveServiceBindingTestCase extends JaxrTestBase
 {
    private static Logger log = Logger.getLogger(JaxrSaveServiceBindingTestCase.class);