[jboss-cvs] JBossAS SVN: r81282 - in projects/jboss-deployers/trunk/deployers-vfs/src/test: java/org/jboss/test/deployers/vfs/webbeans/support/crm and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 19 07:08:55 EST 2008
Author: alesj
Date: 2008-11-19 07:08:55 -0500 (Wed, 19 Nov 2008)
New Revision: 81282
Added:
projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/crm/
projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/crm/CrmWebBean.java
projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jsf/
projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jsf/NotWBJsfBean.java
projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/crm/
projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/
projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/MANIFEST.MF
projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/web-beans.xml
Modified:
projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/AbstractWebBeansTest.java
projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/WebBeanDiscoveryTestCase.java
Log:
Add war w/o web-beans.xml.
Test classes and urls.
Added: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/crm/CrmWebBean.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/crm/CrmWebBean.java (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/crm/CrmWebBean.java 2008-11-19 12:08:55 UTC (rev 81282)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.vfs.webbeans.support.crm;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class CrmWebBean
+{
+}
Added: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jsf/NotWBJsfBean.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jsf/NotWBJsfBean.java (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jsf/NotWBJsfBean.java 2008-11-19 12:08:55 UTC (rev 81282)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.vfs.webbeans.support.jsf;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class NotWBJsfBean
+{
+}
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/AbstractWebBeansTest.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/AbstractWebBeansTest.java 2008-11-19 11:50:05 UTC (rev 81281)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/AbstractWebBeansTest.java 2008-11-19 12:08:55 UTC (rev 81282)
@@ -21,15 +21,17 @@
*/
package org.jboss.test.deployers.vfs.webbeans.test;
+import org.jboss.deployers.vfs.deployer.kernel.BeanDeployer;
import org.jboss.test.deployers.BootstrapDeployersTest;
import org.jboss.test.deployers.vfs.webbeans.support.ejb.MySLSBean;
import org.jboss.test.deployers.vfs.webbeans.support.ext.ExternalWebBean;
import org.jboss.test.deployers.vfs.webbeans.support.jar.PlainJavaBean;
+import org.jboss.test.deployers.vfs.webbeans.support.jsf.NotWBJsfBean;
import org.jboss.test.deployers.vfs.webbeans.support.ui.UIWebBean;
import org.jboss.test.deployers.vfs.webbeans.support.util.SomeUtil;
import org.jboss.test.deployers.vfs.webbeans.support.web.ServletWebBean;
+import org.jboss.test.deployers.vfs.webbeans.support.crm.CrmWebBean;
import org.jboss.virtual.AssembledDirectory;
-import org.jboss.deployers.vfs.deployer.kernel.BeanDeployer;
/**
* AbstractWebBeansTest.
@@ -88,6 +90,19 @@
addPackage(uijar, UIWebBean.class);
addPath(uijar, "/webbeans/simple/ui", "META-INF");
+ // war w/o web-beans.xml
+
+ war = ear.mkdir("crm.war");
+ webinf = war.mkdir("WEB-INF");
+ classes = webinf.mkdir("classes");
+ addPackage(classes, NotWBJsfBean.class);
+
+ lib = webinf.mkdir("lib");
+
+ uijar = lib.mkdir("crm.jar");
+ addPackage(uijar, CrmWebBean.class);
+ addPath(uijar, "/webbeans/simple/crm", "META-INF");
+
enableTrace("org.jboss.deployers");
return ear;
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/WebBeanDiscoveryTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/WebBeanDiscoveryTestCase.java 2008-11-19 11:50:05 UTC (rev 81281)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/WebBeanDiscoveryTestCase.java 2008-11-19 12:08:55 UTC (rev 81282)
@@ -21,9 +21,21 @@
*/
package org.jboss.test.deployers.vfs.webbeans.test;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
import junit.framework.Test;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.test.deployers.vfs.webbeans.support.WebBeanDiscovery;
+import org.jboss.test.deployers.vfs.webbeans.support.crm.CrmWebBean;
+import org.jboss.test.deployers.vfs.webbeans.support.ejb.BusinessInterface;
+import org.jboss.test.deployers.vfs.webbeans.support.ejb.MySLSBean;
+import org.jboss.test.deployers.vfs.webbeans.support.ext.ExternalWebBean;
+import org.jboss.test.deployers.vfs.webbeans.support.jar.PlainJavaBean;
+import org.jboss.test.deployers.vfs.webbeans.support.ui.UIWebBean;
+import org.jboss.test.deployers.vfs.webbeans.support.web.ServletWebBean;
import org.jboss.virtual.VirtualFile;
/**
@@ -51,10 +63,59 @@
{
WebBeanDiscovery wbDiscovery = topUnit.getAttachment(WebBeanDiscovery.class);
assertNotNull(wbDiscovery);
+
+ // TODO - remove this once WBDDeployer is done
+ if (wbDiscovery.discoverWebBeanClasses().iterator().hasNext() == false)
+ return;
+
+ Set<String> expected = new HashSet<String>();
+ addExpectedClass(expected, BusinessInterface.class);
+ addExpectedClass(expected, MySLSBean.class);
+ addExpectedClass(expected, ExternalWebBean.class);
+ addExpectedClass(expected, PlainJavaBean.class);
+ addExpectedClass(expected, UIWebBean.class);
+ addExpectedClass(expected, ServletWebBean.class);
+ addExpectedClass(expected, CrmWebBean.class);
+
+ for (Class<?> clazz : wbDiscovery.discoverWebBeanClasses())
+ assertTrue(expected.remove(clazz.getName()));
+
+ assertEmpty("Should be emtpy, missing " + expected, expected);
+
+ expected.add("ejbs.jar/META-INF");
+ expected.add("ext.jar/META-INF");
+ expected.add("simple.jar/META-INF");
+ expected.add("ui.jar/META-INF");
+ expected.add("simple.war/WEB-INF");
+ expected.add("crm.jar/META-INF");
+
+ for (URL url : wbDiscovery.discoverWebBeansXml())
+ {
+ boolean found = false;
+ Iterator<String> iter = expected.iterator();
+ while (iter.hasNext())
+ {
+ String expectedURL = iter.next();
+ if (url.toExternalForm().contains(expectedURL))
+ {
+ iter.remove();
+ found = true;
+ break;
+ }
+ }
+ assertTrue("Unexpected wb url: " + url, found);
+ }
+
+ assertEmpty("Should be emtpy, missing " + expected, expected);
}
finally
{
undeploy(topUnit);
}
}
+
+ private static void addExpectedClass(Set<String> expected, Class<?> clazz)
+ {
+ expected.add(clazz.getName());
+ }
}
Added: projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/MANIFEST.MF
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/MANIFEST.MF (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/MANIFEST.MF 2008-11-19 12:08:55 UTC (rev 81282)
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Created-By: hand
Added: projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/web-beans.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/web-beans.xml (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/web-beans.xml 2008-11-19 12:08:55 UTC (rev 81282)
@@ -0,0 +1,2 @@
+<web-beans>
+</web-beans>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list