From 69dcce3ae9aa8df45563cbdfe4dfdb6d87ae3cf0 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 29 Mar 2017 08:51:51 +0200
Subject: [PATCH] no-jira: reduce errors log in unit tests
---
.../velocity/VelocityTemplatesPreWarm.java | 37 +++++++++----------
.../OnyxToQtiWorksAssessementItemsTest.java | 4 +-
.../OnyxToQtiWorksAssessementTestsTest.java | 4 +-
3 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/src/main/java/org/olat/core/gui/render/velocity/VelocityTemplatesPreWarm.java b/src/main/java/org/olat/core/gui/render/velocity/VelocityTemplatesPreWarm.java
index 8e7c09589e3..72727061446 100644
--- a/src/main/java/org/olat/core/gui/render/velocity/VelocityTemplatesPreWarm.java
+++ b/src/main/java/org/olat/core/gui/render/velocity/VelocityTemplatesPreWarm.java
@@ -59,27 +59,26 @@ public class VelocityTemplatesPreWarm implements PreWarm {
final File root = new File(WebappHelper.getContextRoot(), "WEB-INF/classes");
final Path fPath = root.toPath();
try {
- Files.walkFileTree(fPath, new SimpleFileVisitor<Path>() {
-
- @Override
- public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
- try {
-
- String path = fPath.relativize(file).toString();
- if(path.endsWith(".html") && path.contains("/_content/")) {
- StringOutput writer = new StringOutput();
- VelocityHelper.getInstance().mergeContent(path, context, writer, null);
-
- numOfTemplates.incrementAndGet();
+ if(Files.exists(fPath)) {
+ Files.walkFileTree(fPath, new SimpleFileVisitor<Path>() {
+ @Override
+ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
+ try {
+ String path = fPath.relativize(file).toString();
+ if(path.endsWith(".html") && path.contains("/_content/")) {
+ StringOutput writer = new StringOutput();
+ VelocityHelper.getInstance().mergeContent(path, context, writer, null);
+ numOfTemplates.incrementAndGet();
+ }
+ } catch (ResourceNotFoundException e) {
+ log.error("", e);
+ } catch (ParseErrorException e) {
+ log.error("", e);
}
- } catch (ResourceNotFoundException e) {
- log.error("", e);
- } catch (ParseErrorException e) {
- log.error("", e);
+ return FileVisitResult.CONTINUE;
}
- return FileVisitResult.CONTINUE;
- }
- });
+ });
+ }
} catch (IOException e) {
log.error("", e);
}
diff --git a/src/test/java/org/olat/ims/qti21/model/xml/OnyxToQtiWorksAssessementItemsTest.java b/src/test/java/org/olat/ims/qti21/model/xml/OnyxToQtiWorksAssessementItemsTest.java
index 2b0cb257a7d..4f717dacfc0 100644
--- a/src/test/java/org/olat/ims/qti21/model/xml/OnyxToQtiWorksAssessementItemsTest.java
+++ b/src/test/java/org/olat/ims/qti21/model/xml/OnyxToQtiWorksAssessementItemsTest.java
@@ -27,7 +27,6 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.nio.charset.Charset;
import java.nio.file.Files;
-import java.nio.file.StandardCopyOption;
import java.util.Arrays;
import java.util.Collection;
import java.util.UUID;
@@ -114,10 +113,9 @@ public class OnyxToQtiWorksAssessementItemsTest {
DefaultHandler2 myHandler = new Onyx38ToQtiWorksHandler(xtw);
saxParser.setProperty("http://xml.org/sax/properties/lexical-handler", myHandler);
saxParser.parse(in, myHandler);
-
- Files.copy(outputFile.toPath(), new File("/HotCoffee/Onyx", xmlFile.getName()).toPath(), StandardCopyOption.REPLACE_EXISTING);
} catch(Exception e1) {
log.error("", e1);
+ throw e1;
}
QtiXmlReader qtiXmlReader = new QtiXmlReader(new JqtiExtensionManager());
diff --git a/src/test/java/org/olat/ims/qti21/model/xml/OnyxToQtiWorksAssessementTestsTest.java b/src/test/java/org/olat/ims/qti21/model/xml/OnyxToQtiWorksAssessementTestsTest.java
index 260ccedf1b1..81304561cfc 100644
--- a/src/test/java/org/olat/ims/qti21/model/xml/OnyxToQtiWorksAssessementTestsTest.java
+++ b/src/test/java/org/olat/ims/qti21/model/xml/OnyxToQtiWorksAssessementTestsTest.java
@@ -27,7 +27,6 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.nio.charset.Charset;
import java.nio.file.Files;
-import java.nio.file.StandardCopyOption;
import java.util.Arrays;
import java.util.Collection;
import java.util.UUID;
@@ -103,10 +102,9 @@ public class OnyxToQtiWorksAssessementTestsTest {
DefaultHandler2 myHandler = new Onyx38ToQtiWorksHandler(xtw);
saxParser.setProperty("http://xml.org/sax/properties/lexical-handler", myHandler);
saxParser.parse(in, myHandler);
-
- Files.copy(outputFile.toPath(), new File("/HotCoffee/Onyx", xmlFile.getName()).toPath(), StandardCopyOption.REPLACE_EXISTING);
} catch(Exception e1) {
log.error("", e1);
+ throw e1;
}
QtiXmlReader qtiXmlReader = new QtiXmlReader(new JqtiExtensionManager());
--
GitLab