Fixed test assertion logic (#994)

dhoard · web-flow · commit f89aa7aa310f · 2024-08-10T12:14:25.000-04:00
Signed-off-by: dhoard &lt;doug.hoard@gmail.com&gt;
diff --git a/integration_test_suite/integration_tests/src/main/java/io/prometheus/jmx/test/support/metrics/MapMetricAssertion.java b/integration_test_suite/integration_tests/src/main/java/io/prometheus/jmx/test/support/metrics/MapMetricAssertion.java
@@ -128,20 +128,18 @@ public MapMetricAssertion isPresent() {
     public MapMetricAssertion isPresentWhen(boolean condition) {
         Collection<Metric> metrics = this.metrics.get(name);
 
-        if (condition && metrics == null) {
-            throw new AssertionFailedError(
-                    String.format(
-                            "Metric type [%s] help [%s] name [%s] labels [%s] value [%f]"
-                                    + " matches multiple metrics",
-                            type, help, name, labels, value));
-        } else if (!condition && metrics != null) {
-            throw new AssertionFailedError(
-                    String.format(
-                            "Metric type [%s] help [%s] name [%s] labels [%s] value [%f] is"
-                                    + " present",
-                            type, help, name, labels, value));
-        } else if (!condition) {
-            return this;
+        if (condition) {
+            if (metrics == null) {
+                throw new AssertionFailedError(
+                        String.format(
+                                "Metric type [%s] help [%s] name [%s] labels [%s] value [%f] is not"
+                                        + " present",
+                                type, help, name, labels, value));
+            }
+        } else {
+            if (metrics == null) {
+                return this;
+            }
         }
 
         Collection<Metric> subMetrics =
