From 19b17c5b58fff9dab7c7dd84812e086c8dfb923a Mon Sep 17 00:00:00 2001
From: Georgy Litvinov <git@litvinovg.pro>
Date: Wed, 8 Dec 2021 14:51:58 +0100
Subject: [PATCH] chore: improved build configuration

---
 build.gradle                                               | 7 ++++---
 .../w2phtml/regressionTests/PageBreaksBeforeHeading.java   | 0
 .../java/w2phtml/regressionTests/html5/BreakAfterTest.java | 0
 .../java/w2phtml/regressionTests/html5/BulletList.java     | 0
 .../w2phtml/regressionTests/html5/GreenstoneHeadings.java  | 0
 .../regressionTests/html5/HardPageBreaksInLists.java       | 0
 .../w2phtml/regressionTests/html5/HeadingWithSections.java | 0
 .../w2phtml/regressionTests/html5/ImageAfterSection.java   | 0
 .../java/w2phtml/regressionTests/html5/ListAfterText.java  | 0
 .../java/w2phtml/regressionTests/html5/ListInSection.java  | 0
 .../java/w2phtml/regressionTests/html5/ListInTable.java    | 0
 .../w2phtml/regressionTests/html5/ListTableSection.java    | 0
 .../w2phtml/regressionTests/html5/PageStartWith10.java     | 0
 .../regressionTests/html5/PageStartWith10InSection.java    | 0
 .../regressionTests/html5/SoftPageBreakInListTest.java     | 0
 .../regressionTests/html5/SplitFilesAlignToPages.java      | 0
 16 files changed, 4 insertions(+), 3 deletions(-)
 rename src/{r_tests => regressionTests}/java/w2phtml/regressionTests/PageBreaksBeforeHeading.java (100%)
 rename src/{r_tests => regressionTests}/java/w2phtml/regressionTests/html5/BreakAfterTest.java (100%)
 rename src/{r_tests => regressionTests}/java/w2phtml/regressionTests/html5/BulletList.java (100%)
 rename src/{r_tests => regressionTests}/java/w2phtml/regressionTests/html5/GreenstoneHeadings.java (100%)
 rename src/{r_tests => regressionTests}/java/w2phtml/regressionTests/html5/HardPageBreaksInLists.java (100%)
 rename src/{r_tests => regressionTests}/java/w2phtml/regressionTests/html5/HeadingWithSections.java (100%)
 rename src/{r_tests => regressionTests}/java/w2phtml/regressionTests/html5/ImageAfterSection.java (100%)
 rename src/{r_tests => regressionTests}/java/w2phtml/regressionTests/html5/ListAfterText.java (100%)
 rename src/{r_tests => regressionTests}/java/w2phtml/regressionTests/html5/ListInSection.java (100%)
 rename src/{r_tests => regressionTests}/java/w2phtml/regressionTests/html5/ListInTable.java (100%)
 rename src/{r_tests => regressionTests}/java/w2phtml/regressionTests/html5/ListTableSection.java (100%)
 rename src/{r_tests => regressionTests}/java/w2phtml/regressionTests/html5/PageStartWith10.java (100%)
 rename src/{r_tests => regressionTests}/java/w2phtml/regressionTests/html5/PageStartWith10InSection.java (100%)
 rename src/{r_tests => regressionTests}/java/w2phtml/regressionTests/html5/SoftPageBreakInListTest.java (100%)
 rename src/{r_tests => regressionTests}/java/w2phtml/regressionTests/html5/SplitFilesAlignToPages.java (100%)

diff --git a/build.gradle b/build.gradle
index f52f57b..cf4b4b7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,8 +16,8 @@ sourceSets {
     regressionTests {
         java {
             compileClasspath += main.output + test.output
-            runtimeClasspath += main.output + files('src/main/java') 
-            java.srcDir file('src/r_tests/java')
+            runtimeClasspath += main.output + test.output + files('src/main/java') 
+            srcDir file('src/r_tests/java')
         }
     }
 }
