You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2020/09/30 20:53:43 UTC

[jspwiki] branch master updated: fix tests' flakiness

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git


The following commit(s) were added to refs/heads/master by this push:
     new 43a15c8  fix tests' flakiness
43a15c8 is described below

commit 43a15c85600d33054eec8fea8c7b622dd582d493
Author: juanpablo <ju...@apache.org>
AuthorDate: Wed Sep 30 22:52:59 2020 +0200

    fix tests' flakiness
---
 .../src/test/java/org/apache/wiki/workflow/DecisionQueueTest.java   | 3 ++-
 .../src/test/java/org/apache/wiki/workflow/WorkflowManagerTest.java | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/jspwiki-main/src/test/java/org/apache/wiki/workflow/DecisionQueueTest.java b/jspwiki-main/src/test/java/org/apache/wiki/workflow/DecisionQueueTest.java
index cb17ab6..73c48c4 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/workflow/DecisionQueueTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/workflow/DecisionQueueTest.java
@@ -32,7 +32,7 @@ import java.util.Collection;
 
 public class DecisionQueueTest {
 
-    TestEngine m_engine = TestEngine.build();
+    TestEngine m_engine;
 
     DecisionQueue m_queue;
 
@@ -50,6 +50,7 @@ public class DecisionQueueTest {
 
     @BeforeEach
     public void setUp() throws Exception {
+        m_engine = TestEngine.build();
         m_queue = m_engine.getManager( WorkflowManager.class ).getDecisionQueue();
         adminSession = m_engine.adminSession();
         janneSession = m_engine.janneSession();
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/workflow/WorkflowManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/workflow/WorkflowManagerTest.java
index ec069b2..0117aa2 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/workflow/WorkflowManagerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/workflow/WorkflowManagerTest.java
@@ -33,12 +33,14 @@ import java.io.File;
 
 public class WorkflowManagerTest {
 
-    protected WikiEngine m_engine = TestEngine.build();
-    protected WorkflowManager wm = m_engine.getManager( WorkflowManager.class );
+    protected WikiEngine m_engine;
+    protected WorkflowManager wm;
     protected Workflow w;
 
     @BeforeEach
     public void setUp() throws Exception {
+        m_engine = TestEngine.build();
+        wm = m_engine.getManager( WorkflowManager.class );
         // Create a workflow with 3 steps, with a Decision in the middle
         w = new Workflow( "workflow.key", new WikiPrincipal( "Owner1" ) );
         final Step startTask = new TaskTest.NormalTask( w );