From 6eeaebecf46c90c1bf54cce94087007cf0e6c57e Mon Sep 17 00:00:00 2001
From: Georgy Litvinov <git@litvinovg.pro>
Date: Thu, 25 Feb 2021 00:35:05 +0100
Subject: [PATCH] Added config for regression tests

---
 build.gradle                                  | 33 ++++++++++++++-----
 .../w2phtml/regressionTests/TestExample.java  |  2 +-
 2 files changed, 25 insertions(+), 10 deletions(-)
 rename src/{test => r_tests}/java/w2phtml/regressionTests/TestExample.java (95%)

diff --git a/build.gradle b/build.gradle
index e7947c1..d991352 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,14 +11,27 @@ properties.setProperty('releaseVersion', project.version )
 mkdir "src/main/tmp/w2phtml"
 propertyDestFile.withWriter { properties.store(it, null) }
 
+sourceSets {
+    regressionTest {
+        java {
+            compileClasspath += main.output + test.output
+            runtimeClasspath += main.output + files('src/main/java') 
+            java.srcDir file('src/r_tests/java')
+        }
+    }
+}
 sourceCompatibility = 1.8
 configurations{
     bundledLibs
+    regressionTestCompile.extendsFrom mainCompile
+    regressionTestRuntime.extendsFrom mainRuntime
+    regressionTestRuntime.extendsFrom bundledLibs
 }
 dependencies{
-    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.1'
-    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.1'
-    testImplementation group: 'commons-io', name: 'commons-io', version: '2.8.0'
+    regressionTestImplementation group: 'commons-io', name: 'commons-io', version: '2.8.0'
+    regressionTestImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.1'
+    regressionTestImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.1'
+    regressionTestRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 
     bundledLibs 'org.libreoffice:jurt:5.3.2'
     bundledLibs 'org.libreoffice:juh:5.3.2'
@@ -202,12 +215,14 @@ task oxtNew(type: Zip){
     from 'releasenotes.txt'
     include '*'
 }
-
-task regressionTests(type: Test){
-    useJUnit()
-    testLogging {
-      events "passed", "skipped", "failed"
-    }
+task regressionTest(type: Test) {
+  testClassesDirs = sourceSets.regressionTest.output.classesDirs
+  classpath = sourceSets.regressionTest.runtimeClasspath
+  useJUnitPlatform()
+  testLogging {
+    events "passed", "skipped", "failed", "standardOut", "standardError"
+  }
+  mustRunAfter jar
 }
 
 task setVersion(){   
diff --git a/src/test/java/w2phtml/regressionTests/TestExample.java b/src/r_tests/java/w2phtml/regressionTests/TestExample.java
similarity index 95%
rename from src/test/java/w2phtml/regressionTests/TestExample.java
rename to src/r_tests/java/w2phtml/regressionTests/TestExample.java
index 84c4864..570c52e 100644
--- a/src/test/java/w2phtml/regressionTests/TestExample.java
+++ b/src/r_tests/java/w2phtml/regressionTests/TestExample.java
@@ -14,7 +14,7 @@ public class TestExample {
 
   @Test
   @DisplayName("Heading with page break before")
-  public static void main(String[] args) throws Exception {
+    void testExample() throws Exception{
 
     List<String> arguments = new ArrayList<String>();
     arguments.add("-page_break_style");