diff --git a/presto-blackhole/src/test/java/com/facebook/presto/plugin/blackhole/TestBlackHoleMetadata.java b/presto-blackhole/src/test/java/com/facebook/presto/plugin/blackhole/TestBlackHoleMetadata.java index f714f2335f54c..09529dc14c7a4 100644 --- a/presto-blackhole/src/test/java/com/facebook/presto/plugin/blackhole/TestBlackHoleMetadata.java +++ b/presto-blackhole/src/test/java/com/facebook/presto/plugin/blackhole/TestBlackHoleMetadata.java @@ -30,7 +30,6 @@ import static com.facebook.presto.testing.TestingConnectorSession.SESSION; import static java.util.concurrent.TimeUnit.SECONDS; import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; public class TestBlackHoleMetadata @@ -68,8 +67,8 @@ public void tableIsCreatedAfterCommits() metadata.finishCreateTable(SESSION, table, ImmutableList.of(), ImmutableList.of()); List tables = metadata.listTables(SESSION, Optional.empty()); - assertTrue(tables.size() == 1, "Expected only one table."); - assertTrue(tables.get(0).getTableName().equals("temp_table"), "Expected table with name 'temp_table'"); + assertEquals(tables.size(), 1, "Expected only one table."); + assertEquals(tables.get(0).getTableName(), "temp_table", "Expected table with name 'temp_table'"); } @Test @@ -82,7 +81,7 @@ public void testCreateTableInNotExistSchema() } catch (PrestoException ex) { assertEquals(ex.getErrorCode(), NOT_FOUND.toErrorCode()); - assertTrue(ex.getMessage().equals("Schema schema1 not found")); + assertEquals(ex.getMessage(), "Schema schema1 not found"); } } diff --git a/presto-common/src/test/java/com/facebook/presto/common/predicate/TestMarker.java b/presto-common/src/test/java/com/facebook/presto/common/predicate/TestMarker.java index 783517b1f2968..362fc8f29c976 100644 --- a/presto-common/src/test/java/com/facebook/presto/common/predicate/TestMarker.java +++ b/presto-common/src/test/java/com/facebook/presto/common/predicate/TestMarker.java @@ -101,7 +101,7 @@ public void testComparisons() // of their indexes. for (int i = 0; i < markers.size(); i++) { for (int j = 0; j < markers.size(); j++) { - assertTrue(markers.get(i).compareTo(markers.get(j)) == Integer.compare(i, j)); + assertEquals(markers.get(i).compareTo(markers.get(j)), Integer.compare(i, j)); } } } diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveCommitHandleOutput.java b/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveCommitHandleOutput.java index 0e1da1b900ff1..9276948481c7d 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveCommitHandleOutput.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveCommitHandleOutput.java @@ -221,7 +221,7 @@ public void testCommitOutputForPartitions() assertEquals(handle.getSerializedCommitOutputForRead(new SchemaTableName(TEST_SCHEMA, TEST_TABLE)), ""); assertFalse(handle.getSerializedCommitOutputForWrite(new SchemaTableName(TEST_SCHEMA, TEST_TABLE)).isEmpty()); - assertTrue(handle.getSerializedCommitOutputForWrite(new SchemaTableName(TEST_SCHEMA, TEST_TABLE)).equals(serializedCommitOutput)); + assertEquals(handle.getSerializedCommitOutputForWrite(new SchemaTableName(TEST_SCHEMA, TEST_TABLE)), serializedCommitOutput); } private HiveMetadata getHiveMetadata(TestingExtendedHiveMetastore metastore, HiveClientConfig hiveClientConfig, ListeningExecutorService listeningExecutor) diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveIntegrationSmokeTest.java b/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveIntegrationSmokeTest.java index 3af65ff14a740..170e05f8557c8 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveIntegrationSmokeTest.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveIntegrationSmokeTest.java @@ -2927,7 +2927,7 @@ else if (columnMetadata.getName().equals(ROW_ID_COLUMN_NAME)) { int bucket = (int) row.getField(2); assertEquals(col1, col0 + 11); - assertTrue(col1 % 2 == 0); + assertEquals(col1 % 2, 0); // Because Hive's hash function for integer n is h(n) = n. assertEquals(bucket, col0 % 2); diff --git a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergSplitManager.java b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergSplitManager.java index eca47f3c2a7a0..bb7f2f26ff5f8 100644 --- a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergSplitManager.java +++ b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergSplitManager.java @@ -41,6 +41,7 @@ import static com.facebook.presto.iceberg.IcebergSessionProperties.PUSHDOWN_FILTER_ENABLED; import static com.facebook.presto.spi.connector.NotPartitionedPartitionHandle.NOT_PARTITIONED; import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; @@ -180,7 +181,8 @@ private void validateSplitsPlannedForSql(SplitManager splitManager, { Session session = sessionWithFilterPushdown(filterPushdown); List tableScanNodes = getTableScanFromOptimizedPlanOfSql(sql, session); - assertTrue(tableScanNodes != null && tableScanNodes.size() == 1); + assertNotNull(tableScanNodes); + assertEquals(tableScanNodes.size(), 1); TransactionId transactionId = transactionManager.beginTransaction(false); session = session.beginTransactionId(transactionId, transactionManager, new AllowAllAccessControl()); diff --git a/presto-main/src/test/java/com/facebook/presto/execution/resourceGroups/TestUpdateablePriorityQueue.java b/presto-main/src/test/java/com/facebook/presto/execution/resourceGroups/TestUpdateablePriorityQueue.java index f953f47c71b59..d5e022a7295e6 100644 --- a/presto-main/src/test/java/com/facebook/presto/execution/resourceGroups/TestUpdateablePriorityQueue.java +++ b/presto-main/src/test/java/com/facebook/presto/execution/resourceGroups/TestUpdateablePriorityQueue.java @@ -44,7 +44,7 @@ public void testIndexedPriorityQueue() @Test public void testStochasticPriorityQueue() { - assertTrue(populateAndExtract(new StochasticPriorityQueue<>()).size() == 3); + assertEquals(populateAndExtract(new StochasticPriorityQueue<>()).size(), 3); } @Test diff --git a/presto-main/src/test/java/com/facebook/presto/operator/GroupByHashYieldAssertion.java b/presto-main/src/test/java/com/facebook/presto/operator/GroupByHashYieldAssertion.java index 8ed18b4b8bce9..296b00c46049e 100644 --- a/presto-main/src/test/java/com/facebook/presto/operator/GroupByHashYieldAssertion.java +++ b/presto-main/src/test/java/com/facebook/presto/operator/GroupByHashYieldAssertion.java @@ -144,7 +144,7 @@ public static GroupByHashYieldResult finishOperatorWithYieldingGroupByHash(List< assertTrue(operator.getOperatorContext().isWaitingForMemory().isDone()); // assert the hash capacity is not changed; otherwise, we should have yielded - assertTrue(oldCapacity == getHashCapacity.apply(operator)); + assertEquals(oldCapacity, getHashCapacity.apply(operator)); // We are not going to rehash; therefore, assert the memory increase only comes from the aggregator assertLessThan(actualIncreasedMemory, additionalMemoryInBytes); diff --git a/presto-main/src/test/java/com/facebook/presto/operator/TestExchangeClient.java b/presto-main/src/test/java/com/facebook/presto/operator/TestExchangeClient.java index 04448a23546d1..008d629588603 100644 --- a/presto-main/src/test/java/com/facebook/presto/operator/TestExchangeClient.java +++ b/presto-main/src/test/java/com/facebook/presto/operator/TestExchangeClient.java @@ -285,7 +285,7 @@ public void testBufferLimit() // wait for client to decide there are no more pages assertNull(getNextPage(exchangeClient)); assertEquals(exchangeClient.getStatus().getBufferedPages(), 0); - assertTrue(exchangeClient.getStatus().getBufferedBytes() == 0); + assertEquals(exchangeClient.getStatus().getBufferedBytes(), 0); assertTrue(exchangeClient.isClosed()); assertStatus(exchangeClient.getStatus().getPageBufferClientStatuses().get(0), location, "closed", 3, 5, 5, "not scheduled"); } diff --git a/presto-main/src/test/java/com/facebook/presto/operator/aggregation/TestDoubleHistogramAggregation.java b/presto-main/src/test/java/com/facebook/presto/operator/aggregation/TestDoubleHistogramAggregation.java index efccb7aff61f0..88e40a693c761 100644 --- a/presto-main/src/test/java/com/facebook/presto/operator/aggregation/TestDoubleHistogramAggregation.java +++ b/presto-main/src/test/java/com/facebook/presto/operator/aggregation/TestDoubleHistogramAggregation.java @@ -100,7 +100,7 @@ public void testNull() Accumulator accumulator = factory.createAccumulator(UpdateMemory.NOOP); Block result = getFinalBlock(accumulator); - assertTrue(result.getPositionCount() == 1); + assertEquals(result.getPositionCount(), 1); assertTrue(result.isNull(0)); } diff --git a/presto-main/src/test/java/com/facebook/presto/operator/aggregation/TestRealHistogramAggregation.java b/presto-main/src/test/java/com/facebook/presto/operator/aggregation/TestRealHistogramAggregation.java index 49a57653901cd..ed1df2d40d453 100644 --- a/presto-main/src/test/java/com/facebook/presto/operator/aggregation/TestRealHistogramAggregation.java +++ b/presto-main/src/test/java/com/facebook/presto/operator/aggregation/TestRealHistogramAggregation.java @@ -101,7 +101,7 @@ public void testNull() Accumulator accumulator = factory.createAccumulator(UpdateMemory.NOOP); Block result = getFinalBlock(accumulator); - assertTrue(result.getPositionCount() == 1); + assertEquals(result.getPositionCount(), 1); assertTrue(result.isNull(0)); } diff --git a/presto-main/src/test/java/com/facebook/presto/operator/scalar/FunctionAssertions.java b/presto-main/src/test/java/com/facebook/presto/operator/scalar/FunctionAssertions.java index 04c939af96f08..00eaa7ba313db 100644 --- a/presto-main/src/test/java/com/facebook/presto/operator/scalar/FunctionAssertions.java +++ b/presto-main/src/test/java/com/facebook/presto/operator/scalar/FunctionAssertions.java @@ -284,7 +284,7 @@ public void assertFunctionDoubleArrayWithError(String projection, Type expectedT Object actual = selectSingleValue(projection, expectedType, compiler); assertTrue(actual instanceof ArrayList); ArrayList arrayList = (ArrayList) actual; - assertTrue(arrayList.size() == expected.size()); + assertEquals(arrayList.size(), expected.size()); for (int i = 0; i < arrayList.size(); ++i) { assertEquals((double) arrayList.get(i), expected.get(i), delta); } @@ -295,7 +295,7 @@ public void assertFunctionFloatArrayWithError(String projection, Type expectedTy Object actual = selectSingleValue(projection, expectedType, compiler); assertTrue(actual instanceof ArrayList); ArrayList arrayList = (ArrayList) actual; - assertTrue(arrayList.size() == expected.size()); + assertEquals(arrayList.size(), expected.size()); for (int i = 0; i < arrayList.size(); ++i) { assertEquals((float) arrayList.get(i), expected.get(i), delta); } @@ -350,7 +350,7 @@ private Object selectUniqueValue(String projection, Type expectedType, Session s HashSet resultSet = new HashSet<>(results); // we should only have a single result - assertTrue(resultSet.size() == 1, "Expected only one result unique result, but got " + resultSet); + assertEquals(resultSet.size(), 1, "Expected only one result unique result, but got " + resultSet); return Iterables.getOnlyElement(resultSet); } @@ -733,7 +733,7 @@ private void assertFilter(String filter, boolean expected, boolean withNoInputCo HashSet resultSet = new HashSet<>(results); // we should only have a single result - assertTrue(resultSet.size() == 1, "Expected only [" + expected + "] result unique result, but got " + resultSet); + assertEquals(resultSet.size(), 1, "Expected only [" + expected + "] result unique result, but got " + resultSet); assertEquals((boolean) Iterables.getOnlyElement(resultSet), expected); } diff --git a/presto-main/src/test/java/com/facebook/presto/type/AbstractTestType.java b/presto-main/src/test/java/com/facebook/presto/type/AbstractTestType.java index 9c2b908605ae7..6dd2ccf895442 100644 --- a/presto-main/src/test/java/com/facebook/presto/type/AbstractTestType.java +++ b/presto-main/src/test/java/com/facebook/presto/type/AbstractTestType.java @@ -178,10 +178,10 @@ private void assertPositionValue(Block block, int position, Object expectedStack assertEquals(block.isNull(position), expectedStackValue == null); if (type.isOrderable()) { - assertTrue(ASC_NULLS_FIRST.compareBlockValue(type, block, position, expectedBlock, 0) == 0); - assertTrue(ASC_NULLS_LAST.compareBlockValue(type, block, position, expectedBlock, 0) == 0); - assertTrue(DESC_NULLS_FIRST.compareBlockValue(type, block, position, expectedBlock, 0) == 0); - assertTrue(DESC_NULLS_LAST.compareBlockValue(type, block, position, expectedBlock, 0) == 0); + assertEquals(ASC_NULLS_FIRST.compareBlockValue(type, block, position, expectedBlock, 0), 0); + assertEquals(ASC_NULLS_LAST.compareBlockValue(type, block, position, expectedBlock, 0), 0); + assertEquals(DESC_NULLS_FIRST.compareBlockValue(type, block, position, expectedBlock, 0), 0); + assertEquals(DESC_NULLS_LAST.compareBlockValue(type, block, position, expectedBlock, 0), 0); } else { try { diff --git a/presto-main/src/test/java/com/facebook/presto/type/TestArrayOperators.java b/presto-main/src/test/java/com/facebook/presto/type/TestArrayOperators.java index 3f7b795895f35..360bc3521fa1f 100644 --- a/presto-main/src/test/java/com/facebook/presto/type/TestArrayOperators.java +++ b/presto-main/src/test/java/com/facebook/presto/type/TestArrayOperators.java @@ -94,7 +94,6 @@ import static java.util.Collections.nCopies; import static java.util.Collections.singletonList; import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; public class TestArrayOperators @@ -852,7 +851,7 @@ public void testSubscript() fail("Access to array with double subscript should fail"); } catch (SemanticException e) { - assertTrue(e.getCode() == TYPE_MISMATCH); + assertEquals(e.getCode(), TYPE_MISMATCH); } assertFunction("ARRAY[NULL][1]", UNKNOWN, null); diff --git a/presto-tests/src/test/java/com/facebook/presto/server/TestServerInfoResource.java b/presto-tests/src/test/java/com/facebook/presto/server/TestServerInfoResource.java index 298dee315a0e4..2d174eefbccc7 100644 --- a/presto-tests/src/test/java/com/facebook/presto/server/TestServerInfoResource.java +++ b/presto-tests/src/test/java/com/facebook/presto/server/TestServerInfoResource.java @@ -155,7 +155,6 @@ private NodeState getNodeState(URI uri, boolean useThriftEncoding, Protocol thri return client.execute(request, new ThriftResponseHandler<>(thriftCodeManager.getCodec(NodeState.class))).getValue(); } else { - requestBuilder = getJsonTransportBuilder(prepareGet()); return client.execute(request, createJsonResponseHandler(jsonCodec(NodeState.class))); } } diff --git a/presto-tests/src/test/java/com/facebook/presto/tests/TestBlackHoleSmoke.java b/presto-tests/src/test/java/com/facebook/presto/tests/TestBlackHoleSmoke.java index 6d4022ed140da..b96aedd2a6165 100644 --- a/presto-tests/src/test/java/com/facebook/presto/tests/TestBlackHoleSmoke.java +++ b/presto-tests/src/test/java/com/facebook/presto/tests/TestBlackHoleSmoke.java @@ -89,7 +89,7 @@ public void createTableWhenTableIsAlreadyCreated() fail("Expected exception to be thrown here!"); } catch (RuntimeException ex) { // it has to RuntimeException as FailureInfo$FailureException is private - assertTrue(ex.getMessage().equals("line 1:1: Destination table 'blackhole.default.nation' already exists")); + assertEquals(ex.getMessage(), "line 1:1: Destination table 'blackhole.default.nation' already exists"); } finally { assertThatQueryReturnsValue("DROP TABLE nation", true); @@ -102,8 +102,8 @@ public void blackHoleConnectorUsage() assertThatQueryReturnsValue("CREATE TABLE nation as SELECT * FROM tpch.tiny.nation", 25L); List tableNames = listBlackHoleTables(); - assertTrue(tableNames.size() == 1, "Expected only one table."); - assertTrue(tableNames.get(0).getObjectName().equals("nation"), "Expected 'nation' table."); + assertEquals(tableNames.size(), 1, "Expected only one table."); + assertEquals(tableNames.get(0).getObjectName(), "nation", "Expected 'nation' table."); assertThatQueryReturnsValue("INSERT INTO nation SELECT * FROM tpch.tiny.nation", 25L); @@ -156,7 +156,7 @@ public void testCreateTableInNotExistSchema() fail("Expected exception to be thrown here!"); } catch (RuntimeException ex) { - assertTrue(ex.getMessage().equals("Schema schema1 not found")); + assertEquals(ex.getMessage(), "Schema schema1 not found"); } int tablesAfterCreate = listBlackHoleTables().size(); @@ -344,7 +344,7 @@ public void pageProcessingDelay() private void assertThatNoBlackHoleTableIsCreated() { - assertTrue(listBlackHoleTables().size() == 0, "No blackhole tables expected"); + assertTrue(listBlackHoleTables().isEmpty(), "No blackhole tables expected"); } private List listBlackHoleTables() @@ -362,9 +362,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(); - assertTrue(fieldCount == 1, format("Expected only one column, but got '%d'", fieldCount)); + assertEquals(fieldCount, 1, format("Expected only one column, but got '%d'", fieldCount)); Object value = materializedRow.getField(0); assertEquals(value, expected); - assertTrue(Iterables.getOnlyElement(rows).getFieldCount() == 1); + assertEquals(Iterables.getOnlyElement(rows).getFieldCount(), 1); } } diff --git a/presto-tests/src/test/java/com/facebook/presto/tests/TestServerInfoResource.java b/presto-tests/src/test/java/com/facebook/presto/tests/TestServerInfoResource.java index 58ca13960f832..3232ed6a29656 100644 --- a/presto-tests/src/test/java/com/facebook/presto/tests/TestServerInfoResource.java +++ b/presto-tests/src/test/java/com/facebook/presto/tests/TestServerInfoResource.java @@ -33,7 +33,6 @@ import static java.util.concurrent.Executors.newCachedThreadPool; import static javax.ws.rs.core.Response.Status.BAD_REQUEST; import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; public class TestServerInfoResource { @@ -70,7 +69,7 @@ public void testServerActive() ServerInfoResource serverInfoResource = coordinator.getServerInfoResource(); NodeState nodeState = serverInfoResource.getServerState(); - assertTrue(nodeState == NodeState.ACTIVE); + assertEquals(nodeState, NodeState.ACTIVE); } } @@ -89,11 +88,11 @@ public void testServerInactiveThenActive() Response response = serverInfoResource.updateState(NodeState.INACTIVE); assertEquals(response.getStatus(), 200); NodeState nodeState = serverInfoResource.getServerState(); - assertTrue(nodeState == NodeState.INACTIVE); + assertEquals(nodeState, NodeState.INACTIVE); response = serverInfoResource.updateState(NodeState.ACTIVE); assertEquals(response.getStatus(), 200); nodeState = serverInfoResource.getServerState(); - assertTrue(nodeState == NodeState.ACTIVE); + assertEquals(nodeState, NodeState.ACTIVE); } } @@ -112,7 +111,7 @@ public void testServerShutdown() Response response = serverInfoResource.updateState(NodeState.SHUTTING_DOWN); assertEquals(response.getStatus(), 200); NodeState nodeState = serverInfoResource.getServerState(); - assertTrue(nodeState == NodeState.SHUTTING_DOWN); + assertEquals(nodeState, NodeState.SHUTTING_DOWN); } }