[jboss-cvs] JBossAS SVN: r65758 - in branches/Branch_4_2/ejb3: src/test/org/jboss/ejb3/test/ejbthree832/unit and 7 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Oct 2 09:37:09 EDT 2007


Author: wolfc
Date: 2007-10-02 09:37:08 -0400 (Tue, 02 Oct 2007)
New Revision: 65758

Modified:
   branches/Branch_4_2/ejb3/.classpath
   branches/Branch_4_2/ejb3/build-test.xml
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/unit/EntityTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/unit/InterceptorsTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/unit/JaccTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointEJB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/unit/ContextEJBTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/NarrowableEJB3Bean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/JSR181TestCase.java
Log:
Fixed for WS 2.0 and exposing known issues

Modified: branches/Branch_4_2/ejb3/.classpath
===================================================================
--- branches/Branch_4_2/ejb3/.classpath	2007-10-02 13:34:57 UTC (rev 65757)
+++ branches/Branch_4_2/ejb3/.classpath	2007-10-02 13:37:08 UTC (rev 65758)
@@ -86,7 +86,7 @@
 	<classpathentry kind="lib" path="/thirdparty/jacorb/lib/jacorb.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-jdk50.jar"/>
 	<classpathentry kind="lib" path="src/resources/test"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jboss-jaxws.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jboss-jaxws.jar" sourcepath="/thirdparty/jboss/jbossws/lib/jbossws-core-src.zip"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jboss-saaj.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jbossws-client.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/dom4j/lib/dom4j.jar"/>

Modified: branches/Branch_4_2/ejb3/build-test.xml
===================================================================
--- branches/Branch_4_2/ejb3/build-test.xml	2007-10-02 13:34:57 UTC (rev 65757)
+++ branches/Branch_4_2/ejb3/build-test.xml	2007-10-02 13:37:08 UTC (rev 65758)
@@ -144,6 +144,7 @@
       <path refid="sun.javamail.classpath"/>
       <path refid="jboss.serialization.classpath"/>
       <path refid="jboss.jbossws.classpath"/>
+      <path refid="jboss.jbossws.spi.classpath"/>
       <path refid="quartz.quartz.classpath"/>
       <path refid="jboss.microcontainer.classpath"/>
       <path refid="jboss.jbossxb.classpath"/>

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/unit/EntityTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/unit/EntityTestCase.java	2007-10-02 13:34:57 UTC (rev 65757)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree832/unit/EntityTestCase.java	2007-10-02 13:37:08 UTC (rev 65758)
@@ -26,8 +26,8 @@
 
 import junit.framework.Test;
 
+import org.jboss.ejb3.test.JBossWithKnownIssuesTestCase;
 import org.jboss.ejb3.test.ejbthree832.EntityTest;
-import org.jboss.test.JBossTestCase;
 
 /**
  * Comment
@@ -35,7 +35,7 @@
  * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
  * @version $Revision: $
  */
