Permalink
Browse files

Add a new integration-tests module

  • Loading branch information...
1 parent 6311f07 commit 663e5daa0b13a37ded47e1e917a182e23fe13f5a @jfarcand jfarcand committed May 30, 2012
Showing with 133 additions and 4 deletions.
  1. +1 −1 {modules/acceptance-tests → integration-tests/cpr}/pom.xml
  2. 0 ...integration-tests/cpr}/src/test/java/org/atmosphere/tests/http/AbstractHttpAtmosphereHandler.java
  3. 0 ...tests → integration-tests/cpr}/src/test/java/org/atmosphere/tests/http/AtmosphereServletTest.java
  4. 0 ...s/acceptance-tests → integration-tests/cpr}/src/test/java/org/atmosphere/tests/http/BaseTest.java
  5. 0 ... → integration-tests/cpr}/src/test/java/org/atmosphere/tests/http/BlockingIOCometSupportTest.java
  6. 0 ...ts → integration-tests/cpr}/src/test/java/org/atmosphere/tests/http/BroadcasterLifecycleTest.java
  7. 0 ...-tests → integration-tests/cpr}/src/test/java/org/atmosphere/tests/http/BroadcasterScopeTest.java
  8. 0 ...sts → integration-tests/cpr}/src/test/java/org/atmosphere/tests/http/ConcurrentBroadcastTest.java
  9. 0 ...sts → integration-tests/cpr}/src/test/java/org/atmosphere/tests/http/GrizzlyCometSupportTest.java
  10. 0 ...ests → integration-tests/cpr}/src/test/java/org/atmosphere/tests/http/Jetty6CometSupportTest.java
  11. 0 ...ests → integration-tests/cpr}/src/test/java/org/atmosphere/tests/http/Jetty7CometSupportTest.java
  12. 0 ...acceptance-tests → integration-tests/cpr}/src/test/java/org/atmosphere/tests/http/MeteorTest.java
  13. 0 ...sts → integration-tests/cpr}/src/test/java/org/atmosphere/tests/http/Tomcat6CometSupportTest.java
  14. 0 ...eptance-tests → integration-tests/cpr}/src/test/java/org/atmosphere/tests/websocket/BaseTest.java
  15. 0 ...ntegration-tests/cpr}/src/test/java/org/atmosphere/tests/websocket/JettyWebSocketSupportTest.java
  16. 0 {modules/jersey → integration-tests/cpr}/src/test/resources/logback-test.xml
  17. +108 −0 integration-tests/jersey/pom.xml
  18. 0 {modules → integration-tests}/jersey/src/test/java/org/atmosphere/jersey/tests/BaseGrizzyTest.java
  19. 0 {modules → integration-tests}/jersey/src/test/java/org/atmosphere/jersey/tests/BaseJettyTest.java
  20. 0 {modules → integration-tests}/jersey/src/test/java/org/atmosphere/jersey/tests/BasePubSubTest.java
  21. 0 {modules → integration-tests}/jersey/src/test/java/org/atmosphere/jersey/tests/BaseTest.java
  22. 0 ...s → integration-tests}/jersey/src/test/java/org/atmosphere/jersey/tests/BlockingIOJerseyTest.java
  23. 0 ...ules → integration-tests}/jersey/src/test/java/org/atmosphere/jersey/tests/BuilderPubSubTest.java
  24. 0 ...es → integration-tests}/jersey/src/test/java/org/atmosphere/jersey/tests/BuilderResponseTest.java
  25. 0 ...les → integration-tests}/jersey/src/test/java/org/atmosphere/jersey/tests/ConcurrentResource.java
  26. 0 ...→ integration-tests}/jersey/src/test/java/org/atmosphere/jersey/tests/ConcurrentResourceTest.java
  27. 0 ...ules → integration-tests}/jersey/src/test/java/org/atmosphere/jersey/tests/GrizzlyJerseyTest.java
  28. 0 {modules → integration-tests}/jersey/src/test/java/org/atmosphere/jersey/tests/Jetty6JerseyTest.java
  29. 0 {modules → integration-tests}/jersey/src/test/java/org/atmosphere/jersey/tests/Jetty7JerseyTest.java
  30. 0 ...les → integration-tests}/jersey/src/test/java/org/atmosphere/jersey/tests/PerRequestResource.java
  31. 0 ...→ integration-tests}/jersey/src/test/java/org/atmosphere/jersey/tests/PerRequestResourceTest.java
  32. 0 {modules → integration-tests}/jersey/src/test/java/org/atmosphere/jersey/tests/PubSubTest.java
  33. 0 ... → integration-tests}/jersey/src/test/java/org/atmosphere/jersey/tests/RecyclableBroadcaster.java
  34. 0 ...ules → integration-tests}/jersey/src/test/java/org/atmosphere/jersey/tests/SingletonResource.java
  35. 0 ... → integration-tests}/jersey/src/test/java/org/atmosphere/jersey/tests/SingletonResourceTest.java
  36. 0 {modules → integration-tests}/jersey/src/test/java/org/atmosphere/jersey/tests/TomcatJerseyTest.java
  37. 0 {modules/acceptance-tests → integration-tests/jersey}/src/test/resources/logback-test.xml
  38. +21 −0 integration-tests/pom.xml
  39. +1 −1 modules/jersey/pom.xml
  40. +0 −1 modules/pom.xml
  41. +2 −1 pom.xml
