Skip to content

Migrate blackhole tests to JUnit #18679

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

Merged
martint merged 2 commits into from
Aug 17, 2023
Merged

Migrate blackhole tests to JUnit #18679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
234e976
Migrate tests to AssertJ
martint Aug 14, 2023
9f53aa0
Migrate blackhole connector tests to JUnit
martint Aug 14, 2023
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
4 changes: 2 additions & 2 deletions plugin/trino-blackhole/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@
</dependency>

<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
14 changes: 7 additions & 7 deletions plugin/trino-blackhole/src/test/java/io/trino/plugin/blackhole/TestBlackHoleMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import io.trino.spi.connector.ConnectorTableMetadata;
import io.trino.spi.connector.SchemaTableName;
import io.trino.spi.security.TrinoPrincipal;
import org.testng.annotations.Test;
import org.junit.jupiter.api.Test;

import java.util.List;
import java.util.Map;
Expand All @@ -32,7 +32,7 @@
import static io.trino.testing.TestingConnectorSession.SESSION;
import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.testng.Assert.assertEquals;
import static org.assertj.core.api.Assertions.assertThat;

public class TestBlackHoleMetadata
{
Expand All @@ -47,9 +47,9 @@ public class TestBlackHoleMetadata
@Test
public void testCreateSchema()
{
assertEquals(metadata.listSchemaNames(SESSION), ImmutableList.of("default"));
assertThat(metadata.listSchemaNames(SESSION)).isEqualTo(ImmutableList.of("default"));
metadata.createSchema(SESSION, "test", ImmutableMap.of(), new TrinoPrincipal(USER, SESSION.getUser()));
assertEquals(metadata.listSchemaNames(SESSION), ImmutableList.of("default", "test"));
assertThat(metadata.listSchemaNames(SESSION)).isEqualTo(ImmutableList.of("default", "test"));
}

@Test
Expand All @@ -70,8 +70,8 @@ public void tableIsCreatedAfterCommits()
metadata.finishCreateTable(SESSION, table, ImmutableList.of(), ImmutableList.of());

List<SchemaTableName> tables = metadata.listTables(SESSION, Optional.empty());
assertEquals(tables.size(), 1, "Expected only one table.");
assertEquals(tables.get(0).getTableName(), "temp_table", "Expected table with name 'temp_table'");
assertThat(tables).hasSize(1);
assertThat(tables.get(0).getTableName()).isEqualTo("temp_table");
}

@Test
Expand All @@ -85,6 +85,6 @@ public void testCreateTableInNotExistSchema()

private void assertThatNoTableIsCreated()
{
assertEquals(metadata.listTables(SESSION, Optional.empty()), ImmutableList.of(), "No table was expected");
assertThat(metadata.listTables(SESSION, Optional.empty())).isEmpty();
}
}
98 changes: 49 additions & 49 deletions plugin/trino-blackhole/src/test/java/io/trino/plugin/blackhole/TestBlackHoleSmoke.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@
import io.trino.testing.MaterializedRow;
import io.trino.testing.QueryRunner;
import org.intellij.lang.annotations.Language;
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.math.BigDecimal;
import java.time.LocalDate;
Expand All @@ -46,21 +47,21 @@
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.testng.Assert.assertEquals;
import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;

