Migrate tests to JUnit

trinodb · Jul 8, 2023 · 3809b78 · 3809b78
1 parent 322d674
commit 3809b78
Show file tree

Hide file tree

Showing 25 changed files with 64 additions and 29 deletions.
diff --git a/core/trino-main/src/test/java/io/trino/util/TestDateTimeUtils.java b/core/trino-main/src/test/java/io/trino/util/TestDateTimeUtils.java
@@ -13,7 +13,7 @@
  */
 package io.trino.util;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.DateTimeException;
 

diff --git a/core/trino-server-main/pom.xml b/core/trino-server-main/pom.xml
@@ -31,8 +31,14 @@
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/core/trino-server-main/src/test/java/io/trino/server/TestDummy.java b/core/trino-server-main/src/test/java/io/trino/server/TestDummy.java
@@ -13,7 +13,7 @@
  */
 package io.trino.server;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestDummy
 {

diff --git a/lib/trino-array/pom.xml b/lib/trino-array/pom.xml
@@ -45,20 +45,26 @@
         </dependency>
 
         <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-core</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-generator-annprocess</artifactId>
+            <artifactId>jmh-core</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/lib/trino-array/src/test/java/io/trino/array/TestBlockBigArray.java b/lib/trino-array/src/test/java/io/trino/array/TestBlockBigArray.java
@@ -15,7 +15,7 @@
 
 import io.trino.spi.block.Block;
 import io.trino.spi.block.IntArrayBlockBuilder;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.slice.SizeOf.instanceSize;
 import static org.assertj.core.api.Assertions.assertThat;

diff --git a/lib/trino-array/src/test/java/io/trino/array/TestBooleanBigArray.java b/lib/trino-array/src/test/java/io/trino/array/TestBooleanBigArray.java
@@ -13,7 +13,7 @@
  */
 package io.trino.array;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 

diff --git a/lib/trino-array/src/test/java/io/trino/array/TestByteBigArray.java b/lib/trino-array/src/test/java/io/trino/array/TestByteBigArray.java
@@ -13,7 +13,7 @@
  */
 package io.trino.array;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 

diff --git a/lib/trino-array/src/test/java/io/trino/array/TestDoubleBigArray.java b/lib/trino-array/src/test/java/io/trino/array/TestDoubleBigArray.java
@@ -13,7 +13,7 @@
  */
 package io.trino.array;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 

diff --git a/lib/trino-array/src/test/java/io/trino/array/TestIntBigArray.java b/lib/trino-array/src/test/java/io/trino/array/TestIntBigArray.java
@@ -13,7 +13,7 @@
  */
 package io.trino.array;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 

diff --git a/lib/trino-array/src/test/java/io/trino/array/TestLongBigArray.java b/lib/trino-array/src/test/java/io/trino/array/TestLongBigArray.java
@@ -13,7 +13,7 @@
  */
 package io.trino.array;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 

diff --git a/lib/trino-array/src/test/java/io/trino/array/TestObjectBigArray.java b/lib/trino-array/src/test/java/io/trino/array/TestObjectBigArray.java
@@ -13,7 +13,7 @@
  */
 package io.trino.array;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 

diff --git a/lib/trino-array/src/test/java/io/trino/array/TestShortBigArray.java b/lib/trino-array/src/test/java/io/trino/array/TestShortBigArray.java
@@ -13,7 +13,7 @@
  */
 package io.trino.array;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 

diff --git a/lib/trino-array/src/test/java/io/trino/array/TestSliceBigArray.java b/lib/trino-array/src/test/java/io/trino/array/TestSliceBigArray.java
@@ -14,14 +14,13 @@
 package io.trino.array;
 
 import io.airlift.slice.Slice;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.airlift.slice.SizeOf.instanceSize;
 import static io.airlift.slice.SizeOf.sizeOf;
 import static io.airlift.slice.Slices.wrappedBuffer;
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Test
 public class TestSliceBigArray
 {
     private static final long BIG_ARRAY_INSTANCE_SIZE = instanceSize(SliceBigArray.class) + new ReferenceCountMap().sizeOf() + new ObjectBigArray<Slice>().sizeOf();

diff --git a/...rino-geospatial/src/test/java/io/trino/plugin/geospatial/TestExtractSpatialInnerJoin.java b/...rino-geospatial/src/test/java/io/trino/plugin/geospatial/TestExtractSpatialInnerJoin.java
@@ -19,7 +19,7 @@
 import io.trino.sql.planner.iterative.rule.test.PlanBuilder;
 import io.trino.sql.planner.iterative.rule.test.RuleAssert;
 import io.trino.sql.planner.iterative.rule.test.RuleTester;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.geospatial.GeometryType.GEOMETRY;
 import static io.trino.plugin.geospatial.SphericalGeographyType.SPHERICAL_GEOGRAPHY;

diff --git a/...trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestExtractSpatialLeftJoin.java b/...trino-geospatial/src/test/java/io/trino/plugin/geospatial/TestExtractSpatialLeftJoin.java
@@ -19,7 +19,7 @@
 import io.trino.sql.planner.iterative.rule.test.BaseRuleTest;
 import io.trino.sql.planner.iterative.rule.test.RuleAssert;
 import io.trino.sql.planner.iterative.rule.test.RuleTester;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.plugin.geospatial.GeometryType.GEOMETRY;
 import static io.trino.plugin.geospatial.SphericalGeographyType.SPHERICAL_GEOGRAPHY;

diff --git a/...ons/src/test/java/io/trino/plugin/teradata/functions/dateformat/TestDateFormatParser.java b/...ons/src/test/java/io/trino/plugin/teradata/functions/dateformat/TestDateFormatParser.java
@@ -17,7 +17,7 @@
 import org.antlr.v4.runtime.Token;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormatter;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.stream.Collectors;
 

diff --git a/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/TestThriftConnectorConfig.java b/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/TestThriftConnectorConfig.java
@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.DataSize;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 

diff --git a/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/TestThriftIndexPageSource.java b/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/TestThriftIndexPageSource.java
@@ -36,7 +36,7 @@
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.type.Type;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/TestThriftPlugin.java b/plugin/trino-thrift/src/test/java/io/trino/plugin/thrift/TestThriftPlugin.java
@@ -18,7 +18,7 @@
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorFactory;
 import io.trino.testing.TestingConnectorContext;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 

diff --git a/plugin/trino-tpcds/pom.xml b/plugin/trino-tpcds/pom.xml
@@ -158,6 +158,18 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>

diff --git a/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/TestTpcdsConfig.java b/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/TestTpcdsConfig.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.tpcds;
 
 import com.google.common.collect.ImmutableMap;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 

diff --git a/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/TestTpcdsMetadata.java b/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/TestTpcdsMetadata.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.tpcds;
 
 import io.trino.spi.connector.ConnectorSession;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;

diff --git a/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/TestTpcdsMetadataStatistics.java b/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/TestTpcdsMetadataStatistics.java
@@ -25,7 +25,7 @@
 import io.trino.tpcds.Table;
 import io.trino.tpcds.column.CallCenterColumn;
 import io.trino.tpcds.column.WebSiteColumn;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.stream.Stream;

diff --git a/plugin/trino-tpch/pom.xml b/plugin/trino-tpch/pom.xml
@@ -78,6 +78,18 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>

diff --git a/plugin/trino-tpch/src/test/java/io/trino/plugin/tpch/TestTpchMetadata.java b/plugin/trino-tpch/src/test/java/io/trino/plugin/tpch/TestTpchMetadata.java
@@ -32,7 +32,7 @@
 import io.trino.tpch.PartColumn;
 import io.trino.tpch.TpchColumn;
 import io.trino.tpch.TpchTable;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;