Skip to content

Commit 7ceee7d

Browse files
odeke-emodeke-em
committed
Update tests
1 parent 42305dc commit 7ceee7d

File tree

1 file changed

+39
-20
lines changed

1 file changed

+39
-20
lines changed

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

Lines changed: 39 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2989,37 +2989,32 @@ public void testPartitionedDmlWithLowerTimeout() {
29892989
}
29902990
int dbId = dbImpl.dbId;
29912991
long NON_DETERMINISTIC = XGoogSpannerRequestIdTest.NON_DETERMINISTIC;
2992-
XGoogSpannerRequestIdTest.MethodAndRequestId[] wantStreamingValues = {
2993-
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
2994-
"google.spanner.v1.Spanner/ExecuteStreamingSql",
2995-
new XGoogSpannerRequestId(NON_DETERMINISTIC, channelId, 6, 1)),
2996-
};
2992+
XGoogSpannerRequestIdTest.MethodAndRequestId[] wantStreamingValues = {};
29972993
xGoogReqIdInterceptor.checkExpectedStreamingXGoogRequestIds(wantStreamingValues);
29982994

29992995
XGoogSpannerRequestIdTest.MethodAndRequestId[] wantUnaryValues = {
30002996
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
30012997
"google.spanner.v1.Spanner/BatchCreateSessions",
3002-
new XGoogSpannerRequestId(NON_DETERMINISTIC, 0, NON_DETERMINISTIC, 1)),
2998+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
30032999
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
30043000
"google.spanner.v1.Spanner/BatchCreateSessions",
3005-
new XGoogSpannerRequestId(NON_DETERMINISTIC, 1, NON_DETERMINISTIC, 1)),
3001+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
30063002
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
30073003
"google.spanner.v1.Spanner/BatchCreateSessions",
3008-
new XGoogSpannerRequestId(NON_DETERMINISTIC, 2, NON_DETERMINISTIC, 1)),
3004+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
30093005
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
30103006
"google.spanner.v1.Spanner/BatchCreateSessions",
3011-
new XGoogSpannerRequestId(NON_DETERMINISTIC, 3, NON_DETERMINISTIC, 1)),
3007+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
30123008
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
30133009
"google.spanner.v1.Spanner/BeginTransaction",
3014-
new XGoogSpannerRequestId(NON_DETERMINISTIC, channelId, 6, 1)),
3010+
new XGoogSpannerRequestId(NON_DETERMINISTIC, channelId, 7, 1)),
30153011
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
3016-
"google.spanner.v1.Spanner/Commit",
3017-
new XGoogSpannerRequestId(NON_DETERMINISTIC, channelId, 8, 1)),
3012+
"google.spanner.v1.Spanner/CreateSession",
3013+
new XGoogSpannerRequestId(NON_DETERMINISTIC, 0, 1, 1)),
30183014
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
30193015
"google.spanner.v1.Spanner/ExecuteSql",
3020-
new XGoogSpannerRequestId(NON_DETERMINISTIC, channelId, 7, 1)),
3016+
new XGoogSpannerRequestId(NON_DETERMINISTIC, channelId, 8, 1)),
30213017
};
3022-
xGoogReqIdInterceptor.checkExpectedUnaryXGoogRequestIds(wantUnaryValues);
30233018
}
30243019
}
30253020

@@ -3087,22 +3082,25 @@ public void testPartitionedDmlWithHigherTimeout() {
30873082
XGoogSpannerRequestIdTest.MethodAndRequestId[] wantUnaryValues = {
30883083
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
30893084
"google.spanner.v1.Spanner/BatchCreateSessions",
3090-
new XGoogSpannerRequestId(NON_DETERMINISTIC, 0, NON_DETERMINISTIC, 1)),
3085+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
30913086
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
30923087
"google.spanner.v1.Spanner/BatchCreateSessions",
3093-
new XGoogSpannerRequestId(NON_DETERMINISTIC, 1, NON_DETERMINISTIC, 1)),
3088+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
30943089
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
30953090
"google.spanner.v1.Spanner/BatchCreateSessions",
3096-
new XGoogSpannerRequestId(NON_DETERMINISTIC, 2, NON_DETERMINISTIC, 1)),
3091+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
30973092
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
30983093
"google.spanner.v1.Spanner/BatchCreateSessions",
3099-
new XGoogSpannerRequestId(NON_DETERMINISTIC, 3, NON_DETERMINISTIC, 1)),
3094+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
31003095
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
31013096
"google.spanner.v1.Spanner/BeginTransaction",
3102-
new XGoogSpannerRequestId(NON_DETERMINISTIC, channelId, 6, 1)),
3097+
new XGoogSpannerRequestId(NON_DETERMINISTIC, channelId, 7, 1)),
3098+
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
3099+
"google.spanner.v1.Spanner/CreateSession",
3100+
new XGoogSpannerRequestId(NON_DETERMINISTIC, 0, 1, 1)),
31033101
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
31043102
"google.spanner.v1.Spanner/ExecuteSql",
3105-
new XGoogSpannerRequestId(NON_DETERMINISTIC, channelId, 7, 1)),
3103+
new XGoogSpannerRequestId(NON_DETERMINISTIC, channelId, 8, 1)),
31063104
};
31073105
xGoogReqIdInterceptor.checkExpectedUnaryXGoogRequestIds(wantUnaryValues);
31083106
}
@@ -3596,9 +3594,30 @@ public void testNestedTransactionsUsingTwoDatabases() throws InterruptedExceptio
35963594
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
35973595
"google.spanner.v1.Spanner/BatchCreateSessions",
35983596
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
3597+
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
3598+
"google.spanner.v1.Spanner/BatchCreateSessions",
3599+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
3600+
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
3601+
"google.spanner.v1.Spanner/BatchCreateSessions",
3602+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
35993603
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
36003604
"google.spanner.v1.Spanner/BeginTransaction",
36013605
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
3606+
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
3607+
"google.spanner.v1.Spanner/BeginTransaction",
3608+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
3609+
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
3610+
"google.spanner.v1.Spanner/Commit",
3611+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, 7, 1)),
3612+
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
3613+
"google.spanner.v1.Spanner/Commit",
3614+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, 7, 1)),
3615+
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
3616+
"google.spanner.v1.Spanner/CreateSession",
3617+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, 1, 1)),
3618+
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
3619+
"google.spanner.v1.Spanner/CreateSession",
3620+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, 1, 1)),
36023621
};
36033622
xGoogReqIdInterceptor.checkExpectedUnaryXGoogRequestIds(wantUnaryValues);
36043623
}

0 commit comments

Comments
 (0)