TSK-1142 Removed JUnit4 dependency in taskana-simplehistory-provider

Taskana · Mar 5, 2020 · 6c6a278 · 6c6a278
1 parent 32d069a
commit 6c6a278
Show file tree

Hide file tree

Showing 8 changed files with 137 additions and 185 deletions.
diff --git a/history/taskana-simplehistory-provider/pom.xml b/history/taskana-simplehistory-provider/pom.xml
@@ -64,21 +64,9 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.junit.vintage</groupId>
-			<artifactId>junit-vintage-engine</artifactId>
-			<version>${version.junit.jupiter}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-api-mockito2</artifactId>
-			<version>${version.powermock}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-junit4</artifactId>
-			<version>${version.powermock}</version>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-junit-jupiter</artifactId>
+			<version>${version.junit.mockito}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -93,5 +81,5 @@
 			<version>${version.h2}</version>
 			<scope>test</scope>
 		</dependency>
-	</dependencies>
+  </dependencies>
 </project>
diff --git a/...story-provider/src/main/java/pro/taskana/simplehistory/impl/SimpleHistoryServiceImpl.java b/...story-provider/src/main/java/pro/taskana/simplehistory/impl/SimpleHistoryServiceImpl.java
@@ -23,8 +23,7 @@ public class SimpleHistoryServiceImpl implements TaskanaHistory {
   @Override
   public void initialize(TaskanaEngineConfiguration taskanaEngineConfiguration) {
     try {
-      this.taskanaHistoryEngine =
-          TaskanaHistoryEngineImpl.createTaskanaEngine(taskanaEngineConfiguration);
+      this.taskanaHistoryEngine = getTaskanaEngine(taskanaEngineConfiguration);
       if (LOGGER.isDebugEnabled()) {
         LOGGER.debug(
             "Simple history service implementation initialized with schemaName: {} ",
@@ -59,4 +58,12 @@ public void create(TaskanaHistoryEvent event) {
   public HistoryQuery createHistoryQuery() {
     return new HistoryQueryImpl(taskanaHistoryEngine, historyQueryMapper);
   }
+
+  /*
+   * ATTENTION: This method exists for testing purposes.
+   */
+  TaskanaHistoryEngineImpl getTaskanaEngine(TaskanaEngineConfiguration taskanaEngineConfiguration)
+      throws SQLException {
+    return TaskanaHistoryEngineImpl.createTaskanaEngine(taskanaEngineConfiguration);
+  }
 }
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/AbstractAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/AbstractAccTest.java
@@ -11,7 +11,7 @@
 import java.util.Properties;
 import javax.sql.DataSource;
 import org.apache.ibatis.datasource.pooled.PooledDataSource;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.BeforeAll;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,7 +45,7 @@ protected AbstractAccTest() {
     // not called
   }
 
-  @BeforeClass
+  @BeforeAll
   public static void setupTest() throws Exception {
     resetDb(null);
   }