[JSPWiki/ci] build #18 - SUCCESS
See https://ci-builds.apache.org/job/JSPWiki/job/ci/18/
[JSPWiki/ci] build #20 - SUCCESS
See https://ci-builds.apache.org/job/JSPWiki/job/ci/20/
[JSPWiki/ci] build #19 - SUCCESS
See https://ci-builds.apache.org/job/JSPWiki/job/ci/19/
svn commit: r44902 [2/2] - in /dev/jspwiki/2.11.0.M8-rc1: ./ binaries/ binaries/portable/ binaries/webapp/ source/ wikipages/
Propchange: dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-tika-searchprovider-2.11.0.M8-javadoc.jar.sha512 -- svn:executable = * Added: dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-tika-searchprovider-2.11.0.M8-sources.jar == Binary file - no diff available. Propchange: dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-tika-searchprovider-2.11.0.M8-sources.jar -- svn:executable = * Propchange: dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-tika-searchprovider-2.11.0.M8-sources.jar -- svn:mime-type = application/zip Added: dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-tika-searchprovider-2.11.0.M8-sources.jar.asc == Binary file - no diff available. Propchange: dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-tika-searchprovider-2.11.0.M8-sources.jar.asc -- svn:executable = * Propchange: dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-tika-searchprovider-2.11.0.M8-sources.jar.asc -- svn:mime-type = application/pgp-signature Added: dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-tika-searchprovider-2.11.0.M8-sources.jar.sha512 == --- dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-tika-searchprovider-2.11.0.M8-sources.jar.sha512 (added) +++ dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-tika-searchprovider-2.11.0.M8-sources.jar.sha512 Wed Dec 9 20:19:38 2020 @@ -0,0 +1 @@ +7665bc8ce7a9fa4b5f8875611a58f8b3b41a8d0b7ba1227a60a6a5cf6526162b3e3ae78171cc3d62d0845b9f4c1c20448a078a46b61c87f6b3205c29c7015eed \ No newline at end of file Propchange: dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-tika-searchprovider-2.11.0.M8-sources.jar.sha512 -- svn:executable = * Added: dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-tika-searchprovider-2.11.0.M8.jar == Binary file - no diff available. Propchange: dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-tika-searchprovider-2.11.0.M8.jar -- svn:executable = * Propchange: dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-tika-searchprovider-2.11.0.M8.jar -- svn:mime-type = application/zip Added: dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-tika-searchprovider-2.11.0.M8.jar.asc == Binary file - no diff available. Propchange: dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-tika-searchprovider-2.11.0.M8.jar.asc -- svn:executable = * Propchange: dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-tika-searchprovider-2.11.0.M8.jar.asc -- svn:mime-type = application/pgp-signature Added: dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-tika-searchprovider-2.11.0.M8.jar.sha512 == --- dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-tika-searchprovider-2.11.0.M8.jar.sha512 (added) +++ dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-tika-searchprovider-2.11.0.M8.jar.sha512 Wed Dec 9 20:19:38 2020 @@ -0,0 +1 @@ +6eccf4c40d6d6b0464b8bf86cc58a184ba9ef1dab98601e4bc8f0a25ea17454a2b18f85a4353cd88b33604d6fca0a3cbda0064c6b9e3d2defaf68462d1e52367 \ No newline at end of file Propchange: dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-tika-searchprovider-2.11.0.M8.jar.sha512 -- svn:executable = * Added: dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-util-2.11.0.M8-javadoc.jar == Binary file - no diff available. Propchange: dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-util-2.11.0.M8-javadoc.jar -- svn:executable = * Propchange: dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-util-2.11.0.M8-javadoc.jar -- svn:mime-type = application/zip Added:
svn commit: r44902 [1/2] - in /dev/jspwiki/2.11.0.M8-rc1: ./ binaries/ binaries/portable/ binaries/webapp/ source/ wikipages/
Author: juanpablo Date: Wed Dec 9 20:19:38 2020 New Revision: 44902 Log: 2.11.0.M8 RC1 Added: dev/jspwiki/2.11.0.M8-rc1/ dev/jspwiki/2.11.0.M8-rc1/binaries/ dev/jspwiki/2.11.0.M8-rc1/binaries/portable/ dev/jspwiki/2.11.0.M8-rc1/binaries/portable/jspwiki-portable-2.11.0.M8-woas.tar.gz (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/portable/jspwiki-portable-2.11.0.M8-woas.tar.gz.asc (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/portable/jspwiki-portable-2.11.0.M8-woas.tar.gz.sha512 (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/portable/jspwiki-portable-2.11.0.M8-woas.zip (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/portable/jspwiki-portable-2.11.0.M8-woas.zip.asc (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/portable/jspwiki-portable-2.11.0.M8-woas.zip.sha512 (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/ dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/JSPWiki-sources.jar (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/JSPWiki-sources.jar.asc (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/JSPWiki-sources.jar.sha512 (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/JSPWiki.war (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/JSPWiki.war.asc (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/JSPWiki.war.sha512 (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-210-adapters-2.11.0.M8-javadoc.jar (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-210-adapters-2.11.0.M8-javadoc.jar.asc (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-210-adapters-2.11.0.M8-javadoc.jar.sha512 (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-210-adapters-2.11.0.M8-sources.jar (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-210-adapters-2.11.0.M8-sources.jar.asc (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-210-adapters-2.11.0.M8-sources.jar.sha512 (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-210-adapters-2.11.0.M8.jar (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-210-adapters-2.11.0.M8.jar.asc (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-210-adapters-2.11.0.M8.jar.sha512 (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-210-test-adaptees-2.11.0.M8-sources.jar (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-210-test-adaptees-2.11.0.M8-sources.jar.asc (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-210-test-adaptees-2.11.0.M8-sources.jar.sha512 (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-210-test-adaptees-2.11.0.M8-tests.jar (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-210-test-adaptees-2.11.0.M8-tests.jar.asc (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-210-test-adaptees-2.11.0.M8-tests.jar.sha512 (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-210-test-adaptees-2.11.0.M8.jar (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-210-test-adaptees-2.11.0.M8.jar.asc (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-210-test-adaptees-2.11.0.M8.jar.sha512 (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-api-2.11.0.M8-javadoc.jar (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-api-2.11.0.M8-javadoc.jar.asc (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-api-2.11.0.M8-javadoc.jar.sha512 (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-api-2.11.0.M8-sources.jar (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-api-2.11.0.M8-sources.jar.asc (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-api-2.11.0.M8-sources.jar.sha512 (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-api-2.11.0.M8.jar (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-api-2.11.0.M8.jar.asc (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-api-2.11.0.M8.jar.sha512 (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-bootstrap-2.11.0.M8-javadoc.jar (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-bootstrap-2.11.0.M8-javadoc.jar.asc (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-bootstrap-2.11.0.M8-javadoc.jar.sha512 (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-bootstrap-2.11.0.M8-sources.jar (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-bootstrap-2.11.0.M8-sources.jar.asc (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-bootstrap-2.11.0.M8-sources.jar.sha512 (with props) dev/jspwiki/2.11.0.M8-rc1/binaries/webapp/jspwiki-bootstrap-2.11.0.M8.jar (with props)
[jspwiki] branch master updated: [maven-release-plugin] prepare for next development iteration
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 1acf4a7 [maven-release-plugin] prepare for next development iteration 1acf4a7 is described below commit 1acf4a73225e660b6cd383e624668113f977a40f Author: juanpablo AuthorDate: Wed Dec 9 20:21:02 2020 +0100 [maven-release-plugin] prepare for next development iteration --- jspwiki-210-adapters/pom.xml | 2 +- jspwiki-210-test-adaptees/pom.xml | 2 +- jspwiki-api/pom.xml | 2 +- jspwiki-bootstrap/pom.xml | 2 +- jspwiki-event/pom.xml | 2 +- jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml | 2 +- jspwiki-it-tests/jspwiki-it-test-cma/pom.xml | 2 +- jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml | 2 +- jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml | 2 +- jspwiki-it-tests/jspwiki-it-test-custom/pom.xml | 2 +- jspwiki-it-tests/jspwiki-selenide-tests/pom.xml | 2 +- jspwiki-it-tests/pom.xml | 2 +- jspwiki-main/pom.xml | 2 +- jspwiki-markdown/pom.xml | 2 +- jspwiki-portable/pom.xml | 2 +- jspwiki-tika-searchprovider/pom.xml | 2 +- jspwiki-util/pom.xml | 2 +- jspwiki-war/pom.xml | 2 +- jspwiki-wikipages/de/pom.xml | 2 +- jspwiki-wikipages/en/pom.xml | 2 +- jspwiki-wikipages/es/pom.xml | 2 +- jspwiki-wikipages/fi/pom.xml | 2 +- jspwiki-wikipages/fr/pom.xml | 2 +- jspwiki-wikipages/it/pom.xml | 2 +- jspwiki-wikipages/nl/pom.xml | 2 +- jspwiki-wikipages/pom.xml | 2 +- jspwiki-wikipages/pt_BR/pom.xml | 2 +- jspwiki-wikipages/ru/pom.xml | 2 +- jspwiki-wikipages/zh_CN/pom.xml | 2 +- pom.xml | 6 +++--- 30 files changed, 32 insertions(+), 32 deletions(-) diff --git a/jspwiki-210-adapters/pom.xml b/jspwiki-210-adapters/pom.xml index d600b29..27edf99 100644 --- a/jspwiki-210-adapters/pom.xml +++ b/jspwiki-210-adapters/pom.xml @@ -22,7 +22,7 @@ org.apache.jspwiki jspwiki-builder -2.11.0.M8 +2.11.0-SNAPSHOT 4.0.0 diff --git a/jspwiki-210-test-adaptees/pom.xml b/jspwiki-210-test-adaptees/pom.xml index c68bbf8..e5737fb 100644 --- a/jspwiki-210-test-adaptees/pom.xml +++ b/jspwiki-210-test-adaptees/pom.xml @@ -22,7 +22,7 @@ org.apache.jspwiki jspwiki-builder -2.11.0.M8 +2.11.0-SNAPSHOT 4.0.0 diff --git a/jspwiki-api/pom.xml b/jspwiki-api/pom.xml index 19e60f3..15f49ea 100644 --- a/jspwiki-api/pom.xml +++ b/jspwiki-api/pom.xml @@ -22,7 +22,7 @@ org.apache.jspwiki jspwiki-builder -2.11.0.M8 +2.11.0-SNAPSHOT 4.0.0 diff --git a/jspwiki-bootstrap/pom.xml b/jspwiki-bootstrap/pom.xml index 92750e7..68ef16d 100644 --- a/jspwiki-bootstrap/pom.xml +++ b/jspwiki-bootstrap/pom.xml @@ -22,7 +22,7 @@ org.apache.jspwiki jspwiki-builder -2.11.0.M8 +2.11.0-SNAPSHOT 4.0.0 diff --git a/jspwiki-event/pom.xml b/jspwiki-event/pom.xml index f12973c..e92d9df 100644 --- a/jspwiki-event/pom.xml +++ b/jspwiki-event/pom.xml @@ -22,7 +22,7 @@ org.apache.jspwiki jspwiki-builder -2.11.0.M8 +2.11.0-SNAPSHOT 4.0.0 diff --git a/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml b/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml index 4f3e376..7b1a5f2 100644 --- a/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml +++ b/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml @@ -22,7 +22,7 @@ org.apache.jspwiki.it jspwiki-it-builder -2.11.0.M8 +2.11.0-SNAPSHOT diff --git a/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml b/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml index a82ae9e..bfc0cfe 100644 --- a/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml +++ b/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml @@ -22,7 +22,7 @@ org.apache.jspwiki.it jspwiki-it-builder -2.11.0.M8 +2.11.0-SNAPSHOT diff --git a/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml b/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml index 278a022..f6ff6e7
[jspwiki] annotated tag 2.11.0.M8-RC1 updated (c2aa07f -> 8bec294)
This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a change to annotated tag 2.11.0.M8-RC1 in repository https://gitbox.apache.org/repos/asf/jspwiki.git. *** WARNING: tag 2.11.0.M8-RC1 was modified! *** from c2aa07f (commit) to 8bec294 (tag) tagging c2aa07f5711be8b961a9a28fd8511ced22c62de6 (commit) replaces 2.11.0.M7 by juanpablo on Wed Dec 9 20:20:56 2020 +0100 - Log - [maven-release-plugin] copy for tag 2.11.0.M8-RC1 --- No new revisions were added by this update. Summary of changes:
[jspwiki] branch master updated (3d0479a -> c2aa07f)
This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git. from 3d0479a another take at WorkflowManagerTest to ensure this time that testWorkflows can be run in any order within the class tests add c2aa07f [maven-release-plugin] prepare release 2.11.0.M8-RC1 No new revisions were added by this update. Summary of changes: jspwiki-210-adapters/pom.xml | 2 +- jspwiki-210-test-adaptees/pom.xml | 2 +- jspwiki-api/pom.xml | 2 +- jspwiki-bootstrap/pom.xml | 2 +- jspwiki-event/pom.xml | 2 +- jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml | 2 +- jspwiki-it-tests/jspwiki-it-test-cma/pom.xml | 2 +- jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml | 2 +- jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml | 2 +- jspwiki-it-tests/jspwiki-it-test-custom/pom.xml | 2 +- jspwiki-it-tests/jspwiki-selenide-tests/pom.xml | 2 +- jspwiki-it-tests/pom.xml | 2 +- jspwiki-main/pom.xml | 2 +- jspwiki-markdown/pom.xml | 2 +- jspwiki-portable/pom.xml | 2 +- jspwiki-tika-searchprovider/pom.xml | 2 +- jspwiki-util/pom.xml | 2 +- jspwiki-war/pom.xml | 2 +- jspwiki-wikipages/de/pom.xml | 2 +- jspwiki-wikipages/en/pom.xml | 2 +- jspwiki-wikipages/es/pom.xml | 2 +- jspwiki-wikipages/fi/pom.xml | 2 +- jspwiki-wikipages/fr/pom.xml | 2 +- jspwiki-wikipages/it/pom.xml | 2 +- jspwiki-wikipages/nl/pom.xml | 2 +- jspwiki-wikipages/pom.xml | 2 +- jspwiki-wikipages/pt_BR/pom.xml | 2 +- jspwiki-wikipages/ru/pom.xml | 2 +- jspwiki-wikipages/zh_CN/pom.xml | 2 +- pom.xml | 6 +++--- 30 files changed, 32 insertions(+), 32 deletions(-)
[jspwiki] branch master updated: another take at WorkflowManagerTest to ensure this time that testWorkflows can be run in any order within the class tests
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 3d0479a another take at WorkflowManagerTest to ensure this time that
testWorkflows can be run in any order within the class tests
3d0479a is described below
commit 3d0479a2e9e3cd2376847b5f0e9f029560651b55
Author: juanpablo
AuthorDate: Wed Dec 9 19:41:24 2020 +0100
another take at WorkflowManagerTest to ensure this time that testWorkflows
can be run in any order within the class tests
---
.../apache/wiki/workflow/WorkflowManagerTest.java | 45 ++
1 file changed, 20 insertions(+), 25 deletions(-)
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 9d18afd..1ceacfe 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
@@ -30,19 +30,17 @@ import org.junit.jupiter.api.Test;
import java.io.File;
-import static org.apache.wiki.TestEngine.with;
-
public class WorkflowManagerTest {
-protected WikiEngine m_engine;
-protected WorkflowManager wm;
+protected WikiEngine m_engine= TestEngine.build();
+protected DefaultWorkflowManager wm;
protected Workflow w;
@BeforeEach
public void setUp() throws Exception {
-m_engine = TestEngine.build( with( "jspwiki.workDir",
"./target/test-classes/WorkflowManagerTests/" + System.currentTimeMillis() ) );
-wm = m_engine.getManager( WorkflowManager.class );
+wm = new DefaultWorkflowManager();
+wm.initialize( m_engine, TestEngine.getTestProperties() );
// 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 );
@@ -105,28 +103,25 @@ public class WorkflowManagerTest {
@Test
public void testSerializeUnserialize() throws WikiException {
-final DefaultWorkflowManager dwm = new DefaultWorkflowManager();
-dwm.initialize( m_engine, TestEngine.getTestProperties() );
-
-dwm.unserializeFromDisk( new File( "./src/test/resources",
DefaultWorkflowManager.SERIALIZATION_FILE ) );
-Assertions.assertEquals( 1, dwm.m_workflows.size() );
-Assertions.assertEquals( 1, dwm.m_queue.decisions().length );
-Assertions.assertEquals( 0, dwm.m_completed.size() );
+wm.unserializeFromDisk( new File( "./src/test/resources",
DefaultWorkflowManager.SERIALIZATION_FILE ) );
+Assertions.assertEquals( 1, wm.m_workflows.size() );
+Assertions.assertEquals( 1, wm.m_queue.decisions().length );
+Assertions.assertEquals( 0, wm.m_completed.size() );
-final Workflow workflow = dwm.m_workflows.iterator().next();
+final Workflow workflow = wm.m_workflows.iterator().next();
final Decision d = ( Decision )workflow.getCurrentStep();
d.decide( Outcome.DECISION_APPROVE, null );
-dwm.actionPerformed( new WorkflowEvent( workflow,
WorkflowEvent.COMPLETED ) );
-dwm.actionPerformed( new WorkflowEvent( d, WorkflowEvent.DQ_REMOVAL )
);
-Assertions.assertEquals( 0, dwm.getWorkflows().size() );
-Assertions.assertEquals( 0, dwm.m_queue.decisions().length );
-Assertions.assertEquals( 1, dwm.getCompletedWorkflows().size() );
-dwm.serializeToDisk( new File( "./target/test-classes",
DefaultWorkflowManager.SERIALIZATION_FILE ) );
-
-dwm.unserializeFromDisk( new File( "./target/test-classes",
DefaultWorkflowManager.SERIALIZATION_FILE ) );
-Assertions.assertEquals( 0, dwm.m_workflows.size() );
-Assertions.assertEquals( 0, dwm.m_queue.decisions().length );
-Assertions.assertEquals( 1, dwm.m_completed.size() );
+wm.actionPerformed( new WorkflowEvent( workflow,
WorkflowEvent.COMPLETED ) );
+wm.actionPerformed( new WorkflowEvent( d, WorkflowEvent.DQ_REMOVAL ) );
+Assertions.assertEquals( 0, wm.getWorkflows().size() );
+Assertions.assertEquals( 0, wm.m_queue.decisions().length );
+Assertions.assertEquals( 1, wm.getCompletedWorkflows().size() );
+wm.serializeToDisk( new File( "./target/test-classes",
DefaultWorkflowManager.SERIALIZATION_FILE ) );
+
+wm.unserializeFromDisk( new File( "./target/test-classes",
DefaultWorkflowManager.SERIALIZATION_FILE ) );
+Assertions.assertEquals( 0, wm.m_workflows.size() );
+Assertions.assertEquals( 0, wm.m_queue.decisions().length );
+Assertions.assertEquals( 1, wm.m_completed.size() );
}
}
[JSPWiki/ci] build #17 - SUCCESS
See https://ci-builds.apache.org/job/JSPWiki/job/ci/17/
[jspwiki] branch master updated: another stab at completely removing test flakiness: ensure each test runs using a different workDir
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 8150055 another stab at completely removing test flakiness: ensure
each test runs using a different workDir
8150055 is described below
commit 8150055a7b3ff65dfa994193e1740d16f9be08a3
Author: juanpablo
AuthorDate: Wed Dec 9 15:26:44 2020 +0100
another stab at completely removing test flakiness: ensure each test runs
using a different workDir
so there is no chance one test reuses the wkflmgr.ser from another test.
This should allow tests to be run in a random order..
---
.../src/test/java/org/apache/wiki/workflow/WorkflowManagerTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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 9e8f871..9d18afd 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
@@ -30,6 +30,8 @@ import org.junit.jupiter.api.Test;
import java.io.File;
+import static org.apache.wiki.TestEngine.with;
+
public class WorkflowManagerTest {
@@ -39,7 +41,7 @@ public class WorkflowManagerTest {
@BeforeEach
public void setUp() throws Exception {
-m_engine = TestEngine.build();
+m_engine = TestEngine.build( with( "jspwiki.workDir",
"./target/test-classes/WorkflowManagerTests/" + System.currentTimeMillis() ) );
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" ) );
[JSPWiki/ci] build #16 - SUCCESS
See https://ci-builds.apache.org/job/JSPWiki/job/ci/16/
[jspwiki] branch master updated: another stab at fixing test 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 d3a7312 another stab at fixing test flakiness:
d3a7312 is described below
commit d3a731288d58ac3461d7467f7a6020de348a6221
Author: juanpablo
AuthorDate: Wed Dec 9 14:56:31 2020 +0100
another stab at fixing test flakiness:
* DecisionQueueTest empties the decission queue before adding new elements
in order to ensure we're working with the same amount of decissions on each test
* WorkflowManagerTest reads the wkflmgr.ser file from src/test/resources on
testSerializeUnserialize(), to ensure we read the expected information for the
test
---
.../test/java/org/apache/wiki/workflow/DecisionQueueTest.java| 9 +
.../test/java/org/apache/wiki/workflow/WorkflowManagerTest.java | 2 +-
2 files changed, 6 insertions(+), 5 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 73c48c4..d2c08b6 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,9 +32,9 @@ import java.util.Collection;
public class DecisionQueueTest {
-TestEngine m_engine;
+TestEngine m_engine = TestEngine.build();
-DecisionQueue m_queue;
+DecisionQueue m_queue = m_engine.getManager( WorkflowManager.class
).getDecisionQueue();
Workflow w;
@@ -50,14 +50,15 @@ 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();
w = new Workflow("workflow.key", new WikiPrincipal("Owner1"));
d1 = new SimpleDecision( w.getId(), w.getAttributes(),
"decision1.key", new GroupPrincipal( "Admin" ) );
d2 = new SimpleDecision( w.getId(), w.getAttributes(),
"decision2.key", new WikiPrincipal( "Owner2" ) );
d3 = new SimpleDecision( w.getId(), w.getAttributes(),
"decision3.key", janneSession.getUserPrincipal() );
+while( m_queue.decisions().length != 0 ) {
+m_queue.remove( m_queue.decisions()[0] );
+}
m_queue.add( d1 );
m_queue.add( d2 );
m_queue.add( d3 );
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 0117aa2..9e8f871 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
@@ -106,7 +106,7 @@ public class WorkflowManagerTest {
final DefaultWorkflowManager dwm = new DefaultWorkflowManager();
dwm.initialize( m_engine, TestEngine.getTestProperties() );
-dwm.unserializeFromDisk( new File( "./target/test-classes",
DefaultWorkflowManager.SERIALIZATION_FILE ) );
+dwm.unserializeFromDisk( new File( "./src/test/resources",
DefaultWorkflowManager.SERIALIZATION_FILE ) );
Assertions.assertEquals( 1, dwm.m_workflows.size() );
Assertions.assertEquals( 1, dwm.m_queue.decisions().length );
Assertions.assertEquals( 0, dwm.m_completed.size() );
