From 644ceffd8d8e92d039d2b1f94b7c66c81ada133f Mon Sep 17 00:00:00 2001 From: Hanzhen Yi Date: Tue, 4 Sep 2018 13:03:04 -0700 Subject: [PATCH 1/5] wip --- .../com/google/cloud/logging/testing/RemoteLoggingHelper.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/testing/RemoteLoggingHelper.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/testing/RemoteLoggingHelper.java index 85b1703e3fff..f451332f5e59 100644 --- a/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/testing/RemoteLoggingHelper.java +++ b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/testing/RemoteLoggingHelper.java @@ -86,11 +86,14 @@ public static RemoteLoggingHelper create(String projectId, InputStream keyStream * credentials. */ public static RemoteLoggingHelper create() throws LoggingHelperException { + System.out.println("hahahaha"); GrpcTransportOptions transportOptions = LoggingOptions.getDefaultGrpcTransportOptions(); LoggingOptions loggingOptions = LoggingOptions.newBuilder() .setRetrySettings(retrySettings()) .setTransportOptions(transportOptions) .build(); + System.out.println("projectId: " + loggingOptions.getProjectId()); + System.out.println("credential: " + loggingOptions.getCredentials()); return new RemoteLoggingHelper(loggingOptions); } From a7ab044ab247cc70754dec6cbbc6675a625dba97 Mon Sep 17 00:00:00 2001 From: Hanzhen Yi Date: Tue, 4 Sep 2018 13:18:36 -0700 Subject: [PATCH 2/5] wip --- .../test/java/com/google/cloud/logging/BaseSystemTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java index a9d32b518122..110cd71544a6 100644 --- a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java +++ b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java @@ -312,9 +312,9 @@ public void testLoggingHandler() throws InterruptedException { assertEquals(logId, entry.getLogName()); assertEquals(ImmutableMap.of("levelName", "INFO", "levelValue", String.valueOf(Level.INFO.intValue())), entry.getLabels()); - assertEquals("global", entry.getResource().getType()); - assertEquals(ImmutableMap.of("project_id", options.getProjectId()), - entry.getResource().getLabels()); + //assertEquals("global", entry.getResource().getType()); + //assertEquals(ImmutableMap.of("project_id", options.getProjectId()), + // entry.getResource().getLabels()); assertNull(entry.getHttpRequest()); assertEquals(Severity.INFO, entry.getSeverity()); assertNull(entry.getOperation()); From e766906604df859e7d41f1ba35a7b39f8afaace9 Mon Sep 17 00:00:00 2001 From: Hanzhen Yi Date: Tue, 4 Sep 2018 13:41:19 -0700 Subject: [PATCH 3/5] fix logging it --- .../cloud/logging/testing/RemoteLoggingHelper.java | 3 --- .../com/google/cloud/logging/BaseSystemTest.java | 13 ++++++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/testing/RemoteLoggingHelper.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/testing/RemoteLoggingHelper.java index f451332f5e59..85b1703e3fff 100644 --- a/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/testing/RemoteLoggingHelper.java +++ b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/testing/RemoteLoggingHelper.java @@ -86,14 +86,11 @@ public static RemoteLoggingHelper create(String projectId, InputStream keyStream * credentials. */ public static RemoteLoggingHelper create() throws LoggingHelperException { - System.out.println("hahahaha"); GrpcTransportOptions transportOptions = LoggingOptions.getDefaultGrpcTransportOptions(); LoggingOptions loggingOptions = LoggingOptions.newBuilder() .setRetrySettings(retrySettings()) .setTransportOptions(transportOptions) .build(); - System.out.println("projectId: " + loggingOptions.getProjectId()); - System.out.println("credential: " + loggingOptions.getCredentials()); return new RemoteLoggingHelper(loggingOptions); } diff --git a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java index 110cd71544a6..5388d1b5d753 100644 --- a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java +++ b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java @@ -16,6 +16,7 @@ package com.google.cloud.logging; +import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -36,12 +37,11 @@ import com.google.common.collect.Iterators; import com.google.common.collect.Sets; import com.google.logging.v2.LogName; +import com.google.logging.v2.ProjectLogName; import java.util.Iterator; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; - -import com.google.logging.v2.ProjectLogName; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -312,9 +312,12 @@ public void testLoggingHandler() throws InterruptedException { assertEquals(logId, entry.getLogName()); assertEquals(ImmutableMap.of("levelName", "INFO", "levelValue", String.valueOf(Level.INFO.intValue())), entry.getLabels()); - //assertEquals("global", entry.getResource().getType()); - //assertEquals(ImmutableMap.of("project_id", options.getProjectId()), - // entry.getResource().getLabels()); + MonitoredResource monitoredResource = + new LoggingConfig(handler.getClass().getName()) + .getMonitoredResource(options.getProjectId()); + assertEquals(monitoredResource.getType(), entry.getResource().getType()); + assertThat(entry.getResource().getLabels()).containsEntry("project_id", options.getProjectId()); + assertNull(entry.getHttpRequest()); assertEquals(Severity.INFO, entry.getSeverity()); assertNull(entry.getOperation()); From bad12d3d931c0bd51fb72cd228609e54e4d4ef20 Mon Sep 17 00:00:00 2001 From: Hanzhen Yi Date: Tue, 4 Sep 2018 13:50:54 -0700 Subject: [PATCH 4/5] format --- .../src/test/java/com/google/cloud/logging/BaseSystemTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java index 5388d1b5d753..9c1578401ed9 100644 --- a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java +++ b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java @@ -315,9 +315,8 @@ public void testLoggingHandler() throws InterruptedException { MonitoredResource monitoredResource = new LoggingConfig(handler.getClass().getName()) .getMonitoredResource(options.getProjectId()); - assertEquals(monitoredResource.getType(), entry.getResource().getType()); + assertThat(entry.getResource().getType()).isEqualTo(monitoredResource.getType()); assertThat(entry.getResource().getLabels()).containsEntry("project_id", options.getProjectId()); - assertNull(entry.getHttpRequest()); assertEquals(Severity.INFO, entry.getSeverity()); assertNull(entry.getOperation()); From aa4d3f261ecf12891d5824bb7af691d19dcf543e Mon Sep 17 00:00:00 2001 From: Hanzhen Yi Date: Wed, 5 Sep 2018 11:53:02 -0700 Subject: [PATCH 5/5] change the unit test to use truth --- .../google/cloud/logging/BaseSystemTest.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java index 9c1578401ed9..8c2507c76525 100644 --- a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java +++ b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java @@ -305,24 +305,24 @@ public void testLoggingHandler() throws InterruptedException { iterator = logging().listLogEntries(EntryListOption.filter(filter)).iterateAll().iterator(); } - assertTrue(iterator.hasNext()); + assertThat(iterator.hasNext()).isTrue(); LogEntry entry = iterator.next(); - assertTrue(entry.getPayload() instanceof StringPayload); - assertTrue(entry.getPayload().getData().contains("Message")); - assertEquals(logId, entry.getLogName()); - assertEquals(ImmutableMap.of("levelName", "INFO", - "levelValue", String.valueOf(Level.INFO.intValue())), entry.getLabels()); + assertThat(entry.getPayload() instanceof StringPayload).isTrue(); + assertThat(entry.getPayload().getData()).contains("Message"); + assertThat(entry.getLogName()).isEqualTo(logId); + assertThat(entry.getLabels()) + .containsExactly("levelName", "INFO", "levelValue", String.valueOf(Level.INFO.intValue())); MonitoredResource monitoredResource = new LoggingConfig(handler.getClass().getName()) .getMonitoredResource(options.getProjectId()); assertThat(entry.getResource().getType()).isEqualTo(monitoredResource.getType()); assertThat(entry.getResource().getLabels()).containsEntry("project_id", options.getProjectId()); - assertNull(entry.getHttpRequest()); - assertEquals(Severity.INFO, entry.getSeverity()); - assertNull(entry.getOperation()); - assertNotNull(entry.getInsertId()); - assertNotNull(entry.getTimestamp()); - assertFalse(iterator.hasNext()); + assertThat(entry.getHttpRequest()).isNull(); + assertThat(entry.getSeverity()).isEqualTo(Severity.INFO); + assertThat(entry.getOperation()).isNull(); + assertThat(entry.getInsertId()).isNotNull(); + assertThat(entry.getTimestamp()).isNotNull(); + assertThat(iterator.hasNext()).isFalse(); logger.removeHandler(handler); logging().deleteLog(logId); }