From 90e28af65c2060f2591e1a42d963fca96729d685 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 11 Sep 2018 11:30:36 -0700 Subject: [PATCH] Allow LoggingAppender default options test to pass locally and on GCE --- .../logging/logback/LoggingAppenderTest.java | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java index 9d67190b3d92..85177031b122 100644 --- a/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java +++ b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java @@ -62,15 +62,19 @@ Logging getLogging() { @Before public void setUp() {} - private final WriteOption[] defaultWriteOptions = - new WriteOption[] { - WriteOption.logName("java.log"), - WriteOption.resource( - MonitoredResource.newBuilder("global") - .setLabels( - new ImmutableMap.Builder().put("project_id", projectId).build()) - .build()) - }; + private final WriteOption defaultWriteOptionLogName = WriteOption.logName("java.log"); + // For local test runs, the default option is global + private final WriteOption defaultWriteOptionResourceGlobal = WriteOption.resource( + MonitoredResource.newBuilder("global") + .setLabels( + new ImmutableMap.Builder().put("project_id", projectId).build()) + .build()); + // CI runs on GCE so the default is gce_instance + private final WriteOption defaultWriteOptionResourceGCE = WriteOption.resource( + MonitoredResource.newBuilder("gce_instance") + .setLabels( + new ImmutableMap.Builder().put("project_id", projectId).build()) + .build()); @Test public void testFlushLevelConfigUpdatesLoggingFlushSeverity() { @@ -179,8 +183,8 @@ public void testDefaultWriteOptionsHasExpectedDefaults() { LoggingEvent loggingEvent = createLoggingEvent(Level.ERROR, timestamp.getSeconds()); loggingAppender.doAppend(loggingEvent); - assertThat(logNameArg.getValue()).isEqualTo(defaultWriteOptions[0]); - assertThat(resourceArg.getValue()).isEqualTo(defaultWriteOptions[1]); + assertThat(logNameArg.getValue()).isEqualTo(defaultWriteOptionLogName); + assertThat(resourceArg.getValue()).isAnyOf(defaultWriteOptionResourceGlobal, defaultWriteOptionResourceGCE); } private LoggingEvent createLoggingEvent(Level level, long timestamp) {