[webbeans-commits] Webbeans SVN: r2354 - in extensions/trunk/tomcat: build and 27 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Wed Apr 8 14:59:16 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-04-08 14:59:16 -0400 (Wed, 08 Apr 2009)
New Revision: 2354
Added:
extensions/trunk/tomcat/build.properties
extensions/trunk/tomcat/tests/
extensions/trunk/tomcat/tests/pom.xml
extensions/trunk/tomcat/tests/src/
extensions/trunk/tomcat/tests/src/etc/
extensions/trunk/tomcat/tests/src/etc/header.txt
extensions/trunk/tomcat/tests/src/main/
extensions/trunk/tomcat/tests/src/main/java/
extensions/trunk/tomcat/tests/src/main/resources/
extensions/trunk/tomcat/tests/src/test/
extensions/trunk/tomcat/tests/src/test/debug-resources/
extensions/trunk/tomcat/tests/src/test/debug-resources/META-INF/
extensions/trunk/tomcat/tests/src/test/debug-resources/META-INF/jboss-test-harness.properties
extensions/trunk/tomcat/tests/src/test/java/
extensions/trunk/tomcat/tests/src/test/java/org/
extensions/trunk/tomcat/tests/src/test/java/org/jboss/
extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/
extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/
extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/
extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/
extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/ExampleTest.java
extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Game.java
extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Generator.java
extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Mock.java
extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/MockExampleTest.java
extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/MockSentenceTranslator.java
extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Random.java
extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/SentenceParser.java
extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/SentenceTranslator.java
extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/TextTranslator.java
extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Translator.java
extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/
extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/LookupTest.java
extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Mouse.java
extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/RatServlet.java
extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/ServletInjectionTest.java
extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Sewer.java
extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Vole.java
extensions/trunk/tomcat/tests/src/test/resources/
extensions/trunk/tomcat/tests/src/test/resources/org/
extensions/trunk/tomcat/tests/src/test/resources/org/jboss/
extensions/trunk/tomcat/tests/src/test/resources/org/jboss/testharness/
extensions/trunk/tomcat/tests/src/test/resources/org/jboss/testharness/impl/
extensions/trunk/tomcat/tests/src/test/resources/org/jboss/testharness/impl/packaging/
extensions/trunk/tomcat/tests/src/test/resources/org/jboss/testharness/impl/packaging/jsr299/
extensions/trunk/tomcat/tests/src/test/resources/org/jboss/testharness/impl/packaging/war/
extensions/trunk/tomcat/tests/src/test/resources/org/jboss/testharness/impl/packaging/war/custom-web.xml
extensions/trunk/tomcat/tests/src/test/resources/org/jboss/webbeans/
extensions/trunk/tomcat/tests/src/test/resources/org/jboss/webbeans/test/
extensions/trunk/tomcat/tests/src/test/resources/org/jboss/webbeans/test/tomcat/
extensions/trunk/tomcat/tests/src/test/resources/org/jboss/webbeans/test/tomcat/examples/
extensions/trunk/tomcat/tests/src/test/resources/org/jboss/webbeans/test/tomcat/examples/beans.xml
extensions/trunk/tomcat/tests/src/test/resources/org/jboss/webbeans/test/tomcat/lookup/
extensions/trunk/tomcat/tests/src/test/resources/org/jboss/webbeans/test/tomcat/lookup/context-servlet-injection.xml
extensions/trunk/tomcat/tests/src/test/resources/org/jboss/webbeans/test/tomcat/lookup/context.xml
extensions/trunk/tomcat/tests/src/test/resources/org/jboss/webbeans/test/tomcat/lookup/web-servlet-injection.xml
extensions/trunk/tomcat/tests/unit-tests.xml
Modified:
extensions/trunk/tomcat/
extensions/trunk/tomcat/build/pom.xml
extensions/trunk/tomcat/pom.xml
Log:
add tests
Property changes on: extensions/trunk/tomcat
___________________________________________________________________
Name: svn:ignore
+
target
Modified: extensions/trunk/tomcat/build/pom.xml
===================================================================
--- extensions/trunk/tomcat/build/pom.xml 2009-04-08 16:29:47 UTC (rev 2353)
+++ extensions/trunk/tomcat/build/pom.xml 2009-04-08 18:59:16 UTC (rev 2354)
@@ -18,21 +18,25 @@
<dependency>
<groupId>org.jboss.webbeans.tomcat</groupId>
<artifactId>webbeans-tomcat-int</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-core</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
+ <optional>true</optional>
</dependency>
</dependencies>
Added: extensions/trunk/tomcat/build.properties
===================================================================
--- extensions/trunk/tomcat/build.properties (rev 0)
+++ extensions/trunk/tomcat/build.properties 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1 @@
+tomcat.home=/Applications/apache-tomcat-6.0.18
Modified: extensions/trunk/tomcat/pom.xml
===================================================================
--- extensions/trunk/tomcat/pom.xml 2009-04-08 16:29:47 UTC (rev 2353)
+++ extensions/trunk/tomcat/pom.xml 2009-04-08 18:59:16 UTC (rev 2354)
@@ -16,8 +16,9 @@
<modules>
<module>int</module>
+ <module>build</module>
<module>support</module>
- <module>build</module>
+ <module>tests</module>
</modules>
<description>
Added: extensions/trunk/tomcat/tests/pom.xml
===================================================================
--- extensions/trunk/tomcat/tests/pom.xml (rev 0)
+++ extensions/trunk/tomcat/tests/pom.xml 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>webbeans-tomcat-parent</artifactId>
+ <groupId>org.jboss.webbeans.tomcat</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.webbeans.tomcat</groupId>
+ <artifactId>webbeans-tomcat-test</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Web Beans Tomcat Integration Tests</name>
+ <url>http://www.seamframework.org/WebBeans</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ <classifier>jdk15</classifier>
+ <exclusions>
+ <exclusion>
+ <artifactId>junit</artifactId>
+ <groupId>junit</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-core-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness-tomcat</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-spi</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-ri</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <defaultGoal>test</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>unit-tests.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-test-report</id>
+ <phase>test</phase>
+ <goals>
+ <goal>report-only</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory>
+ <outputName>test-report</outputName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>incontainer</id>
+ <activation>
+ <property>
+ <name>incontainer</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <stripVersion>true</stripVersion>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness</artifactId>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/classes/lib</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>javax.el</groupId>
+ <artifactId>el-ri</artifactId>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.webbeans.tomcat</groupId>
+ <artifactId>webbeans-tomcat</artifactId>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>unit-tests.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ <systemProperties>
+ <property>
+ <name>org.jboss.testharness.standalone</name>
+ <value>false</value>
+ </property>
+ <property>
+ <name>org.jboss.testharness.container.extraConfigurationDir</name>
+ <value>../</value>
+ </property>
+ <property>
+ <name>org.jboss.testharness.container.forceRestart</name>
+ <value>true</value>
+ </property>
+ <property>
+ <name>org.jboss.testharness.runIntegrationTests</name>
+ <value>true</value>
+ </property>
+ <property>
+ <name>org.jboss.testharness.libraryDirectory</name>
+ <value>target/dependency/lib</value>
+ </property>
+ <property>
+ <name>org.jboss.testharness.outputDirectory</name>
+ <value>target</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>write-artifacts-to-disk</id>
+ <activation>
+ <property>
+ <name>dumpArtifacts</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-test-artifacts</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <mainClass>org.jboss.testharness.api.TCK</mainClass>
+ <classpathScope>test</classpathScope>
+ <systemProperties>
+ <systemProperty>
+ <key>dumpArtifacts</key>
+ <value>true</value>
+ </systemProperty>
+ <systemProperty>
+ <key>org.jboss.testharness.outputDirectory</key>
+ <value>target/test-artifacts</value>
+ </systemProperty>
+ <systemProperty>
+ <key>org.jboss.testharness.libraryDirectory</key>
+ <value>target/dependency/lib</value>
+ </systemProperty>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
Added: extensions/trunk/tomcat/tests/src/etc/header.txt
===================================================================
--- extensions/trunk/tomcat/tests/src/etc/header.txt (rev 0)
+++ extensions/trunk/tomcat/tests/src/etc/header.txt 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1,14 @@
+JBoss, Home of Professional Open Source
+Copyright 2008, Red Hat Middleware LLC, and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
Added: extensions/trunk/tomcat/tests/src/test/debug-resources/META-INF/jboss-test-harness.properties
===================================================================
--- extensions/trunk/tomcat/tests/src/test/debug-resources/META-INF/jboss-test-harness.properties (rev 0)
+++ extensions/trunk/tomcat/tests/src/test/debug-resources/META-INF/jboss-test-harness.properties 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1,7 @@
+# Configuration for running incontainer tests from your IDE
+# Alter the path webbeans accordingly (relative from the tck/impl dir)
+org.jboss.testharness.standalone=false
+org.jboss.testharness.container.extraConfigurationDir=../
+org.jboss.testharness.container.forceRestart=false
+org.jboss.testharness.libraryDirectory=target/dependency/lib
+org.jboss.testharness.runIntegrationTests=true
\ No newline at end of file
Added: extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/ExampleTest.java
===================================================================
--- extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/ExampleTest.java (rev 0)
+++ extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/ExampleTest.java 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1,67 @@
+package org.jboss.webbeans.test.tomcat.examples;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.jboss.webbeans.test.ServletLifecycleContainersImpl;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class ExampleTest extends AbstractWebBeansTest
+{
+
+ @Override
+ @BeforeClass
+ public void beforeClass() throws Throwable
+ {
+ getCurrentConfiguration().setStandaloneContainers(new ServletLifecycleContainersImpl());
+ super.beforeClass();
+ }
+
+ @Test
+ public void testGameGenerator() throws Exception {
+
+ new RunInDependentContext()
+ {
+
+ @Override
+ protected void execute() throws Exception
+ {
+ Game game1 = getCurrentManager().getInstanceByType(Game.class);
+ Game game2 = getCurrentManager().getInstanceByType(Game.class);
+ assert game1!=game2;
+ assert game1.getNumber()!=game2.getNumber();
+ Generator gen1 = getCurrentManager().getInstanceByType(Generator.class);
+ Generator gen2 = getCurrentManager().getInstanceByType(Generator.class);
+ assert gen1.getRandom()!=null;
+ assert gen1.getRandom()==gen2.getRandom();
+ }
+
+ }.run();
+ }
+
+ @Test
+ public void testSentenceTranslator() throws Exception {
+
+ new RunInDependentContext()
+ {
+
+ @Override
+ protected void execute() throws Exception
+ {
+ TextTranslator tt1 = getCurrentManager().getInstanceByType(TextTranslator.class);
+ try
+ {
+ tt1.translate("hello world");
+ assert false;
+ }
+ catch (UnsupportedOperationException uoe)
+ {
+ //expected
+ }
+ }
+
+ }.run();
+ }
+
+}
Added: extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Game.java
===================================================================
--- extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Game.java (rev 0)
+++ extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Game.java 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1,20 @@
+package org.jboss.webbeans.test.tomcat.examples;
+
+import javax.inject.Initializer;
+
+public class Game
+{
+ private final int number;
+
+ @Initializer
+ Game(@Random int number)
+ {
+ this.number = number;
+ }
+
+ public int getNumber()
+ {
+ return number;
+ }
+
+}
Added: extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Generator.java
===================================================================
--- extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Generator.java (rev 0)
+++ extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Generator.java 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1,27 @@
+package org.jboss.webbeans.test.tomcat.examples;
+
+import javax.context.ApplicationScoped;
+import javax.inject.Produces;
+
+ at ApplicationScoped
+public class Generator {
+
+ private int lastInt = 0;
+ private java.util.Random random = new java.util.Random( System.currentTimeMillis() );
+
+ java.util.Random getRandom()
+ {
+ return random;
+ }
+
+ @Produces @Random int next() {
+ int nextInt = getRandom().nextInt(100);
+ while (nextInt == lastInt)
+ {
+ nextInt = getRandom().nextInt(100);
+ }
+ lastInt = nextInt;
+ return nextInt;
+ }
+
+}
Added: extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Mock.java
===================================================================
--- extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Mock.java (rev 0)
+++ extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Mock.java 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1,20 @@
+package org.jboss.webbeans.test.tomcat.examples;
+
+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
+public @interface Mock
+{
+
+}
Added: extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/MockExampleTest.java
===================================================================
--- extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/MockExampleTest.java (rev 0)
+++ extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/MockExampleTest.java 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1,30 @@
+package org.jboss.webbeans.test.tomcat.examples;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at BeansXml("beans.xml")
+public class MockExampleTest extends AbstractWebBeansTest
+{
+
+ @Test
+ public void testMockSentenceTranslator() throws Exception
+ {
+
+ new RunInDependentContext()
+ {
+
+ @Override
+ protected void execute() throws Exception
+ {
+ TextTranslator tt2 = getCurrentManager().getInstanceByType(TextTranslator.class);
+ assert "Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.".equals( tt2.translate("Hello world. How's tricks?") );
+ }
+
+ }.run();
+ }
+
+}
Added: extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/MockSentenceTranslator.java
===================================================================
--- extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/MockSentenceTranslator.java (rev 0)
+++ extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/MockSentenceTranslator.java 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1,10 @@
+package org.jboss.webbeans.test.tomcat.examples;
+
+ at Mock
+public class MockSentenceTranslator implements Translator
+{
+ public String translate(String sentence)
+ {
+ return "Lorem ipsum dolor sit amet";
+ }
+}
Added: extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Random.java
===================================================================
--- extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Random.java (rev 0)
+++ extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Random.java 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1,22 @@
+package org.jboss.webbeans.test.tomcat.examples;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+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.BindingType;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at BindingType
+public @interface Random
+{
+
+}
Added: extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/SentenceParser.java
===================================================================
--- extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/SentenceParser.java (rev 0)
+++ extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/SentenceParser.java 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1,12 @@
+package org.jboss.webbeans.test.tomcat.examples;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class SentenceParser
+{
+ public List<String> parse(String text)
+ {
+ return Arrays.asList(text.split("[.?]"));
+ }
+}
Added: extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/SentenceTranslator.java
===================================================================
--- extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/SentenceTranslator.java (rev 0)
+++ extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/SentenceTranslator.java 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.test.tomcat.examples;
+
+public class SentenceTranslator implements Translator
+{
+ public String translate(String sentence)
+ {
+ throw new UnsupportedOperationException();
+ }
+}
\ No newline at end of file
Added: extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/TextTranslator.java
===================================================================
--- extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/TextTranslator.java (rev 0)
+++ extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/TextTranslator.java 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1,28 @@
+package org.jboss.webbeans.test.tomcat.examples;
+
+import javax.inject.Initializer;
+
+public class TextTranslator
+{
+
+ private SentenceParser sentenceParser;
+ private Translator sentenceTranslator;
+
+ @Initializer
+ TextTranslator(SentenceParser sentenceParser, Translator sentenceTranslator)
+ {
+ this.sentenceParser = sentenceParser;
+ this.sentenceTranslator = sentenceTranslator;
+ }
+
+ public String translate(String text)
+ {
+ StringBuilder sb = new StringBuilder();
+ for (String sentence: sentenceParser.parse(text))
+ {
+ sb.append(sentenceTranslator.translate(sentence)).append(". ");
+ }
+ return sb.toString().trim();
+ }
+
+}
\ No newline at end of file
Added: extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Translator.java
===================================================================
--- extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Translator.java (rev 0)
+++ extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Translator.java 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.test.tomcat.examples;
+
+
+public interface Translator
+{
+
+ public String translate(String sentence);
+
+}
Added: extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/LookupTest.java
===================================================================
--- extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/LookupTest.java (rev 0)
+++ extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/LookupTest.java 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1,36 @@
+package org.jboss.webbeans.test.tomcat.lookup;
+
+
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.Classes;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.Resources;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.testng.annotations.Test;
+
+ at Artifact(addCurrentPackage=false)
+ at IntegrationTest
+ at Resources({
+ @Resource(source="context.xml", destination="/META-INF/context.xml")
+})
+ at Classes({Mouse.class, Vole.class, LookupTest.class})
+public class LookupTest extends AbstractWebBeansTest
+{
+
+ @Test
+ public void testManagerInJndi() throws Exception
+ {
+ assert getCurrentManager().getInstanceByType(Mouse.class).getManager() != null;
+ assert getCurrentManager().getInstanceByType(Mouse.class).getManager().equals(getCurrentManager());
+ }
+
+ @Test
+ public void testResource() throws Exception
+ {
+ assert getCurrentManager().getInstanceByType(Vole.class).getManager() != null;
+ assert getCurrentManager().getInstanceByType(Vole.class).getManager().equals(getCurrentManager());
+ }
+
+}
Added: extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Mouse.java
===================================================================
--- extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Mouse.java (rev 0)
+++ extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Mouse.java 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1,22 @@
+package org.jboss.webbeans.test.tomcat.lookup;
+
+import javax.inject.manager.Manager;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+public class Mouse
+{
+
+ public Manager getManager()
+ {
+ try
+ {
+ return (Manager) new InitialContext().lookup("java:comp/env/app/Manager");
+ }
+ catch (NamingException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+}
Added: extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/RatServlet.java
===================================================================
--- extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/RatServlet.java (rev 0)
+++ extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/RatServlet.java 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1,29 @@
+package org.jboss.webbeans.test.tomcat.lookup;
+
+import java.io.IOException;
+
+import javax.inject.Current;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class RatServlet extends HttpServlet
+{
+
+ @Current Sewer sewer;
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+ {
+ if (sewer.getName().equals(Sewer.NAME))
+ {
+ resp.setStatus(HttpServletResponse.SC_OK);
+ }
+ else
+ {
+ resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+ }
+ }
+
+}
Added: extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/ServletInjectionTest.java
===================================================================
--- extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/ServletInjectionTest.java (rev 0)
+++ extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/ServletInjectionTest.java 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1,54 @@
+package org.jboss.webbeans.test.tomcat.lookup;
+
+
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpMethod;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.log4j.Logger;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.Classes;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.Resources;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+ at Artifact(addCurrentPackage=false)
+ at IntegrationTest(runLocally=true)
+ at Resources({
+ @Resource(source="context-servlet-injection.xml", destination="/META-INF/context.xml"),
+ @Resource(source="web-servlet-injection.xml", destination="/WEB-INF/web.xml")
+})
+ at Classes({
+ RatServlet.class,
+ Sewer.class
+})
+public class ServletInjectionTest extends AbstractWebBeansTest
+{
+
+ private static final Logger log = Logger.getLogger(ServletInjectionTest.class);
+
+ @Override
+ @BeforeClass
+ public void beforeClass() throws Throwable
+ {
+ log.info("To run the servlet injection test you must add tomcat-support.jar to $CATALINA_BASE/lib");
+ super.beforeClass();
+ }
+
+
+ @Test
+ public void testServletInjection() throws Exception
+ {
+ HttpClient client = new HttpClient();
+ HttpMethod method = new GetMethod(getContextPath() + "/rat");
+ assert client.executeMethod(method) == HttpServletResponse.SC_OK;
+ }
+
+
+
+}
Added: extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Sewer.java
===================================================================
--- extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Sewer.java (rev 0)
+++ extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Sewer.java 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1,13 @@
+package org.jboss.webbeans.test.tomcat.lookup;
+
+public class Sewer
+{
+
+ public static String NAME = "Sewer8";
+
+ public String getName()
+ {
+ return NAME;
+ }
+
+}
Added: extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Vole.java
===================================================================
--- extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Vole.java (rev 0)
+++ extensions/trunk/tomcat/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Vole.java 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1,17 @@
+package org.jboss.webbeans.test.tomcat.lookup;
+
+import javax.annotation.Resource;
+import javax.inject.manager.Manager;
+
+public class Vole
+{
+
+ @Resource(mappedName="java:comp/env/app/Manager")
+ Manager manager;
+
+ public Manager getManager()
+ {
+ return manager;
+ }
+
+}
Added: extensions/trunk/tomcat/tests/src/test/resources/org/jboss/testharness/impl/packaging/war/custom-web.xml
===================================================================
--- extensions/trunk/tomcat/tests/src/test/resources/org/jboss/testharness/impl/packaging/war/custom-web.xml (rev 0)
+++ extensions/trunk/tomcat/tests/src/test/resources/org/jboss/testharness/impl/packaging/war/custom-web.xml 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.5"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+
+ <display-name>JBoss Test Harness</display-name>
+
+ <listener>
+ <listener-class>org.jboss.testharness.impl.runner.servlet.HarnessServletListener</listener-class>
+ </listener>
+
+ <listener>
+ <listener-class>org.jboss.webbeans.environment.servlet.Listener</listener-class>
+ </listener>
+
+ <servlet>
+ <servlet-name>JBoss Test Harness Test Runner</servlet-name>
+ <servlet-class>org.jboss.testharness.impl.runner.servlet.ServletTestRunner</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>JBoss Test Harness Test Runner</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
Added: extensions/trunk/tomcat/tests/src/test/resources/org/jboss/webbeans/test/tomcat/examples/beans.xml
===================================================================
--- extensions/trunk/tomcat/tests/src/test/resources/org/jboss/webbeans/test/tomcat/examples/beans.xml (rev 0)
+++ extensions/trunk/tomcat/tests/src/test/resources/org/jboss/webbeans/test/tomcat/examples/beans.xml 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1,8 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:test="urn:java:org.jboss.webbeans.test.tomcat.examples">
+ <Deploy>
+ <Standard />
+ <Production />
+ <test:Mock />
+ </Deploy>
+</Beans>
Added: extensions/trunk/tomcat/tests/src/test/resources/org/jboss/webbeans/test/tomcat/lookup/context-servlet-injection.xml
===================================================================
--- extensions/trunk/tomcat/tests/src/test/resources/org/jboss/webbeans/test/tomcat/lookup/context-servlet-injection.xml (rev 0)
+++ extensions/trunk/tomcat/tests/src/test/resources/org/jboss/webbeans/test/tomcat/lookup/context-servlet-injection.xml 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1,9 @@
+<Context>
+ <Resource name="app/Manager" auth="Container"
+ type="javax.inject.manager.Manager"
+ factory="org.jboss.webbeans.resources.ManagerObjectFactory"/>
+<!-- Uncomment to enable injection into Servlet -->
+ <Listener className="org.jboss.webbeans.environment.tomcat.WebBeansLifecycleListener" />
+
+
+</Context>
Added: extensions/trunk/tomcat/tests/src/test/resources/org/jboss/webbeans/test/tomcat/lookup/context.xml
===================================================================
--- extensions/trunk/tomcat/tests/src/test/resources/org/jboss/webbeans/test/tomcat/lookup/context.xml (rev 0)
+++ extensions/trunk/tomcat/tests/src/test/resources/org/jboss/webbeans/test/tomcat/lookup/context.xml 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1,9 @@
+<Context>
+ <Resource name="app/Manager" auth="Container"
+ type="javax.inject.manager.Manager"
+ factory="org.jboss.webbeans.resources.ManagerObjectFactory"/>
+<!-- Uncomment to enable injection into Servlet -->
+<Listener className="org.jboss.webbeans.environment.tomcat.WebBeansLifecycleListener" />
+
+
+</Context>
Added: extensions/trunk/tomcat/tests/src/test/resources/org/jboss/webbeans/test/tomcat/lookup/web-servlet-injection.xml
===================================================================
--- extensions/trunk/tomcat/tests/src/test/resources/org/jboss/webbeans/test/tomcat/lookup/web-servlet-injection.xml (rev 0)
+++ extensions/trunk/tomcat/tests/src/test/resources/org/jboss/webbeans/test/tomcat/lookup/web-servlet-injection.xml 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.5"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+
+ <display-name>JBoss Test Harness</display-name>
+
+ <listener>
+ <listener-class>org.jboss.testharness.impl.runner.servlet.HarnessServletListener</listener-class>
+ </listener>
+
+ <listener>
+ <listener-class>org.jboss.webbeans.environment.servlet.Listener</listener-class>
+ </listener>
+
+ <servlet>
+ <servlet-name>Rat Servlet</servlet-name>
+ <servlet-class>org.jboss.webbeans.test.tomcat.lookup.RatServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Rat Servlet</servlet-name>
+ <url-pattern>/rat</url-pattern>
+ </servlet-mapping>
+
+</web-app>
Added: extensions/trunk/tomcat/tests/unit-tests.xml
===================================================================
--- extensions/trunk/tomcat/tests/unit-tests.xml (rev 0)
+++ extensions/trunk/tomcat/tests/unit-tests.xml 2009-04-08 18:59:16 UTC (rev 2354)
@@ -0,0 +1,26 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+
+<suite name="Web Beans Tomcat Integration" verbose="1" >
+
+ <test name="Web Beans Tomcat Integration">
+ <method-selectors>
+ <method-selector>
+ <selector-class name="org.jboss.testharness.impl.testng.DisableIntegrationTestsMethodSelector" />
+ </method-selector>
+ <method-selector>
+ <selector-class name="org.jboss.testharness.impl.testng.ExcludeIncontainerUnderInvestigationMethodSelector" />
+ </method-selector>
+ </method-selectors>
+ <groups>
+ <run>
+ <exclude name="stub" />
+ <exclude name="broken" />
+ </run>
+ </groups>
+ <packages>
+ <package name="org.jboss.webbeans.test.tomcat.examples" />
+ <package name="org.jboss.webbeans.test.tomcat.lookup" />
+ </packages>
+ </test>
+
+</suite>
\ No newline at end of file
More information about the weld-commits
mailing list