Skip to content

Commit 1ae31ed

Browse files
mayurkale22mayurkale22
committed
chore: minor style fix
1 parent e618d6d commit 1ae31ed

File tree

3 files changed

+45
-36
lines changed

3 files changed

+45
-36
lines changed

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

Lines changed: 38 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,8 @@ public void writeAtLeastOnceWithTagOptions() {
286286
assertNotNull(commit.getSingleUseTransaction());
287287
assertTrue(commit.getSingleUseTransaction().hasReadWrite());
288288
assertNotNull(commit.getRequestOptions());
289-
assertEquals("app=spanner,env=test", commit.getRequestOptions().getTransactionTag());
290-
assertEquals("", commit.getRequestOptions().getRequestTag());
289+
assertThat(commit.getRequestOptions().getTransactionTag()).isEqualTo("app=spanner,env=test");
290+
assertThat(commit.getRequestOptions().getRequestTag()).isEmpty();
291291
}
292292

293293
@Test
@@ -305,8 +305,9 @@ public void testExecuteQueryWithTag() {
305305
assertThat(requests).hasSize(1);
306306
ExecuteSqlRequest request = requests.get(0);
307307
assertNotNull(request.getRequestOptions());
308-
assertEquals("app=spanner,env=test,action=query", request.getRequestOptions().getRequestTag());
309-
assertEquals("", request.getRequestOptions().getTransactionTag());
308+
assertThat(request.getRequestOptions().getRequestTag())
309+
.isEqualTo("app=spanner,env=test,action=query");
310+
assertThat(request.getRequestOptions().getTransactionTag()).isEmpty();
310311
}
311312

312313
@Test
@@ -328,8 +329,9 @@ public void testExecuteReadWithTag() {
328329
assertThat(requests).hasSize(1);
329330
ReadRequest request = requests.get(0);
330331
assertNotNull(request.getRequestOptions());
331-
assertEquals("app=spanner,env=test,action=read", request.getRequestOptions().getRequestTag());
332-
assertEquals("", request.getRequestOptions().getTransactionTag());
332+
assertThat(request.getRequestOptions().getRequestTag())
333+
.isEqualTo("app=spanner,env=test,action=read");
334+
assertThat(request.getRequestOptions().getTransactionTag()).isEmpty();
333335
}
334336

335337
@Test
@@ -355,9 +357,10 @@ public Void run(TransactionContext transaction) throws Exception {
355357
assertThat(requests).hasSize(1);
356358
ExecuteSqlRequest request = requests.get(0);
357359
assertNotNull(request.getRequestOptions());
358-
assertEquals("app=spanner,env=test,action=query", request.getRequestOptions().getRequestTag());
359-
assertEquals(
360-
"app=spanner,env=test,action=txn", request.getRequestOptions().getTransactionTag());
360+
assertThat(request.getRequestOptions().getRequestTag())
361+
.isEqualTo("app=spanner,env=test,action=query");
362+
assertThat(request.getRequestOptions().getTransactionTag())
363+
.isEqualTo("app=spanner,env=test,action=txn");
361364
}
362365

363366
@Test
@@ -386,9 +389,10 @@ public Void run(TransactionContext transaction) throws Exception {
386389
assertThat(requests).hasSize(1);
387390
ReadRequest request = requests.get(0);
388391
assertNotNull(request.getRequestOptions());
389-
assertEquals("app=spanner,env=test,action=read", request.getRequestOptions().getRequestTag());
390-
assertEquals(
391-
"app=spanner,env=test,action=txn", request.getRequestOptions().getTransactionTag());
392+
assertThat(request.getRequestOptions().getRequestTag())
393+
.isEqualTo("app=spanner,env=test,action=read");
394+
assertThat(request.getRequestOptions().getTransactionTag())
395+
.isEqualTo("app=spanner,env=test,action=txn");
392396
}
393397

394398
@Test
@@ -409,8 +413,9 @@ public Long run(TransactionContext transaction) throws Exception {
409413
assertThat(requests).hasSize(1);
410414
ExecuteSqlRequest request = requests.get(0);
411415
assertNotNull(request.getRequestOptions());
412-
assertEquals("app=spanner,env=test,action=update", request.getRequestOptions().getRequestTag());
413-
assertEquals("", request.getRequestOptions().getTransactionTag());
416+
assertThat(request.getRequestOptions().getRequestTag())
417+
.isEqualTo("app=spanner,env=test,action=update");
418+
assertThat(request.getRequestOptions().getTransactionTag()).isEmpty();
414419
}
415420

416421
@Test
@@ -433,9 +438,10 @@ public long[] run(TransactionContext transaction) throws Exception {
433438
assertThat(requests).hasSize(1);
434439
ExecuteBatchDmlRequest request = requests.get(0);
435440
assertNotNull(request.getRequestOptions());
436-
assertEquals("app=spanner,env=test,action=batch", request.getRequestOptions().getRequestTag());
437-
assertEquals(
438-
"app=spanner,env=test,action=txn", request.getRequestOptions().getTransactionTag());
441+
assertThat(request.getRequestOptions().getRequestTag())
442+
.isEqualTo("app=spanner,env=test,action=batch");
443+
assertThat(request.getRequestOptions().getTransactionTag())
444+
.isEqualTo("app=spanner,env=test,action=txn");
439445
}
440446

