@@ -509,27 +509,29 @@ public void testDefaultUserAgent() {
|
509 | 509 |
|
510 | 510 | @Test
|
511 | 511 | public void testCustomUserAgent() {
|
512 |
| -final HeaderProvider userAgentHeaderProvider = |
513 |
| -new HeaderProvider() { |
514 |
| -@Override |
515 |
| -public Map<String, String> getHeaders() { |
516 |
| -final Map<String, String> headers = new HashMap<>(); |
517 |
| -headers.put("user-agent", "test-agent"); |
518 |
| -return headers; |
519 |
| -} |
520 |
| -}; |
521 |
| -final SpannerOptions options = |
522 |
| -createSpannerOptions().toBuilder().setHeaderProvider(userAgentHeaderProvider).build(); |
523 |
| -try (Spanner spanner = options.getService()) { |
524 |
| -final DatabaseClient databaseClient = |
525 |
| -spanner.getDatabaseClient(DatabaseId.of("[PROJECT]", "[INSTANCE]", "[DATABASE]")); |
| 512 | +for (String headerId : new String[] {"user-agent", "User-Agent", "USER-AGENT"}) { |
| 513 | +final HeaderProvider userAgentHeaderProvider = |
| 514 | +new HeaderProvider() { |
| 515 | +@Override |
| 516 | +public Map<String, String> getHeaders() { |
| 517 | +final Map<String, String> headers = new HashMap<>(); |
| 518 | +headers.put(headerId, "test-agent"); |
| 519 | +return headers; |
| 520 | +} |
| 521 | +}; |
| 522 | +final SpannerOptions options = |
| 523 | +createSpannerOptions().toBuilder().setHeaderProvider(userAgentHeaderProvider).build(); |
| 524 | +try (Spanner spanner = options.getService()) { |
| 525 | +final DatabaseClient databaseClient = |
| 526 | +spanner.getDatabaseClient(DatabaseId.of("[PROJECT]", "[INSTANCE]", "[DATABASE]")); |
| 527 | + |
| 528 | +try (final ResultSet rs = databaseClient.singleUse().executeQuery(SELECT1AND2)) { |
| 529 | +rs.next(); |
| 530 | +} |
526 | 531 |
|
527 |
| -try (final ResultSet rs = databaseClient.singleUse().executeQuery(SELECT1AND2)) { |
528 |
| -rs.next(); |
| 532 | +assertThat(seenHeaders.get(Key.of("user-agent", Metadata.ASCII_STRING_MARSHALLER))) |
| 533 | +.contains("test-agent " + defaultUserAgent); |
529 | 534 | }
|
530 |
| - |
531 |
| -assertThat(seenHeaders.get(Key.of("user-agent", Metadata.ASCII_STRING_MARSHALLER))) |
532 |
| -.contains("test-agent " + defaultUserAgent); |
533 | 535 | }
|
534 | 536 | }
|
535 | 537 |
|
|
0 commit comments