@@ -26,12 +26,13 @@ configurations{
     regressionTestsCompile.extendsFrom mainCompile
     regressionTestsRuntime.extendsFrom mainRuntime
     regressionTestsRuntime.extendsFrom compileClasspath
+    regressionTestsImplementation.extendsFrom compileClasspath
 }
 dependencies{
     regressionTestsImplementation group: 'commons-io', name: 'commons-io', version: '2.8.0'
     regressionTestsImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.1'
     regressionTestsImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.1'
-    regressionTestsRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
+    regressionTestsImplementation 'org.junit.jupiter:junit-jupiter-engine'
 
     compileClasspath 'org.libreoffice:jurt:5.3.2'
     compileClasspath 'org.libreoffice:juh:5.3.2'
diff --git a/src/r_tests/java/w2phtml/regressionTests/PageBreaksBeforeHeading.java b/src/regressionTests/java/w2phtml/regressionTests/PageBreaksBeforeHeading.java
similarity index 100%
rename from src/r_tests/java/w2phtml/regressionTests/PageBreaksBeforeHeading.java
rename to src/regressionTests/java/w2phtml/regressionTests/PageBreaksBeforeHeading.java
diff --git a/src/r_tests/java/w2phtml/regressionTests/html5/BreakAfterTest.java b/src/regressionTests/java/w2phtml/regressionTests/html5/BreakAfterTest.java
similarity index 100%
rename from src/r_tests/java/w2phtml/regressionTests/html5/BreakAfterTest.java
rename to src/regressionTests/java/w2phtml/regressionTests/html5/BreakAfterTest.java
diff --git a/src/r_tests/java/w2phtml/regressionTests/html5/BulletList.java b/src/regressionTests/java/w2phtml/regressionTests/html5/BulletList.java
similarity index 100%
rename from src/r_tests/java/w2phtml/regressionTests/html5/BulletList.java
rename to src/regressionTests/java/w2phtml/regressionTests/html5/BulletList.java
diff --git a/src/r_tests/java/w2phtml/regressionTests/html5/GreenstoneHeadings.java b/src/regressionTests/java/w2phtml/regressionTests/html5/GreenstoneHeadings.java
similarity index 100%
rename from src/r_tests/java/w2phtml/regressionTests/html5/GreenstoneHeadings.java
rename to src/regressionTests/java/w2phtml/regressionTests/html5/GreenstoneHeadings.java
diff --git a/src/r_tests/java/w2phtml/regressionTests/html5/HardPageBreaksInLists.java b/src/regressionTests/java/w2phtml/regressionTests/html5/HardPageBreaksInLists.java
similarity index 100%
rename from src/r_tests/java/w2phtml/regressionTests/html5/HardPageBreaksInLists.java
rename to src/regressionTests/java/w2phtml/regressionTests/html5/HardPageBreaksInLists.java
diff --git a/src/r_tests/java/w2phtml/regressionTests/html5/HeadingWithSections.java b/src/regressionTests/java/w2phtml/regressionTests/html5/HeadingWithSections.java
similarity index 100%
rename from src/r_tests/java/w2phtml/regressionTests/html5/HeadingWithSections.java
rename to src/regressionTests/java/w2phtml/regressionTests/html5/HeadingWithSections.java
diff --git a/src/r_tests/java/w2phtml/regressionTests/html5/ImageAfterSection.java b/src/regressionTests/java/w2phtml/regressionTests/html5/ImageAfterSection.java
similarity index 100%
rename from src/r_tests/java/w2phtml/regressionTests/html5/ImageAfterSection.java
rename to src/regressionTests/java/w2phtml/regressionTests/html5/ImageAfterSection.java
diff --git a/src/r_tests/java/w2phtml/regressionTests/html5/ListAfterText.java b/src/regressionTests/java/w2phtml/regressionTests/html5/ListAfterText.java
similarity index 100%
rename from src/r_tests/java/w2phtml/regressionTests/html5/ListAfterText.java
rename to src/regressionTests/java/w2phtml/regressionTests/html5/ListAfterText.java
diff --git a/src/r_tests/java/w2phtml/regressionTests/html5/ListInSection.java b/src/regressionTests/java/w2phtml/regressionTests/html5/ListInSection.java
similarity index 100%
rename from src/r_tests/java/w2phtml/regressionTests/html5/ListInSection.java
rename to src/regressionTests/java/w2phtml/regressionTests/html5/ListInSection.java
diff --git a/src/r_tests/java/w2phtml/regressionTests/html5/ListInTable.java b/src/regressionTests/java/w2phtml/regressionTests/html5/ListInTable.java
similarity index 100%
rename from src/r_tests/java/w2phtml/regressionTests/html5/ListInTable.java
rename to src/regressionTests/java/w2phtml/regressionTests/html5/ListInTable.java
diff --git a/src/r_tests/java/w2phtml/regressionTests/html5/ListTableSection.java b/src/regressionTests/java/w2phtml/regressionTests/html5/ListTableSection.java
similarity index 100%
rename from src/r_tests/java/w2phtml/regressionTests/html5/ListTableSection.java
rename to src/regressionTests/java/w2phtml/regressionTests/html5/ListTableSection.java
diff --git a/src/r_tests/java/w2phtml/regressionTests/html5/PageStartWith10.java b/src/regressionTests/java/w2phtml/regressionTests/html5/PageStartWith10.java
similarity index 100%
rename from src/r_tests/java/w2phtml/regressionTests/html5/PageStartWith10.java
rename to src/regressionTests/java/w2phtml/regressionTests/html5/PageStartWith10.java
diff --git a/src/r_tests/java/w2phtml/regressionTests/html5/PageStartWith10InSection.java b/src/regressionTests/java/w2phtml/regressionTests/html5/PageStartWith10InSection.java
similarity index 100%
rename from src/r_tests/java/w2phtml/regressionTests/html5/PageStartWith10InSection.java
rename to src/regressionTests/java/w2phtml/regressionTests/html5/PageStartWith10InSection.java
diff --git a/src/r_tests/java/w2phtml/regressionTests/html5/SoftPageBreakInListTest.java b/src/regressionTests/java/w2phtml/regressionTests/html5/SoftPageBreakInListTest.java
similarity index 100%
rename from src/r_tests/java/w2phtml/regressionTests/html5/SoftPageBreakInListTest.java
rename to src/regressionTests/java/w2phtml/regressionTests/html5/SoftPageBreakInListTest.java
diff --git a/src/r_tests/java/w2phtml/regressionTests/html5/SplitFilesAlignToPages.java b/src/regressionTests/java/w2phtml/regressionTests/html5/SplitFilesAlignToPages.java
similarity index 100%
rename from src/r_tests/java/w2phtml/regressionTests/html5/SplitFilesAlignToPages.java
rename to src/regressionTests/java/w2phtml/regressionTests/html5/SplitFilesAlignToPages.java