From 93592950dd39e14339e38e12421c1927412d0d7b Mon Sep 17 00:00:00 2001
From: Georgy Litvinov <git@litvinovg.pro>
Date: Fri, 12 Mar 2021 23:18:04 +0100
Subject: [PATCH] Modified gradle task

---
 .gitlab-ci.yml |  2 +-
 build.gradle   | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2bccf44..7235e8b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
 
 build:
   stage: build
-  script: gradle jar && gradle oxt
+  script: ./gradlew regressionTests ./gradlew jar && ./gradlew oxt
   artifacts:
     paths:
       - build/distributions/w2phtml.oxt
diff --git a/build.gradle b/build.gradle
index d991352..a2a949c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ mkdir "src/main/tmp/w2phtml"
 propertyDestFile.withWriter { properties.store(it, null) }
 
 sourceSets {
-    regressionTest {
+    regressionTests {
         java {
             compileClasspath += main.output + test.output
             runtimeClasspath += main.output + files('src/main/java') 
@@ -23,15 +23,15 @@ sourceSets {
 sourceCompatibility = 1.8
 configurations{
     bundledLibs
-    regressionTestCompile.extendsFrom mainCompile
-    regressionTestRuntime.extendsFrom mainRuntime
-    regressionTestRuntime.extendsFrom bundledLibs
+    regressionTestsCompile.extendsFrom mainCompile
+    regressionTestsRuntime.extendsFrom mainRuntime
+    regressionTestsRuntime.extendsFrom bundledLibs
 }
 dependencies{
-    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'
+    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'
 
     bundledLibs 'org.libreoffice:jurt:5.3.2'
     bundledLibs 'org.libreoffice:juh:5.3.2'
@@ -215,9 +215,9 @@ task oxtNew(type: Zip){
     from 'releasenotes.txt'
     include '*'
 }
-task regressionTest(type: Test) {
-  testClassesDirs = sourceSets.regressionTest.output.classesDirs
-  classpath = sourceSets.regressionTest.runtimeClasspath
+task regressionTests(type: Test) {
+  testClassesDirs = sourceSets.regressionTests.output.classesDirs
+  classpath = sourceSets.regressionTests.runtimeClasspath
   useJUnitPlatform()
   testLogging {
     events "passed", "skipped", "failed", "standardOut", "standardError"