Skip to content

HDDS-13043. Replace != with assertNotEquals in TestSCMContainerPlacementRackAware. #8470

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
adoroszlai merged 1 commit into from
May 17, 2025
Merged

HDDS-13043. Replace != with assertNotEquals in TestSCMContainerPlacementRackAware. #8470

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
50 changes: 20 additions & 30 deletions ...he/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackAware.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
Expand Down Expand Up @@ -693,10 +692,9 @@ public void chooseSingleNodeRackWithUsedAndExcludeNodes()
excludedNodes, null, nodeNum, 0, 5);
assertEquals(nodeNum, datanodeDetails.size());

assertTrue(cluster.isSameParent(
datanodes.get(0), datanodeDetails.get(0)) &&
cluster.isSameParent(datanodes.get(1), datanodeDetails.get(0)) &&
excludedNodes.get(0).getUuid() != datanodeDetails.get(0).getUuid());
assertTrue(cluster.isSameParent(datanodes.get(0), datanodeDetails.get(0)));
assertTrue(cluster.isSameParent(datanodes.get(1), datanodeDetails.get(0)));
assertNotEquals(excludedNodes.get(0), datanodeDetails.get(0));

// Required 2 DN for 2 replica
nodeNum = 2;
Expand All @@ -709,9 +707,8 @@ public void chooseSingleNodeRackWithUsedAndExcludeNodes()
excludedNodes, null, nodeNum, 0, 5);
assertEquals(nodeNum, datanodeDetails.size());

assertTrue(excludedNodes.get(0).getUuid() !=
datanodeDetails.get(0).getUuid() &&
excludedNodes.get(0).getUuid() != datanodeDetails.get(1).getUuid());
assertNotEquals(excludedNodes.get(0), datanodeDetails.get(0));
assertNotEquals(excludedNodes.get(0), datanodeDetails.get(1));

nodeNum = 3;
// No replica exist
Expand All @@ -721,9 +718,8 @@ public void chooseSingleNodeRackWithUsedAndExcludeNodes()
excludedNodes, null, nodeNum, 0, 5);
assertEquals(nodeNum, datanodeDetails.size());

assertTrue(excludedNodes.get(0).getUuid() !=
datanodeDetails.get(0).getUuid() &&
excludedNodes.get(0).getUuid() != datanodeDetails.get(1).getUuid());
assertNotEquals(excludedNodes.get(0), datanodeDetails.get(0));
assertNotEquals(excludedNodes.get(0), datanodeDetails.get(1));
}

@ParameterizedTest
Expand All @@ -747,9 +743,8 @@ public void chooseNodeWithUsedAndExcludeNodesMultipleRack(int datanodeCount)
assertEquals(nodeNum, datanodeDetails.size());

// Exclude node should not be returned
assertTrue(excludedNodes.get(0).getUuid() !=
datanodeDetails.get(0).getUuid() && excludedNodes.get(0).getUuid() !=
datanodeDetails.get(1).getUuid());
assertNotEquals(excludedNodes.get(0), datanodeDetails.get(0));
assertNotEquals(excludedNodes.get(0), datanodeDetails.get(1));

usedNodes.clear();
excludedNodes.clear();
Expand All @@ -764,13 +759,11 @@ public void chooseNodeWithUsedAndExcludeNodesMultipleRack(int datanodeCount)

assertEquals(nodeNum, datanodeDetails.size());

assertTrue(excludedNodes.get(0).getUuid() !=
datanodeDetails.get(0).getUuid() && excludedNodes.get(1).getUuid() !=
datanodeDetails.get(0).getUuid());
assertNotEquals(excludedNodes.get(0), datanodeDetails.get(0));
assertNotEquals(excludedNodes.get(1), datanodeDetails.get(0));

assertTrue(excludedNodes.get(0).getUuid() !=
datanodeDetails.get(1).getUuid() && excludedNodes.get(1).getUuid() !=
datanodeDetails.get(1).getUuid());
assertNotEquals(excludedNodes.get(0), datanodeDetails.get(1));
assertNotEquals(excludedNodes.get(1), datanodeDetails.get(1));
}

@ParameterizedTest
Expand All @@ -790,9 +783,8 @@ public void chooseNodeWithOnlyExcludeAndNoUsedNodes(int datanodeCount)
assertEquals(nodeNum, datanodeDetails.size());

// Exclude node should not be returned
assertTrue(excludedNodes.get(0).getUuid() !=
datanodeDetails.get(0).getUuid() && excludedNodes.get(0).getUuid() !=
datanodeDetails.get(1).getUuid());
assertNotEquals(excludedNodes.get(0), datanodeDetails.get(0));
assertNotEquals(excludedNodes.get(0), datanodeDetails.get(1));

excludedNodes.clear();
// Multiple exclude nodes
Expand All @@ -805,13 +797,11 @@ public void chooseNodeWithOnlyExcludeAndNoUsedNodes(int datanodeCount)
assertEquals(nodeNum, datanodeDetails.size());

// Exclude node should not be returned
assertTrue(excludedNodes.get(0).getUuid() !=
datanodeDetails.get(0).getUuid() && excludedNodes.get(0).getUuid() !=
datanodeDetails.get(1).getUuid());
assertNotEquals(excludedNodes.get(0), datanodeDetails.get(0));
assertNotEquals(excludedNodes.get(0), datanodeDetails.get(1));

assertTrue(excludedNodes.get(1).getUuid() !=
datanodeDetails.get(0).getUuid() && excludedNodes.get(1).getUuid() !=
datanodeDetails.get(1).getUuid());
assertNotEquals(excludedNodes.get(1), datanodeDetails.get(0));
assertNotEquals(excludedNodes.get(1), datanodeDetails.get(1));
}

@ParameterizedTest
Expand Down Expand Up @@ -881,7 +871,7 @@ public void chooseNodeWithUsedAndFavouredNodesMultipleRack()

// Favoured node should be returned,
// as favoured node is in the different rack as used nodes.
assertSame(favouredNodes.get(0).getUuid(), datanodeDetails.get(0).getUuid());
assertEquals(favouredNodes.get(0), datanodeDetails.get(0));

}
}