Skip to content

Commit 7c89c3f

Browse files
committed
test setup - try use env for all test in ci.
1 parent bde6ede commit 7c89c3f

File tree

3 files changed

+12
-20
lines changed

3 files changed

+12
-20
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
- run: .kokoro/build.sh
3737
env:
3838
JOB_TYPE: test
39+
GOOGLE_SDK_JAVA_LOGGING: true
3940
units-java8:
4041
# Building using Java 17 and run the tests with Java 8 runtime
4142
name: "units (8)"
@@ -58,6 +59,7 @@ jobs:
5859
- run: .kokoro/build.sh
5960
env:
6061
JOB_TYPE: test
62+
GOOGLE_SDK_JAVA_LOGGING: true
6163
windows:
6264
runs-on: windows-latest
6365
steps:
@@ -72,6 +74,7 @@ jobs:
7274
- run: .kokoro/build.bat
7375
env:
7476
JOB_TYPE: test
77+
GOOGLE_SDK_JAVA_LOGGING: true
7578
dependencies:
7679
runs-on: ubuntu-latest
7780
strategy:

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

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,37 +39,18 @@
3939
import static com.google.auth.oauth2.ServiceAccountCredentialsTest.createDefaultBuilder;
4040
import static org.junit.Assert.assertEquals;
4141

42-
import ch.qos.logback.classic.LoggerContext;
4342
import com.google.api.client.http.HttpStatusCodes;
4443
import com.google.auth.TestAppender;
4544
import com.google.auth.TestUtils;
4645
import java.io.IOException;
4746
import java.util.List;
4847
import java.util.Map;
49-
import org.junit.After;
50-
import org.junit.Before;
5148
import org.junit.Test;
5249
import org.slf4j.Logger;
5350
import org.slf4j.LoggerFactory;
5451

5552
public class LoggingTest {
5653

57-
private static final Logger LOGGER = LoggerFactory.getLogger(LoggingTest.class);
58-
private TestEnvironmentProvider testEnvironmentProvider;
59-
60-
@Before
61-
public void setup() {
62-
testEnvironmentProvider = new TestEnvironmentProvider();
63-
testEnvironmentProvider.setEnv("GOOGLE_SDK_JAVA_LOGGING", "true");
64-
LoggingConfigs.setEnvironmentProvider(testEnvironmentProvider);
65-
}
66-
67-
@After
68-
public void tearDown() {
69-
LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
70-
loggerContext.getLogger(Logger.ROOT_LOGGER_NAME).detachAppender("CONSOLE");
71-
}
72-
7354
private TestAppender setupTestLogger(Class<?> clazz) {
7455
TestAppender testAppender = new TestAppender();
7556
testAppender.start();
@@ -130,7 +111,7 @@ public void idTokenWithAudience_iamFlow_targetAudienceMatchesAudClaim() throws I
130111
assertEquals(
131112
"Sending Auth request to get id token via Iam Endpoint",
132113
testAppender.events.get(0).getFormattedMessage());
133-
assertEquals("Auth response payload.", testAppender.events.get(1).getFormattedMessage());
114+
assertEquals("Auth response payload", testAppender.events.get(1).getFormattedMessage());
134115

135116
testAppender.stop();
136117
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,4 +136,12 @@ public void testLogGenericData() {
136136

137137
testAppender.stop();
138138
}
139+
140+
private TestAppender setupTestLogger(Class<?> clazz) {
141+
TestAppender testAppender = new TestAppender();
142+
testAppender.start();
143+
Logger logger = LoggerFactory.getLogger(clazz);
144+
((ch.qos.logback.classic.Logger) logger).addAppender(testAppender);
145+
return testAppender;
146+
}
139147
}

0 commit comments

Comments
 (0)