Improved invocation metrics test for better diagnosis, fix for #568

5 files changed, 15 insertions, 5 deletions

diff --git a/cpp/test/Ice/metrics/AllTests.cpp b/cpp/test/Ice/metrics/AllTests.cpp
index 1beef435bb5..61b48ae297f 100644
--- a/cpp/test/Ice/metrics/AllTests.cpp
+++ b/cpp/test/Ice/metrics/AllTests.cpp
@@ -1325,7 +1325,9 @@ allTests(Test::TestHelper* helper, const CommunicatorObserverIPtr& obsv)
         im1 = ICE_DYNAMIC_CAST(IceMX::InvocationMetrics, map["fail"]);
         test(im1->current <= 1 && im1->total == 3 && im1->failures == 3 && im1->retry == 3 && im1->remotes.size() == 1);
         rim1 = ICE_DYNAMIC_CAST(IceMX::ChildInvocationMetrics, im1->remotes[0]);
-        test(rim1->current == 0 && rim1->total == 6 && rim1->failures == 6);
+        test(rim1->current == 0);
+        test(rim1->total == 6);
+        test(rim1->failures == 6);
         checkFailure(clientMetrics, "Invocation", im1->id, "::Ice::ConnectionLostException", 3);
     }
 
diff --git a/csharp/test/Ice/metrics/AllTests.cs b/csharp/test/Ice/metrics/AllTests.cs
index 31326ba9c53..d709d57c198 100644
--- a/csharp/test/Ice/metrics/AllTests.cs
+++ b/csharp/test/Ice/metrics/AllTests.cs
@@ -1073,7 +1073,9 @@ public class AllTests : Test.AllTests
             im1 = (IceMX.InvocationMetrics)map["fail"];
             test(im1.current <= 1 && im1.total == 3 && im1.failures == 3 && im1.retry == 3 && im1.remotes.Length == 1);
             rim1 = (IceMX.ChildInvocationMetrics)(collocated ? im1.collocated[0] : im1.remotes[0]);
-            test(rim1.current == 0 && rim1.total == 6 && rim1.failures == 6);
+            test(rim1.current == 0);
+            test(rim1.total == 6);
+            test(rim1.failures == 6);
             checkFailure(clientMetrics, "Invocation", im1.id, "::Ice::ConnectionLostException", 3, output);
         }
 
diff --git a/java-compat/test/src/main/java/test/Ice/metrics/AllTests.java b/java-compat/test/src/main/java/test/Ice/metrics/AllTests.java
index 376c72a76af..245cf3d7e79 100644
--- a/java-compat/test/src/main/java/test/Ice/metrics/AllTests.java
+++ b/java-compat/test/src/main/java/test/Ice/metrics/AllTests.java
@@ -1144,7 +1144,9 @@ public class AllTests
             im1 = (IceMX.InvocationMetrics)map.get("fail");
             test(im1.current <= 1 && im1.total == 3 && im1.failures == 3 && im1.retry == 3 && im1.remotes.length == 1);
             rim1 = (IceMX.ChildInvocationMetrics)im1.remotes[0];
-            test(rim1.current == 0 && rim1.total == 6 && rim1.failures == 6);
+            test(rim1.current == 0);
+            test(rim1.total == 6);
+            test(rim1.failures == 6);
             checkFailure(clientMetrics, "Invocation", im1.id, "::Ice::ConnectionLostException", 3, out);
         }
 
diff --git a/java/test/src/main/java/test/Ice/metrics/AllTests.java b/java/test/src/main/java/test/Ice/metrics/AllTests.java
index c6035f6548e..aae4eaa2661 100644
--- a/java/test/src/main/java/test/Ice/metrics/AllTests.java
+++ b/java/test/src/main/java/test/Ice/metrics/AllTests.java
@@ -1096,7 +1096,9 @@ public class AllTests
             im1 = (InvocationMetrics)map.get("fail");
             test(im1.current <= 1 && im1.total == 3 && im1.failures == 3 && im1.retry == 3 && im1.remotes.length == 1);
             rim1 = (ChildInvocationMetrics)im1.remotes[0];
-            test(rim1.current == 0 && rim1.total == 6 && rim1.failures == 6);
+            test(rim1.current == 0);
+            test(rim1.total == 6);
+            test(rim1.failures == 6);
             checkFailure(clientMetrics, "Invocation", im1.id, "::Ice::ConnectionLostException", 3, out);
         }
 
diff --git a/objective-c/test/Ice/metrics/AllTests.m b/objective-c/test/Ice/metrics/AllTests.m
index 986d86cd3c0..ad364f08365 100644
--- a/objective-c/test/Ice/metrics/AllTests.m
+++ b/objective-c/test/Ice/metrics/AllTests.m
@@ -1079,7 +1079,9 @@ metricsAllTests(id<ICECommunicator> communicator)
     im1 = (ICEMXInvocationMetrics*)[map objectForKey:@"fail"];
     test(im1.current <= 1 && im1.total == 3 && im1.failures == 3 && im1.retry == 3 && [im1.remotes count] == 1);
     rim1 = (ICEMXRemoteMetrics*)[im1.remotes objectAtIndex:0];
-    test(rim1.current == 0 && rim1.total == 6 && rim1.failures == 6);
+    test(rim1.current == 0);
+    test(rim1.total == 6);
+    test(rim1.failures == 6);
 
     checkFailure(clientMetrics, @"Invocation", im1.id_, @"::Ice::ConnectionLostException", 3);