Skip to content

Commit 6bf0865

Browse files
committed
chore: Update logging tests
1 parent 7b63cbf commit 6bf0865

File tree

1 file changed

+17
-9
lines changed

1 file changed

+17
-9
lines changed

oauth2_http/javatests/com/google/auth/oauth2/LoggingTest.java

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import static org.junit.Assert.assertEquals;
5151
import static org.junit.Assert.assertTrue;
5252

53+
import ch.qos.logback.classic.spi.ILoggingEvent;
5354
import com.google.api.client.http.HttpStatusCodes;
5455
import com.google.api.client.json.webtoken.JsonWebToken.Payload;
5556
import com.google.api.client.util.ArrayMap;
@@ -440,12 +441,17 @@ public void getRequestMetadata_hasAccessToken() throws IOException {
440441

441442
TestUtils.assertContainsBearerToken(metadata, ACCESS_TOKEN);
442443

443-
assertEquals(3, testAppender.events.size());
444+
// TODO: Add the other three logging events
445+
446+
// 3 logging events (sending, received, payload details) for each call
447+
// `getRequestMetadata` call calls default service account and token endpoints
448+
assertEquals(6, testAppender.events.size());
444449

450+
ILoggingEvent requestRefreshAccessToken = testAppender.events.get(3);
445451
assertEquals(
446-
"Sending request to refresh access token", testAppender.events.get(0).getMessage());
447-
assertEquals(3, testAppender.events.get(0).getKeyValuePairs().size());
448-
for (KeyValuePair kvp : testAppender.events.get(0).getKeyValuePairs()) {
452+
"Sending request to refresh access token", requestRefreshAccessToken.getMessage());
453+
assertEquals(3, requestRefreshAccessToken.getKeyValuePairs().size());
454+
for (KeyValuePair kvp : requestRefreshAccessToken.getKeyValuePairs()) {
449455
assertTrue(
450456
kvp.key.equals("request.headers")
451457
|| kvp.key.equals("request.method")
@@ -454,17 +460,19 @@ public void getRequestMetadata_hasAccessToken() throws IOException {
454460
assertTrue(isValidJson((String) kvp.value));
455461
}
456462
}
463+
ILoggingEvent responseRefreshAccessToken = testAppender.events.get(4);
457464
assertEquals(
458-
"Received response for refresh access token", testAppender.events.get(1).getMessage());
459-
assertEquals(3, testAppender.events.get(1).getKeyValuePairs().size());
460-
for (KeyValuePair kvp : testAppender.events.get(1).getKeyValuePairs()) {
465+
"Received response for refresh access token", responseRefreshAccessToken.getMessage());
466+
assertEquals(3, responseRefreshAccessToken.getKeyValuePairs().size());
467+
for (KeyValuePair kvp : responseRefreshAccessToken.getKeyValuePairs()) {
461468
assertTrue(
462469
kvp.key.equals("response.headers")
463470
|| kvp.key.equals("response.status")
464471
|| kvp.key.equals("response.status.message"));
465472
}
466-
assertEquals("Response payload for access token", testAppender.events.get(2).getMessage());
467-
assertEquals(3, testAppender.events.get(2).getKeyValuePairs().size());
473+
ILoggingEvent payloadRefreshAccessToken = testAppender.events.get(5);
474+
assertEquals("Response payload for access token", payloadRefreshAccessToken.getMessage());
475+
assertEquals(3, payloadRefreshAccessToken.getKeyValuePairs().size());
468476

469477
testAppender.stop();
470478
}

0 commit comments

Comments
 (0)