Skip to content

Assert no other partitions in assertExpectedPartitions #11925

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
findepi merged 3 commits into from
Apr 14, 2022
Merged

Assert no other partitions in assertExpectedPartitions #11925

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ed7804
Remove redundant casts in test
findepi Apr 13, 2022
b3f2d94
Clarify test assertions
findepi Apr 13, 2022
6ccf07d
Assert no other partitions in assertExpectedPartitions
findepi Apr 13, 2022
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
16 changes: 7 additions & 9 deletions plugin/trino-hive/src/test/java/io/trino/plugin/hive/AbstractTestHive.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1282,17 +1282,15 @@ protected void assertExpectedTableProperties(ConnectorTableProperties actualProp
protected void assertExpectedPartitions(ConnectorTableHandle table, Iterable<HivePartition> expectedPartitions)
{
Iterable<HivePartition> actualPartitions = ((HiveTableHandle) table).getPartitions().orElseThrow(AssertionError::new);
Map<String, ?> actualById = uniqueIndex(actualPartitions, HivePartition::getPartitionId);
for (Object expected : expectedPartitions) {
assertInstanceOf(expected, HivePartition.class);
HivePartition expectedPartition = (HivePartition) expected;
Map<String, HivePartition> actualById = uniqueIndex(actualPartitions, HivePartition::getPartitionId);
Map<String, HivePartition> expectedById = uniqueIndex(expectedPartitions, HivePartition::getPartitionId);

Object actual = actualById.get(expectedPartition.getPartitionId());
assertEquals(actual, expected);
assertInstanceOf(actual, HivePartition.class);
HivePartition actualPartition = (HivePartition) actual;
assertThat(actualById).isEqualTo(expectedById);

assertNotNull(actualPartition, "partition " + expectedPartition.getPartitionId());
// HivePartition.equals doesn't compare all the fields, so let's check them
for (Map.Entry<String, HivePartition> expected : expectedById.entrySet()) {
HivePartition actualPartition = actualById.get(expected.getKey());
HivePartition expectedPartition = expected.getValue();
assertEquals(actualPartition.getPartitionId(), expectedPartition.getPartitionId());
assertEquals(actualPartition.getKeys(), expectedPartition.getKeys());
assertEquals(actualPartition.getTableName(), expectedPartition.getTableName());
Expand Down