From c56c133d8dc99d5109f7e2da718c999ddddde57e Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Mon, 13 Feb 2017 11:13:07 +0100
Subject: [PATCH] OO-2526: fix unit tests
---
.../document/file/FileDocumentFactory.java | 6 +-
.../file/FileDocumentFactoryTest.java | 59 ++++++++++++-------
2 files changed, 43 insertions(+), 22 deletions(-)
diff --git a/src/main/java/org/olat/search/service/document/file/FileDocumentFactory.java b/src/main/java/org/olat/search/service/document/file/FileDocumentFactory.java
index e6797d7af4b..7583cc93ff6 100644
--- a/src/main/java/org/olat/search/service/document/file/FileDocumentFactory.java
+++ b/src/main/java/org/olat/search/service/document/file/FileDocumentFactory.java
@@ -223,7 +223,7 @@ public class FileDocumentFactory {
if(leaf instanceof LocalImpl) {
String path = ((LocalImpl)leaf).getBasefile().getAbsolutePath();
- if (searchModule.getFileBlackList().contains(path)) {
+ if (!isFileSupported(path)) {
return false;
}
}
@@ -247,6 +247,10 @@ public class FileDocumentFactory {
return true;
}
+ public boolean isFileSupported(String path) {
+ return !searchModule.getFileBlackList().contains(path);
+ }
+
public int getExcludedFileSizeCount( ) {
return excludedFileSizeCount;
}
diff --git a/src/test/java/org/olat/search/service/document/file/FileDocumentFactoryTest.java b/src/test/java/org/olat/search/service/document/file/FileDocumentFactoryTest.java
index d3f9663c2f6..453da134215 100644
--- a/src/test/java/org/olat/search/service/document/file/FileDocumentFactoryTest.java
+++ b/src/test/java/org/olat/search/service/document/file/FileDocumentFactoryTest.java
@@ -27,7 +27,6 @@
package org.olat.search.service.document.file;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.File;
@@ -36,10 +35,13 @@ import java.net.URISyntaxException;
import java.net.URL;
import org.apache.lucene.document.Document;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.olat.core.commons.modules.bc.vfs.OlatNamedContainerImpl;
import org.olat.core.commons.modules.bc.vfs.OlatRootFolderImpl;
+import org.olat.core.logging.OLog;
+import org.olat.core.logging.Tracing;
import org.olat.core.util.FileUtils;
import org.olat.core.util.resource.OresHelper;
import org.olat.core.util.vfs.LocalFileImpl;
@@ -54,6 +56,8 @@ import org.springframework.beans.factory.annotation.Autowired;
* @author Christian Guretzki
*/
public class FileDocumentFactoryTest extends OlatTestCase {
+
+ private static final OLog log = Tracing.createLoggerFor(FileDocumentFactoryTest.class);
// variables for test fixture
@@ -70,28 +74,41 @@ public class FileDocumentFactoryTest extends OlatTestCase {
rootPath = "/search_junit_test_folder";
}
- @Test public void testIsFileSupported() {
- assertTrue("html must be supported", fileDocumentFactory.isFileSupported(new LocalFileImpl(new File("test.html"))));
- assertTrue("htm must be supported", fileDocumentFactory.isFileSupported(new LocalFileImpl(new File("test.htm"))));
- assertTrue("HTML must be supported", fileDocumentFactory.isFileSupported(new LocalFileImpl(new File("test.HTML"))));
- assertTrue("HTM must be supported", fileDocumentFactory.isFileSupported(new LocalFileImpl(new File("test.HTM"))));
- assertTrue("HTM must be supported", fileDocumentFactory.isFileSupported(new LocalFileImpl(new File("test.xhtml"))));
- assertTrue("HTM must be supported", fileDocumentFactory.isFileSupported(new LocalFileImpl(new File("test.XHTML"))));
+ @Test
+ public void testIsFileSupported() {
+ Assert.assertTrue("html must be supported", fileDocumentFactory.isFileSupported("test.html"));
+ Assert.assertTrue("htm must be supported", fileDocumentFactory.isFileSupported("test.htm"));
+ Assert.assertTrue("HTML must be supported", fileDocumentFactory.isFileSupported("test.HTML"));
+ Assert.assertTrue("HTM must be supported", fileDocumentFactory.isFileSupported("test.HTM"));
+ Assert.assertTrue("HTM must be supported", fileDocumentFactory.isFileSupported("test.xhtml"));
+ Assert.assertTrue("HTM must be supported", fileDocumentFactory.isFileSupported("test.XHTML"));
+
+ Assert.assertTrue("pdf must be supported", fileDocumentFactory.isFileSupported("test.pdf"));
+ Assert.assertTrue("PDF must be supported", fileDocumentFactory.isFileSupported("test.PDF"));
+
+ Assert.assertTrue("DOC must be supported", fileDocumentFactory.isFileSupported(getVFSFile("test2.DOC")));
+ Assert.assertTrue("doc must be supported", fileDocumentFactory.isFileSupported(getVFSFile("test.doc")));
- assertTrue("pdf must be supported", fileDocumentFactory.isFileSupported(new LocalFileImpl(new File("test.pdf"))));
- assertTrue("PDF must be supported", fileDocumentFactory.isFileSupported(new LocalFileImpl(new File("test.PDF"))));
+ Assert.assertTrue("TXT must be supported", fileDocumentFactory.isFileSupported("test.TXT"));
+ Assert.assertTrue("txt must be supported", fileDocumentFactory.isFileSupported("test.txt"));
+ Assert.assertTrue("txt must be supported", fileDocumentFactory.isFileSupported("test.readme"));
+ Assert.assertTrue("txt must be supported", fileDocumentFactory.isFileSupported("test.README"));
+ Assert.assertTrue("txt must be supported", fileDocumentFactory.isFileSupported("test.csv"));
+ Assert.assertTrue("txt must be supported", fileDocumentFactory.isFileSupported("test.CSV"));
+ Assert.assertTrue("XML must be supported", fileDocumentFactory.isFileSupported("test.XML"));
+ Assert.assertTrue("xml must be supported", fileDocumentFactory.isFileSupported("test.xml"));
+
+ //this is excluded
+ Assert.assertFalse("xml must be supported", fileDocumentFactory.isFileSupported("imsmanifest.xml"));
+ }
+
+ @Test
+ public void testIsFileSupported_realfile() throws IOException, DocumentException, DocumentAccessException, URISyntaxException {
- assertTrue("DOC must be supported", fileDocumentFactory.isFileSupported(getVFSFile("test2.DOC")));
- assertTrue("doc must be supported", fileDocumentFactory.isFileSupported(getVFSFile("test.doc")));
+ Assert.assertTrue("html must be supported", fileDocumentFactory.isFileSupported(getVFSFile("test.html")));
+ Assert.assertTrue("html must be supported", fileDocumentFactory.isFileSupported(getVFSFile("test.doc")));
+ Assert.assertTrue("html must be supported", fileDocumentFactory.isFileSupported(getVFSFile("test2.DOC")));
- assertTrue("TXT must be supported", fileDocumentFactory.isFileSupported(new LocalFileImpl(new File("test.TXT"))));
- assertTrue("txt must be supported", fileDocumentFactory.isFileSupported(new LocalFileImpl(new File("test.txt"))));
- assertTrue("txt must be supported", fileDocumentFactory.isFileSupported(new LocalFileImpl(new File("test.readme"))));
- assertTrue("txt must be supported", fileDocumentFactory.isFileSupported(new LocalFileImpl(new File("test.README"))));
- assertTrue("txt must be supported", fileDocumentFactory.isFileSupported(new LocalFileImpl(new File("test.csv"))));
- assertTrue("txt must be supported", fileDocumentFactory.isFileSupported(new LocalFileImpl(new File("test.CSV"))));
- assertTrue("XML must be supported", fileDocumentFactory.isFileSupported(new LocalFileImpl(new File("test.XML"))));
- assertTrue("xml must be supported", fileDocumentFactory.isFileSupported(new LocalFileImpl(new File("test.xml"))));
}
private VFSLeaf getVFSFile(String filename) {
@@ -100,7 +117,7 @@ public class FileDocumentFactoryTest extends OlatTestCase {
File file = new File(url.toURI());
return new LocalFileImpl(file);
} catch (URISyntaxException e) {
- e.printStackTrace();
+ log.error("", e);
return null;
}
}
--
GitLab