Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate Accumulo tests to JUnit #18763

Merged
merged 1 commit into from
Aug 23, 2023
Merged

Migrate Accumulo tests to JUnit #18763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions plugin/trino-accumulo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,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.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
Expand All @@ -306,6 +318,24 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<dependencies>
<!-- allow both JUnit and TestNG -->
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit-platform</artifactId>
<version>${dep.plugin.surefire.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-testng</artifactId>
<version>${dep.plugin.surefire.version}</version>
</dependency>
</dependencies>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
Expand Down
13 changes: 8 additions & 5 deletions plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/TestAccumuloClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,27 @@
import io.trino.spi.connector.ConnectorTableMetadata;
import io.trino.spi.connector.SchemaTableName;
import org.apache.accumulo.core.client.Connector;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

import static io.trino.spi.type.BigintType.BIGINT;
import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
import static org.testng.Assert.assertNotNull;

@TestInstance(PER_CLASS)
public class TestAccumuloClient
{
private AccumuloClient client;
private ZooKeeperMetadataManager zooKeeperMetadataManager;

@BeforeClass
@BeforeAll
public void setUp()
throws Exception
{
Expand All @@ -55,7 +58,7 @@ public void setUp()
client = new AccumuloClient(connector, config, zooKeeperMetadataManager, new AccumuloTableManager(connector), new IndexLookup(connector, new ColumnCardinalityCache(connector, config)));
}

@AfterClass(alwaysRun = true)
@AfterAll
public void tearDown()
{
zooKeeperMetadataManager = null;
Expand Down
9 changes: 6 additions & 3 deletions plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/index/TestIndexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.ColumnVisibility;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;

import java.util.Iterator;
import java.util.Map.Entry;
Expand All @@ -43,9 +44,11 @@
import static io.trino.spi.type.BigintType.BIGINT;
import static io.trino.spi.type.VarcharType.VARCHAR;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;

@TestInstance(PER_CLASS)
public class TestIndexer
{
private static final LexicoderRowSerializer SERIALIZER = new LexicoderRowSerializer();
Expand Down Expand Up @@ -75,7 +78,7 @@ private static byte[] encode(Type type, Object v)
private Mutation m2v;
private AccumuloTable table;

@BeforeClass
@BeforeAll
public void setupClass()
{
AccumuloColumnHandle c1 = new AccumuloColumnHandle("id", Optional.empty(), Optional.empty(), VARCHAR, 0, "", Optional.empty(), false);
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/model/TestAccumuloSplit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import com.google.common.collect.ImmutableList;
import io.airlift.json.JsonCodec;
import org.apache.accumulo.core.data.Range;
import org.testng.annotations.Test;
import org.junit.jupiter.api.Test;

import java.util.Optional;
import java.util.stream.Collectors;
Expand Down
9 changes: 6 additions & 3 deletions plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/model/TestField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import io.trino.spi.type.StandardTypes;
import io.trino.spi.type.Type;
import io.trino.spi.type.TypeSignatureParameter;
import org.testng.annotations.Test;
import org.junit.jupiter.api.Test;

import java.sql.Time;
import java.sql.Timestamp;
Expand All @@ -45,14 +45,17 @@
import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
import static java.lang.Float.floatToIntBits;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.testng.Assert.assertEquals;

public class TestField
{
@Test(expectedExceptions = NullPointerException.class, expectedExceptionsMessageRegExp = "type is null")
@Test
public void testTypeIsNull()
{
new Field(null, null);
assertThatThrownBy(() -> new Field(null, null))
.isInstanceOf(NullPointerException.class)
.hasMessage("type is null");
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/model/TestRow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import io.airlift.slice.Slices;
import io.trino.plugin.accumulo.serializers.AccumuloRowSerializer;
import io.trino.spi.type.ArrayType;
import org.testng.annotations.Test;
import org.junit.jupiter.api.Test;

import java.sql.Timestamp;
import java.time.LocalDateTime;
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/model/TestSerializedRange.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
package io.trino.plugin.accumulo.model;

import org.apache.accumulo.core.data.Range;
import org.testng.annotations.Test;
import org.junit.jupiter.api.Test;

import static org.testng.Assert.assertEquals;

Expand Down
2 changes: 1 addition & 1 deletion ...src/test/java/io/trino/plugin/accumulo/serializers/AbstractTestAccumuloRowSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Value;
import org.testng.annotations.Test;
import org.junit.jupiter.api.Test;

import java.sql.Time;
import java.sql.Timestamp;
Expand Down