441447
@Test
@@ -449,8 +455,9 @@ public void testPartitionedDMLWithTag() {
449455
assertThat(requests).hasSize(1);
450456
ExecuteSqlRequest request = requests.get(0);
451457
assertNotNull(request.getRequestOptions());
452-
assertEquals("app=spanner,env=test,action=dml", request.getRequestOptions().getRequestTag());
453-
assertEquals("", request.getRequestOptions().getTransactionTag());
458+
assertThat(request.getRequestOptions().getRequestTag())
459+
.isEqualTo("app=spanner,env=test,action=dml");
460+
assertThat(request.getRequestOptions().getTransactionTag()).isEmpty();
454461
}
455462

456463
@Test
@@ -472,9 +479,9 @@ public Void run(TransactionContext transaction) throws Exception {
472479
assertThat(requests).hasSize(1);
473480
CommitRequest request = requests.get(0);
474481
assertNotNull(request.getRequestOptions());
475-
assertEquals("", request.getRequestOptions().getRequestTag());
476-
assertEquals(
477-
"app=spanner,env=test,action=commit", request.getRequestOptions().getTransactionTag());
482+
assertThat(request.getRequestOptions().getRequestTag()).isEmpty();
483+
assertThat(request.getRequestOptions().getTransactionTag())
484+
.isEqualTo("app=spanner,env=test,action=commit");
478485
}
479486

480487
@Test
@@ -491,9 +498,9 @@ public void testTransactionManagerCommitWithTag() {
491498
assertThat(requests).hasSize(1);
492499
CommitRequest request = requests.get(0);
493500
assertNotNull(request.getRequestOptions());
494-
assertEquals("", request.getRequestOptions().getRequestTag());
495-
assertEquals(
496-
"app=spanner,env=test,action=manager", request.getRequestOptions().getTransactionTag());
501+
assertThat(request.getRequestOptions().getRequestTag()).isEmpty();
502+
assertThat(request.getRequestOptions().getTransactionTag())
503+
.isEqualTo("app=spanner,env=test,action=manager");
497504
}
498505

499506
@Test
@@ -516,9 +523,9 @@ public ApiFuture<Void> doWorkAsync(TransactionContext txn) {
516523
assertThat(requests).hasSize(1);
517524
CommitRequest request = requests.get(0);
518525
assertNotNull(request.getRequestOptions());
519-
assertEquals("", request.getRequestOptions().getRequestTag());
520-
assertEquals(
521-
"app=spanner,env=test,action=runner", request.getRequestOptions().getTransactionTag());
526+
assertThat(request.getRequestOptions().getRequestTag()).isEmpty();
527+
assertThat(request.getRequestOptions().getTransactionTag())
528+
.isEqualTo("app=spanner,env=test,action=runner");
522529
}
523530

524531
@Test
@@ -547,8 +554,9 @@ public ApiFuture<Void> apply(TransactionContext txn, Void input)
547554
assertThat(requests).hasSize(1);
548555
CommitRequest request = requests.get(0);
549556
assertNotNull(request.getRequestOptions());
550-
assertEquals(
551-
"app=spanner,env=test,action=manager", request.getRequestOptions().getTransactionTag());
557+
assertThat(request.getRequestOptions().getRequestTag()).isEmpty();
558+
assertThat(request.getRequestOptions().getTransactionTag())
559+
.isEqualTo("app=spanner,env=test,action=manager");
552560
}
553561

554562
@Test

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,13 +171,13 @@ public void listEquality() {
171171
@Test
172172
public void readOptTest() {
173173
int limit = 3;
174-
String tag = "read";
174+
String tag = "app=spanner,env=test,action=read";
175175
Options opts = Options.fromReadOptions(Options.limit(limit), Options.tag(tag));
176176

177177
assertThat(opts.toString())
178178
.isEqualTo("limit: " + Integer.toString(limit) + " " + "tag: " + tag + " ");
179179
assertThat(opts.tag()).isEqualTo(tag);
180-
assertThat(opts.hashCode()).isEqualTo(3526226);
180+
assertThat(opts.hashCode()).isEqualTo(-1111478426);
181181
}
182182

183183
@Test
@@ -204,13 +204,13 @@ public void readEquality() {
204204
@Test
205205
public void queryOptTest() {
206206
int chunks = 3;
207-
String tag = "query";
207+
String tag = "app=spanner,env=test,action=query";
208208
Options opts = Options.fromQueryOptions(Options.prefetchChunks(chunks), Options.tag(tag));
209209
assertThat(opts.toString())
210210
.isEqualTo("prefetchChunks: " + Integer.toString(chunks) + " " + "tag: " + tag + " ");
211211
assertThat(opts.prefetchChunks()).isEqualTo(chunks);
212212
assertThat(opts.tag()).isEqualTo(tag);
213-
assertThat(opts.hashCode()).isEqualTo(107974020);
213+
assertThat(opts.hashCode()).isEqualTo(-97431824);
214214
}
215215

216216
@Test

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,8 +389,9 @@ public void testRequestWithPriorityAndRequestTag() {
389389
ExecuteSqlRequest request =
390390
tx.newTransactionRequestFrom(
391391
Statement.of("UPDATE FOO SET BAR=1 WHERE TRUE"),
392-
Options.fromUpdateOptions(Options.priority(RpcPriority.LOW), Options.tag("tag")));
392+
Options.fromUpdateOptions(
393+
Options.priority(RpcPriority.LOW), Options.tag("app=spanner,env=test")));
393394
assertEquals(Priority.PRIORITY_LOW, request.getRequestOptions().getPriority());
394-
assertEquals("tag", request.getRequestOptions().getRequestTag());
395+
assertThat(request.getRequestOptions().getRequestTag()).isEqualTo("app=spanner,env=test");
395396
}
396397
}

0 commit comments

Comments
 (0)