deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ch...@apache.org
Subject git commit: DELTASPIKE-481 Use unique archive names in Servlet module integration tests
Date Thu, 02 Jan 2014 17:09:44 GMT
Updated Branches:
  refs/heads/master dfa9c7976 -> eced5f1e6


DELTASPIKE-481 Use unique archive names in Servlet module integration tests


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/eced5f1e
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/eced5f1e
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/eced5f1e

Branch: refs/heads/master
Commit: eced5f1e67991c73b87c5285d9c31cdb08213b58
Parents: dfa9c79
Author: Christian Kaltepoth <chkal@apache.org>
Authored: Thu Jan 2 18:08:28 2014 +0100
Committer: Christian Kaltepoth <chkal@apache.org>
Committed: Thu Jan 2 18:08:28 2014 +0100

----------------------------------------------------------------------
 .../servlet/impl/event/context/ServletContextEventsTest.java   | 2 +-
 .../servlet/impl/event/request/RequestResponseEventsTest.java  | 6 +++---
 .../test/servlet/impl/event/session/SessionEventsTest.java     | 2 +-
 .../servlet/impl/producer/ServletContextInjectionTest.java     | 2 +-
 .../test/servlet/impl/producer/ServletObjectInjectionTest.java | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/eced5f1e/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/event/context/ServletContextEventsTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/event/context/ServletContextEventsTest.java
b/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/event/context/ServletContextEventsTest.java
index d702c91..50ad6c0 100644
--- a/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/event/context/ServletContextEventsTest.java
+++ b/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/event/context/ServletContextEventsTest.java
@@ -49,7 +49,7 @@ public class ServletContextEventsTest
     @Deployment
     public static WebArchive getDeployment()
     {
-        return ShrinkWrap.create(WebArchive.class, "test.war")
+        return ShrinkWrap.create(WebArchive.class, ServletContextEventsTest.class.getSimpleName()
+ ".war")
                 .addAsLibraries(Deployments.getDeltaSpikeCoreArchives())
                 .addAsLibraries(Deployments.getDeltaSpikeServletArchives())
                 .addAsLibraries(Deployments.getTestSupportArchives())

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/eced5f1e/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/event/request/RequestResponseEventsTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/event/request/RequestResponseEventsTest.java
b/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/event/request/RequestResponseEventsTest.java
index ac9d085..2c6f599 100644
--- a/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/event/request/RequestResponseEventsTest.java
+++ b/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/event/request/RequestResponseEventsTest.java
@@ -53,7 +53,7 @@ public class RequestResponseEventsTest
     @Deployment
     public static WebArchive getDeployment()
     {
-        return ShrinkWrap.create(WebArchive.class, "test.war")
+        return ShrinkWrap.create(WebArchive.class, RequestResponseEventsTest.class.getSimpleName()
+ ".war")
                 .addAsLibraries(Deployments.getDeltaSpikeCoreArchives())
                 .addAsLibraries(Deployments.getDeltaSpikeServletArchives())
                 .addAsLibraries(Deployments.getTestSupportArchives())
@@ -80,7 +80,7 @@ public class RequestResponseEventsTest
     public void shouldReceiveRequestInitializedEvent()
     {
         assertTrue("Didn't receive expected event",
-                observer.getEventLog().contains("Initialized HttpServletRequest: /test/foobar.txt"));
+                observer.getEventLog().contains("Initialized HttpServletRequest: /RequestResponseEventsTest/foobar.txt"));
     }
 
     @Test
@@ -96,7 +96,7 @@ public class RequestResponseEventsTest
     public void shouldReceiveRequestDestroyedEvent()
     {
         assertTrue("Didn't receive expected event",
-                observer.getEventLog().contains("Destroyed HttpServletRequest: /test/foobar.txt"));
+                observer.getEventLog().contains("Destroyed HttpServletRequest: /RequestResponseEventsTest/foobar.txt"));
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/eced5f1e/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/event/session/SessionEventsTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/event/session/SessionEventsTest.java
b/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/event/session/SessionEventsTest.java
index b9fe6ae..9234e1b 100644
--- a/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/event/session/SessionEventsTest.java
+++ b/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/event/session/SessionEventsTest.java
@@ -60,7 +60,7 @@ public class SessionEventsTest
     @Deployment
     public static WebArchive getDeployment()
     {
-        return ShrinkWrap.create(WebArchive.class, "test.war")
+        return ShrinkWrap.create(WebArchive.class, SessionEventsTest.class.getSimpleName()
+ ".war")
                 .addAsLibraries(Deployments.getDeltaSpikeCoreArchives())
                 .addAsLibraries(Deployments.getDeltaSpikeServletArchives())
                 .addAsLibraries(Deployments.getTestSupportArchives())

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/eced5f1e/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/producer/ServletContextInjectionTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/producer/ServletContextInjectionTest.java
b/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/producer/ServletContextInjectionTest.java
index 69d77f5..b71d1fe 100644
--- a/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/producer/ServletContextInjectionTest.java
+++ b/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/producer/ServletContextInjectionTest.java
@@ -50,7 +50,7 @@ public class ServletContextInjectionTest
     @Deployment
     public static WebArchive getDeployment()
     {
-        return ShrinkWrap.create(WebArchive.class, "test.war")
+        return ShrinkWrap.create(WebArchive.class, ServletContextInjectionTest.class.getSimpleName()
+ ".war")
                 .addAsLibraries(Deployments.getDeltaSpikeCoreArchives())
                 .addAsLibraries(Deployments.getDeltaSpikeServletArchives())
                 .addAsLibraries(Deployments.getTestSupportArchives())

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/eced5f1e/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/producer/ServletObjectInjectionTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/producer/ServletObjectInjectionTest.java
b/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/producer/ServletObjectInjectionTest.java
index a08360f..9ca7e9d 100644
--- a/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/producer/ServletObjectInjectionTest.java
+++ b/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/producer/ServletObjectInjectionTest.java
@@ -53,7 +53,7 @@ public class ServletObjectInjectionTest
     @Deployment(testable = false)
     public static WebArchive getDeployment()
     {
-        return ShrinkWrap.create(WebArchive.class, "test.war")
+        return ShrinkWrap.create(WebArchive.class, ServletObjectInjectionTest.class.getSimpleName()
+ ".war")
                 .addAsLibraries(Deployments.getDeltaSpikeCoreArchives())
                 .addAsLibraries(Deployments.getDeltaSpikeServletArchives())
                 .addClass(ServletObjectInjectionBean.class)


Mime
View raw message