Fix deleteSink: return false on NOT_FOUND, add tests

mziccard · mziccard · commit 945894c6737b · 2016-09-01T14:23:42.000+02:00
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/DefaultLoggingRpc.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/DefaultLoggingRpc.java
@@ -184,7 +184,8 @@ public Future<ListSinksResponse> list(ListSinksRequest request) {
 
   @Override
   public Future<Empty> delete(DeleteSinkRequest request) {
-    return translate(configApi.deleteSinkCallable().futureCall(request), true);
+    return translate(configApi.deleteSinkCallable().futureCall(request), true,
+        Code.NOT_FOUND.value());
   }
 
   @Override
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
@@ -111,6 +111,7 @@ public void testCreateGetUpdateAndDeleteSink() {
     assertEquals(SinkInfo.VersionFormat.V2, sink.versionFormat());
     assertEquals("severity<=ERROR", sink.filter());
     assertTrue(sink.delete());
+    assertFalse(sink.delete());
   }
 
   @Test
@@ -137,6 +138,7 @@ public void testCreateGetUpdateAndDeleteSinkAsync()
     assertEquals(SinkInfo.VersionFormat.V2, sink.versionFormat());
     assertEquals("severity<=ERROR", sink.filter());
     assertTrue(sink.deleteAsync().get());
+    assertFalse(sink.deleteAsync().get());
   }
 
   @Test
@@ -255,6 +257,7 @@ public void testCreateGetUpdateAndDeleteMetric() {
     assertEquals("severity>=WARNING", metric.filter());
     assertEquals("newDescription", metric.description());
     assertTrue(metric.delete());
+    assertFalse(metric.delete());
   }
 
   @Test
@@ -277,6 +280,7 @@ public void testCreateGetUpdateAndDeleteMetricAsync()
     assertEquals("severity>=WARNING", metric.filter());
     assertEquals("newDescription", metric.description());
     assertTrue(metric.deleteAsync().get());
+    assertFalse(metric.deleteAsync().get());
   }
 
   @Test
@@ -398,7 +402,8 @@ public void testWriteAndListLogEntries() throws InterruptedException {
     while (iterator.hasNext()) {
       assertTrue(iterator.next().timestamp() <= lastTimestamp);
     }
-    logging().deleteLog(logName);
+    assertTrue(logging().deleteLog(logName));
+    assertFalse(logging().deleteLog(logName));
   }
 
   @Test
@@ -443,7 +448,8 @@ public void testWriteAndListLogEntriesAsync() throws InterruptedException, Execu
     assertNull(entry.httpRequest());
     assertNotNull(entry.insertId());
     assertNotNull(entry.timestamp());
-    logging().deleteLogAsync(logName).get();
+    assertTrue(logging().deleteLogAsync(logName).get());
+    assertFalse(logging().deleteLogAsync(logName).get());
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,8 @@ public Future<ListSinksResponse> list(ListSinksRequest request) {`
`184`	`184`
`185`	`185`	`@Override`
`186`	`186`	`public Future<Empty> delete(DeleteSinkRequest request) {`
`187`		`- return translate(configApi.deleteSinkCallable().futureCall(request), true);`
	`187`	`+ return translate(configApi.deleteSinkCallable().futureCall(request), true,`
	`188`	`+ Code.NOT_FOUND.value());`
`188`	`189`	`}`
`189`	`190`
`190`	`191`	`@Override`