From d545f6dd20a7d33cba1064c3c50d47bc613d8087 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 2 Nov 2011 12:27:38 +0100
Subject: [PATCH] FXOLAT-207: update PortfolioModuleTest to wait until the
event is send, make the LogFileParser works on test unit
---
.../org/olat/core/logging/LogFileParser.java | 4 ++--
.../org/olat/portfolio/PortfolioModuleTest.java | 16 ++++++++++++++--
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/olat/core/logging/LogFileParser.java b/src/main/java/org/olat/core/logging/LogFileParser.java
index 7591096b3c6..49662bdc486 100644
--- a/src/main/java/org/olat/core/logging/LogFileParser.java
+++ b/src/main/java/org/olat/core/logging/LogFileParser.java
@@ -60,8 +60,8 @@ public class LogFileParser extends LogDelegator {
} else {
logfilepathBase = logdir + File.separator + filename;
}
- }else {
- //todo if java.io.tmpdir is in use the log gets written to catalina.out....
+ } else {
+ logfilepathBase = System.getProperty("java.io.tmpdir") + File.separator + "logs" + File.separator + filename;
}
log = getLogger();
}
diff --git a/src/test/java/org/olat/portfolio/PortfolioModuleTest.java b/src/test/java/org/olat/portfolio/PortfolioModuleTest.java
index 663826d2ca6..8f8736ca3c4 100644
--- a/src/test/java/org/olat/portfolio/PortfolioModuleTest.java
+++ b/src/test/java/org/olat/portfolio/PortfolioModuleTest.java
@@ -22,10 +22,10 @@
package org.olat.portfolio;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
import java.util.List;
@@ -113,6 +113,12 @@ public class PortfolioModuleTest extends OlatTestCase {
//////////////////////////////////
portfolioModule.setEnableArtefactHandler(dummyHandler, false);
+ try {//wait until the event is send
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+
//found in the list of all available handlers
List<EPArtefactHandler<?>> allHandlers = portfolioModule.getAllAvailableArtefactHandlers();
boolean foundInAll = false;
@@ -144,6 +150,12 @@ public class PortfolioModuleTest extends OlatTestCase {
//////////////////////////////////
portfolioModule.setEnableArtefactHandler(dummyHandler, false);
+ try {//wait until the event is send
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+
//found in the list of all available handlers
allHandlers = portfolioModule.getAllAvailableArtefactHandlers();
foundInAll = false;
--
GitLab