You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2018/09/06 16:23:04 UTC
[1/2] tomee git commit: Fixed Test.
Repository: tomee
Updated Branches:
refs/heads/master 2d0274802 -> 6ba7fc5f7
Fixed Test.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f37e812e
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f37e812e
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f37e812e
Branch: refs/heads/master
Commit: f37e812e787c7e4da2919dcc1c1cda8c5a6fb0be
Parents: 2d02748
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Wed Sep 5 22:06:22 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Wed Sep 5 22:06:22 2018 +0100
----------------------------------------------------------------------
.../test/java/jug/rest/arquillian/SubjectServiceTomEETest.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/f37e812e/examples/polling-parent/polling-web/src/test/java/jug/rest/arquillian/SubjectServiceTomEETest.java
----------------------------------------------------------------------
diff --git a/examples/polling-parent/polling-web/src/test/java/jug/rest/arquillian/SubjectServiceTomEETest.java b/examples/polling-parent/polling-web/src/test/java/jug/rest/arquillian/SubjectServiceTomEETest.java
index d55d326..200d477 100644
--- a/examples/polling-parent/polling-web/src/test/java/jug/rest/arquillian/SubjectServiceTomEETest.java
+++ b/examples/polling-parent/polling-web/src/test/java/jug/rest/arquillian/SubjectServiceTomEETest.java
@@ -53,10 +53,7 @@ public class SubjectServiceTomEETest {
return new WebModule(SubjectServiceTomEETest.class).getArchive()
.addClass(VoteCounter.class)
.addPackage(Subject.class.getPackage()) // domain
-
- //X creates duplicate perstence units :(
- //X.addAsWebInfResource(new ClassLoaderAsset("META-INF/persistence.xml"), "persistence.xml")
-
+ .addAsWebInfResource(new ClassLoaderAsset("META-INF/persistence.xml"), "persistence.xml")
.addAsWebInfResource(new ClassLoaderAsset("META-INF/env-entries.properties"), "env-entries.properties")
.addAsWebInfResource(new ClassLoaderAsset("META-INF/resources.xml"), "resources.xml")
.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
[2/2] tomee git commit: Fixed random failure with test.
Posted by jg...@apache.org.
Fixed random failure with test.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6ba7fc5f
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6ba7fc5f
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6ba7fc5f
Branch: refs/heads/master
Commit: 6ba7fc5f79a545d215762f39092e50685dd80e47
Parents: f37e812
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Thu Sep 6 17:05:29 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Thu Sep 6 17:05:29 2018 +0100
----------------------------------------------------------------------
.../org/apache/tomee/jul/handler/rotating/ArchivingTest.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/6ba7fc5f/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/ArchivingTest.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/ArchivingTest.java b/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/ArchivingTest.java
index 6bd53e9..c50ffcd 100644
--- a/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/ArchivingTest.java
+++ b/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/ArchivingTest.java
@@ -43,7 +43,6 @@ import java.util.zip.GZIPInputStream;
import java.util.zip.ZipInputStream;
import static java.nio.file.StandardWatchEventKinds.ENTRY_CREATE;
-import static java.nio.file.StandardWatchEventKinds.ENTRY_DELETE;
import static java.nio.file.StandardWatchEventKinds.ENTRY_MODIFY;
import static java.util.Arrays.asList;
import static org.junit.Assert.assertEquals;
@@ -183,10 +182,6 @@ public class ArchivingTest {
}
final File logArchive = new File("target/ArchivingTestPurge-" + format + "/logs/archives/test.2015-09-01.0.log." + format);
- if (logArchive.delete()) {
- System.out.println("Deleted existing test file: " + logArchive);
- }
-
final File parentFile = logArchive.getParentFile();
if (!parentFile.exists() && !parentFile.mkdirs()) {
Assert.fail("Unable to create: " + parentFile);
@@ -195,7 +190,6 @@ public class ArchivingTest {
final WatchService watcher = FileSystems.getDefault().newWatchService();
final WatchKey key = dir.register(watcher,
ENTRY_CREATE,
- ENTRY_DELETE,
ENTRY_MODIFY);
latch.set(new CountDownLatch(1));