logicaldoc-core tests updated in document and folder

Author: gdesiato

logicaldoc-core/src/main/java/com/logicaldoc/core/document/DigestProcessor.java

@@ -36,7 +36,6 @@ public DigestProcessor() {
 		log = LoggerFactory.getLogger(DigestProcessor.class);
 	}
 
-
 	@Override
 	public boolean isIndeterminate() {
 		return false;
@@ -57,15 +56,9 @@ protected void runTask() throws TaskException {
 			size = documentDao.queryForLong(
 					"select count(*) from ld_document where ld_deleted = 0 and ld_docref is null and ld_digest is null");
 
-			Integer max = config.getProperty("digest.batch") != null
-					? Integer.parseInt(config.getProperty("digest.batch"))
-					: null;
-
-			if (max != null && max.intValue() < size && max.intValue() > 0)
-				size = max.intValue();
-
-			if (max != null && max.intValue() < 1)
-				max = null;
+			int max = config.getInt("digest.batch", (int) size);
+			if (max < size && max > 0)
+				size = max;
 
 			log.info("Found a total of {} documents to process", size);
 

logicaldoc-core/src/main/java/com/logicaldoc/core/document/DocumentComparator.java

@@ -351,16 +351,4 @@ public static Comparator<AbstractDocument> getComparator(List<DocumentComparator
 			return 0;
 		};
 	}
-
-	public static Comparator<AbstractDocument> getComparator(final DocumentComparator... multipleOptions) {
-		return (d1, d2) -> {
-			for (DocumentComparator option : multipleOptions) {
-				int result = option.compare(d1, d2);
-				if (result != 0) {
-					return result;
-				}
-			}
-			return 0;
-		};
-	}
 }

logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateBookmarkDAO.java

@@ -31,24 +31,14 @@ public List<Bookmark> findByUserId(long userId) throws PersistenceException {
 
 	@Override
 	public Bookmark findByUserIdAndDocId(long userId, long docId) throws PersistenceException {
-		List<Bookmark> list = findByWhere(ENTITY + USER_ID + userId + AND + ENTITY + ".targetId =" + docId + AND
-				+ ENTITY + ".type=" + Bookmark.TYPE_DOCUMENT, null, null);
-
-		if (list.isEmpty())
-			return null;
-		else
-			return list.get(0);
+		return findByWhere(ENTITY + USER_ID + userId + AND + ENTITY + ".targetId =" + docId + AND
+				+ ENTITY + ".type=" + Bookmark.TYPE_DOCUMENT, null, null).stream().findFirst().orElse(null);
 	}
 
 	@Override
 	public Bookmark findByUserIdAndFolderId(long userId, long folderId) throws PersistenceException {
-		List<Bookmark> list = findByWhere(ENTITY + USER_ID + userId + AND + ENTITY + ".targetId =" + folderId + AND
-				+ ENTITY + ".type=" + Bookmark.TYPE_FOLDER, null, null);
-
-		if (list.isEmpty())
-			return null;
-		else
-			return list.get(0);
+		return findByWhere(ENTITY + USER_ID + userId + AND + ENTITY + ".targetId =" + folderId + AND
+				+ ENTITY + ".type=" + Bookmark.TYPE_FOLDER, null, null).stream().findFirst().orElse(null);
 	}
 
 	@Override

logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateVersionDAO.java

@@ -169,10 +169,6 @@ public void updateDigest(Version version) {
 		}
 	}
 
-	public void setStore(Store store) {
-		this.store = store;
-	}
-
 	@Override
 	public void delete(long versionId, int delCode) throws PersistenceException {
 		if (!checkStoringAspect())
@@ -191,8 +187,4 @@ protected void deleteVersion(Version versionToDelete, int delCode) {
 		versionToDelete.setVersion(StringUtils.right(versionToDelete.getId() + "." + versionToDelete.getVersion(), 10));
 		saveOrUpdate(versionToDelete);
 	}
-
-	public void setFolderDAO(FolderDAO folderDAO) {
-		this.folderDAO = folderDAO;
-	}
 }

logicaldoc-core/src/test/java/com/logicaldoc/core/AbstractCoreTestCase.java

@@ -72,6 +72,9 @@ private void prepareStore() throws IOException {
 
 		// Store the file of document 3
 		FileUtil.copyResource("/small.pdf", new File(rootStoreOne.getPath() + "/3/doc/1.3"));
+
+		// Store the file of document 8
+		FileUtil.copyResource("/small.pdf", new File(rootStoreOne.getPath() + "/8/doc/1.0"));
 	}
 
 	@Override

logicaldoc-core/src/test/java/com/logicaldoc/core/document/DigestProcessorTest.java

@@ -0,0 +1,58 @@
+package com.logicaldoc.core.document;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.Locale;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.logicaldoc.core.AbstractCoreTestCase;
+import com.logicaldoc.core.task.TaskException;
+import com.logicaldoc.util.Context;
+import com.logicaldoc.util.plugin.PluginException;
+
+/**
+ * Test case for <code>DigestProcess</code>
+ * 
+ * @author Giuseppe Desiato - LogicalDOC
+ * @since 9.1.1
+ */
+public class DigestProcessorTest extends AbstractCoreTestCase {
+
+	private DigestProcessor testSubject;
+
+	@Before
+	public void setUp() throws IOException, SQLException, PluginException {
+		super.setUp();
+
+		testSubject = Context.get(DigestProcessor.class);
+	}
+
+	@Test
+	public void testRunTask() throws TaskException {
+		testSubject.runTask();
+		
+		Context.get().getProperties().setProperty("digest.batch", "10");
+		assertEquals("10", Context.get().getProperties().getProperty("digest.batch"));
+		
+		Context.get().getProperties().setProperty("digest.batch", "2");
+		assertEquals("2", Context.get().getProperties().getProperty("digest.batch"));
+		
+		Context.get().getProperties().setProperty("digest.batch", "1000");
+		assertEquals("1000", Context.get().getProperties().getProperty("digest.batch"));
+		
+		assertFalse(testSubject.isIndeterminate());
+		assertTrue(testSubject.isConcurrent());
+	}
+
+	@Test
+	public void testPrepareReport() {
+		assertNotNull(testSubject.prepareReport(Locale.ENGLISH));
+	}
+}