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

Fix flaky tests org.apache.helix.rest.server.TestResourceAssignmentOptimizerAccessor(#2640) #2663

Merged
merged 1 commit into from
Feb 27, 2024
+19 −27
Merged

Fix flaky tests org.apache.helix.rest.server.TestResourceAssignmentOptimizerAccessor(#2640) #2663

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
6 changes: 6 additions & 0 deletions helix-rest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,12 @@
<artifactId>swagger-models</artifactId>
<version>1.6.4</version>
</dependency>
<dependency>
<groupId>org.skyscreamer</groupId>
<artifactId>jsonassert</artifactId>
<version>1.5.1</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<resources>
Expand Down
40 changes: 13 additions & 27 deletions ...t/src/test/java/org/apache/helix/rest/server/TestResourceAssignmentOptimizerAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
import org.apache.helix.model.IdealState;
import org.apache.helix.model.InstanceConfig;
import org.apache.helix.rest.server.resources.helix.ResourceAssignmentOptimizerAccessor;
import org.json.JSONException;
import org.skyscreamer.jsonassert.JSONAssert;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
Expand Down Expand Up @@ -99,7 +101,7 @@ public void afterClass() {
}

@Test
public void testComputePartitionAssignment() throws IOException {
public void testComputePartitionAssignment() throws IOException, JSONException {
System.out.println("Start test :" + TestHelper.getTestMethodName());

// Test AddInstances, RemoveInstances and SwapInstances
Expand All @@ -121,8 +123,7 @@ public void testComputePartitionAssignment() throws IOException {
Assert.assertTrue(headers.containsKey(ResourceAssignmentOptimizerAccessor.RESPONSE_HEADER_KEY));
Assert.assertFalse(
headers.get(ResourceAssignmentOptimizerAccessor.RESPONSE_HEADER_KEY).isEmpty());
Assert.assertEquals(headers.get(ResourceAssignmentOptimizerAccessor.RESPONSE_HEADER_KEY).get(0),
"{instanceFilter=[], resourceFilter=[], returnFormat=IdealStateFormat}");
JSONAssert.assertEquals((String) headers.get(ResourceAssignmentOptimizerAccessor.RESPONSE_HEADER_KEY).get(0), "{instanceFilter=[], resourceFilter=[], returnFormat=IdealStateFormat}", false);

// Test partitionAssignment InstanceFilter
String payload2 = "{\"Options\" : { \"InstanceFilter\" : [\"" + liveInstances.get(0) + "\" , \""
Expand All @@ -146,14 +147,10 @@ public void testComputePartitionAssignment() throws IOException {
headers2.get(ResourceAssignmentOptimizerAccessor.RESPONSE_HEADER_KEY);
Assert.assertFalse(
headers2.get(ResourceAssignmentOptimizerAccessor.RESPONSE_HEADER_KEY).isEmpty());
Assert.assertTrue(
partitionAssignmentMetadata2.get(0).equals(
"{instanceFilter=[" + liveInstances.get(0) + ", " + liveInstances.get(1)
+ "], resourceFilter=[], returnFormat=IdealStateFormat}") ||
partitionAssignmentMetadata2.get(0).equals(
"{instanceFilter=[" + liveInstances.get(1) + ", " + liveInstances.get(0)
+ "], resourceFilter=[], returnFormat=IdealStateFormat}"),
partitionAssignmentMetadata2.get(0).toString());
JSONAssert.assertEquals("{instanceFilter=[" + liveInstances.get(0) + ", " + liveInstances.get(1) + "], "
+ "resourceFilter=[], " + "returnFormat=IdealStateFormat}", partitionAssignmentMetadata2.get(0).toString(), false);
JSONAssert.assertEquals("{instanceFilter=[" + liveInstances.get(0) + ", " + liveInstances.get(1) + "], "
+ "resourceFilter=[], " + "returnFormat=IdealStateFormat}", ((String) partitionAssignmentMetadata2.get(0)), false);

// Test partitionAssignment ResourceFilter
String payload3 =
Expand All @@ -177,14 +174,8 @@ public void testComputePartitionAssignment() throws IOException {
headers3.get(ResourceAssignmentOptimizerAccessor.RESPONSE_HEADER_KEY);
Assert.assertFalse(
headers3.get(ResourceAssignmentOptimizerAccessor.RESPONSE_HEADER_KEY).isEmpty());
Assert.assertTrue(
partitionAssignmentMetadata3.get(0).equals(
"{instanceFilter=[], resourceFilter=[" + resources.get(0) + ", " + resources.get(1)
+ "], returnFormat=IdealStateFormat}") ||
partitionAssignmentMetadata3.get(0).equals(
"{instanceFilter=[], resourceFilter=[" + resources.get(1) + ", " + resources.get(0)
+ "], returnFormat=IdealStateFormat}"),
partitionAssignmentMetadata3.get(0).toString());
JSONAssert.assertEquals("{instanceFilter=[], resourceFilter=[" + resources.get(0) + ", " + resources.get(1)
+ "], returnFormat=IdealStateFormat}", partitionAssignmentMetadata3.get(0).toString(), false);

// Test Option CurrentState format with AddInstances, RemoveInstances and SwapInstances
String payload4 = "{\"InstanceChange\" : { \"ActivateInstances\" : [\"" + toEnabledInstance
Expand All @@ -211,14 +202,9 @@ public void testComputePartitionAssignment() throws IOException {
headers4.get(ResourceAssignmentOptimizerAccessor.RESPONSE_HEADER_KEY);
Assert.assertFalse(
headers4.get(ResourceAssignmentOptimizerAccessor.RESPONSE_HEADER_KEY).isEmpty());
Assert.assertTrue(
partitionAssignmentMetadata4.get(0).equals(
"{instanceFilter=[], resourceFilter=[" + resources.get(0) + ", " + resources.get(1)
+ "], returnFormat=CurrentStateFormat}") ||
partitionAssignmentMetadata4.get(0).equals(
"{instanceFilter=[], resourceFilter=[" + resources.get(1) + ", " + resources.get(0)
+ "], returnFormat=CurrentStateFormat}"),
partitionAssignmentMetadata4.get(0).toString());
JSONAssert.assertEquals(partitionAssignmentMetadata4.get(0).toString(),
"{instanceFilter=[], resourceFilter=[" + resources.get(0) + ", " + resources.get(1)+ "], returnFormat" +
"=CurrentStateFormat}",false);

System.out.println("End test :" + TestHelper.getTestMethodName());
}
Expand Down
Loading