fix: jarTest

Signed-off-by: Daniel Kubányi <[email protected]>
sogis · Jul 12, 2024 · 7767b45 · 7767b45
1 parent a15f58b
commit 7767b45
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/gretl/integration-test.gradle b/gretl/integration-test.gradle
@@ -23,13 +23,12 @@ sourceSets {
  * Task for executing the integration tests. It references the 
  * classes and runtime classpath of the integration test source set.
  */
-tasks.register('jarTest', Test){
+tasks.register('jarTest', Test) {
     description = 'Runs integration tests against the installed gretl jar.'
     group = LifecycleBasePlugin.VERIFICATION_GROUP
 
-    useJUnit {
-        excludeCategories 'ch.so.agi.gretl.testutil.QgisReachableTest'
-        excludeCategories 'ch.so.agi.gretl.testutil.S3Test'
+    useJUnitPlatform {
+        excludeTags 'qgisReachableTest', 's3Test'
     }
 
     systemProperty('GRETL_TESTTYPE', 'jar')
@@ -41,12 +40,12 @@ tasks.register('jarTest', Test){
     jvmArgs '-Xmx1g'
 }
 
-tasks.register('jarS3Test', Test){
+tasks.register('jarS3Test', Test) {
     description = 'Runs the S3 integration tests against the installed gretl jar.'
     group = LifecycleBasePlugin.VERIFICATION_GROUP
 
-    useJUnit {
-        includeCategories 'ch.so.agi.gretl.testutil.S3Test'
+    useJUnitPlatform {
+        includeTags 's3Test'
     }
 
     systemProperty('GRETL_TESTTYPE', 'jar')
@@ -58,12 +57,12 @@ tasks.register('jarS3Test', Test){
     jvmArgs '-Xmx1g'
 }
 
-tasks.register('imageTest', Test){
+tasks.register('imageTest', Test) {
     description = 'Runs integration tests against the installed gretl docker image.'
     group = LifecycleBasePlugin.VERIFICATION_GROUP
 
-    useJUnit {
-        excludeCategories 'ch.so.agi.gretl.testutil.S3Test'
+    useJUnitPlatform {
+        excludeTags 's3Test'
     }
 
     systemProperty('GRETL_TESTTYPE', 'image')
@@ -74,12 +73,12 @@ tasks.register('imageTest', Test){
     classpath += sourceSets.integrationTest.runtimeClasspath
 }
 
-tasks.register('imageS3Test', Test){
+tasks.register('imageS3Test', Test) {
     description = 'Runs S3 integration tests against the installed gretl docker image.'
     group = LifecycleBasePlugin.VERIFICATION_GROUP
 
-    useJUnit {
-        includeCategories 'ch.so.agi.gretl.testutil.S3Test'
+    useJUnitPlatform {
+        includeTags 's3Test'
     }
 
     systemProperty('GRETL_TESTTYPE', 'image')

diff --git a/gretl/src/test/java/ch/so/agi/gretl/testutil/TestTags.java b/gretl/src/test/java/ch/so/agi/gretl/testutil/TestTags.java
@@ -5,4 +5,5 @@ public interface TestTags {
     String S3_TEST = "s3Test";
     String SFTP_TEST = "sftpTest";
     String DB_DRIVERS_REACHABLE_TEST = "dbDriversReachableTest";
+    String QGIS_REACHABLE_TEST = "qgisReachableTest";
 }