From 8f048c91b6900d14426026150cb0f9335fdc65a8 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Thu, 17 Jun 2021 01:49:28 +0200
Subject: [PATCH] fix unit tests
---
.../java/org/caosdb/server/jobs/JobConfigTest.java | 8 ++++++++
.../java/org/caosdb/server/jobs/ScheduleTest.java | 8 ++++++++
.../caosdb/server/jobs/core/TestInsertFilesInDir.java | 11 +++++++++--
3 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/test/java/org/caosdb/server/jobs/JobConfigTest.java b/src/test/java/org/caosdb/server/jobs/JobConfigTest.java
index bdaa63f5..70917b53 100644
--- a/src/test/java/org/caosdb/server/jobs/JobConfigTest.java
+++ b/src/test/java/org/caosdb/server/jobs/JobConfigTest.java
@@ -2,16 +2,24 @@ package org.caosdb.server.jobs;
import static org.junit.Assert.assertEquals;
+import java.io.IOException;
+import org.caosdb.server.CaosDBServer;
import org.caosdb.server.entity.DeleteEntity;
import org.caosdb.server.entity.InsertEntity;
import org.caosdb.server.entity.RetrieveEntity;
import org.caosdb.server.entity.Role;
import org.caosdb.server.entity.UpdateEntity;
import org.jdom2.Element;
+import org.junit.BeforeClass;
import org.junit.Test;
public class JobConfigTest {
+ @BeforeClass
+ public static void setup() throws IOException {
+ CaosDBServer.initServerProperties();
+ }
+
@Test
public void testGetTransactionType() {
final JobConfig jobConfig = JobConfig.getInstance();
diff --git a/src/test/java/org/caosdb/server/jobs/ScheduleTest.java b/src/test/java/org/caosdb/server/jobs/ScheduleTest.java
index cef0ec3e..9aa8e6f6 100644
--- a/src/test/java/org/caosdb/server/jobs/ScheduleTest.java
+++ b/src/test/java/org/caosdb/server/jobs/ScheduleTest.java
@@ -24,10 +24,18 @@ package org.caosdb.server.jobs;
import static org.junit.Assert.fail;
+import java.io.IOException;
+import org.caosdb.server.CaosDBServer;
+import org.junit.BeforeClass;
import org.junit.Test;
public class ScheduleTest {
+ @BeforeClass
+ public static void setup() throws IOException {
+ CaosDBServer.initServerProperties();
+ }
+
/** The problem of ticket #297 was that a CHECK job was executed during the ROLL_BACK stage. */
@Test
public void testTicket297() {
diff --git a/src/test/java/org/caosdb/server/jobs/core/TestInsertFilesInDir.java b/src/test/java/org/caosdb/server/jobs/core/TestInsertFilesInDir.java
index ae5df853..5d81ac36 100644
--- a/src/test/java/org/caosdb/server/jobs/core/TestInsertFilesInDir.java
+++ b/src/test/java/org/caosdb/server/jobs/core/TestInsertFilesInDir.java
@@ -4,16 +4,23 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
+import org.caosdb.server.CaosDBServer;
+import org.junit.BeforeClass;
import org.junit.Test;
public class TestInsertFilesInDir {
+ @BeforeClass
+ public static void setup() throws IOException {
+ CaosDBServer.initServerProperties();
+ }
+
@Test
public void testExclude() throws IOException {
- InsertFilesInDir job = new InsertFilesInDir();
+ final InsertFilesInDir job = new InsertFilesInDir();
job.init(null, null, null);
job.parseValue("-e ^.*test.*$ test");
- File testFile = new File("test.dat");
+ final File testFile = new File("test.dat");
assertTrue(job.isExcluded(testFile));
}
}
--
GitLab