Skip to content

Commit 47bd674

Browse files
authored
Fix logging integration test failure on when running on GCE (#3641)
The monitoredResource for logging would contain information of the GCE instance when running on GCE. Change the hard-coded assertions to make the test pass when running on GCE as well as local environment. Fix #3632
1 parent 124ed55 commit 47bd674

File tree

1 file changed

+19
-17
lines changed
  • google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging

1 file changed

+19
-17
lines changed

google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java

+19-17
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.google.cloud.logging;
1818

19+
import static com.google.common.truth.Truth.assertThat;
1920
import static org.junit.Assert.assertEquals;
2021
import static org.junit.Assert.assertFalse;
2122
import static org.junit.Assert.assertNotNull;
@@ -36,12 +37,11 @@
3637
import com.google.common.collect.Iterators;
3738
import com.google.common.collect.Sets;
3839
import com.google.logging.v2.LogName;
40+
import com.google.logging.v2.ProjectLogName;
3941
import java.util.Iterator;
4042
import java.util.Set;
4143
import java.util.logging.Level;
4244
import java.util.logging.Logger;
43-
44-
import com.google.logging.v2.ProjectLogName;
4545
import org.junit.Rule;
4646
import org.junit.Test;
4747
import org.junit.rules.ExpectedException;
@@ -305,22 +305,24 @@ public void testLoggingHandler() throws InterruptedException {
305305
iterator =
306306
logging().listLogEntries(EntryListOption.filter(filter)).iterateAll().iterator();
307307
}
308-
assertTrue(iterator.hasNext());
308+
assertThat(iterator.hasNext()).isTrue();
309309
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();
324326
logger.removeHandler(handler);
325327
logging().deleteLog(logId);
326328
}

0 commit comments

Comments
 (0)