You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by st...@apache.org on 2014/10/25 22:49:40 UTC
git commit: TOMEE-1408 use distinct appName for each test
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 36de91964 -> 08bcf6aeb
TOMEE-1408 use distinct appName for each test
backported from trunk to prevent funny effects if tests get
executed in randomly different order.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/08bcf6ae
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/08bcf6ae
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/08bcf6ae
Branch: refs/heads/tomee-1.7.x
Commit: 08bcf6aeb9445222d6ef8101a0c6b79b3163ceb6
Parents: 36de919
Author: Mark Struberg <st...@apache.org>
Authored: Sat Oct 25 22:46:03 2014 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Sat Oct 25 22:46:03 2014 +0200
----------------------------------------------------------------------
.../openejb/config/DeploymentsElementTest.java | 46 +++++++++++++-------
1 file changed, 30 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/08bcf6ae/container/openejb-core/src/test/java/org/apache/openejb/config/DeploymentsElementTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/DeploymentsElementTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/DeploymentsElementTest.java
index 500398b..4d3333a 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/DeploymentsElementTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/DeploymentsElementTest.java
@@ -67,7 +67,9 @@ public class DeploymentsElementTest extends Assert {
final Server server = new Server();
final File apps = server.deploymentsDir("myapps");
- final File ear = new File(apps, "colors.ear");
+ final String appName = "deploymentsDir_Ear_Packed_ApplicationXml";
+
+ final File ear = new File(apps, appName + ".ear");
{
final Map<String, Object> contents = new HashMap<String, Object>();
contents.put("foo.jar", Archives.jarArchive(Orange.class));
@@ -95,7 +97,9 @@ public class DeploymentsElementTest extends Assert {
final Server server = new Server();
final File apps = server.deploymentsDir("myapps");
- final File ear = new File(apps, "colors.ear");
+ final String appName = "deploymentsDir_Ear_Packed_NoApplicationXml";
+
+ final File ear = new File(apps, appName + ".ear");
{
final Map<String, Object> contents = new HashMap<String, Object>();
contents.put("foo.jar", Archives.jarArchive(Orange.class));
@@ -123,7 +127,9 @@ public class DeploymentsElementTest extends Assert {
final Server server = new Server();
final File apps = server.deploymentsDir("myapps");
- final File ear = new File(server.getBase(), "colors.ear");
+ final String appName = "deploymentsDir_Ear_Unpacked_ApplicationXml";
+
+ final File ear = new File(server.getBase(), appName + ".ear");
{
final Map<String, Object> contents = new HashMap<String, Object>();
contents.put("foo.jar", Archives.jarArchive(Orange.class));
@@ -131,7 +137,7 @@ public class DeploymentsElementTest extends Assert {
Archives.jarArchive(ear, contents);
}
- Zips.unzip(ear, Files.mkdir(apps, "colors"));
+ Zips.unzip(ear, Files.mkdir(apps, appName));
final OpenEjbConfiguration configuration = server.init();
@@ -153,14 +159,16 @@ public class DeploymentsElementTest extends Assert {
final Server server = new Server();
final File apps = server.deploymentsDir("myapps");
- final File ear = new File(server.getBase(), "colors.ear");
+ final String appName = "deploymentsDir_Ear_Unpacked_NoApplicationXml";
+
+ final File ear = new File(server.getBase(), appName + ".ear");
{
final Map<String, Object> contents = new HashMap<String, Object>();
contents.put("foo.jar", Archives.jarArchive(Orange.class));
Archives.jarArchive(ear, contents);
}
- Zips.unzip(ear, Files.mkdir(apps, "colors"));
+ Zips.unzip(ear, Files.mkdir(apps, appName));
final OpenEjbConfiguration configuration = server.init();
@@ -184,7 +192,9 @@ public class DeploymentsElementTest extends Assert {
final Server server = new Server();
final File apps = server.deploymentsDir("myapps");
- final File ear = new File(server.getBase(), "colors.ear");
+ final String appName = "deploymentsDir_Ear_Packed_Unpacked_ApplicationXml";
+
+ final File ear = new File(server.getBase(), appName + ".ear");
{
final Map<String, Object> contents = new HashMap<String, Object>();
contents.put("foo.jar", Archives.jarArchive(Orange.class));
@@ -192,8 +202,8 @@ public class DeploymentsElementTest extends Assert {
Archives.jarArchive(ear, contents);
}
- IO.copy(ear, Files.path(apps, "colors.ear")); // packed
- Zips.unzip(ear, Files.mkdir(apps, "colors")); // unpacked
+ IO.copy(ear, Files.path(apps, appName + ".ear")); // packed
+ Zips.unzip(ear, Files.mkdir(apps, appName)); // unpacked
final OpenEjbConfiguration configuration = server.init();
@@ -216,15 +226,17 @@ public class DeploymentsElementTest extends Assert {
final Server server = new Server();
final File apps = server.deploymentsDir("myapps");
- final File ear = new File(server.getBase(), "colors.ear");
+ final String appName = "deploymentsDir_Ear_Packed_Unpacked_NoApplicationXml";
+
+ final File ear = new File(server.getBase(), appName + ".ear");
{
final Map<String, Object> contents = new HashMap<String, Object>();
contents.put("foo.jar", Archives.jarArchive(Orange.class));
Archives.jarArchive(ear, contents);
}
- IO.copy(ear, Files.path(apps, "colors.ear")); // packed
- Zips.unzip(ear, Files.mkdir(apps, "colors")); // unpacked
+ IO.copy(ear, Files.path(apps, appName + ".ear")); // packed
+ Zips.unzip(ear, Files.mkdir(apps, appName)); // unpacked
final OpenEjbConfiguration configuration = server.init();
@@ -250,26 +262,28 @@ public class DeploymentsElementTest extends Assert {
final Server server = new Server();
final File apps = server.deploymentsDir("myapps");
+ final String appName = "deploymentsDir_Ear_Packed_Unpacked_Modified";
+
{ // Unpacked version -- Orange
- final File ear = new File(server.getBase(), "colors.ear");
+ final File ear = new File(server.getBase(), appName + ".ear");
final Map<String, Object> contents = new HashMap<String, Object>();
contents.put("foo.jar", Archives.jarArchive(Orange.class));
contents.put("META-INF/application.xml", "<application><module><ejb>foo.jar</ejb></module></application>");
Archives.jarArchive(ear, contents);
- Zips.unzip(ear, Files.mkdir(apps, "colors")); // unpacked
+ Zips.unzip(ear, Files.mkdir(apps, appName)); // unpacked
}
Thread.sleep(100);
{ // Packed version -- Yellow
- final File ear = new File(server.getBase(), "colors.ear");
+ final File ear = new File(server.getBase(), appName + ".ear");
final Map<String, Object> contents = new HashMap<String, Object>();
contents.put("foo.jar", Archives.jarArchive(Yellow.class));
contents.put("META-INF/application.xml", "<application><module><ejb>foo.jar</ejb></module></application>");
Archives.jarArchive(ear, contents);
- Zips.unzip(ear, Files.mkdir(apps, "colors")); // unpacked
+ Zips.unzip(ear, Files.mkdir(apps, appName)); // unpacked
}
final OpenEjbConfiguration configuration = server.init();