[jboss-cvs] JBossAS SVN: r72293 - in trunk/testsuite/src/main/org/jboss/test/deployers: ear/test and 1 other directory.

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

Author: alex.loubyansky at jboss.com
Date: 2008-04-16 12:00:27 -0400 (Wed, 16 Apr 2008)
New Revision: 72293

Added:
   trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EARAltDDConnectorDeploymentUnitTestCase.java
Modified:
   trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java
   trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EARAltDDClientDeploymentUnitTestCase.java
Log:
JBAS-5445; a testcase for connector module, currently failing due to assertDeployed not working

Modified: trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java	2008-04-16 15:51:56 UTC (rev 72292)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java	2008-04-16 16:00:27 UTC (rev 72293)
@@ -43,6 +43,7 @@
    public static final String ear1Deployment = "testdeployers-ear1.ear";
    public static final String earAltDDDeployment = "testdeployers-ear-altdd.ear";
    public static final String earAltDDClientDeployment = "testdeployers-ear-altdd-client.ear";
+   public static final String earAltDDConnectorDeployment = "testdeployers-ear-altdd-connector.ear";
    public static final String ear1DeploymentUnpacked = "unpacked-ear1.ear";
    public static final String ear2DeploymentUnpacked = "unpacked-ear2.ear";
    public static final String earNoAppXml = "testdeployers-ear-noappxml.ear";
@@ -55,6 +56,7 @@
    public static final String notWeb1Deployment = "web1-not.awar";
    public static final String notWeb1DeploymentUnpacked = "unpacked-web1-not.awar";
    public static final String rar1Deployment = "testdeployers-mcf1.rar";
+   public static final String rarInvalidDeployment = "testdeployers-invalidmcf.rar";
    public static final String rar1DeploymentUnpacked = "unpacked-mcf1.rar";
    public static final String notRar1Deployment = "mcf1-not.arar";
    public static final String notRar1DeploymentUnpacked = "unpacked-mcf1-not.arar";

Modified: trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EARAltDDClientDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EARAltDDClientDeploymentUnitTestCase.java	2008-04-16 15:51:56 UTC (rev 72292)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EARAltDDClientDeploymentUnitTestCase.java	2008-04-16 16:00:27 UTC (rev 72293)
@@ -21,17 +21,14 @@
   */
 package org.jboss.test.deployers.ear.test;
 
-import java.net.URL;
 import java.util.Properties;
 
-import javax.jms.Queue;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
 import junit.framework.Test;
 
-import org.jboss.test.cts.interfaces.StatelessSessionHome;
 import org.jboss.test.deployers.AbstractDeploymentTest;
 
 /**

Added: trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EARAltDDConnectorDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EARAltDDConnectorDeploymentUnitTestCase.java	                        (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EARAltDDConnectorDeploymentUnitTestCase.java	2008-04-16 16:00:27 UTC (rev 72293)
@@ -0,0 +1,66 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * 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.test.deployers.ear.test;
+
+
+import java.util.HashSet;
+
+import junit.framework.Test;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.test.deployers.AbstractDeploymentTest;
+
+/**
+ * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
+ * @version $Revision: 66915 $
+ */
+public class EARAltDDConnectorDeploymentUnitTestCase extends AbstractDeploymentTest
+{
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(EARAltDDConnectorDeploymentUnitTestCase.class, earAltDDConnectorDeployment);
+   }
+
+   public EARAltDDConnectorDeploymentUnitTestCase(String test)
+   {
+      super(test);
+   }
+
+   public void testEARDeployment() throws Exception
+   {
+      /* TODO: this doesn't work currently
+       * java.io.NotSerializableException: java.io.ByteArrayInputStream
+       * ...
+       at org.jboss.test.deployers.AbstractDeploymentTest.invokeMainDeployer(AbstractDeploymentTest.java:80)
+       at org.jboss.test.deployers.AbstractDeploymentTest.getDeploymentUnit(AbstractDeploymentTest.java:111)
+       at org.jboss.test.deployers.AbstractDeploymentTest.assertDeployed(AbstractDeploymentTest.java:86)
+       */
+       final HashSet<String> expected = new HashSet<String>();
+       expected.add(earAltDDConnectorDeployment);
+       expected.add(rarInvalidDeployment);
+       
+       DeploymentUnit topInfo = assertDeployed(earAltDDDeployment);
+       CheckExpectedDeploymentInfoVisitor visitor = new CheckExpectedDeploymentInfoVisitor(expected);
+       visitor.start(topInfo);
+       assertTrue("Expected subdeployments: " + expected, expected.isEmpty());
+   }
+}