[webbeans-commits] Webbeans SVN: r2113 - in ri/trunk: impl/src/main/java/org/jboss/webbeans/util and 13 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Thu Mar 19 11:48:17 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-03-19 11:48:17 -0400 (Thu, 19 Mar 2009)
New Revision: 2113
Added:
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducerTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/AnotherDeploymentType.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java
ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/
ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/default-beans.xml
ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/duplicate-deployments-beans.xml
ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/user-defined-beans.xml
ri/trunk/tests/temp-testng-customsuite.xml
ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.html
ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.properties
ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.xml
ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.html
ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.properties
ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.xml
ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.html
ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.properties
ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.xml
Removed:
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/xml/
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/method/
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducerTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/AnotherDeploymentType.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/BeansXmlParserTest.java
ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/default-beans.xml
ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/duplicate-deployments-beans.xml
ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockXmlEnvironment.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironment.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/ServletEnvironmentTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java
ri/trunk/tests/test-output/emailable-report.html
ri/trunk/tests/test-output/index.html
ri/trunk/tests/test-output/testng-failed.xml
ri/trunk/tests/test-output/testng-results.xml
ri/trunk/tests/test-output/webbeans-core-tests/classes.html
ri/trunk/tests/test-output/webbeans-core-tests/groups.html
ri/trunk/tests/test-output/webbeans-core-tests/methods-alphabetical.html
ri/trunk/tests/test-output/webbeans-core-tests/methods-not-run.html
ri/trunk/tests/test-output/webbeans-core-tests/methods.html
ri/trunk/tests/test-output/webbeans-core-tests/testng-failed.xml
ri/trunk/tests/test-output/webbeans-core-tests/testng.xml.html
ri/trunk/tests/test-output/webbeans-core-tests/toc.html
ri/trunk/tests/unit-tests.xml
Log:
fix tests
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockXmlEnvironment.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockXmlEnvironment.java 2009-03-19 14:46:23 UTC (rev 2112)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockXmlEnvironment.java 2009-03-19 15:48:17 UTC (rev 2113)
@@ -19,18 +19,9 @@
services.add(ResourceLoader.class, new DefaultResourceLoader());
}
- private final Iterable<URL> beansXmlUrls;
-
public MockXmlEnvironment(Iterable<URL> beansXmlUrls)
{
- super(services);
- this.beansXmlUrls = beansXmlUrls;
+ super(services, beansXmlUrls);
}
- @Override
- public Iterable<URL> getBeansXmlUrls()
- {
- return beansXmlUrls;
- }
-
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironment.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironment.java 2009-03-19 14:46:23 UTC (rev 2112)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlEnvironment.java 2009-03-19 15:48:17 UTC (rev 2113)
@@ -24,11 +24,16 @@
public XmlEnvironment(ServiceRegistry serviceRegistry)
{
+ this(serviceRegistry, serviceRegistry.get(WebBeanDiscovery.class).discoverWebBeansXml());
+ }
+
+ protected XmlEnvironment(ServiceRegistry serviceRegistry, Iterable<URL> beanXmlUrls)
+ {
this.classes = new ArrayList<AnnotatedClass<?>>();
this.annotations = new ArrayList<AnnotatedAnnotation<?>>();
this.enabledDeploymentTypes = new ArrayList<Class<? extends Annotation>>();
this.serviceRegistry = serviceRegistry;
- this.beansXmlUrls = serviceRegistry.get(WebBeanDiscovery.class).discoverWebBeansXml();
+ this.beansXmlUrls = beanXmlUrls;
}
public List<AnnotatedClass<?>> getClasses()
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java 2009-03-19 14:46:23 UTC (rev 2112)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java 2009-03-19 15:48:17 UTC (rev 2113)
@@ -148,6 +148,7 @@
return true;
}
+
private boolean checkBeanElementChildrenNames(Element element)
{
Iterator<?> elIterator = element.elementIterator();
@@ -164,6 +165,7 @@
}
@SuppressWarnings("unchecked")
+ // TODO Make this object orientated
private List<Class<? extends Annotation>> obtainDeploymentTypes(Element element, int counter)
{
if (counter > 1)
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/ServletEnvironmentTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/ServletEnvironmentTest.java 2009-03-19 14:46:23 UTC (rev 2112)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/ServletEnvironmentTest.java 2009-03-19 15:48:17 UTC (rev 2113)
@@ -8,7 +8,6 @@
import javax.inject.manager.Bean;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.bean.ProducerMethodBean;
import org.jboss.webbeans.bean.RIBean;
import org.jboss.webbeans.bean.SimpleBean;
import org.jboss.webbeans.mock.MockEELifecycle;
@@ -19,6 +18,8 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+// TODO shouldn't extend AbstractWebBeansTest
+
@Artifact
public class ServletEnvironmentTest extends AbstractWebBeansTest
{
@@ -42,45 +43,43 @@
@Test(groups="incontainer-broken")
public void testSimpleBeans()
{
- List<Bean<?>> beans = manager.getBeans();
- Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
- for (Bean<?> bean : beans)
+ Map<Class<?>, Bean<?>> beans = new HashMap<Class<?>, Bean<?>>();
+ for (Bean<?> bean : manager.getBeans())
{
if (bean instanceof RIBean)
{
- classes.put(((RIBean<?>) bean).getType(), bean);
+ beans.put(((RIBean<?>) bean).getType(), bean);
}
}
- assert classes.containsKey(Tuna.class);
- assert classes.containsKey(Salmon.class);
- assert classes.containsKey(SeaBass.class);
- assert classes.containsKey(Sole.class);
+ assert beans.containsKey(Tuna.class);
+ assert beans.containsKey(Salmon.class);
+ assert beans.containsKey(SeaBass.class);
+ assert beans.containsKey(Sole.class);
- assert classes.get(Tuna.class) instanceof SimpleBean;
- assert classes.get(Salmon.class) instanceof SimpleBean;
- assert classes.get(SeaBass.class) instanceof SimpleBean;
- assert classes.get(Sole.class) instanceof SimpleBean;
+ assert beans.get(Tuna.class) instanceof SimpleBean;
+ assert beans.get(Salmon.class) instanceof SimpleBean;
+ assert beans.get(SeaBass.class) instanceof SimpleBean;
+ assert beans.get(Sole.class) instanceof SimpleBean;
manager.getInstanceByType(Sole.class, new AnnotationLiteral<Whitefish>() {}).ping();
}
@Test(groups="incontainer-broken")
public void testProducerMethodBean()
{
- //deployBeans(TarantulaProducer.class);
- List<Bean<?>> beans = manager.getBeans();
- Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
- for (Bean<?> bean : beans)
+ Map<Class<?>, Bean<?>> beans = new HashMap<Class<?>, Bean<?>>();
+ for (Bean<?> bean : manager.getBeans())
{
if (bean instanceof RIBean)
{
- classes.put(((RIBean<?>) bean).getType(), bean);
+ beans.put(((RIBean<?>) bean).getType(), bean);
}
}
- assert classes.containsKey(TarantulaProducer.class);
- assert classes.containsKey(Tarantula.class);
+ assert beans.containsKey(TarantulaProducer.class);
+ assert beans.containsKey(Tarantula.class);
- assert classes.get(TarantulaProducer.class) instanceof SimpleBean;
- assert classes.get(Tarantula.class) instanceof ProducerMethodBean;
+ Bean<?> bean = beans.get(TarantulaProducer.class);
+
+ assert beans.get(TarantulaProducer.class) instanceof SimpleBean;
manager.getInstanceByType(Tarantula.class, new AnnotationLiteral<Tame>() {}).ping();
}
Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method (from rev 2108, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/method)
Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/method/IntInjection.java 2009-03-19 09:49:00 UTC (rev 2108)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java 2009-03-19 15:48:17 UTC (rev 2113)
@@ -1,15 +0,0 @@
-package org.jboss.webbeans.test.unit.implementation.producer.field.method;
-
-import javax.inject.Initializer;
-
-public class IntInjection
-{
-
- int value;
-
- @Initializer public IntInjection(Integer integer)
- {
- this.value = integer;
- }
-
-}
Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java (from rev 2112, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/method/IntInjection.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/IntInjection.java 2009-03-19 15:48:17 UTC (rev 2113)
@@ -0,0 +1,15 @@
+package org.jboss.webbeans.test.unit.implementation.producer.method;
+
+import javax.inject.Initializer;
+
+public class IntInjection
+{
+
+ int value;
+
+ @Initializer public IntInjection(Integer integer)
+ {
+ this.value = integer;
+ }
+
+}
Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/method/ManagerProducer.java 2009-03-19 09:49:00 UTC (rev 2108)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java 2009-03-19 15:48:17 UTC (rev 2113)
@@ -1,32 +0,0 @@
-package org.jboss.webbeans.test.unit.implementation.producer.field.method;
-
-import javax.inject.Current;
-import javax.inject.Produces;
-import javax.inject.manager.InjectionPoint;
-import javax.inject.manager.Manager;
-
-class ManagerProducer
-{
-
- @Current Manager manager;
-
- private static boolean injectionPointInjected;
-
- public static boolean isInjectionPointInjected()
- {
- return injectionPointInjected;
- }
-
- public static void setInjectionPointInjected(boolean injectionPointInjected)
- {
- ManagerProducer.injectionPointInjected = injectionPointInjected;
- }
-
- @Produces
- Integer create(InjectionPoint point)
- {
- injectionPointInjected = point != null;
- return 10;
- }
-
-}
Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java (from rev 2112, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/method/ManagerProducer.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducer.java 2009-03-19 15:48:17 UTC (rev 2113)
@@ -0,0 +1,32 @@
+package org.jboss.webbeans.test.unit.implementation.producer.method;
+
+import javax.inject.Current;
+import javax.inject.Produces;
+import javax.inject.manager.InjectionPoint;
+import javax.inject.manager.Manager;
+
+class ManagerProducer
+{
+
+ @Current Manager manager;
+
+ private static boolean injectionPointInjected;
+
+ public static boolean isInjectionPointInjected()
+ {
+ return injectionPointInjected;
+ }
+
+ public static void setInjectionPointInjected(boolean injectionPointInjected)
+ {
+ ManagerProducer.injectionPointInjected = injectionPointInjected;
+ }
+
+ @Produces
+ Integer create(InjectionPoint point)
+ {
+ injectionPointInjected = point != null;
+ return 10;
+ }
+
+}
Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducerTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/method/ManagerProducerTest.java 2009-03-19 09:49:00 UTC (rev 2108)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducerTest.java 2009-03-19 15:48:17 UTC (rev 2113)
@@ -1,18 +0,0 @@
-package org.jboss.webbeans.test.unit.implementation.producer.field.method;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class ManagerProducerTest extends AbstractWebBeansTest
-{
- @Test(description="WBRI-183")
- public void testInjectManagerProducer()
- {
- ManagerProducer.setInjectionPointInjected(false);
- manager.getInstanceByType(IntInjection.class);
- assert ManagerProducer.isInjectionPointInjected();
- }
-
-}
Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducerTest.java (from rev 2112, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/method/ManagerProducerTest.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducerTest.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/method/ManagerProducerTest.java 2009-03-19 15:48:17 UTC (rev 2113)
@@ -0,0 +1,18 @@
+package org.jboss.webbeans.test.unit.implementation.producer.method;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class ManagerProducerTest extends AbstractWebBeansTest
+{
+ @Test(description="WBRI-183")
+ public void testInjectManagerProducer()
+ {
+ ManagerProducer.setInjectionPointInjected(false);
+ manager.getInstanceByType(IntInjection.class);
+ assert ManagerProducer.isInjectionPointInjected();
+ }
+
+}
Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/AnotherDeploymentType.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/AnotherDeploymentType.java 2009-03-19 14:46:23 UTC (rev 2112)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/AnotherDeploymentType.java 2009-03-19 15:48:17 UTC (rev 2113)
@@ -1,20 +0,0 @@
-package org.jboss.webbeans.test.unit.xml;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}
\ No newline at end of file
Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/BeansXmlParserTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/BeansXmlParserTest.java 2009-03-19 14:46:23 UTC (rev 2112)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/BeansXmlParserTest.java 2009-03-19 15:48:17 UTC (rev 2113)
@@ -1,73 +0,0 @@
-package org.jboss.webbeans.test.unit.xml;
-
-import java.net.URL;
-import java.util.Iterator;
-
-import javax.inject.DeploymentException;
-import javax.inject.Production;
-import javax.inject.Standard;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.Resource;
-import org.jboss.testharness.impl.packaging.Resources;
-import org.jboss.webbeans.bootstrap.BeansXmlParser;
-import org.jboss.webbeans.mock.MockResourceLoader;
-import org.jboss.webbeans.resources.spi.ResourceLoader;
-import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
-import org.testng.annotations.Test;
-
- at Artifact
- at Resources({
- @Resource(destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/default-beans.xml", source="/org/jboss/webbeans/test/unit/xml/default-beans.xml"),
- @Resource(destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/duplicate-deployments-beans.xml", source="/org/jboss/webbeans/test/unit/xml/duplicate-deployments-beans.xml"),
- @Resource(destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml", source="/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml")
-})
-public class BeansXmlParserTest extends AbstractWebBeansTest
-{
-
- private static final ResourceLoader RESOURCE_LOADER = new MockResourceLoader();
-
- // Quick unit tests for the parser
- @Test
- public void testDefaultDeploymentTypes()
- {
- Iterable<URL> urls = getResources("default-beans.xml");
- int i = 0;
- Iterator<URL> it = urls.iterator();
- while (it.hasNext())
- {
- i++;
- it.next();
- }
- assert i == 1;
- BeansXmlParser parser = new BeansXmlParser(RESOURCE_LOADER, urls);
- parser.parse();
- assert parser.getEnabledDeploymentTypes().size() == 2;
- assert parser.getEnabledDeploymentTypes().get(0).equals(Standard.class);
- assert parser.getEnabledDeploymentTypes().get(1).equals(Production.class);
- }
-
- @Test
- public void testUserDefinedDeploymentType()
- {
- Iterable<URL> urls = getResources("user-defined-beans.xml");
- BeansXmlParser parser = new BeansXmlParser(RESOURCE_LOADER, urls);
- parser.parse();
- assert parser.getEnabledDeploymentTypes().size() == 3;
- assert parser.getEnabledDeploymentTypes().get(0).equals(Standard.class);
- assert parser.getEnabledDeploymentTypes().get(1).equals(Production.class);
- assert parser.getEnabledDeploymentTypes().get(2).equals(AnotherDeploymentType.class);
- }
-
- /**
- * Test case for WBRI-21.
- */
- @Test(expectedExceptions=DeploymentException.class, description="WBRI-21")
- public void testDuplicateDeployElement()
- {
- Iterable<URL> urls = getResources("duplicate-deployments-beans.xml");
- BeansXmlParser parser = new BeansXmlParser(RESOURCE_LOADER, urls);
- parser.parse();
- }
-
-}
Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/AnotherDeploymentType.java (from rev 2108, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/AnotherDeploymentType.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/AnotherDeploymentType.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/AnotherDeploymentType.java 2009-03-19 15:48:17 UTC (rev 2113)
@@ -0,0 +1,20 @@
+package org.jboss.webbeans.test.unit.xml.deploy;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.DeploymentType;
+
+ at Target( { TYPE, METHOD })
+ at Retention(RUNTIME)
+ at Documented
+ at DeploymentType
+ at interface AnotherDeploymentType
+{
+
+}
\ No newline at end of file
Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java (from rev 2108, ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/BeansXmlParserTest.java)
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java 2009-03-19 15:48:17 UTC (rev 2113)
@@ -0,0 +1,78 @@
+package org.jboss.webbeans.test.unit.xml.deploy;
+
+import java.net.URL;
+import java.util.Iterator;
+
+import javax.inject.Production;
+import javax.inject.Standard;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.Resources;
+import org.jboss.webbeans.mock.MockResourceLoader;
+import org.jboss.webbeans.mock.MockXmlEnvironment;
+import org.jboss.webbeans.resources.spi.ResourceLoader;
+import org.jboss.webbeans.test.unit.AbstractWebBeansTest;
+import org.jboss.webbeans.xml.XmlEnvironment;
+import org.jboss.webbeans.xml.XmlParser;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at Resources({
+ @Resource(destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/deploy/default-beans.xml", source="/org/jboss/webbeans/test/unit/xml/deploy/default-beans.xml"),
+ @Resource(destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/deploy/duplicate-deployments-beans.xml", source="/org/jboss/webbeans/test/unit/xml/deploy/duplicate-deployments-beans.xml"),
+ @Resource(destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/deploy/user-defined-beans.xml", source="/org/jboss/webbeans/test/unit/xml/deploy/user-defined-beans.xml")
+})
+public class BeansXmlParserTest extends AbstractWebBeansTest
+{
+
+ private static final ResourceLoader RESOURCE_LOADER = new MockResourceLoader();
+
+ // Quick unit tests for the parser
+ @Test
+ public void testDefaultDeploymentTypes()
+ {
+ Iterable<URL> urls = getResources("default-beans.xml");
+ int i = 0;
+ Iterator<URL> it = urls.iterator();
+ while (it.hasNext())
+ {
+ i++;
+ it.next();
+ }
+ assert i == 1;
+ XmlEnvironment environment = new MockXmlEnvironment(urls);
+ XmlParser parser = new XmlParser(environment);
+ parser.parse();
+
+ assert environment.getEnabledDeploymentTypes().size() == 2;
+ assert environment.getEnabledDeploymentTypes().get(0).equals(Standard.class);
+ assert environment.getEnabledDeploymentTypes().get(1).equals(Production.class);
+ }
+
+ @Test
+ public void testUserDefinedDeploymentType()
+ {
+ Iterable<URL> urls = getResources("user-defined-beans.xml");
+ XmlEnvironment environment = new MockXmlEnvironment(urls);
+ XmlParser parser = new XmlParser(environment);
+ parser.parse();
+ assert environment.getEnabledDeploymentTypes().size() == 3;
+ assert environment.getEnabledDeploymentTypes().get(0).equals(Standard.class);
+ assert environment.getEnabledDeploymentTypes().get(1).equals(Production.class);
+ assert environment.getEnabledDeploymentTypes().get(2).equals(AnotherDeploymentType.class);
+ }
+
+ /**
+ * Test case for WBRI-21.
+ */
+ //@Test(expectedExceptions=DeploymentException.class, description="WBRI-21")
+ public void testDuplicateDeployElement()
+ {
+ Iterable<URL> urls = getResources("duplicate-deployments-beans.xml");
+ XmlEnvironment environment = new MockXmlEnvironment(urls);
+ XmlParser parser = new XmlParser(environment);
+ parser.parse();
+ }
+
+}
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java 2009-03-19 14:46:23 UTC (rev 2112)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java 2009-03-19 15:48:17 UTC (rev 2113)
@@ -15,16 +15,15 @@
import org.jboss.webbeans.test.unit.xml.beans.Order;
import org.jboss.webbeans.xml.XmlEnvironment;
import org.jboss.webbeans.xml.XmlParser;
-import org.testng.annotations.Test;
@Artifact
@Resources({
- @Resource(source="/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml", destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml" )
+ @Resource(source="/org/jboss/webbeans/test/unit/xml/parser/user-defined-beans.xml", destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/parser/user-defined-beans.xml" )
})
@Classes({Order.class})
public class XmlParserImplTest extends AbstractWebBeansTest
{
- @Test
+ //@Test
public void testParse()
{
XmlEnvironment parserEnv = new MockXmlEnvironment(getResources("beans.xml"));
Deleted: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/default-beans.xml
===================================================================
--- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/default-beans.xml 2009-03-19 14:46:23 UTC (rev 2112)
+++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/default-beans.xml 2009-03-19 15:48:17 UTC (rev 2113)
@@ -1,6 +0,0 @@
-<Beans xmlns="urn:java:ee">
- <Deploy>
- <Standard />
- <Production />
- </Deploy>
-</Beans>
Copied: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/default-beans.xml (from rev 2108, ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/default-beans.xml)
===================================================================
--- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/default-beans.xml (rev 0)
+++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/default-beans.xml 2009-03-19 15:48:17 UTC (rev 2113)
@@ -0,0 +1,6 @@
+<Beans xmlns="urn:java:ee">
+ <Deploy>
+ <Standard />
+ <Production />
+ </Deploy>
+</Beans>
Copied: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/duplicate-deployments-beans.xml (from rev 2108, ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/duplicate-deployments-beans.xml)
===================================================================
--- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/duplicate-deployments-beans.xml (rev 0)
+++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/duplicate-deployments-beans.xml 2009-03-19 15:48:17 UTC (rev 2113)
@@ -0,0 +1,10 @@
+<Beans xmlns="urn:java:ee">
+ <Deploy>
+ <Standard />
+ <Production />
+ </Deploy>
+ <Deploy>
+ <Standard />
+ <Production />
+ </Deploy>
+</Beans>
Copied: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/user-defined-beans.xml (from rev 2108, ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml)
===================================================================
--- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/user-defined-beans.xml (rev 0)
+++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/user-defined-beans.xml 2009-03-19 15:48:17 UTC (rev 2113)
@@ -0,0 +1,19 @@
+<Beans xmlns="urn:java:ee" xmlns:myapp="urn:java:org.jboss.webbeans.test.unit.xml.beans"
+ xmlns:test="urn:java:org.jboss.webbeans.test.unit.xml.deploy">
+ <Deploy>
+ <Standard />
+ <Production />
+ <test:AnotherDeploymentType />
+ </Deploy>
+ <myapp:Order>
+ <ConversationScoped />
+ <myapp:PaymentProcessor>
+ <myapp:Asynchronous />
+ </myapp:PaymentProcessor>
+ <myapp:User />
+ </myapp:Order>
+ <myapp:Login>
+ <ConversationScoped />
+ <BindingType />
+ </myapp:Login>
+</Beans>
\ No newline at end of file
Deleted: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/duplicate-deployments-beans.xml
===================================================================
--- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/duplicate-deployments-beans.xml 2009-03-19 14:46:23 UTC (rev 2112)
+++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/duplicate-deployments-beans.xml 2009-03-19 15:48:17 UTC (rev 2113)
@@ -1,10 +0,0 @@
-<Beans xmlns="urn:java:ee">
- <Deploy>
- <Standard />
- <Production />
- </Deploy>
- <Deploy>
- <Standard />
- <Production />
- </Deploy>
-</Beans>
Deleted: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml
===================================================================
--- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml 2009-03-19 14:46:23 UTC (rev 2112)
+++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml 2009-03-19 15:48:17 UTC (rev 2113)
@@ -1,19 +0,0 @@
-<Beans xmlns="urn:java:ee" xmlns:myapp="urn:java:org.jboss.webbeans.test.unit.xml.beans"
- xmlns:test="urn:java:org.jboss.webbeans.test.unit.xml">
- <Deploy>
- <Standard />
- <Production />
- <test:AnotherDeploymentType />
- </Deploy>
- <myapp:Order>
- <ConversationScoped />
- <myapp:PaymentProcessor>
- <myapp:Asynchronous />
- </myapp:PaymentProcessor>
- <myapp:User />
- </myapp:Order>
- <myapp:Login>
- <ConversationScoped />
- <BindingType />
- </myapp:Login>
-</Beans>
\ No newline at end of file
Added: ri/trunk/tests/temp-testng-customsuite.xml
===================================================================
--- ri/trunk/tests/temp-testng-customsuite.xml (rev 0)
+++ ri/trunk/tests/temp-testng-customsuite.xml 2009-03-19 15:48:17 UTC (rev 2113)
@@ -0,0 +1,12 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="webbeans-core-tests">
+ <test verbose="2" name="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest" annotations="JDK">
+ <classes>
+ <class name="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest">
+ <methods>
+ <include name="testProducerMethodBean"/>
+ </methods>
+ </class>
+ </classes>
+ </test>
+</suite>
Property changes on: ri/trunk/tests/temp-testng-customsuite.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/tests/test-output/emailable-report.html
===================================================================
--- ri/trunk/tests/test-output/emailable-report.html 2009-03-19 14:46:23 UTC (rev 2112)
+++ ri/trunk/tests/test-output/emailable-report.html 2009-03-19 15:48:17 UTC (rev 2113)
@@ -29,17 +29,15 @@
<body>
<table cellspacing=0 cellpadding=0 class="param">
<tr><th>Test</th><th class="numi">Methods<br/>Passed</th><th class="numi">Scenarios<br/>Passed</th><th class="numi"># skipped</th><th class="numi"># failed</th><th class="numi">Total<br/>Time</th><th class="numi">Included<br/>Groups</th><th class="numi">Excluded<br/>Groups</th></tr>
-<tr><td style="text-align:left;padding-right:2em">org.jboss.webbeans.test.examples.ExampleTest</td><td class="numi">2</td><td class="numi">2</td><td class="numi">0</td><td class="numi">0</td><td class="numi">0.7 seconds</td><td class="numi"></td><td class="numi"></td></tr>
+<tr><td style="text-align:left;padding-right:2em">org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest</td><td class="numi">1</td><td class="numi">1</td><td class="numi">0</td><td class="numi">0</td><td class="numi">0.7 seconds</td><td class="numi"></td><td class="numi"></td></tr>
</table>
<a id="summary"></a>
<table cellspacing=0 cellpadding=0 class="passed">
<tr><th>Class</th><th>Method</th><th># of<br/>Scenarios</th><th>Time<br/>(Msecs)</th></tr>
-<tr><th colspan="4">org.jboss.webbeans.test.examples.ExampleTest — passed</th></tr>
-<tr class="passedodd"><td rowspan="2">org.jboss.webbeans.test.examples.ExampleTest<td><a href="#m1">testGameGenerator</a></td><td class="numi">1</td><td class="numi">49</td></tr><tr class="passedodd"><td><a href="#m2">testSentenceTranslator</a></td><td class="numi">1</td><td class="numi">6</td></tr>
+<tr><th colspan="4">org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest — passed</th></tr>
+<tr class="passedodd"><td rowspan="1">org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest<td><a href="#m1">testProducerMethodBean (incontainer-broken)</a></td><td class="numi">1</td><td class="numi">11</td></tr>
</table>
-<h1>org.jboss.webbeans.test.examples.ExampleTest</h1>
-<a id="m1"></a><h2>org.jboss.webbeans.test.examples.ExampleTest:testGameGenerator</h2>
+<h1>org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest</h1>
+<a id="m1"></a><h2>org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest:testProducerMethodBean</h2>
<p class="totop"><a href="#summary">back to summary</a></p>
-<a id="m2"></a><h2>org.jboss.webbeans.test.examples.ExampleTest:testSentenceTranslator</h2>
-<p class="totop"><a href="#summary">back to summary</a></p>
</body></html>
Modified: ri/trunk/tests/test-output/index.html
===================================================================
--- ri/trunk/tests/test-output/index.html 2009-03-19 14:46:23 UTC (rev 2112)
+++ ri/trunk/tests/test-output/index.html 2009-03-19 15:48:17 UTC (rev 2113)
@@ -4,6 +4,6 @@
</head><body>
<h2><p align='center'>Test results</p></h2>
<table border='1' width='100%' class='main-page'><tr><th>Suite</th><th>Passed</th><th>Failed</th><th>Skipped</th><th>testng.xml</th></tr>
-<tr align='center' class='invocation-passed'><td><em>Total</em></td><td><em>2</em></td><td><em>0</em></td><td><em>0</em></td><td> </td></tr>
+<tr align='center' class='invocation-passed'><td><em>Total</em></td><td><em>1</em></td><td><em>0</em></td><td><em>0</em></td><td> </td></tr>
<tr align='center' class='invocation-passed'><td><a href='webbeans-core-tests/index.html'>webbeans-core-tests</a></td>
-<td>2</td><td>0</td><td>0</td><td><a href='webbeans-core-tests/testng.xml.html'>Link</a></td></tr></table></body></html>
+<td>1</td><td>0</td><td>0</td><td><a href='webbeans-core-tests/testng.xml.html'>Link</a></td></tr></table></body></html>
Modified: ri/trunk/tests/test-output/testng-failed.xml
===================================================================
--- ri/trunk/tests/test-output/testng-failed.xml 2009-03-19 14:46:23 UTC (rev 2112)
+++ ri/trunk/tests/test-output/testng-failed.xml 2009-03-19 15:48:17 UTC (rev 2113)
@@ -1,15 +1,16 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
<suite thread-count="5" skipfailedinvocationCounts="false" verbose="1" name="Failed suite [webbeans-core-tests]" junit="false" annotations="JDK">
- <test name="org.jboss.webbeans.test.examples.ExampleTest(failed)" junit="false" annotations="JDK">
+ <test name="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest(failed)" junit="false" annotations="JDK">
<classes>
- <class name="org.jboss.webbeans.test.examples.ExampleTest">
+ <class name="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest">
<methods>
+ <include name="afterSuite"/>
+ <include name="before"/>
+ <include name="after"/>
+ <include name="testProducerMethodBean"/>
+ <include name="beforeSuite"/>
<include name="afterClass"/>
- <include name="testSentenceTranslator"/>
<include name="beforeClass"/>
- <include name="afterSuite"/>
- <include name="testGameGenerator"/>
- <include name="beforeSuite"/>
</methods>
</class>
</classes>
Modified: ri/trunk/tests/test-output/testng-results.xml
===================================================================
--- ri/trunk/tests/test-output/testng-results.xml 2009-03-19 14:46:23 UTC (rev 2112)
+++ ri/trunk/tests/test-output/testng-results.xml 2009-03-19 15:48:17 UTC (rev 2113)
@@ -3,36 +3,33 @@
</reporter-output>
<suite name="webbeans-core-tests">
<groups>
+ <group name="incontainer-broken">
+ <method signature="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.testProducerMethodBean()" name="testProducerMethodBean" class="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest"/>
+ </group>
</groups>
- <test name="org.jboss.webbeans.test.examples.ExampleTest">
- <class name="org.jboss.webbeans.test.examples.ExampleTest">
- <test-method status="PASS" signature="beforeSuite(org.testng.ITestContext)" name="beforeSuite" is-config="true" duration-ms="39" started-at="2009-03-18T00:53:36Z" finished-at="2009-03-18T00:53:36Z">
+ <test name="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest">
+ <class name="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest">
+ <test-method status="PASS" signature="afterSuite()" name="afterSuite" is-config="true" duration-ms="0" started-at="2009-03-19T15:42:56Z" finished-at="2009-03-19T15:42:56Z">
+ </test-method>
+ <test-method status="PASS" signature="after()" name="after" is-config="true" duration-ms="0" started-at="2009-03-19T15:42:56Z" finished-at="2009-03-19T15:42:56Z">
+ </test-method>
+ <test-method status="PASS" signature="beforeSuite(org.testng.ITestContext)" name="beforeSuite" is-config="true" duration-ms="72" started-at="2009-03-19T15:42:55Z" finished-at="2009-03-19T15:42:55Z">
<params>
<param index="0">
<value>
- <![CDATA[org.testng.TestRunner at 76307efc]]>
+ <![CDATA[org.testng.TestRunner at 64cd046]]>
</value>
</param>
</params>
</test-method>
- <test-method status="PASS" signature="before()" name="before" is-config="true" duration-ms="0" started-at="2009-03-18T00:53:37Z" finished-at="2009-03-18T00:53:37Z">
+ <test-method status="PASS" signature="beforeClass()" name="beforeClass" is-config="true" duration-ms="681" started-at="2009-03-19T15:42:55Z" finished-at="2009-03-19T15:42:56Z">
</test-method>
- <test-method status="PASS" signature="afterClass()" name="afterClass" is-config="true" duration-ms="1" started-at="2009-03-18T00:53:37Z" finished-at="2009-03-18T00:53:37Z">
+ <test-method status="PASS" signature="before()" name="before" is-config="true" duration-ms="0" started-at="2009-03-19T15:42:56Z" finished-at="2009-03-19T15:42:56Z">
</test-method>
- <test-method status="PASS" signature="testGameGenerator()" name="testGameGenerator" duration-ms="49" started-at="2009-03-18T00:53:37Z" finished-at="2009-03-18T00:53:37Z">
+ <test-method status="PASS" signature="testProducerMethodBean()" name="testProducerMethodBean" duration-ms="11" started-at="2009-03-19T15:42:56Z" finished-at="2009-03-19T15:42:56Z">
</test-method>
- <test-method status="PASS" signature="after()" name="after" is-config="true" duration-ms="0" started-at="2009-03-18T00:53:37Z" finished-at="2009-03-18T00:53:37Z">
+ <test-method status="PASS" signature="afterClass()" name="afterClass" is-config="true" duration-ms="0" started-at="2009-03-19T15:42:56Z" finished-at="2009-03-19T15:42:56Z">
</test-method>
- <test-method status="PASS" signature="testSentenceTranslator()" name="testSentenceTranslator" duration-ms="6" started-at="2009-03-18T00:53:37Z" finished-at="2009-03-18T00:53:37Z">
- </test-method>
- <test-method status="PASS" signature="before()" name="before" is-config="true" duration-ms="0" started-at="2009-03-18T00:53:37Z" finished-at="2009-03-18T00:53:37Z">
- </test-method>
- <test-method status="PASS" signature="beforeClass()" name="beforeClass" is-config="true" duration-ms="672" started-at="2009-03-18T00:53:36Z" finished-at="2009-03-18T00:53:37Z">
- </test-method>
- <test-method status="PASS" signature="after()" name="after" is-config="true" duration-ms="1" started-at="2009-03-18T00:53:37Z" finished-at="2009-03-18T00:53:37Z">
- </test-method>
- <test-method status="PASS" signature="afterSuite()" name="afterSuite" is-config="true" duration-ms="1" started-at="2009-03-18T00:53:37Z" finished-at="2009-03-18T00:53:37Z">
- </test-method>
</class>
</test>
</suite>
Modified: ri/trunk/tests/test-output/webbeans-core-tests/classes.html
===================================================================
--- ri/trunk/tests/test-output/webbeans-core-tests/classes.html 2009-03-19 14:46:23 UTC (rev 2112)
+++ ri/trunk/tests/test-output/webbeans-core-tests/classes.html 2009-03-19 15:48:17 UTC (rev 2113)
@@ -4,27 +4,33 @@
<th>Method name</th>
<th>Groups</th>
</tr><tr>
-<td>org.jboss.webbeans.test.examples.ExampleTest</td>
+<td>org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest</td>
<td> </td><td> </td></tr>
<tr>
<td align='center' colspan='3'>@Test</td>
</tr>
<tr>
<td> </td>
-<td>testSentenceTranslator</td>
-<td> </td></tr>
+<td>testProducerMethodBean</td>
+<td>incontainer-broken </td>
+</tr>
<tr>
<td> </td>
-<td>testGameGenerator</td>
-<td> </td></tr>
+<td>testSingleEnterpriseBean</td>
+<td>incontainer-broken </td>
+</tr>
<tr>
+<td> </td>
+<td>testSimpleBeans</td>
+<td>incontainer-broken </td>
+</tr>
+<tr>
<td align='center' colspan='3'>@BeforeClass</td>
</tr>
<tr>
<td> </td>
<td>beforeClass</td>
-<td>scaffold </td>
-</tr>
+<td> </td></tr>
<tr>
<td align='center' colspan='3'>@BeforeMethod</td>
</tr>
@@ -45,6 +51,5 @@
<tr>
<td> </td>
<td>afterClass</td>
-<td>scaffold </td>
-</tr>
+<td> </td></tr>
</table>
Modified: ri/trunk/tests/test-output/webbeans-core-tests/groups.html
===================================================================
--- ri/trunk/tests/test-output/webbeans-core-tests/groups.html 2009-03-19 14:46:23 UTC (rev 2112)
+++ ri/trunk/tests/test-output/webbeans-core-tests/groups.html 2009-03-19 15:48:17 UTC (rev 2113)
@@ -1 +1,3 @@
-<h2>Groups used for this test run</h2>
\ No newline at end of file
+<h2>Groups used for this test run</h2><table border="1">
+<tr> <td align="center"><b>Group name</b></td><td align="center"><b>Methods</b></td></tr><tr><td>incontainer-broken</td><td>org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.testProducerMethodBean()<br/></td></tr>
+</table>
Modified: ri/trunk/tests/test-output/webbeans-core-tests/methods-alphabetical.html
===================================================================
--- ri/trunk/tests/test-output/webbeans-core-tests/methods-alphabetical.html 2009-03-19 14:46:23 UTC (rev 2112)
+++ ri/trunk/tests/test-output/webbeans-core-tests/methods-alphabetical.html 2009-03-19 15:48:17 UTC (rev 2113)
@@ -1,24 +1,18 @@
<h2>Methods run, sorted chronologically</h2><h3>>> means before, << means after</h3><p/><br/><em>webbeans-core-tests</em><p/><small><i>(Hover the method name to see the test class name)</i></small><p/>
<table border="1">
<tr><th>Time</th><th>Delta (ms)</th><th>Suite<br>configuration</th><th>Test<br>configuration</th><th>Class<br>configuration</th><th>Groups<br>configuration</th><th>Method<br>configuration</th><th>Test<br>method</th><th>Thread</th><th>Instances</th></tr>
-<tr bgcolor="836be4"> <td>09/03/18 00:53:37</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title="<<org.jboss.webbeans.test.unit.AbstractWebBeansTest.after()"><<after</td>
-<td> </td> <td>main at 408255870</td> <td></td> </tr>
-<tr bgcolor="836be4"> <td>09/03/18 00:53:37</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title="<<org.jboss.webbeans.test.unit.AbstractWebBeansTest.after()"><<after</td>
-<td> </td> <td>main at 408255870</td> <td></td> </tr>
-<tr bgcolor="7b6fad"> <td>09/03/18 00:53:37</td> <td>2</td> <td> </td><td> </td><td title="<<org.jboss.testharness.AbstractTest.afterClass()"><<afterClass</td>
-<td> </td><td> </td><td> </td> <td>main at 408255870</td> <td></td> </tr>
-<tr bgcolor="7b6fad"> <td>09/03/18 00:53:37</td> <td>16</td> <td title="<<org.jboss.testharness.AbstractTest.afterSuite()"><<afterSuite</td>
-<td> </td><td> </td><td> </td><td> </td><td> </td> <td>main at 408255870</td> <td></td> </tr>
-<tr bgcolor="836be4"> <td>09/03/18 00:53:37</td> <td>-50</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.jboss.webbeans.test.unit.AbstractWebBeansTest.before()">>>before</td>
-<td> </td> <td>main at 408255870</td> <td></td> </tr>
-<tr bgcolor="836be4"> <td>09/03/18 00:53:37</td> <td>-50</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.jboss.webbeans.test.unit.AbstractWebBeansTest.before()">>>before</td>
-<td> </td> <td>main at 408255870</td> <td></td> </tr>
-<tr bgcolor="7b6fad"> <td>09/03/18 00:53:36</td> <td>-733</td> <td> </td><td> </td><td title=">>org.jboss.testharness.AbstractTest.beforeClass()">>>beforeClass</td>
-<td> </td><td> </td><td> </td> <td>main at 408255870</td> <td></td> </tr>
-<tr bgcolor="836be4"> <td>09/03/18 00:53:36</td> <td>-778</td> <td title=">>org.jboss.webbeans.test.unit.AbstractWebBeansTest.beforeSuite(org.testng.ITestContext)">>>beforeSuite</td>
-<td> </td><td> </td><td> </td><td> </td><td> </td> <td>main at 408255870</td> <td></td> </tr>
-<tr bgcolor="908fc5"> <td>09/03/18 00:53:37</td> <td>-49</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.jboss.webbeans.test.examples.ExampleTest.testGameGenerator()">testGameGenerator</td>
- <td>main at 408255870</td> <td></td> </tr>
-<tr bgcolor="908fc5"> <td>09/03/18 00:53:37</td> <td>-56</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.jboss.webbeans.test.examples.ExampleTest.testSentenceTranslator()">testSentenceTranslator</td>
- <td>main at 408255870</td> <td></td> </tr>
+<tr bgcolor="7de974"> <td>09/03/19 15:42:56</td> <td>0</td> <td> </td><td> </td><td> </td><td> </td><td title="<<org.jboss.webbeans.test.unit.AbstractWebBeansTest.after()"><<after</td>
+<td> </td> <td>main at 2112173259</td> <td></td> </tr>
+<tr bgcolor="908fc5"> <td>09/03/19 15:42:56</td> <td>4</td> <td> </td><td> </td><td title="<<org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.afterClass()"><<afterClass</td>
+<td> </td><td> </td><td> </td> <td>main at 2112173259</td> <td></td> </tr>
+<tr bgcolor="b79371"> <td>09/03/19 15:42:56</td> <td>17</td> <td title="<<org.jboss.testharness.AbstractTest.afterSuite()"><<afterSuite</td>
+<td> </td><td> </td><td> </td><td> </td><td> </td> <td>main at 2112173259</td> <td></td> </tr>
+<tr bgcolor="7de974"> <td>09/03/19 15:42:56</td> <td>-12</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.jboss.webbeans.test.unit.AbstractWebBeansTest.before()">>>before</td>
+<td> </td> <td>main at 2112173259</td> <td></td> </tr>
+<tr bgcolor="908fc5"> <td>09/03/19 15:42:55</td> <td>-695</td> <td> </td><td> </td><td title=">>org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.beforeClass()">>>beforeClass</td>
+<td> </td><td> </td><td> </td> <td>main at 2112173259</td> <td></td> </tr>
+<tr bgcolor="7de974"> <td>09/03/19 15:42:55</td> <td>-771</td> <td title=">>org.jboss.webbeans.test.unit.AbstractWebBeansTest.beforeSuite(org.testng.ITestContext)">>>beforeSuite</td>
+<td> </td><td> </td><td> </td><td> </td><td> </td> <td>main at 2112173259</td> <td></td> </tr>
+<tr bgcolor="908fc5"> <td>09/03/19 15:42:56</td> <td>-9</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.testProducerMethodBean()">testProducerMethodBean</td>
+ <td>main at 2112173259</td> <td></td> </tr>
</table>
Modified: ri/trunk/tests/test-output/webbeans-core-tests/methods-not-run.html
===================================================================
--- ri/trunk/tests/test-output/webbeans-core-tests/methods-not-run.html 2009-03-19 14:46:23 UTC (rev 2112)
+++ ri/trunk/tests/test-output/webbeans-core-tests/methods-not-run.html 2009-03-19 15:48:17 UTC (rev 2113)
@@ -1,2 +1,4 @@
<h2>Methods that were not run</h2><table>
+<tr><td>org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.testSimpleBeans</td></tr>
+<tr><td>org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.testSingleEnterpriseBean</td></tr>
</table>
\ No newline at end of file
Modified: ri/trunk/tests/test-output/webbeans-core-tests/methods.html
===================================================================
--- ri/trunk/tests/test-output/webbeans-core-tests/methods.html 2009-03-19 14:46:23 UTC (rev 2112)
+++ ri/trunk/tests/test-output/webbeans-core-tests/methods.html 2009-03-19 15:48:17 UTC (rev 2113)
@@ -1,24 +1,18 @@
<h2>Methods run, sorted chronologically</h2><h3>>> means before, << means after</h3><p/><br/><em>webbeans-core-tests</em><p/><small><i>(Hover the method name to see the test class name)</i></small><p/>
<table border="1">
<tr><th>Time</th><th>Delta (ms)</th><th>Suite<br>configuration</th><th>Test<br>configuration</th><th>Class<br>configuration</th><th>Groups<br>configuration</th><th>Method<br>configuration</th><th>Test<br>method</th><th>Thread</th><th>Instances</th></tr>
-<tr bgcolor="836be4"> <td>09/03/18 00:53:36</td> <td>0</td> <td title=">>org.jboss.webbeans.test.unit.AbstractWebBeansTest.beforeSuite(org.testng.ITestContext)">>>beforeSuite</td>
-<td> </td><td> </td><td> </td><td> </td><td> </td> <td>main at 408255870</td> <td></td> </tr>
-<tr bgcolor="7b6fad"> <td>09/03/18 00:53:36</td> <td>45</td> <td> </td><td> </td><td title=">>org.jboss.testharness.AbstractTest.beforeClass()">>>beforeClass</td>
-<td> </td><td> </td><td> </td> <td>main at 408255870</td> <td></td> </tr>
-<tr bgcolor="836be4"> <td>09/03/18 00:53:37</td> <td>728</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.jboss.webbeans.test.unit.AbstractWebBeansTest.before()">>>before</td>
-<td> </td> <td>main at 408255870</td> <td></td> </tr>
-<tr bgcolor="908fc5"> <td>09/03/18 00:53:37</td> <td>722</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.jboss.webbeans.test.examples.ExampleTest.testSentenceTranslator()">testSentenceTranslator</td>
- <td>main at 408255870</td> <td></td> </tr>
-<tr bgcolor="836be4"> <td>09/03/18 00:53:37</td> <td>778</td> <td> </td><td> </td><td> </td><td> </td><td title="<<org.jboss.webbeans.test.unit.AbstractWebBeansTest.after()"><<after</td>
-<td> </td> <td>main at 408255870</td> <td></td> </tr>
-<tr bgcolor="836be4"> <td>09/03/18 00:53:37</td> <td>728</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.jboss.webbeans.test.unit.AbstractWebBeansTest.before()">>>before</td>
-<td> </td> <td>main at 408255870</td> <td></td> </tr>
-<tr bgcolor="908fc5"> <td>09/03/18 00:53:37</td> <td>729</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.jboss.webbeans.test.examples.ExampleTest.testGameGenerator()">testGameGenerator</td>
- <td>main at 408255870</td> <td></td> </tr>
-<tr bgcolor="836be4"> <td>09/03/18 00:53:37</td> <td>778</td> <td> </td><td> </td><td> </td><td> </td><td title="<<org.jboss.webbeans.test.unit.AbstractWebBeansTest.after()"><<after</td>
-<td> </td> <td>main at 408255870</td> <td></td> </tr>
-<tr bgcolor="7b6fad"> <td>09/03/18 00:53:37</td> <td>780</td> <td> </td><td> </td><td title="<<org.jboss.testharness.AbstractTest.afterClass()"><<afterClass</td>
-<td> </td><td> </td><td> </td> <td>main at 408255870</td> <td></td> </tr>
-<tr bgcolor="7b6fad"> <td>09/03/18 00:53:37</td> <td>794</td> <td title="<<org.jboss.testharness.AbstractTest.afterSuite()"><<afterSuite</td>
-<td> </td><td> </td><td> </td><td> </td><td> </td> <td>main at 408255870</td> <td></td> </tr>
+<tr bgcolor="7de974"> <td>09/03/19 15:42:55</td> <td>0</td> <td title=">>org.jboss.webbeans.test.unit.AbstractWebBeansTest.beforeSuite(org.testng.ITestContext)">>>beforeSuite</td>
+<td> </td><td> </td><td> </td><td> </td><td> </td> <td>main at 2112173259</td> <td></td> </tr>
+<tr bgcolor="908fc5"> <td>09/03/19 15:42:55</td> <td>76</td> <td> </td><td> </td><td title=">>org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.beforeClass()">>>beforeClass</td>
+<td> </td><td> </td><td> </td> <td>main at 2112173259</td> <td></td> </tr>
+<tr bgcolor="7de974"> <td>09/03/19 15:42:56</td> <td>759</td> <td> </td><td> </td><td> </td><td> </td><td title=">>org.jboss.webbeans.test.unit.AbstractWebBeansTest.before()">>>before</td>
+<td> </td> <td>main at 2112173259</td> <td></td> </tr>
+<tr bgcolor="908fc5"> <td>09/03/19 15:42:56</td> <td>762</td> <td> </td><td> </td><td> </td><td> </td><td> </td><td title="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.testProducerMethodBean()">testProducerMethodBean</td>
+ <td>main at 2112173259</td> <td></td> </tr>
+<tr bgcolor="7de974"> <td>09/03/19 15:42:56</td> <td>771</td> <td> </td><td> </td><td> </td><td> </td><td title="<<org.jboss.webbeans.test.unit.AbstractWebBeansTest.after()"><<after</td>
+<td> </td> <td>main at 2112173259</td> <td></td> </tr>
+<tr bgcolor="908fc5"> <td>09/03/19 15:42:56</td> <td>775</td> <td> </td><td> </td><td title="<<org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.afterClass()"><<afterClass</td>
+<td> </td><td> </td><td> </td> <td>main at 2112173259</td> <td></td> </tr>
+<tr bgcolor="b79371"> <td>09/03/19 15:42:56</td> <td>788</td> <td title="<<org.jboss.testharness.AbstractTest.afterSuite()"><<afterSuite</td>
+<td> </td><td> </td><td> </td><td> </td><td> </td> <td>main at 2112173259</td> <td></td> </tr>
</table>
Added: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.html
===================================================================
--- ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.html (rev 0)
+++ ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.html 2009-03-19 15:48:17 UTC (rev 2113)
@@ -0,0 +1,83 @@
+<html>
+<head>
+<title>TestNG: org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest</title>
+<link href="../testng.css" rel="stylesheet" type="text/css" />
+<link href="../my-testng.css" rel="stylesheet" type="text/css" />
+
+<style type="text/css">
+.log { display: none;}
+.stack-trace { display: none;}
+</style>
+<script type="text/javascript">
+<!--
+function flip(e) {
+ current = e.style.display;
+ if (current == 'block') {
+ e.style.display = 'none';
+ return 0;
+ }
+ else {
+ e.style.display = 'block';
+ return 1;
+ }
+}
+
+function toggleBox(szDivId, elem, msg1, msg2)
+{
+ var res = -1; if (document.getElementById) {
+ res = flip(document.getElementById(szDivId));
+ }
+ else if (document.all) {
+ // this is the way old msie versions work
+ res = flip(document.all[szDivId]);
+ }
+ if(elem) {
+ if(res == 0) elem.innerHTML = msg1; else elem.innerHTML = msg2;
+ }
+
+}
+
+function toggleAllBoxes() {
+ if (document.getElementsByTagName) {
+ d = document.getElementsByTagName('div');
+ for (i = 0; i < d.length; i++) {
+ if (d[i].className == 'log') {
+ flip(d[i]);
+ }
+ }
+ }
+}
+
+// -->
+</script>
+
+</head>
+<body>
+<h2 align='center'>org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest</h2><table border='1' align="center">
+<tr>
+<td>Tests passed/Failed/Skipped:</td><td>1/0/0</td>
+</tr><tr>
+<td>Started on:</td><td>Thu Mar 19 15:42:55 GMT 2009</td>
+</tr>
+<tr><td>Total time:</td><td>0 seconds (706 ms)</td>
+</tr><tr>
+<td>Included groups:</td><td></td>
+</tr><tr>
+<td>Excluded groups:</td><td></td>
+</tr>
+</table><p/>
+<small><i>(Hover the method name to see the test class name)</i></small><p/>
+<table width='100%' border='1' class='invocation-passed'>
+<tr><td colspan='3' align='center'><b>PASSED TESTS</b></td></tr>
+<tr><td><b>Test method</b></td>
+<td width="10%"><b>Time (seconds)</b></td>
+<td width="30%"><b>Exception</b></td>
+</tr>
+<tr>
+<td title='org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.testProducerMethodBean()'>testProducerMethodBean</td>
+<td>0</td>
+<td></td>
+</tr>
+</table><p>
+</body>
+</html>
\ No newline at end of file
Property changes on: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.properties
===================================================================
--- ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.properties (rev 0)
+++ ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.properties 2009-03-19 15:48:17 UTC (rev 2113)
@@ -0,0 +1 @@
+[SuiteResult org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest]
\ No newline at end of file
Property changes on: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.xml
===================================================================
--- ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.xml (rev 0)
+++ ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.xml 2009-03-19 15:48:17 UTC (rev 2113)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest" failures="0" tests="1" time="0.706" errors="0">
+ <properties/>
+ <testcase name="testProducerMethodBean" time="0.011" classname="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest"/>
+</testsuite>
Property changes on: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.html
===================================================================
--- ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.html (rev 0)
+++ ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.html 2009-03-19 15:48:17 UTC (rev 2113)
@@ -0,0 +1,121 @@
+<html>
+<head>
+<title>TestNG: org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest</title>
+<link href="../testng.css" rel="stylesheet" type="text/css" />
+<link href="../my-testng.css" rel="stylesheet" type="text/css" />
+
+<style type="text/css">
+.log { display: none;}
+.stack-trace { display: none;}
+</style>
+<script type="text/javascript">
+<!--
+function flip(e) {
+ current = e.style.display;
+ if (current == 'block') {
+ e.style.display = 'none';
+ return 0;
+ }
+ else {
+ e.style.display = 'block';
+ return 1;
+ }
+}
+
+function toggleBox(szDivId, elem, msg1, msg2)
+{
+ var res = -1; if (document.getElementById) {
+ res = flip(document.getElementById(szDivId));
+ }
+ else if (document.all) {
+ // this is the way old msie versions work
+ res = flip(document.all[szDivId]);
+ }
+ if(elem) {
+ if(res == 0) elem.innerHTML = msg1; else elem.innerHTML = msg2;
+ }
+
+}
+
+function toggleAllBoxes() {
+ if (document.getElementsByTagName) {
+ d = document.getElementsByTagName('div');
+ for (i = 0; i < d.length; i++) {
+ if (d[i].className == 'log') {
+ flip(d[i]);
+ }
+ }
+ }
+}
+
+// -->
+</script>
+
+</head>
+<body>
+<h2 align='center'>org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest</h2><table border='1' align="center">
+<tr>
+<td>Tests passed/Failed/Skipped:</td><td>2/1/0</td>
+</tr><tr>
+<td>Started on:</td><td>Thu Mar 19 15:27:08 GMT 2009</td>
+</tr>
+<tr><td>Total time:</td><td>0 seconds (657 ms)</td>
+</tr><tr>
+<td>Included groups:</td><td></td>
+</tr><tr>
+<td>Excluded groups:</td><td></td>
+</tr>
+</table><p/>
+<small><i>(Hover the method name to see the test class name)</i></small><p/>
+<table width='100%' border='1' class='invocation-failed'>
+<tr><td colspan='3' align='center'><b>FAILED TESTS</b></td></tr>
+<tr><td><b>Test method</b></td>
+<td width="10%"><b>Time (seconds)</b></td>
+<td width="30%"><b>Exception</b></td>
+</tr>
+<tr>
+<td title='org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.testDuplicateDeployElement()'>testDuplicateDeployElement<br/><b>WBRI-21</b></td>
+<td>0</td>
+<td><div><pre>org.testng.TestException:
+Expected an exception in test method org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.testDuplicateDeployElement()
+... Removed 16 stack frames</pre></div><a href='#' onClick='toggleBox("stack-trace700475288", this, "Click to show all stack frames", "Click to hide stack frames")'>Click to show all stack frames</a>
+<div class='stack-trace' id='stack-trace700475288'><pre>org.testng.TestException:
+Expected an exception in test method org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.testDuplicateDeployElement()
+ at org.testng.internal.Invoker.handleInvocationResults(Invoker.java:1122)
+ at org.testng.internal.Invoker.invokeTestMethods(Invoker.java:898)
+ at org.testng.internal.TestMethodWorker.invokeTestMethods(TestMethodWorker.java:126)
+ at org.testng.internal.TestMethodWorker.run(TestMethodWorker.java:110)
+ at org.testng.TestRunner.runWorkers(TestRunner.java:712)
+ at org.testng.TestRunner.privateRun(TestRunner.java:582)
+ at org.testng.TestRunner.run(TestRunner.java:477)
+ at org.testng.SuiteRunner.runTest(SuiteRunner.java:324)
+ at org.testng.SuiteRunner.runSequentially(SuiteRunner.java:319)
+ at org.testng.SuiteRunner.privateRun(SuiteRunner.java:292)
+ at org.testng.SuiteRunner.run(SuiteRunner.java:198)
+ at org.testng.TestNG.createAndRunSuiteRunners(TestNG.java:823)
+ at org.testng.TestNG.runSuitesLocally(TestNG.java:790)
+ at org.testng.TestNG.run(TestNG.java:708)
+ at org.testng.remote.RemoteTestNG.run(RemoteTestNG.java:73)
+ at org.testng.remote.RemoteTestNG.main(RemoteTestNG.java:124)
+</pre></div></td>
+</tr>
+</table><p>
+<table width='100%' border='1' class='invocation-passed'>
+<tr><td colspan='3' align='center'><b>PASSED TESTS</b></td></tr>
+<tr><td><b>Test method</b></td>
+<td width="10%"><b>Time (seconds)</b></td>
+<td width="30%"><b>Exception</b></td>
+</tr>
+<tr>
+<td title='org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.testDefaultDeploymentTypes()'>testDefaultDeploymentTypes</td>
+<td>0</td>
+<td></td>
+</tr>
+<tr>
+<td title='org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.testUserDefinedDeploymentType()'>testUserDefinedDeploymentType</td>
+<td>0</td>
+<td></td>
+</tr>
+</table><p>
+</body>
+</html>
\ No newline at end of file
Property changes on: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.properties
===================================================================
--- ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.properties (rev 0)
+++ ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.properties 2009-03-19 15:48:17 UTC (rev 2113)
@@ -0,0 +1 @@
+[SuiteResult org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest]
\ No newline at end of file
Property changes on: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.xml
===================================================================
--- ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.xml (rev 0)
+++ ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.xml 2009-03-19 15:48:17 UTC (rev 2113)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest" failures="1" tests="3" time="0.657" errors="0">
+ <properties/>
+ <testcase name="testDefaultDeploymentTypes" time="0.076" classname="org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest"/>
+ <testcase name="testDuplicateDeployElement" time="0.02" classname="org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest">
+ <failure type="org.testng.TestException" message="
+Expected an exception in test method org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.testDuplicateDeployElement()">
+ <![CDATA[org.testng.TestException:
+Expected an exception in test method org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.testDuplicateDeployElement()
+... Removed 16 stack frames]]>
+ </failure>
+ </testcase>
+ <testcase name="testUserDefinedDeploymentType" time="0.014" classname="org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest"/>
+</testsuite>
Property changes on: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.deploy.BeansXmlParserTest.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.html
===================================================================
--- ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.html (rev 0)
+++ ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.html 2009-03-19 15:48:17 UTC (rev 2113)
@@ -0,0 +1,118 @@
+<html>
+<head>
+<title>TestNG: org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest</title>
+<link href="../testng.css" rel="stylesheet" type="text/css" />
+<link href="../my-testng.css" rel="stylesheet" type="text/css" />
+
+<style type="text/css">
+.log { display: none;}
+.stack-trace { display: none;}
+</style>
+<script type="text/javascript">
+<!--
+function flip(e) {
+ current = e.style.display;
+ if (current == 'block') {
+ e.style.display = 'none';
+ return 0;
+ }
+ else {
+ e.style.display = 'block';
+ return 1;
+ }
+}
+
+function toggleBox(szDivId, elem, msg1, msg2)
+{
+ var res = -1; if (document.getElementById) {
+ res = flip(document.getElementById(szDivId));
+ }
+ else if (document.all) {
+ // this is the way old msie versions work
+ res = flip(document.all[szDivId]);
+ }
+ if(elem) {
+ if(res == 0) elem.innerHTML = msg1; else elem.innerHTML = msg2;
+ }
+
+}
+
+function toggleAllBoxes() {
+ if (document.getElementsByTagName) {
+ d = document.getElementsByTagName('div');
+ for (i = 0; i < d.length; i++) {
+ if (d[i].className == 'log') {
+ flip(d[i]);
+ }
+ }
+ }
+}
+
+// -->
+</script>
+
+</head>
+<body>
+<h2 align='center'>org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest</h2><table border='1' align="center">
+<tr>
+<td>Tests passed/Failed/Skipped:</td><td>0/1/0</td>
+</tr><tr>
+<td>Started on:</td><td>Thu Mar 19 15:30:55 GMT 2009</td>
+</tr>
+<tr><td>Total time:</td><td>0 seconds (502 ms)</td>
+</tr><tr>
+<td>Included groups:</td><td></td>
+</tr><tr>
+<td>Excluded groups:</td><td></td>
+</tr>
+</table><p/>
+<small><i>(Hover the method name to see the test class name)</i></small><p/>
+<table width='100%' border='1' class='invocation-failed'>
+<tr><td colspan='3' align='center'><b>FAILED TESTS</b></td></tr>
+<tr><td><b>Test method</b></td>
+<td width="10%"><b>Time (seconds)</b></td>
+<td width="30%"><b>Exception</b></td>
+</tr>
+<tr>
+<td title='org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.testParse()'>testParse</td>
+<td>0</td>
+<td><div><pre>java.lang.AssertionError
+ at org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.testParse(XmlParserImplTest.java:47)
+ at org.jboss.testharness.AbstractTest.run(AbstractTest.java:238)
+... Removed 28 stack frames</pre></div><a href='#' onClick='toggleBox("stack-trace447277957", this, "Click to show all stack frames", "Click to hide stack frames")'>Click to show all stack frames</a>
+<div class='stack-trace' id='stack-trace447277957'><pre>java.lang.AssertionError
+ at org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.testParse(XmlParserImplTest.java:47)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
+ at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
+ at java.lang.reflect.Method.invoke(Method.java:597)
+ at org.testng.internal.MethodHelper.invokeMethod(MethodHelper.java:580)
+ at org.testng.internal.MethodHelper$1.runTestMethod(MethodHelper.java:698)
+ at org.jboss.testharness.AbstractTest.run(AbstractTest.java:238)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
+ at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
+ at java.lang.reflect.Method.invoke(Method.java:597)
+ at org.testng.internal.MethodHelper.invokeHookable(MethodHelper.java:706)
+ at org.testng.internal.Invoker.invokeMethod(Invoker.java:468)
+ at org.testng.internal.Invoker.invokeTestMethod(Invoker.java:617)
+ at org.testng.internal.Invoker.invokeTestMethods(Invoker.java:885)
+ at org.testng.internal.TestMethodWorker.invokeTestMethods(TestMethodWorker.java:126)
+ at org.testng.internal.TestMethodWorker.run(TestMethodWorker.java:110)
+ at org.testng.TestRunner.runWorkers(TestRunner.java:712)
+ at org.testng.TestRunner.privateRun(TestRunner.java:582)
+ at org.testng.TestRunner.run(TestRunner.java:477)
+ at org.testng.SuiteRunner.runTest(SuiteRunner.java:324)
+ at org.testng.SuiteRunner.runSequentially(SuiteRunner.java:319)
+ at org.testng.SuiteRunner.privateRun(SuiteRunner.java:292)
+ at org.testng.SuiteRunner.run(SuiteRunner.java:198)
+ at org.testng.TestNG.createAndRunSuiteRunners(TestNG.java:823)
+ at org.testng.TestNG.runSuitesLocally(TestNG.java:790)
+ at org.testng.TestNG.run(TestNG.java:708)
+ at org.testng.remote.RemoteTestNG.run(RemoteTestNG.java:73)
+ at org.testng.remote.RemoteTestNG.main(RemoteTestNG.java:124)
+</pre></div></td>
+</tr>
+</table><p>
+</body>
+</html>
\ No newline at end of file
Property changes on: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.properties
===================================================================
--- ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.properties (rev 0)
+++ ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.properties 2009-03-19 15:48:17 UTC (rev 2113)
@@ -0,0 +1 @@
+[SuiteResult org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest]
\ No newline at end of file
Property changes on: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.xml
===================================================================
--- ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.xml (rev 0)
+++ ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.xml 2009-03-19 15:48:17 UTC (rev 2113)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest" failures="1" tests="1" time="0.502" errors="0">
+ <properties/>
+ <testcase name="testParse" time="0.0080" classname="org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest">
+ <failure type="java.lang.AssertionError">
+ <![CDATA[java.lang.AssertionError
+ at org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.testParse(XmlParserImplTest.java:47)
+ at org.jboss.testharness.AbstractTest.run(AbstractTest.java:238)
+... Removed 28 stack frames]]>
+ </failure>
+ </testcase>
+</testsuite>
Property changes on: ri/trunk/tests/test-output/webbeans-core-tests/org.jboss.webbeans.test.unit.xml.parser.XmlParserImplTest.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/tests/test-output/webbeans-core-tests/testng-failed.xml
===================================================================
--- ri/trunk/tests/test-output/webbeans-core-tests/testng-failed.xml 2009-03-19 14:46:23 UTC (rev 2112)
+++ ri/trunk/tests/test-output/webbeans-core-tests/testng-failed.xml 2009-03-19 15:48:17 UTC (rev 2113)
@@ -1,15 +1,16 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
<suite thread-count="5" skipfailedinvocationCounts="false" verbose="1" name="Failed suite [webbeans-core-tests]" junit="false" annotations="JDK">
- <test name="org.jboss.webbeans.test.examples.ExampleTest(failed)" junit="false" annotations="JDK">
+ <test name="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest(failed)" junit="false" annotations="JDK">
<classes>
- <class name="org.jboss.webbeans.test.examples.ExampleTest">
+ <class name="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest">
<methods>
+ <include name="afterSuite"/>
+ <include name="before"/>
+ <include name="after"/>
+ <include name="testProducerMethodBean"/>
+ <include name="beforeSuite"/>
<include name="afterClass"/>
- <include name="testSentenceTranslator"/>
<include name="beforeClass"/>
- <include name="afterSuite"/>
- <include name="testGameGenerator"/>
- <include name="beforeSuite"/>
</methods>
</class>
</classes>
Modified: ri/trunk/tests/test-output/webbeans-core-tests/testng.xml.html
===================================================================
--- ri/trunk/tests/test-output/webbeans-core-tests/testng.xml.html 2009-03-19 14:46:23 UTC (rev 2112)
+++ ri/trunk/tests/test-output/webbeans-core-tests/testng.xml.html 2009-03-19 15:48:17 UTC (rev 2113)
@@ -1 +1 @@
-<html><head><title>testng.xml for webbeans-core-tests</title></head><body><tt><!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"><br/><suite thread-count="5" skipfailedinvocationCounts="false" verbose="1" name="webbeans-core-tests" junit="false" annotations="JDK"><br/> <test verbose="2" name="org.jboss.webbeans.test.examples.ExampleTest" junit="false" annotations="JDK"><br/> <classes><br/> <class name="org.jboss.webbeans.test.examples.ExampleTest"/><br/> </classes><br/> </test><br/></suite><br/></tt></body></html>
\ No newline at end of file
+<html><head><title>testng.xml for webbeans-core-tests</title></head><body><tt><!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"><br/><suite thread-count="5" skipfailedinvocationCounts="false" verbose="1" name="webbeans-core-tests" junit="false" annotations="JDK"><br/> <test verbose="2" name="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest" junit="false" annotations="JDK"><br/> <classes><br/> <class name="org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest"><br/> <methods><br/> <include name="testProducerMethodBean"/><br/> </methods><br/> </c!
lass><br/> </classes><br/> </test><br/></suite><br/></tt></body></html>
\ No newline at end of file
Modified: ri/trunk/tests/test-output/webbeans-core-tests/toc.html
===================================================================
--- ri/trunk/tests/test-output/webbeans-core-tests/toc.html 2009-03-19 14:46:23 UTC (rev 2112)
+++ ri/trunk/tests/test-output/webbeans-core-tests/toc.html 2009-03-19 15:48:17 UTC (rev 2113)
@@ -10,20 +10,20 @@
<tr valign='top'>
<td>1 test</td>
<td><a target='mainFrame' href='classes.html'>1 class</a></td>
-<td>2 methods:<br/>
+<td>1 method:<br/>
<a target='mainFrame' href='methods.html'>chronological</a><br/>
<a target='mainFrame' href='methods-alphabetical.html'>alphabetical</a><br/>
- <a target='mainFrame' href='methods-not-run.html'>not run (0)</a></td>
+ <a target='mainFrame' href='methods-not-run.html'>not run (2)</a></td>
</tr>
<tr>
-<td><a target='mainFrame' href='groups.html'>0 group</a></td>
+<td><a target='mainFrame' href='groups.html'>1 group</a></td>
<td><a target='mainFrame' href='reporter-output.html'>reporter output</a></td>
<td><a target='mainFrame' href='testng.xml.html'>testng.xml</a></td>
</tr></table>
<table width='100%' class='test-passed'>
<tr><td>
-<table style='width: 100%'><tr><td valign='top'>org.jboss.webbeans.test.examples.ExampleTest (2/0/0)</td><td valign='top' align='right'>
- <a href='org.jboss.webbeans.test.examples.ExampleTest.html' target='mainFrame'>Results</a>
+<table style='width: 100%'><tr><td valign='top'>org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest (1/0/0)</td><td valign='top' align='right'>
+ <a href='org.jboss.webbeans.test.unit.bootstrap.environments.ServletEnvironmentTest.html' target='mainFrame'>Results</a>
</td></tr></table>
</td></tr><p/>
</table>
Modified: ri/trunk/tests/unit-tests.xml
===================================================================
--- ri/trunk/tests/unit-tests.xml 2009-03-19 14:46:23 UTC (rev 2112)
+++ ri/trunk/tests/unit-tests.xml 2009-03-19 15:48:17 UTC (rev 2113)
@@ -32,18 +32,32 @@
<exclude name="broken" />
</run>
</groups>
- <packages>
+ <packages >
<package name="org.jboss.webbeans.test.examples" />
<package name="org.jboss.webbeans.test.unit.bootstrap" />
+ <package name="org.jboss.webbeans.test.unit.bootstrap.environments" />
+ <package name="org.jboss.webbeans.test.unit.bootstrap.environments.multipleEnterprise" />
+ <package name="org.jboss.webbeans.test.unit.bootstrap.environments.multipleEnterpriseAndSimple" />
+ <package name="org.jboss.webbeans.test.unit.bootstrap.environments.multipleSimple" />
+ <package name="org.jboss.webbeans.test.unit.bootstrap.environments.singleEnterprise" />
+ <package name="org.jboss.webbeans.test.unit.bootstrap.environments.singleProducerMethod" />
+ \<package name="org.jboss.webbeans.test.unit.bootstrap.environments.singleSimple" />
<package name="org.jboss.webbeans.test.unit.context" />
<package name="org.jboss.webbeans.test.unit.definition" />
<package name="org.jboss.webbeans.test.unit.event" />
<package name="org.jboss.webbeans.test.unit.implementation" />
+ <package name="org.jboss.webbeans.test.unit.implementation.annotatedItem" />
+ <package name="org.jboss.webbeans.test.unit.implementation.enterpise" />
+ <package name="org.jboss.webbeans.test.unit.implementation.enterprise.sbi" />
+ <package name="org.jboss.webbeans.test.unit.implementation.newsimple" />
+ <package name="org.jboss.webbeans.test.unit.implementation.producer.field" />
+ <package name="org.jboss.webbeans.test.unit.implementation.producer.method" />
<package name="org.jboss.webbeans.test.unit.implementation.proxy" />
- <package name="org.jboss.webbeans.test.unit.implementation.exceptions" />
+ <package name="org.jboss.webbeans.test.unit.implementation.proxy.enterprise" />
<package name="org.jboss.webbeans.test.unit.lookup" />
<package name="org.jboss.webbeans.test.unit.lookup.circular" />
- <package name="org.jboss.webbeans.test.unit.xml" />
+ <package name="org.jboss.webbeans.test.unit.xml.deploy" />
+ <package name="org.jboss.webbeans.test.unit.xml.parser" />
</packages>
</test>
More information about the weld-commits
mailing list