@Test(singleThreaded = true)
@TestInstance(PER_CLASS)
public class TestBlackHoleSmoke
{
private QueryRunner queryRunner;

@BeforeClass
@BeforeAll
public void setUp()
throws Exception
{
queryRunner = createQueryRunner();
}

@AfterClass(alwaysRun = true)
@AfterAll
public void tearDown()
{
assertThatNoBlackHoleTableIsCreated();
Expand All @@ -71,11 +72,11 @@ public void tearDown()
@Test
public void testCreateSchema()
{
assertEquals(queryRunner.execute("SHOW SCHEMAS FROM blackhole").getRowCount(), 2);
assertThat(queryRunner.execute("SHOW SCHEMAS FROM blackhole").getRowCount()).isEqualTo(2);
assertThatQueryReturnsValue("CREATE TABLE test_schema as SELECT * FROM tpch.tiny.nation", 25L);

queryRunner.execute("CREATE SCHEMA blackhole.test");
assertEquals(queryRunner.execute("SHOW SCHEMAS FROM blackhole").getRowCount(), 3);
assertThat(queryRunner.execute("SHOW SCHEMAS FROM blackhole").getRowCount()).isEqualTo(3);
assertThatQueryReturnsValue("CREATE TABLE test.test_schema as SELECT * FROM tpch.tiny.region", 5L);

assertThatQueryDoesNotReturnValues("DROP TABLE test_schema");
Expand All @@ -99,8 +100,8 @@ public void blackHoleConnectorUsage()
assertThatQueryReturnsValue("CREATE TABLE nation as SELECT * FROM tpch.tiny.nation", 25L);

List<QualifiedObjectName> tableNames = listBlackHoleTables();
assertEquals(tableNames.size(), 1, "Expected only one table.");
assertEquals(tableNames.get(0).getObjectName(), "nation", "Expected 'nation' table.");
assertThat(tableNames).hasSize(1);
assertThat(tableNames.get(0).getObjectName()).isEqualTo("nation");

assertThatQueryReturnsValue("INSERT INTO nation SELECT * FROM tpch.tiny.nation", 25L);

Expand Down Expand Up @@ -142,7 +143,7 @@ public void testCreateTableInNotExistSchema()
.hasMessage("Schema schema1 not found");

int tablesAfterCreate = listBlackHoleTables().size();
assertEquals(tablesBeforeCreate, tablesAfterCreate);
assertThat(tablesBeforeCreate).isEqualTo(tablesAfterCreate);
}

@Test
Expand All @@ -165,13 +166,13 @@ public void dataGenerationUsage()
assertThatQueryReturnsValue("SELECT count(*) FROM nation", 6L, session);

MaterializedResult rows = queryRunner.execute(session, "SELECT * FROM nation LIMIT 1");
assertEquals(rows.getRowCount(), 1);
assertThat(rows.getRowCount()).isEqualTo(1);
MaterializedRow row = Iterables.getOnlyElement(rows);
assertEquals(row.getFieldCount(), 4);
assertEquals(row.getField(0), 0L);
assertEquals(row.getField(1), "****************");
assertEquals(row.getField(2), 0L);
assertEquals(row.getField(3), "****************");
assertThat(row.getFieldCount()).isEqualTo(4);
assertThat(row.getField(0)).isEqualTo(0L);
assertThat(row.getField(1)).isEqualTo("****************");
assertThat(row.getField(2)).isEqualTo(0L);
assertThat(row.getField(3)).isEqualTo("****************");

assertThatQueryDoesNotReturnValues("DROP TABLE nation");
}
Expand Down Expand Up @@ -228,7 +229,7 @@ public void testMaterializedView()
try {
// reading
MaterializedResult rows = queryRunner.execute("SELECT * FROM " + viewName);
assertEquals(rows.getRowCount(), 25);
assertThat(rows.getRowCount()).isEqualTo(25);

// listing
assertThat(queryRunner.execute("SHOW TABLES").getOnlyColumnAsSet())
Expand Down Expand Up @@ -291,14 +292,14 @@ public void fieldLength()
session);

MaterializedResult rows = queryRunner.execute(session, "SELECT * FROM nation");
assertEquals(rows.getRowCount(), 1);
assertThat(rows.getRowCount()).isEqualTo(1);
MaterializedRow row = Iterables.getOnlyElement(rows);
assertEquals(row.getFieldCount(), 5);
assertEquals(row.getField(0), 0L);
assertEquals(row.getField(1), "********");
assertEquals(row.getField(2), 0L);
assertEquals(row.getField(3), "********");
assertEquals(row.getField(4), "***"); // this one is shorter due to column type being VARCHAR(3)
assertThat(row.getFieldCount()).isEqualTo(5);
assertThat(row.getField(0)).isEqualTo(0L);
assertThat(row.getField(1)).isEqualTo("********");
assertThat(row.getField(2)).isEqualTo(0L);
assertThat(row.getField(3)).isEqualTo("********");
assertThat(row.getField(4)).isEqualTo("***"); // this one is shorter due to column type being VARCHAR(3)

assertThatQueryDoesNotReturnValues("DROP TABLE nation");
}
Expand Down Expand Up @@ -330,22 +331,22 @@ public void testSelectAllTypes()
{
createBlackholeAllTypesTable();
MaterializedResult rows = queryRunner.execute("SELECT * FROM blackhole_all_types");
assertEquals(rows.getRowCount(), 1);
assertThat(rows.getRowCount()).isEqualTo(1);
MaterializedRow row = Iterables.getOnlyElement(rows);
assertEquals(row.getFieldCount(), 13);
assertEquals(row.getField(0), "**********");
assertEquals(row.getField(1), 0L);
assertEquals(row.getField(2), 0);
assertEquals(row.getField(3), (short) 0);
assertEquals(row.getField(4), (byte) 0);
assertEquals(row.getField(5), 0.0f);
assertEquals(row.getField(6), 0.0);
assertEquals(row.getField(7), false);
assertEquals(row.getField(8), LocalDate.ofEpochDay(0));
assertEquals(row.getField(9), LocalDateTime.of(1970, 1, 1, 0, 0, 0));
assertEquals(row.getField(10), "****************".getBytes(UTF_8));
assertEquals(row.getField(11), new BigDecimal("0.00"));
assertEquals(row.getField(12), new BigDecimal("00000000000000000000.0000000000"));
assertThat(row.getFieldCount()).isEqualTo(13);
assertThat(row.getField(0)).isEqualTo("**********");
assertThat(row.getField(1)).isEqualTo(0L);
assertThat(row.getField(2)).isEqualTo(0);
assertThat(row.getField(3)).isEqualTo((short) 0);
assertThat(row.getField(4)).isEqualTo((byte) 0);
assertThat(row.getField(5)).isEqualTo(0.0f);
assertThat(row.getField(6)).isEqualTo(0.0);
assertThat(row.getField(7)).isEqualTo(false);
assertThat(row.getField(8)).isEqualTo(LocalDate.ofEpochDay(0));
assertThat(row.getField(9)).isEqualTo(LocalDateTime.of(1970, 1, 1, 0, 0, 0));
assertThat(row.getField(10)).isEqualTo("****************".getBytes(UTF_8));
assertThat(row.getField(11)).isEqualTo(new BigDecimal("0.00"));
assertThat(row.getField(12)).isEqualTo(new BigDecimal("00000000000000000000.0000000000"));
dropBlackholeAllTypesTable();
}

