Skip to content

Commit 25e94ee

Browse files
committed
feat(logging): Improve migrated tests
1 parent 87b160e commit 25e94ee

File tree

2 files changed

+118
-118
lines changed

2 files changed

+118
-118
lines changed

utils/logging-utils/src/test/java/datadog/logging/IOLoggerTest.java

Lines changed: 53 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -16,56 +16,56 @@
1616
import org.slf4j.Marker;
1717

1818
class IOLoggerTest {
19-
final IOLogger.Response response =
19+
private final IOLogger.Response response =
2020
new IOLogger.Response(404, "Not Found", "The thing you were looking for does not exist");
21-
final RuntimeException exception = new RuntimeException("Something went wrong!");
21+
private final RuntimeException exception = new RuntimeException("Something went wrong!");
2222

23-
Logger log;
24-
RatelimitedLogger rateLimitedLogger;
25-
IOLogger ioLogger;
23+
private Logger log;
24+
private RatelimitedLogger rateLimitedLogger;
25+
private IOLogger ioLogger;
2626

2727
@BeforeEach
2828
void setUp() {
29-
log = mock(Logger.class);
30-
rateLimitedLogger = mock(RatelimitedLogger.class);
31-
ioLogger = new IOLogger(log, rateLimitedLogger);
29+
this.log = mock(Logger.class);
30+
this.rateLimitedLogger = mock(RatelimitedLogger.class);
31+
this.ioLogger = new IOLogger(this.log, this.rateLimitedLogger);
3232
}
3333

3434
@Test
3535
void successDebugLevel() {
36-
when(log.isDebugEnabled()).thenReturn(true);
36+
when(this.log.isDebugEnabled()).thenReturn(true);
3737

38-
ioLogger.success("test {}", "message");
38+
this.ioLogger.success("test {}", "message");
3939

40-
verify(log).debug(eq(EXCLUDE_TELEMETRY), eq("test {}"), (Object[]) any());
40+
verify(this.log).debug(eq(EXCLUDE_TELEMETRY), eq("test {}"), (Object[]) any());
4141
}
4242

4343
@Test
4444
void successInfoLevel() {
45-
when(log.isDebugEnabled()).thenReturn(false);
45+
when(this.log.isDebugEnabled()).thenReturn(false);
4646

47-
ioLogger.success("test {}", "message");
47+
this.ioLogger.success("test {}", "message");
4848

49-
verify(log, never()).debug(nullable(Marker.class), anyString(), (Object[]) any());
50-
verify(log, never()).info(nullable(Marker.class), anyString(), (Object[]) any());
49+
verify(this.log, never()).debug(nullable(Marker.class), anyString(), (Object[]) any());
50+
verify(this.log, never()).info(nullable(Marker.class), anyString(), (Object[]) any());
5151
}
5252

5353
@Test
5454
void errorDebugLevelMessage() {
55-
when(log.isDebugEnabled()).thenReturn(true);
55+
when(this.log.isDebugEnabled()).thenReturn(true);
5656

57-
ioLogger.error("test message");
57+
this.ioLogger.error("test message");
5858

59-
verify(log).debug(EXCLUDE_TELEMETRY, "test message");
59+
verify(this.log).debug(EXCLUDE_TELEMETRY, "test message");
6060
}
6161

6262
@Test
6363
void errorDebugLevelResponse() {
64-
when(log.isDebugEnabled()).thenReturn(true);
64+
when(this.log.isDebugEnabled()).thenReturn(true);
6565

66-
ioLogger.error("test message", response);
66+
this.ioLogger.error("test message", this.response);
6767

68-
verify(log)
68+
verify(this.log)
6969
.debug(
7070
eq(EXCLUDE_TELEMETRY),
7171
anyString(),
@@ -77,39 +77,39 @@ void errorDebugLevelResponse() {
7777

7878
@Test
7979
void errorDebugLevelException() {
80-
when(log.isDebugEnabled()).thenReturn(true);
80+
when(this.log.isDebugEnabled()).thenReturn(true);
8181

82-
ioLogger.error("test message", exception);
82+
this.ioLogger.error("test message", this.exception);
8383

84-
verify(log).debug(EXCLUDE_TELEMETRY, "test message", exception);
84+
verify(this.log).debug(EXCLUDE_TELEMETRY, "test message", this.exception);
8585
}
8686

8787
@Test
8888
void errorInfoLevelMessage() {
89-
when(log.isDebugEnabled()).thenReturn(false);
89+
when(this.log.isDebugEnabled()).thenReturn(false);
9090

91-
ioLogger.error("test message");
91+
this.ioLogger.error("test message");
9292

93-
verify(rateLimitedLogger).warn("test message");
93+
verify(this.rateLimitedLogger).warn("test message");
9494
}
9595

9696
@Test
9797
void errorInfoLevelResponse() {
98-
when(log.isDebugEnabled()).thenReturn(false);
98+
when(this.log.isDebugEnabled()).thenReturn(false);
9999

100-
ioLogger.error("test message", response);
100+
this.ioLogger.error("test message", this.response);
101101

102-
verify(rateLimitedLogger)
102+
verify(this.rateLimitedLogger)
103103
.warn(eq(EXCLUDE_TELEMETRY), anyString(), eq("test message"), eq(404), eq("Not Found"));
104104
}
105105

106106
@Test
107107
void errorInfoLevelException() {
108-
when(log.isDebugEnabled()).thenReturn(false);
108+
when(this.log.isDebugEnabled()).thenReturn(false);
109109

110-
ioLogger.error("test message", exception);
110+
this.ioLogger.error("test message", this.exception);
111111

112-
verify(rateLimitedLogger)
112+
verify(this.rateLimitedLogger)
113113
.warn(
114114
eq(EXCLUDE_TELEMETRY),
115115
anyString(),
@@ -120,30 +120,31 @@ void errorInfoLevelException() {
120120

121121
@Test
122122
void loggedErrorThenSuccessInfoLevel() {
123-
when(log.isDebugEnabled()).thenReturn(false);
124-
when(log.isInfoEnabled()).thenReturn(true);
125-
when(rateLimitedLogger.warn("test message")).thenReturn(true);
126-
127-
ioLogger.error("test message");
128-
ioLogger.success("very successful");
129-
ioLogger.success("very successful again");
130-
131-
verify(rateLimitedLogger).warn("test message");
132-
verify(log).info(eq(EXCLUDE_TELEMETRY), eq("very successful"), (Object[]) any());
133-
verify(log, never()).info(eq(EXCLUDE_TELEMETRY), eq("very successful again"), (Object[]) any());
123+
when(this.log.isDebugEnabled()).thenReturn(false);
124+
when(this.log.isInfoEnabled()).thenReturn(true);
125+
when(this.rateLimitedLogger.warn("test message")).thenReturn(true);
126+
127+
this.ioLogger.error("test message");
128+
this.ioLogger.success("very successful");
129+
this.ioLogger.success("very successful again");
130+
131+
verify(this.rateLimitedLogger).warn("test message");
132+
verify(this.log).info(eq(EXCLUDE_TELEMETRY), eq("very successful"), (Object[]) any());
133+
verify(this.log, never())
134+
.info(eq(EXCLUDE_TELEMETRY), eq("very successful again"), (Object[]) any());
134135
}
135136

136137
@Test
137138
void unloggedErrorThenSuccessInfoLevel() {
138-
when(log.isDebugEnabled()).thenReturn(false);
139-
when(log.isInfoEnabled()).thenReturn(true);
140-
when(rateLimitedLogger.warn("test message")).thenReturn(false);
139+
when(this.log.isDebugEnabled()).thenReturn(false);
140+
when(this.log.isInfoEnabled()).thenReturn(true);
141+
when(this.rateLimitedLogger.warn("test message")).thenReturn(false);
141142

142-
ioLogger.error("test message");
143-
ioLogger.success("very successful");
144-
ioLogger.success("very successful again");
143+
this.ioLogger.error("test message");
144+
this.ioLogger.success("very successful");
145+
this.ioLogger.success("very successful again");
145146

146-
verify(rateLimitedLogger).warn("test message");
147-
verify(log, never()).info(nullable(Marker.class), anyString(), (Object[]) any());
147+
verify(this.rateLimitedLogger).warn("test message");
148+
verify(this.log, never()).info(nullable(Marker.class), anyString(), (Object[]) any());
148149
}
149150
}

0 commit comments

Comments
 (0)