|
16 | 16 |
|
17 | 17 | package com.google.cloud.logging;
|
18 | 18 |
|
| 19 | +import static com.google.common.truth.Truth.assertThat; |
19 | 20 | import static org.junit.Assert.assertEquals;
|
20 | 21 | import static org.junit.Assert.assertFalse;
|
21 | 22 | import static org.junit.Assert.assertNotNull;
|
|
36 | 37 | import com.google.common.collect.Iterators;
|
37 | 38 | import com.google.common.collect.Sets;
|
38 | 39 | import com.google.logging.v2.LogName;
|
| 40 | +import com.google.logging.v2.ProjectLogName; |
39 | 41 | import java.util.Iterator;
|
40 | 42 | import java.util.Set;
|
41 | 43 | import java.util.logging.Level;
|
42 | 44 | import java.util.logging.Logger;
|
43 |
| - |
44 |
| -import com.google.logging.v2.ProjectLogName; |
45 | 45 | import org.junit.Rule;
|
46 | 46 | import org.junit.Test;
|
47 | 47 | import org.junit.rules.ExpectedException;
|
@@ -305,22 +305,24 @@ public void testLoggingHandler() throws InterruptedException {
|
305 | 305 | iterator =
|
306 | 306 | logging().listLogEntries(EntryListOption.filter(filter)).iterateAll().iterator();
|
307 | 307 | }
|
308 |
| - assertTrue(iterator.hasNext()); |
| 308 | + assertThat(iterator.hasNext()).isTrue(); |
309 | 309 | LogEntry entry = iterator.next();
|
310 |
| - assertTrue(entry.getPayload() instanceof StringPayload); |
311 |
| - assertTrue(entry.<StringPayload>getPayload().getData().contains("Message")); |
312 |
| - assertEquals(logId, entry.getLogName()); |
313 |
| - assertEquals(ImmutableMap.of("levelName", "INFO", |
314 |
| - "levelValue", String.valueOf(Level.INFO.intValue())), entry.getLabels()); |
315 |
| - assertEquals("global", entry.getResource().getType()); |
316 |
| - assertEquals(ImmutableMap.of("project_id", options.getProjectId()), |
317 |
| - entry.getResource().getLabels()); |
318 |
| - assertNull(entry.getHttpRequest()); |
319 |
| - assertEquals(Severity.INFO, entry.getSeverity()); |
320 |
| - assertNull(entry.getOperation()); |
321 |
| - assertNotNull(entry.getInsertId()); |
322 |
| - assertNotNull(entry.getTimestamp()); |
323 |
| - assertFalse(iterator.hasNext()); |
| 310 | + assertThat(entry.getPayload() instanceof StringPayload).isTrue(); |
| 311 | + assertThat(entry.<StringPayload>getPayload().getData()).contains("Message"); |
| 312 | + assertThat(entry.getLogName()).isEqualTo(logId); |
| 313 | + assertThat(entry.getLabels()) |
| 314 | + .containsExactly("levelName", "INFO", "levelValue", String.valueOf(Level.INFO.intValue())); |
| 315 | + MonitoredResource monitoredResource = |
| 316 | + new LoggingConfig(handler.getClass().getName()) |
| 317 | + .getMonitoredResource(options.getProjectId()); |
| 318 | + assertThat(entry.getResource().getType()).isEqualTo(monitoredResource.getType()); |
| 319 | + assertThat(entry.getResource().getLabels()).containsEntry("project_id", options.getProjectId()); |
| 320 | + assertThat(entry.getHttpRequest()).isNull(); |
| 321 | + assertThat(entry.getSeverity()).isEqualTo(Severity.INFO); |
| 322 | + assertThat(entry.getOperation()).isNull(); |
| 323 | + assertThat(entry.getInsertId()).isNotNull(); |
| 324 | + assertThat(entry.getTimestamp()).isNotNull(); |
| 325 | + assertThat(iterator.hasNext()).isFalse(); |
324 | 326 | logger.removeHandler(handler);
|
325 | 327 | logging().deleteLog(logId);
|
326 | 328 | }
|
|
0 commit comments