Suffix checks

Author: odeke-em

google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java

@@ -2923,18 +2923,6 @@ public void testPartitionedDmlDoesNotTimeout() {
       xGoogReqIdInterceptor.checkExpectedStreamingXGoogRequestIds(wantStreamingValues);
 
       XGoogSpannerRequestIdTest.MethodAndRequestId[] wantUnaryValues = {
-        XGoogSpannerRequestIdTest.ofMethodAndRequestId(
-            "google.spanner.v1.Spanner/BatchCreateSessions",
-            new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
-        XGoogSpannerRequestIdTest.ofMethodAndRequestId(
-            "google.spanner.v1.Spanner/BatchCreateSessions",
-            new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
-        XGoogSpannerRequestIdTest.ofMethodAndRequestId(
-            "google.spanner.v1.Spanner/BatchCreateSessions",
-            new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
-        XGoogSpannerRequestIdTest.ofMethodAndRequestId(
-            "google.spanner.v1.Spanner/BatchCreateSessions",
-            new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
         XGoogSpannerRequestIdTest.ofMethodAndRequestId(
             "google.spanner.v1.Spanner/BeginTransaction",
             new XGoogSpannerRequestId(NON_DETERMINISTIC, channelId, 7, 1)),
@@ -2945,7 +2933,7 @@ public void testPartitionedDmlDoesNotTimeout() {
             "google.spanner.v1.Spanner/ExecuteSql",
             new XGoogSpannerRequestId(NON_DETERMINISTIC, channelId, 8, 1)),
       };
-      xGoogReqIdInterceptor.checkExpectedUnaryXGoogRequestIds(wantUnaryValues);
+      xGoogReqIdInterceptor.checkExpectedUnaryXGoogRequestIdsAsSuffixes(wantUnaryValues);
     }
   }
 
@@ -3045,18 +3033,6 @@ public void testPartitionedDmlWithHigherTimeout() {
       xGoogReqIdInterceptor.checkExpectedStreamingXGoogRequestIds(wantStreamingValues);
 
       XGoogSpannerRequestIdTest.MethodAndRequestId[] wantUnaryValues = {
-        XGoogSpannerRequestIdTest.ofMethodAndRequestId(
-            "google.spanner.v1.Spanner/BatchCreateSessions",
-            new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
-        XGoogSpannerRequestIdTest.ofMethodAndRequestId(
-            "google.spanner.v1.Spanner/BatchCreateSessions",
-            new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
-        XGoogSpannerRequestIdTest.ofMethodAndRequestId(
-            "google.spanner.v1.Spanner/BatchCreateSessions",
-            new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
-        XGoogSpannerRequestIdTest.ofMethodAndRequestId(
-            "google.spanner.v1.Spanner/BatchCreateSessions",
-            new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
         XGoogSpannerRequestIdTest.ofMethodAndRequestId(
             "google.spanner.v1.Spanner/BeginTransaction",
             new XGoogSpannerRequestId(NON_DETERMINISTIC, channelId, 7, 1)),
@@ -3067,7 +3043,7 @@ public void testPartitionedDmlWithHigherTimeout() {
             "google.spanner.v1.Spanner/ExecuteSql",
             new XGoogSpannerRequestId(NON_DETERMINISTIC, channelId, 8, 1)),
       };
-      xGoogReqIdInterceptor.checkExpectedUnaryXGoogRequestIds(wantUnaryValues);
+      xGoogReqIdInterceptor.checkExpectedUnaryXGoogRequestIdsAsSuffixes(wantUnaryValues);
     }
   }
 
@@ -5406,17 +5382,11 @@ public void testSessionPoolExhaustedError_containsStackTraces() {
       long NON_DETERMINISTIC = XGoogSpannerRequestIdTest.NON_DETERMINISTIC;
 
       XGoogSpannerRequestIdTest.MethodAndRequestId[] wantUnaryValues = {
-        XGoogSpannerRequestIdTest.ofMethodAndRequestId(
-            "google.spanner.v1.Spanner/BatchCreateSessions",
-            new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
-        XGoogSpannerRequestIdTest.ofMethodAndRequestId(
-            "google.spanner.v1.Spanner/BatchCreateSessions",
-            new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
         XGoogSpannerRequestIdTest.ofMethodAndRequestId(
             "google.spanner.v1.Spanner/CreateSession",
             new XGoogSpannerRequestId(NON_DETERMINISTIC, 0, 1, 1)),
       };
-      xGoogReqIdInterceptor.checkExpectedUnaryXGoogRequestIds(wantUnaryValues);
+      xGoogReqIdInterceptor.checkExpectedUnaryXGoogRequestIdsAsSuffixes(wantUnaryValues);
     }
   }
 

google-cloud-spanner/src/test/java/com/google/cloud/spanner/XGoogSpannerRequestIdTest.java

@@ -206,6 +206,21 @@ public void checkAtLeastHasExpectedUnaryXGoogRequestIds(MethodAndRequestId... wa
       }
     }
 
+    public void checkExpectedUnaryXGoogRequestIdsAsSuffixes(MethodAndRequestId... wantUnaryValues) {
+      MethodAndRequestId[] gotUnaryValues = this.accumulatedUnaryValues();
+      sortValues(gotUnaryValues);
+      for (int i = 0; i < gotUnaryValues.length && false; i++) {
+        System.out.println("\033[33misUnary: #" + i + ":: " + gotUnaryValues[i] + "\033[00m");
+      }
+      if (wantUnaryValues.length < gotUnaryValues.length) {
+        MethodAndRequestId[] gotSliced =
+            Arrays.copyOfRange(gotUnaryValues, wantUnaryValues.length+1, gotUnaryValues.length);
+        assertEquals(wantUnaryValues, gotSliced);
+      } else {
+        assertEquals(wantUnaryValues, gotUnaryValues);
+      }
+    }
+
     private void sortValues(MethodAndRequestId[] values) {
       massageValues(values);
       Arrays.sort(values, new MethodAndRequestIdComparator());