[webbeans-commits] Webbeans SVN: r2468 - in ri/trunk/tests: src/main/java/org/jboss/webbeans/test and 7 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Fri Apr 17 09:42:07 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-04-17 09:42:07 -0400 (Fri, 17 Apr 2009)
New Revision: 2468
Added:
ri/trunk/tests/src/main/java/org/jboss/webbeans/test/harness/
ri/trunk/tests/src/main/java/org/jboss/webbeans/test/harness/AbstractStandaloneContainersImpl.java
ri/trunk/tests/src/main/java/org/jboss/webbeans/test/harness/ServletLifecycleContainersImpl.java
ri/trunk/tests/src/main/java/org/jboss/webbeans/test/harness/StandaloneContainersImpl.java
Removed:
ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractStandaloneContainersImpl.java
ri/trunk/tests/src/main/java/org/jboss/webbeans/test/ServletLifecycleContainersImpl.java
ri/trunk/tests/src/main/java/org/jboss/webbeans/test/StandaloneContainersImpl.java
Modified:
ri/trunk/tests/src/main/resources/META-INF/jboss-test-harness.properties
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/ELResolverTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java
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/schema/SchemaValidationTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/PaymentResource.java
ri/trunk/tests/unit-tests.xml
Log:
Fix incontainer tests
Deleted: ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractStandaloneContainersImpl.java
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractStandaloneContainersImpl.java 2009-04-17 13:01:06 UTC (rev 2467)
+++ ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractStandaloneContainersImpl.java 2009-04-17 13:42:07 UTC (rev 2468)
@@ -1,63 +0,0 @@
-package org.jboss.webbeans.test;
-
-import java.net.URL;
-
-import org.jboss.testharness.api.DeploymentException;
-import org.jboss.testharness.spi.StandaloneContainers;
-import org.jboss.webbeans.mock.MockServletLifecycle;
-import org.jboss.webbeans.mock.MockWebBeanDiscovery;
-
-public abstract class AbstractStandaloneContainersImpl implements StandaloneContainers
-{
-
- private MockServletLifecycle lifecycle;
-
- public void deploy(Iterable<Class<?>> classes, Iterable<URL> beansXml) throws DeploymentException
- {
- this.lifecycle = newLifecycle();
- lifecycle.initialize();
- try
- {
- MockWebBeanDiscovery discovery = lifecycle.getWebBeanDiscovery();
- discovery.setWebBeanClasses(classes);
- if (beansXml != null)
- {
- discovery.setWebBeansXmlFiles(beansXml);
- }
- lifecycle.beginApplication();
- }
- catch (Exception e)
- {
- throw new DeploymentException("Error deploying beans", e);
- }
- lifecycle.beginSession();
- lifecycle.beginRequest();
- }
-
- protected abstract MockServletLifecycle newLifecycle();
-
- public void deploy(Iterable<Class<?>> classes) throws DeploymentException
- {
- deploy(classes, null);
- }
-
- public void cleanup()
- {
- // Np-op
-
- }
-
- public void setup()
- {
- // No-op
- }
-
- public void undeploy()
- {
- lifecycle.endRequest();
- lifecycle.endSession();
- lifecycle.endApplication();
- lifecycle = null;
- }
-
-}
\ No newline at end of file
Deleted: ri/trunk/tests/src/main/java/org/jboss/webbeans/test/ServletLifecycleContainersImpl.java
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/webbeans/test/ServletLifecycleContainersImpl.java 2009-04-17 13:01:06 UTC (rev 2467)
+++ ri/trunk/tests/src/main/java/org/jboss/webbeans/test/ServletLifecycleContainersImpl.java 2009-04-17 13:42:07 UTC (rev 2468)
@@ -1,14 +0,0 @@
-package org.jboss.webbeans.test;
-
-import org.jboss.webbeans.mock.MockServletLifecycle;
-
-public class ServletLifecycleContainersImpl extends AbstractStandaloneContainersImpl
-{
-
- @Override
- protected MockServletLifecycle newLifecycle()
- {
- return new MockServletLifecycle();
- }
-
-}
Deleted: ri/trunk/tests/src/main/java/org/jboss/webbeans/test/StandaloneContainersImpl.java
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/webbeans/test/StandaloneContainersImpl.java 2009-04-17 13:01:06 UTC (rev 2467)
+++ ri/trunk/tests/src/main/java/org/jboss/webbeans/test/StandaloneContainersImpl.java 2009-04-17 13:42:07 UTC (rev 2468)
@@ -1,16 +0,0 @@
-package org.jboss.webbeans.test;
-
-import org.jboss.testharness.spi.StandaloneContainers;
-import org.jboss.webbeans.mock.MockEELifecycle;
-import org.jboss.webbeans.mock.MockServletLifecycle;
-
-public class StandaloneContainersImpl extends AbstractStandaloneContainersImpl implements StandaloneContainers
-{
-
- @Override
- protected MockServletLifecycle newLifecycle()
- {
- return new MockEELifecycle();
- }
-
-}
Copied: ri/trunk/tests/src/main/java/org/jboss/webbeans/test/harness/AbstractStandaloneContainersImpl.java (from rev 2462, ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractStandaloneContainersImpl.java)
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/webbeans/test/harness/AbstractStandaloneContainersImpl.java (rev 0)
+++ ri/trunk/tests/src/main/java/org/jboss/webbeans/test/harness/AbstractStandaloneContainersImpl.java 2009-04-17 13:42:07 UTC (rev 2468)
@@ -0,0 +1,63 @@
+package org.jboss.webbeans.test.harness;
+
+import java.net.URL;
+
+import org.jboss.testharness.api.DeploymentException;
+import org.jboss.testharness.spi.StandaloneContainers;
+import org.jboss.webbeans.mock.MockServletLifecycle;
+import org.jboss.webbeans.mock.MockWebBeanDiscovery;
+
+public abstract class AbstractStandaloneContainersImpl implements StandaloneContainers
+{
+
+ private MockServletLifecycle lifecycle;
+
+ public void deploy(Iterable<Class<?>> classes, Iterable<URL> beansXml) throws DeploymentException
+ {
+ this.lifecycle = newLifecycle();
+ lifecycle.initialize();
+ try
+ {
+ MockWebBeanDiscovery discovery = lifecycle.getWebBeanDiscovery();
+ discovery.setWebBeanClasses(classes);
+ if (beansXml != null)
+ {
+ discovery.setWebBeansXmlFiles(beansXml);
+ }
+ lifecycle.beginApplication();
+ }
+ catch (Exception e)
+ {
+ throw new DeploymentException("Error deploying beans", e);
+ }
+ lifecycle.beginSession();
+ lifecycle.beginRequest();
+ }
+
+ protected abstract MockServletLifecycle newLifecycle();
+
+ public void deploy(Iterable<Class<?>> classes) throws DeploymentException
+ {
+ deploy(classes, null);
+ }
+
+ public void cleanup()
+ {
+ // Np-op
+
+ }
+
+ public void setup()
+ {
+ // No-op
+ }
+
+ public void undeploy()
+ {
+ lifecycle.endRequest();
+ lifecycle.endSession();
+ lifecycle.endApplication();
+ lifecycle = null;
+ }
+
+}
\ No newline at end of file
Copied: ri/trunk/tests/src/main/java/org/jboss/webbeans/test/harness/ServletLifecycleContainersImpl.java (from rev 2462, ri/trunk/tests/src/main/java/org/jboss/webbeans/test/ServletLifecycleContainersImpl.java)
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/webbeans/test/harness/ServletLifecycleContainersImpl.java (rev 0)
+++ ri/trunk/tests/src/main/java/org/jboss/webbeans/test/harness/ServletLifecycleContainersImpl.java 2009-04-17 13:42:07 UTC (rev 2468)
@@ -0,0 +1,14 @@
+package org.jboss.webbeans.test.harness;
+
+import org.jboss.webbeans.mock.MockServletLifecycle;
+
+public class ServletLifecycleContainersImpl extends AbstractStandaloneContainersImpl
+{
+
+ @Override
+ protected MockServletLifecycle newLifecycle()
+ {
+ return new MockServletLifecycle();
+ }
+
+}
Copied: ri/trunk/tests/src/main/java/org/jboss/webbeans/test/harness/StandaloneContainersImpl.java (from rev 2462, ri/trunk/tests/src/main/java/org/jboss/webbeans/test/StandaloneContainersImpl.java)
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/webbeans/test/harness/StandaloneContainersImpl.java (rev 0)
+++ ri/trunk/tests/src/main/java/org/jboss/webbeans/test/harness/StandaloneContainersImpl.java 2009-04-17 13:42:07 UTC (rev 2468)
@@ -0,0 +1,16 @@
+package org.jboss.webbeans.test.harness;
+
+import org.jboss.testharness.spi.StandaloneContainers;
+import org.jboss.webbeans.mock.MockEELifecycle;
+import org.jboss.webbeans.mock.MockServletLifecycle;
+
+public class StandaloneContainersImpl extends AbstractStandaloneContainersImpl implements StandaloneContainers
+{
+
+ @Override
+ protected MockServletLifecycle newLifecycle()
+ {
+ return new MockEELifecycle();
+ }
+
+}
Modified: ri/trunk/tests/src/main/resources/META-INF/jboss-test-harness.properties
===================================================================
--- ri/trunk/tests/src/main/resources/META-INF/jboss-test-harness.properties 2009-04-17 13:01:06 UTC (rev 2467)
+++ ri/trunk/tests/src/main/resources/META-INF/jboss-test-harness.properties 2009-04-17 13:42:07 UTC (rev 2468)
@@ -1,2 +1,2 @@
-org.jboss.testharness.spi.StandaloneContainers=org.jboss.webbeans.test.StandaloneContainersImpl
+org.jboss.testharness.spi.StandaloneContainers=org.jboss.webbeans.test.harness.StandaloneContainersImpl
org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/ELResolverTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/ELResolverTest.java 2009-04-17 13:01:06 UTC (rev 2467)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/ELResolverTest.java 2009-04-17 13:42:07 UTC (rev 2468)
@@ -11,7 +11,7 @@
public class ELResolverTest extends AbstractWebBeansTest
{
- @Test
+ @Test(groups="incontainer-broken")
public void testNonBeanDoesntResolveToNamespace()
{
ELContext elContext = EL.createELContext();
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java 2009-04-17 13:01:06 UTC (rev 2467)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java 2009-04-17 13:42:07 UTC (rev 2468)
@@ -24,7 +24,10 @@
@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")
})
- at Classes(packages="org.jboss.webbeans.test.unit.xml.beans")
+ at Classes(
+ packages={"org.jboss.webbeans.test.unit.xml.beans", "org.jboss.webbeans.test.unit.xml.beans.annotationtype"},
+ value={MockXmlEnvironment.class}
+)
public class BeansXmlParserTest extends AbstractWebBeansTest
{
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-04-17 13:01:06 UTC (rev 2467)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java 2009-04-17 13:42:07 UTC (rev 2468)
@@ -25,9 +25,14 @@
@Artifact
@Resources({
- @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" )
+ @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" ),
+ @Resource(source="/org/jboss/webbeans/test/unit/xml/parser/schema.xsd", destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/parser/schema.xsd" ),
+ @Resource(source="/org/jboss/webbeans/test/unit/xml/parser/namespace", destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/parser/namespace" )
})
- at Classes({Order.class})
+ at Classes(
+ value={Order.class, MockXmlEnvironment.class},
+ packages={"org.jboss.webbeans.test.unit.xml.beans.annotationtype", "org.jboss.webbeans.test.unit.xml.parser.schema.foo"}
+)
public class XmlParserImplTest extends AbstractWebBeansTest
{
//@Test
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/SchemaValidationTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/SchemaValidationTest.java 2009-04-17 13:01:06 UTC (rev 2467)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/SchemaValidationTest.java 2009-04-17 13:42:07 UTC (rev 2468)
@@ -17,9 +17,16 @@
@Artifact
@Resources({
@Resource(source="/org/jboss/webbeans/test/unit/xml/parser/schema/beans.xml", destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/parser/schema/beans.xml" ),
- @Resource(source="/org/jboss/webbeans/test/unit/xml/parser/schema/not-valid-beans.xml", destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/parser/schema/not-valid-beans.xml" )
+ @Resource(source="/org/jboss/webbeans/test/unit/xml/parser/schema/not-valid-beans.xml", destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/parser/schema/not-valid-beans.xml" ),
+ @Resource(source="/org/jboss/webbeans/test/unit/xml/parser/schema/namespace", destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/parser/schema/namespace" ),
+ @Resource(source="/org/jboss/webbeans/test/unit/xml/parser/schema/schema.xsd", destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/parser/schema/schema.xsd" ),
+ @Resource(source="/org/jboss/webbeans/test/unit/xml/parser/schema/notvalid/schema.xsd", destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/parser/schema/notvalid/schema.xsd" ),
+ @Resource(source="/org/jboss/webbeans/test/unit/xml/parser/schema/valid/schema.xsd", destination="WEB-INF/classes/org/jboss/webbeans/test/unit/xml/parser/schema/valid/schema.xsd" )
})
- at Classes({Order.class})
+ at Classes(
+ value={Order.class, MockXmlEnvironment.class},
+ packages={"org.jboss.webbeans.test.unit.xml.beans.annotationtype", "org.jboss.webbeans.test.unit.xml.parser.schema.foo"}
+)
public class SchemaValidationTest extends AbstractWebBeansTest
{
@Test
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/PaymentResource.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/PaymentResource.java 2009-04-17 13:01:06 UTC (rev 2467)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/PaymentResource.java 2009-04-17 13:42:07 UTC (rev 2468)
@@ -1,8 +1,6 @@
package org.jboss.webbeans.test.unit.xml.parser.schema.foo;
-import javax.annotation.Resource;
- at Resource
public class PaymentResource
{
Modified: ri/trunk/tests/unit-tests.xml
===================================================================
--- ri/trunk/tests/unit-tests.xml 2009-04-17 13:01:06 UTC (rev 2467)
+++ ri/trunk/tests/unit-tests.xml 2009-04-17 13:42:07 UTC (rev 2468)
@@ -69,6 +69,7 @@
<package name="org.jboss.webbeans.test.unit.lookup.circular" />
<package name="org.jboss.webbeans.test.unit.xml.deploy" />
<package name="org.jboss.webbeans.test.unit.xml.parser" />
+ <package name="org.jboss.webbeans.test.unit.xml.parser.schema" />
</packages>
</test>
More information about the weld-commits
mailing list