diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java index a09e188fef2f..523d801f8f18 100644 --- a/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java +++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java @@ -113,33 +113,6 @@ public void testCreateGetUpdateAndDeleteSink() { assertFalse(sink.delete()); } - @Test - public void testCreateGetUpdateAndDeleteSinkAsync() - throws ExecutionException, InterruptedException { - String name = formatForTest("test-create-get-update-sink-async"); - SinkInfo sinkInfo = SinkInfo.newBuilder(name, DatasetDestination.of("dataset")) - .setFilter("severity>=ERROR") - .setVersionFormat(SinkInfo.VersionFormat.V2) - .build(); - Sink sink = logging().createAsync(sinkInfo).get(); - assertEquals(name, sink.getName()); - assertEquals(SinkInfo.VersionFormat.V2, sink.getVersionFormat()); - assertEquals("severity>=ERROR", sink.getFilter()); - DatasetDestination datasetDestination = sink.getDestination(); - assertEquals(logging().getOptions().getProjectId(), datasetDestination.getProject()); - assertEquals("dataset", datasetDestination.getDataset()); - assertEquals(sink, logging().getSinkAsync(name).get()); - sink = sink.toBuilder() - .setFilter("severity<=ERROR") - .build() - .updateAsync().get(); - assertEquals(name, sink.getName()); - assertEquals(SinkInfo.VersionFormat.V2, sink.getVersionFormat()); - assertEquals("severity<=ERROR", sink.getFilter()); - assertTrue(sink.deleteAsync().get()); - assertFalse(sink.deleteAsync().get()); - } - @Test public void testUpdateNonExistingSink() { String name = formatForTest("test-update-non-existing-sink"); @@ -153,19 +126,6 @@ public void testUpdateNonExistingSink() { logging().update(sinkInfo); } - @Test - public void testUpdateNonExistingSinkAsync() throws ExecutionException, InterruptedException { - String name = formatForTest("test-update-non-existing-sink-async"); - SinkInfo sinkInfo = SinkInfo.newBuilder(name, DatasetDestination.of("dataset")) - .setFilter("severity>=ERROR") - .setVersionFormat(SinkInfo.VersionFormat.V2) - .build(); - assertNull(logging().getSinkAsync(name).get()); - thrown.expect(ExecutionException.class); - thrown.expectMessage("NOT_FOUND"); - logging().updateAsync(sinkInfo).get(); - } - @Test public void testListSinks() throws InterruptedException { String firstName = formatForTest("test-list-sinks-1"); @@ -183,23 +143,6 @@ public void testListSinks() throws InterruptedException { secondSink.delete(); } - @Test - public void testListSinksAsync() throws ExecutionException, InterruptedException { - String firstName = formatForTest("test-list-sinks-async-1"); - String secondName = formatForTest("test-list-sinks-async-2"); - Sink firstSink = logging().create(SinkInfo.of(firstName, DatasetDestination.of("dataset"))); - Sink secondSink = logging().create(SinkInfo.of(secondName, DatasetDestination.of("dataset"))); - Logging.ListOption[] options = {Logging.ListOption.pageSize(1)}; - AsyncPage sinkPage = logging().listSinksAsync(options).get(); - Set sinks = Sets.newHashSet(sinkPage.iterateAll()); - while (!sinks.contains(firstSink) || !sinks.contains(secondSink)) { - Thread.sleep(500); - sinks = Sets.newHashSet(logging().listSinksAsync(options).get().iterateAll()); - } - firstSink.delete(); - secondSink.delete(); - } - @Test public void testListMonitoredResourceDescriptors() { Iterator iterator = @@ -212,19 +155,6 @@ public void testListMonitoredResourceDescriptors() { assertTrue(count > 0); } - @Test - public void testListMonitoredResourceDescriptorsAsync() - throws ExecutionException, InterruptedException { - Iterator iterator = logging() - .listMonitoredResourceDescriptorsAsync(Logging.ListOption.pageSize(1)).get().iterateAll().iterator(); - int count = 0; - while (iterator.hasNext()) { - assertNotNull(iterator.next().getType()); - count += 1; - } - assertTrue(count > 0); - } - @Test public void testCreateGetUpdateAndDeleteMetric() { String name = formatForTest("test-create-get-update-metric"); @@ -248,30 +178,6 @@ public void testCreateGetUpdateAndDeleteMetric() { assertFalse(metric.delete()); } - @Test - public void testCreateGetUpdateAndDeleteMetricAsync() - throws ExecutionException, InterruptedException { - String name = formatForTest("test-create-get-update-metric-async"); - MetricInfo metricInfo = MetricInfo.newBuilder(name, "severity>=ERROR") - .setDescription("description") - .build(); - Metric metric = logging().createAsync(metricInfo).get(); - assertEquals(name, metric.getName()); - assertEquals("severity>=ERROR", metric.getFilter()); - assertEquals("description", metric.getDescription()); - assertEquals(metric, logging().getMetricAsync(name).get()); - metric = metric.toBuilder() - .setDescription("newDescription") - .setFilter("severity>=WARNING") - .build() - .updateAsync().get(); - assertEquals(name, metric.getName()); - assertEquals("severity>=WARNING", metric.getFilter()); - assertEquals("newDescription", metric.getDescription()); - assertTrue(metric.deleteAsync().get()); - assertFalse(metric.deleteAsync().get()); - } - @Test public void testUpdateNonExistingMetric() { String name = formatForTest("test-update-non-existing-metric"); @@ -286,20 +192,6 @@ public void testUpdateNonExistingMetric() { assertTrue(metric.delete()); } - @Test - public void testUpdateNonExistingMetricAsync() throws ExecutionException, InterruptedException { - String name = formatForTest("test-update-non-existing-metric-async"); - MetricInfo metricInfo = MetricInfo.newBuilder(name, "severity>=ERROR") - .setDescription("description") - .build(); - assertNull(logging().getMetricAsync(name).get()); - Metric metric = logging().updateAsync(metricInfo).get(); - assertEquals(name, metric.getName()); - assertEquals("severity>=ERROR", metric.getFilter()); - assertEquals("description", metric.getDescription()); - assertTrue(metric.deleteAsync().get()); - } - @Test public void testListMetrics() throws InterruptedException { String firstName = formatForTest("test-list-metrics-1"); @@ -317,23 +209,6 @@ public void testListMetrics() throws InterruptedException { secondMetric.delete(); } - @Test - public void testListMetricsAsync() throws ExecutionException, InterruptedException { - String firstName = formatForTest("test-list-metrics-async-1"); - String secondName = formatForTest("test-list-metrics-async-2"); - Metric firstMetric = logging().create(MetricInfo.of(firstName, "severity>=ERROR")); - Metric secondMetric = logging().create(MetricInfo.of(secondName, "severity>=ERROR")); - Logging.ListOption[] options = {Logging.ListOption.pageSize(1)}; - AsyncPage metricPage = logging().listMetricsAsync(options).get(); - Set metrics = Sets.newHashSet(metricPage.iterateAll()); - while (!metrics.contains(firstMetric) || !metrics.contains(secondMetric)) { - Thread.sleep(500); - metrics = Sets.newHashSet(logging().listMetricsAsync(options).get().iterateAll()); - } - firstMetric.delete(); - secondMetric.delete(); - } - @Test public void testWriteAndListLogEntries() throws InterruptedException { String logId = formatForTest("test-write-log-entries-log"); @@ -401,66 +276,12 @@ public void testWriteAndListLogEntries() throws InterruptedException { assertTrue(logging().deleteLog(logId)); } - @Test - public void testWriteAndListLogEntriesAsync() throws InterruptedException, ExecutionException { - String logId = formatForTest("test-write-log-entries-async-log"); - LoggingOptions loggingOptions = logging().getOptions(); - LogName logName = LogName.of(loggingOptions.getProjectId(), logId); - StringPayload firstPayload = StringPayload.of("stringPayload"); - LogEntry firstEntry = LogEntry.newBuilder(firstPayload).setSeverity(Severity.ALERT).build(); - ProtoPayload secondPayload = - ProtoPayload.of(Any.pack(StringValue.newBuilder().setValue("protoPayload").build())); - LogEntry secondEntry = LogEntry.newBuilder(secondPayload).setSeverity(Severity.DEBUG).build(); - logging().write(ImmutableList.of(firstEntry, secondEntry), - WriteOption.labels(ImmutableMap.of("key1", "value1")), - WriteOption.resource(MonitoredResource.newBuilder("global").build()), - WriteOption.logName(logId)); - logging().flush(); - String filter = createEqualityFilter("logName", logName); - EntryListOption[] options = {EntryListOption.filter(filter), EntryListOption.pageSize(1)}; - AsyncPage page = logging().listLogEntriesAsync(options).get(); - while (Iterators.size(page.iterateAll().iterator()) < 2) { - Thread.sleep(500); - page = logging().listLogEntriesAsync(options).get(); - } - Iterator iterator = page.iterateAll().iterator(); - assertTrue(iterator.hasNext()); - LogEntry entry = iterator.next(); - assertEquals(firstPayload, entry.getPayload()); - assertEquals(logId, entry.getLogName()); - assertEquals(ImmutableMap.of("key1", "value1"), entry.getLabels()); - assertEquals("global", entry.getResource().getType()); - assertNull(entry.getHttpRequest()); - assertEquals(Severity.ALERT, entry.getSeverity()); - assertNull(entry.getOperation()); - assertNotNull(entry.getInsertId()); - assertNotNull(entry.getTimestamp()); - assertTrue(iterator.hasNext()); - entry = iterator.next(); - assertEquals(secondPayload, entry.getPayload()); - assertEquals(logId, entry.getLogName()); - assertEquals(ImmutableMap.of("key1", "value1"), entry.getLabels()); - assertEquals("global", entry.getResource().getType()); - assertNull(entry.getOperation()); - assertEquals(Severity.DEBUG, entry.getSeverity()); - assertNull(entry.getHttpRequest()); - assertNotNull(entry.getInsertId()); - assertNotNull(entry.getTimestamp()); - assertTrue(logging().deleteLogAsync(logId).get()); - } - @Test public void testDeleteNonExistingLog() { String logId = formatForTest("test-delete-non-existing-log"); assertFalse(logging().deleteLog(logId)); } - @Test - public void testDeleteNonExistingLogAsync() throws ExecutionException, InterruptedException { - String logId = formatForTest("test-delete-non-existing-log-async"); - assertFalse(logging().deleteLogAsync(logId).get()); - } - @Test public void testLoggingHandler() throws InterruptedException { String logId = formatForTest("test-logging-handler");