Minor fix for the constraints related tests. (apache#545)

Minor fix for the constraints related tests.
huizhilu · Aug 16, 2020 · cb1668f · cb1668f
1 parent 70194d8
commit cb1668f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/...in/java/org/apache/helix/controller/rebalancer/waged/constraints/UsageSoftConstraint.java b/...in/java/org/apache/helix/controller/rebalancer/waged/constraints/UsageSoftConstraint.java
@@ -19,8 +19,6 @@
  * under the License.
  */
 
-import java.util.function.Function;
-
 import org.apache.commons.math3.analysis.function.Sigmoid;
 
 /**

diff --git a/...helix/controller/rebalancer/waged/constraints/TestMaxCapacityUsageInstanceConstraint.java b/...helix/controller/rebalancer/waged/constraints/TestMaxCapacityUsageInstanceConstraint.java
@@ -48,7 +48,8 @@ public void testGetNormalizedScore() {
     when(_testNode.getProjectedHighestUtilization(anyMap())).thenReturn(0.8f);
     when(_clusterContext.getEstimatedMaxUtilization()).thenReturn(1f);
     double score = _constraint.getAssignmentScore(_testNode, _testReplica, _clusterContext);
-    Assert.assertTrue(score > 0.99);
+    // Convert to float so as to compare with equal.
+    Assert.assertEquals((float) score,0.8f);
     double normalizedScore =
         _constraint.getAssignmentNormalizedScore(_testNode, _testReplica, _clusterContext);
     Assert.assertTrue(normalizedScore > 0.99);

diff --git a/.../controller/rebalancer/waged/constraints/TestResourcePartitionAntiAffinityConstraint.java b/.../controller/rebalancer/waged/constraints/TestResourcePartitionAntiAffinityConstraint.java
@@ -49,8 +49,8 @@ public void testGetAssignmentScore() {
 
     double score = _constraint.getAssignmentScore(_testNode, _testReplica, _clusterContext);
     double normalizedScore = _constraint.getAssignmentNormalizedScore(_testNode, _testReplica, _clusterContext);
-    Assert.assertTrue(score > 0.99);
-    Assert.assertTrue(score > 0.99);
+    Assert.assertEquals(score, 0.3);
+    Assert.assertTrue(normalizedScore > 0.99);
   }
 
   @Test
@@ -61,7 +61,7 @@ public void testGetAssignmentScoreMaxScore() {
 
     double score = _constraint.getAssignmentScore(_testNode, _testReplica, _clusterContext);
     double normalizedScore = _constraint.getAssignmentNormalizedScore(_testNode, _testReplica, _clusterContext);
-    Assert.assertEquals(score, 1.0);
+    Assert.assertEquals(score, 0.0);
     Assert.assertEquals(normalizedScore, 1.0);
   }
 }
diff --git a/...x/controller/rebalancer/waged/constraints/TestResourceTopStateAntiAffinityConstraint.java b/...x/controller/rebalancer/waged/constraints/TestResourceTopStateAntiAffinityConstraint.java
@@ -51,7 +51,7 @@ public void testGetAssignmentScoreWhenReplicaNotTopState() {
     double normalizedScore =
         _constraint.getAssignmentNormalizedScore(_testNode, _testReplica, _clusterContext);
     Assert.assertEquals(score, 0.0);
-    Assert.assertEquals(normalizedScore, 0.0);
+    Assert.assertEquals(normalizedScore, 1.0);
     verifyZeroInteractions(_testNode);
     verifyZeroInteractions(_clusterContext);
   }
@@ -64,7 +64,7 @@ public void testGetAssignmentScoreWhenReplicaIsTopStateHeavyLoad() {
     double score = _constraint.getAssignmentScore(_testNode, _testReplica, _clusterContext);
     double normalizedScore =
         _constraint.getAssignmentNormalizedScore(_testNode, _testReplica, _clusterContext);
-    Assert.assertEquals(score, 0.5);
+    Assert.assertEquals(score, 1.0);
     Assert.assertEquals(normalizedScore, 0.5);
   }
 
@@ -76,7 +76,7 @@ public void testGetAssignmentScoreWhenReplicaIsTopStateLightLoad() {
     double score = _constraint.getAssignmentScore(_testNode, _testReplica, _clusterContext);
     double normalizedScore =
         _constraint.getAssignmentNormalizedScore(_testNode, _testReplica, _clusterContext);
-    Assert.assertEquals(score, 1.0);
+    Assert.assertEquals(score, 0.0);
     Assert.assertEquals(normalizedScore, 1.0);
   }
 }