Expand All @@ -354,7 +355,7 @@ public void testSelectWithUnenforcedConstraint()
{
createBlackholeAllTypesTable();
MaterializedResult rows = queryRunner.execute("SELECT * FROM blackhole_all_types where _bigint > 10");
assertEquals(rows.getRowCount(), 0);
assertThat(rows.getRowCount()).isEqualTo(0);
dropBlackholeAllTypesTable();
}

Expand Down Expand Up @@ -410,7 +411,7 @@ public void pageProcessingDelay()

Stopwatch stopwatch = Stopwatch.createStarted();

assertEquals(queryRunner.execute(session, "SELECT * FROM nation").getRowCount(), 1);
assertThat(queryRunner.execute(session, "SELECT * FROM nation").getRowCount()).isEqualTo(1);
queryRunner.execute(session, "INSERT INTO nation SELECT CAST(null AS BIGINT), CAST(null AS VARCHAR(25)), CAST(null AS BIGINT), CAST(null AS VARCHAR(152))");

stopwatch.stop();
Expand All @@ -421,7 +422,7 @@ public void pageProcessingDelay()

private void assertThatNoBlackHoleTableIsCreated()
{
assertEquals(listBlackHoleTables().size(), 0, "No blackhole tables expected");
assertThat(listBlackHoleTables()).isEmpty();
}

private List<QualifiedObjectName> listBlackHoleTables()
Expand All @@ -439,10 +440,9 @@ private void assertThatQueryReturnsValue(String sql, Object expected, Session se
MaterializedResult rows = session == null ? queryRunner.execute(sql) : queryRunner.execute(session, sql);
MaterializedRow materializedRow = Iterables.getOnlyElement(rows);
int fieldCount = materializedRow.getFieldCount();
assertEquals(fieldCount, 1, format("Expected only one column, but got '%d'", fieldCount));
Object value = materializedRow.getField(0);
assertEquals(value, expected);
assertEquals(Iterables.getOnlyElement(rows).getFieldCount(), 1);
assertThat(fieldCount).isEqualTo(1);
assertThat(materializedRow.getField(0)).isEqualTo(expected);
assertThat(Iterables.getOnlyElement(rows).getFieldCount()).isEqualTo(1);
}

private void assertThatQueryDoesNotReturnValues(String sql)
Expand All @@ -453,6 +453,6 @@ private void assertThatQueryDoesNotReturnValues(String sql)
private void assertThatQueryDoesNotReturnValues(Session session, @Language("SQL") String sql)
{
MaterializedResult rows = session == null ? queryRunner.execute(sql) : queryRunner.execute(session, sql);
assertEquals(rows.getRowCount(), 0);
assertThat(rows.getRowCount()).isEqualTo(0);
}
}