-public class EntityTestCase extends JBossTestCase
+public class EntityTestCase extends JBossWithKnownIssuesTestCase
 {
 
    public EntityTestCase(String name)
@@ -55,7 +55,7 @@
       String configuration = getConfiguration();
       if(configuration.equals("all"))
       {
-         System.err.println("EJBTHREE-832");
+         showKnownIssue("EJBTHREE-832");
          return;
       }
       assertEquals("Wrong server configuration", "default", configuration);

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java	2007-10-02 13:34:57 UTC (rev 65757)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java	2007-10-02 13:37:08 UTC (rev 65758)
@@ -36,6 +36,7 @@
 import junit.framework.Test;
 
 import org.jboss.ejb3.test.CustomJNDIJBossTestCase;
+import org.jboss.ejb3.test.JBossWithKnownIssuesTestCase;
 import org.jboss.ejb3.test.iiop.HomedStatelessHome;
 import org.jboss.ejb3.test.iiop.MySession;
 import org.jboss.ejb3.test.iiop.MyStateful;
@@ -248,7 +249,7 @@
    
    public void testTxPropegation() throws Exception
    {
-      System.err.println("EJBTHREE-892");
+      JBossWithKnownIssuesTestCase.showKnownIssue("EJBTHREE-892");
       /*
       InitialContext ctx = getInitialContext();
       Object obj = ctx.lookup("TxTesterBean/remote");

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/unit/InterceptorsTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/unit/InterceptorsTestCase.java	2007-10-02 13:34:57 UTC (rev 65757)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/unit/InterceptorsTestCase.java	2007-10-02 13:37:08 UTC (rev 65758)
@@ -31,6 +31,7 @@
 
 import org.jboss.ejb3.mdb.ProducerManager;
 import org.jboss.ejb3.mdb.ProducerObject;
+import org.jboss.ejb3.test.JBossWithKnownIssuesTestCase;
 import org.jboss.ejb3.test.interceptors2.AnnotatedClassInterceptor3;
 import org.jboss.ejb3.test.interceptors2.AnnotatedMethodInterceptor4;
 import org.jboss.ejb3.test.interceptors2.AnnotatedOnlySLSB;
@@ -60,15 +61,13 @@
 import org.jboss.ejb3.test.interceptors2.XMLMethodInterceptor;
 import org.jboss.ejb3.test.interceptors2.XMLOnlySLSB;
 import org.jboss.ejb3.test.interceptors2.XMLOnlySLSBRemote;
-import org.jboss.test.JBossTestCase;
 
 /**
  * 
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
  * @version $Revision$
  */
-public class InterceptorsTestCase
-extends JBossTestCase
+public class InterceptorsTestCase extends JBossWithKnownIssuesTestCase
 {
    org.apache.log4j.Logger log = getLog();
 
@@ -462,7 +461,7 @@
       ArrayList<Interception> actual = status.getInterceptions();
       if(actual.size() == 6)
       {
-         System.err.println("EJBTHREE-896");
+         showKnownIssue("EJBTHREE-896");
          return;
       }
       compare(

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/unit/JaccTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/unit/JaccTestCase.java	2007-10-02 13:34:57 UTC (rev 65757)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jacc/unit/JaccTestCase.java	2007-10-02 13:37:08 UTC (rev 65758)
@@ -26,6 +26,7 @@
 import javax.ejb.EJBException;
 import javax.transaction.RollbackException;
 
+import org.jboss.ejb3.test.JBossWithKnownIssuesTestCase;
 import org.jboss.ejb3.test.jacc.AllEntity;
 import org.jboss.ejb3.test.jacc.SomeEntity;
 import org.jboss.ejb3.test.jacc.StarEntity;
@@ -33,7 +34,6 @@
 import org.jboss.ejb3.test.jacc.Stateless;
 import org.jboss.security.SecurityAssociation;
 import org.jboss.security.SimplePrincipal;
-import org.jboss.test.JBossTestCase;
 import junit.framework.Test;
 
 /**
@@ -41,7 +41,7 @@
  * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
  * @version $Revision$
  */
-public class JaccTestCase extends JBossTestCase
+public class JaccTestCase extends JBossWithKnownIssuesTestCase
 {
    org.apache.log4j.Logger log = getLog();
 
@@ -395,7 +395,7 @@
       {
          if(ex.getCause() != null && ex.getCause() instanceof RollbackException)
          {
-            System.err.println("EJBTHREE-894");
+            showKnownIssue("EJBTHREE-894");
          }
          else
             hasSecurityOrEJBException(ex);

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointEJB.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointEJB.java	2007-10-02 13:34:57 UTC (rev 65757)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/EndpointEJB.java	2007-10-02 13:37:08 UTC (rev 65758)
@@ -33,7 +33,7 @@
 import javax.xml.ws.WebServiceContext;
 import javax.xml.ws.WebServiceException;
 
-import org.jboss.ws.annotation.WebContext;
+import org.jboss.wsf.spi.annotation.WebContext;
 
 @WebService(endpointInterface = "org.jboss.ejb3.test.jaxws.EndpointInterface", serviceName = "TestService", targetNamespace = "http://org.jboss.ws/jaxws/context")
 @WebContext(contextRoot="jaxws-context", urlPattern="/*")

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/unit/ContextEJBTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/unit/ContextEJBTestCase.java	2007-10-02 13:34:57 UTC (rev 65757)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/jaxws/unit/ContextEJBTestCase.java	2007-10-02 13:37:08 UTC (rev 65758)
@@ -24,9 +24,9 @@
 // $Id: ContextEJBTestCase.java 1874 2007-01-09 14:28:41Z thomas.diesler at jboss.com $
 
 import junit.framework.Test;
+
+import org.jboss.ejb3.test.JBossWithKnownIssuesTestCase;
 import org.jboss.ejb3.test.jaxws.EndpointInterface;
-import org.jboss.test.JBossTestCase;
-
 import javax.xml.namespace.QName;
 import javax.xml.ws.Service;
 import javax.xml.ws.soap.SOAPFaultException;
@@ -40,7 +40,7 @@
  * @author Thomas.Diesler at jboss.org
  * @since 29-Apr-2005
  */
-public class ContextEJBTestCase extends JBossTestCase
+public class ContextEJBTestCase extends JBossWithKnownIssuesTestCase
 {
    public ContextEJBTestCase(String name)
    {
@@ -70,7 +70,7 @@
       catch(SOAPFaultException e)
       {
          assertEquals("java.lang.IllegalStateException: wsCtx was not injected", e.getMessage());
-         System.err.println("EJBTHREE-900");
+         showKnownIssue("EJBTHREE-900");
       }
    }
 
@@ -91,7 +91,7 @@
       catch(SOAPFaultException e)
       {
          assertEquals("java.lang.IllegalStateException: No message context found", e.getMessage());
-         System.err.println("EJBTHREE-757");
+         showKnownIssue("EJBTHREE-757");
       }
    }
 }

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3Bean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3Bean.java	2007-10-02 13:34:57 UTC (rev 65757)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/EJB3Bean.java	2007-10-02 13:37:08 UTC (rev 65758)
@@ -22,7 +22,7 @@
 package org.jboss.ejb3.test.webservices.jsr181;
 
 import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.ws.annotation.WebContext;
+import org.jboss.wsf.spi.annotation.WebContext;
 
 import javax.ejb.Remote;
 import javax.ejb.RemoteHome;

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/NarrowableEJB3Bean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/NarrowableEJB3Bean.java	2007-10-02 13:34:57 UTC (rev 65757)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/jsr181/NarrowableEJB3Bean.java	2007-10-02 13:37:08 UTC (rev 65758)
@@ -30,7 +30,7 @@
 import javax.jws.WebService;
 import javax.jws.soap.SOAPBinding;
 
-import org.jboss.ws.annotation.WebContext;
+import org.jboss.wsf.spi.annotation.WebContext;
 
 /**
  * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/JSR181TestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/JSR181TestCase.java	2007-10-02 13:34:57 UTC (rev 65757)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/JSR181TestCase.java	2007-10-02 13:37:08 UTC (rev 65758)
@@ -21,14 +21,7 @@
  */
 package org.jboss.ejb3.test.webservices.unit;
 
-import junit.framework.Test;
-import org.jboss.ejb3.test.webservices.jsr181.EJB3RemoteInterface;
-import org.jboss.ejb3.test.webservices.jsr181.EndpointInterface;
-import org.jboss.ejb3.test.webservices.jsr181.NarrowableEJB3RemoteHomeInterface;
-import org.jboss.ejb3.test.webservices.jsr181.NarrowableEJB3RemoteInterface;
-import org.jboss.ejb3.test.webservices.jsr181.RemoteHomeInterface;
-import org.jboss.ejb3.test.webservices.jsr181.StatelessRemote;
-import org.jboss.test.JBossTestCase;
+import java.util.Hashtable;
 
 import javax.ejb.EJBException;
 import javax.naming.Context;
@@ -37,14 +30,21 @@
 import javax.rmi.PortableRemoteObject;
 import javax.xml.rpc.Service;
 
-import java.util.Hashtable;
-import java.util.Properties;
+import junit.framework.Test;
 
+import org.jboss.ejb3.test.JBossWithKnownIssuesTestCase;
+import org.jboss.ejb3.test.webservices.jsr181.EJB3RemoteInterface;
+import org.jboss.ejb3.test.webservices.jsr181.EndpointInterface;
+import org.jboss.ejb3.test.webservices.jsr181.NarrowableEJB3RemoteHomeInterface;
+import org.jboss.ejb3.test.webservices.jsr181.NarrowableEJB3RemoteInterface;
+import org.jboss.ejb3.test.webservices.jsr181.RemoteHomeInterface;
+import org.jboss.ejb3.test.webservices.jsr181.StatelessRemote;
+
 /**
  * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
  * @version $Revision$
  */
-public class JSR181TestCase extends JBossTestCase
+public class JSR181TestCase extends JBossWithKnownIssuesTestCase
 {
    public JSR181TestCase(String name)
    {
@@ -135,7 +135,7 @@
          Throwable t = e.getCause();
          assertNotNull(t);
          assertTrue(t instanceof NullPointerException);
-         System.err.println("EJBTHREE-899");
+         showKnownIssue("EJBTHREE-899");
       }
    }
    
@@ -155,7 +155,7 @@
          Throwable t = e.getCause();
          assertNotNull(t);
          assertTrue(t instanceof NullPointerException);
-         System.err.println("EJBTHREE-899");
+         showKnownIssue("EJBTHREE-899");
       }
    }
    




More information about the jboss-cvs-commits mailing list