Move aggregation query tests to JUnit

jklamer · Sep 13, 2023 · 1d17262 · 1d17262
1 parent 838a010
commit 1d17262
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
diff --git a/testing/trino-faulttolerant-tests/pom.xml b/testing/trino-faulttolerant-tests/pom.xml
@@ -363,6 +363,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <!-- for benchmarks -->
         <dependency>
             <groupId>org.openjdk.jmh</groupId>

diff --git a/...src/test/java/io/trino/faulttolerant/hive/TestHiveFaultTolerantExecutionAggregations.java b/...src/test/java/io/trino/faulttolerant/hive/TestHiveFaultTolerantExecutionAggregations.java
@@ -18,17 +18,22 @@
 import io.trino.plugin.hive.HiveQueryRunner;
 import io.trino.testing.AbstractTestFaultTolerantExecutionAggregations;
 import io.trino.testing.QueryRunner;
-import org.testng.annotations.AfterClass;
+import io.trino.testng.services.ManageTestResources;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.TestInstance;
 
 import java.util.Map;
 
 import static io.trino.plugin.exchange.filesystem.containers.MinioStorage.getExchangeManagerProperties;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tpch.TpchTable.getTables;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+@TestInstance(PER_CLASS)
 public class TestHiveFaultTolerantExecutionAggregations
         extends AbstractTestFaultTolerantExecutionAggregations
 {
+    @ManageTestResources.Suppress(because = "Not a TestNG test class")
     private MinioStorage minioStorage;
 
     @Override
@@ -48,7 +53,7 @@ protected QueryRunner createQueryRunner(Map<String, String> extraProperties)
                 .build();
     }
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void destroy()
             throws Exception
     {

diff --git a/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestAggregations.java b/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestAggregations.java
@@ -17,7 +17,7 @@
 import io.trino.Session;
 import io.trino.spi.type.TimeZoneKey;
 import org.intellij.lang.annotations.Language;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 

diff --git a/testing/trino-tests/pom.xml b/testing/trino-tests/pom.xml
@@ -376,6 +376,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <!-- for benchmarks -->
         <dependency>
             <groupId>org.openjdk.jmh</groupId>

diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestAggregations.java b/testing/trino-tests/src/test/java/io/trino/tests/TestAggregations.java
@@ -22,7 +22,7 @@
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
 import io.trino.tests.tpch.TpchQueryRunnerBuilder;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.function.Predicate;