@@ -8,7 +8,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.atmosphere</groupId>
- <artifactId>acceptance-tests-runtime</artifactId>
+ <artifactId>integration-cpr</artifactId>
<packaging>jar</packaging>
<version>1.0.0-SNAPSHOT</version>
<name>acceptance-tests-runtime</name>
@@ -0,0 +1,108 @@
+<?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>
+ <groupId>org.atmosphere</groupId>
+ <artifactId>atmosphere-project</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.atmosphere</groupId>
+ <artifactId>integration-jersey</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+ <name>acceptance-tests-runtime</name>
+ <url>https://github.com/Atmosphere/atmosphere</url>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${jetty7-version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.atmosphere</groupId>
+ <artifactId>atmosphere-jersey</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ <version>${jersey-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-servlet</artifactId>
+ <version>${jersey-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-http</artifactId>
+ <version>${grizzly-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-http-servlet</artifactId>
+ <version>${grizzly-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-comet</artifactId>
+ <version>${grizzly-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-compat</artifactId>
+ <version>${grizzly-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>coyote</artifactId>
+ <version>${tomcat-version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <version>${tomcat-version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>servlet-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
+
@@ -0,0 +1,21 @@
+<?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>
+ <groupId>org.atmosphere</groupId>
+ <artifactId>atmosphere-project</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.atmosphere</groupId>
+ <artifactId>atmosphere-integration</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>atmosphere-modules</name>
+ <url>https://github.com/Atmosphere/atmosphere</url>
+
+ <modules>
+ <module>cpr</module>
+ <module>jersey</module>
+ </modules>
+</project>
@@ -23,7 +23,7 @@
<testResources>
<testResource>
- <directory>src/test/resources</directory>
+ <directory>../../integration-tests/jersey/src/test/resources</directory>
</testResource>
</testResources>
View
@@ -19,7 +19,6 @@
<module>compat-tomcat7</module>
<module>compat-jbossweb</module>
<module>cpr</module>
- <module>acceptance-tests</module>
<module>annotations</module>
<module>jersey</module>
<module>jquery</module>
View
@@ -142,7 +142,7 @@
<configuration>
<filesets>
<fileset>
- <directory>${project.basedir}/works</directory>
+ <directory>${project.basedir}/work</directory>
</fileset>
<fileset>
<directory>${project.basedir}/overlays</directory>
@@ -266,6 +266,7 @@
<module>modules</module>
<module>extras</module>
<module>samples</module>
+ <module>integration-tests</module>
</modules>
<reporting>
<outputDirectory>target/site</outputDirectory>

0 comments on commit 663e5da

Please sign in to comment.