Skip to content

Commit d86b7a0

Browse files
committed
added tests.
1 parent 1641f55 commit d86b7a0

File tree

3 files changed

+42
-4
lines changed

3 files changed

+42
-4
lines changed

gax-java/gax/src/main/java/com/google/api/gax/logging/Slf4jUtils.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ static void logWithMDC(
102102
for (Entry<String, Object> entry : contextMap.entrySet()) {
103103
String key = entry.getKey();
104104
Object value = entry.getValue();
105-
// MDC.put(key, value.toString());
106105
MDC.put(key, value instanceof String ? (String) value : gson.toJson(value));
107106
}
108107
}

gax-java/gax/src/test/java/com/google/api/gax/logging/Slf4jUtilsTest.java

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,38 @@ void testLogWithMDC_InfoLevel_VerifyMDC() {
100100
assertEquals(message, testLogger.messageList.get(0));
101101
}
102102

103+
@Test
104+
void testLogWithMDC_DEBUG() {
105+
TestLogger testLogger = new TestLogger("test-logger");
106+
Slf4jUtils.logWithMDC(testLogger, Level.DEBUG, new HashMap<>(), "test message");
107+
108+
assertEquals(Level.DEBUG, testLogger.level);
109+
}
110+
111+
@Test
112+
void testLogWithMDC_TRACE() {
113+
TestLogger testLogger = new TestLogger("test-logger");
114+
Slf4jUtils.logWithMDC(testLogger, Level.TRACE, new HashMap<>(), "test message");
115+
116+
assertEquals(Level.TRACE, testLogger.level);
117+
}
118+
119+
@Test
120+
void testLogWithMDC_WARN() {
121+
TestLogger testLogger = new TestLogger("test-logger");
122+
Slf4jUtils.logWithMDC(testLogger, Level.WARN, new HashMap<>(), "test message");
123+
124+
assertEquals(Level.WARN, testLogger.level);
125+
}
126+
127+
@Test
128+
void testLogWithMDC_ERROR() {
129+
TestLogger testLogger = new TestLogger("test-logger");
130+
Slf4jUtils.logWithMDC(testLogger, Level.ERROR, new HashMap<>(), "test message");
131+
132+
assertEquals(Level.ERROR, testLogger.level);
133+
}
134+
103135
@Test
104136
void testMessageToMap_ValidMessage() throws InvalidProtocolBufferException {
105137
Field field =

gax-java/gax/src/test/java/com/google/api/gax/logging/TestLogger.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ public boolean isTraceEnabled() {
7777
}
7878

7979
@Override
80-
public void trace(String msg) {}
80+
public void trace(String msg) {
81+
level = Level.TRACE;
82+
}
8183

8284
@Override
8385
public void trace(String format, Object arg) {}
@@ -121,6 +123,7 @@ public void debug(String msg) {
121123
Map<String, String> currentMDC = MDC.getCopyOfContextMap();
122124
MDCMap.putAll(currentMDC);
123125
messageList.add(msg);
126+
level = Level.DEBUG;
124127
}
125128

126129
@Override
@@ -208,7 +211,9 @@ public boolean isWarnEnabled() {
208211
}
209212

210213
@Override
211-
public void warn(String msg) {}
214+
public void warn(String msg) {
215+
level = Level.WARN;
216+
}
212217

213218
@Override
214219
public void warn(String format, Object arg) {}
@@ -248,7 +253,9 @@ public boolean isErrorEnabled() {
248253
}
249254

250255
@Override
251-
public void error(String msg) {}
256+
public void error(String msg) {
257+
level = Level.ERROR;
258+
}
252259

253260
@Override
254261
public void error(String format, Object arg) {}

0 commit comments

Comments
 (0)