Make exception constructors package scoped, better test coverage

googleapis · Apr 20, 2016 · 4b8f3ea · 4b8f3ea
1 parent 7847bea
commit 4b8f3ea
Show file tree

Hide file tree

Showing 9 changed files with 123 additions and 29 deletions.
diff --git a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryException.java b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryException.java
@@ -47,12 +47,12 @@ public BigQueryException(int code, String message) {
     this(code, message, (Throwable) null);
   }
 
-  private BigQueryException(int code, String message, Throwable cause) {
+  BigQueryException(int code, String message, Throwable cause) {
     super(code, message, null, true, cause);
     this.error = null;
   }
 
-  public BigQueryException(int code, String message, BigQueryError error) {
+  BigQueryException(int code, String message, BigQueryError error) {
     super(code, message, error != null ? error.reason() : null, true);
     this.error = error;
   }

diff --git a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryExceptionTest.java b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryExceptionTest.java
@@ -23,6 +23,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 import com.google.cloud.BaseServiceException;
@@ -86,13 +87,24 @@ public void testBigqueryException() {
     assertTrue(exception.retryable());
     assertTrue(exception.idempotent());
 
-    IOException cause = new SocketTimeoutException();
+    IOException cause = new SocketTimeoutException("socketTimeoutMessage");
     exception = new BigQueryException(cause);
+    assertEquals(BigQueryException.UNKNOWN_CODE, exception.code());
     assertNull(exception.reason());
-    assertNull(exception.getMessage());
+    assertEquals("socketTimeoutMessage", exception.getMessage());
+    assertEquals(cause, exception.getCause());
     assertTrue(exception.retryable());
     assertTrue(exception.idempotent());
-    assertEquals(cause, exception.getCause());
+    assertSame(cause, exception.getCause());
+
+    exception = new BigQueryException(504, "message", cause);
+    assertEquals(504, exception.code());
+    assertEquals("message", exception.getMessage());
+    assertNull(exception.reason());
+    assertNull(exception.error());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+    assertSame(cause, exception.getCause());
   }
 
   @Test
@@ -123,7 +135,7 @@ public void testTranslateAndThrow() throws Exception {
       assertEquals("message", ex.getMessage());
       assertFalse(ex.retryable());
       assertTrue(ex.idempotent());
-      assertEquals(cause, ex.getCause());
+      assertSame(cause, ex.getCause());
     } finally {
       verify(exceptionMock);
     }

diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java
@@ -37,7 +37,7 @@ public class DatastoreException extends BaseServiceException {
       new Error(10, "ABORTED"), new Error(4, "DEADLINE_EXCEEDED"), new Error(14, "UNAVAILABLE"));
   private static final long serialVersionUID = 2663750991205874435L;
 
-  public DatastoreException(int code, String message, String reason) {
+  DatastoreException(int code, String message, String reason) {
     this(code, message, reason, null);
   }
 

diff --git a/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java b/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java
@@ -23,6 +23,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -66,12 +67,23 @@ public void testDatastoreException() throws Exception {
     assertFalse(exception.retryable());
     assertTrue(exception.idempotent());
 
-    IOException cause = new SocketTimeoutException();
+    IOException cause = new SocketTimeoutException("socketTimeoutMessage");
     exception = new DatastoreException(cause);
+    assertEquals(DatastoreException.UNKNOWN_CODE, exception.code());
     assertNull(exception.reason());
-    assertNull(exception.getMessage());
+    assertEquals("socketTimeoutMessage", exception.getMessage());
+    assertEquals(cause, exception.getCause());
     assertTrue(exception.retryable());
     assertTrue(exception.idempotent());
+    assertSame(cause, exception.getCause());
+
+    exception = new DatastoreException(2, "message", "INTERNAL", cause);
+    assertEquals(2, exception.code());
+    assertEquals("INTERNAL", exception.reason());
+    assertEquals("message", exception.getMessage());
+    assertFalse(exception.retryable());
+    assertTrue(exception.idempotent());
+    assertSame(cause, exception.getCause());
   }
 
   @Test
@@ -103,7 +115,7 @@ public void testTranslateAndThrow() throws Exception {
       assertEquals("message", ex.getMessage());
       assertFalse(ex.retryable());
       assertTrue(ex.idempotent());
-      assertEquals(cause, ex.getCause());
+      assertSame(cause, ex.getCause());
     } finally {
       verify(exceptionMock);
     }

diff --git a/gcloud-java-dns/src/test/java/com/google/cloud/dns/DnsExceptionTest.java b/gcloud-java-dns/src/test/java/com/google/cloud/dns/DnsExceptionTest.java
@@ -16,35 +16,87 @@
 
 package com.google.cloud.dns;
 
-import com.google.cloud.BaseServiceException;
-import com.google.cloud.RetryHelper.RetryHelperException;
-
-import org.junit.Test;
-
-import java.io.IOException;
-import java.net.SocketTimeoutException;
-
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
+import com.google.api.client.googleapis.json.GoogleJsonError;
+import com.google.cloud.BaseServiceException;
+import com.google.cloud.RetryHelper.RetryHelperException;
+
+import org.junit.Test;
+
+import java.io.IOException;
+import java.net.SocketTimeoutException;
+
 public class DnsExceptionTest {
 
   @Test
   public void testDnsException() throws Exception {
-    IOException cause = new SocketTimeoutException("message");
-    DnsException exception = new DnsException(cause, true);
-    assertEquals(DnsException.UNKNOWN_CODE, exception.code());
+    IOException cause = new SocketTimeoutException("socketTimeoutMessage");
+    DnsException exception = new DnsException(500, "message", cause);
+    assertEquals(500, exception.code());
+    assertEquals("message", exception.getMessage());
     assertNull(exception.reason());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+    assertSame(cause, exception.getCause());
+
+    exception = new DnsException(502, "message", cause);
+    assertEquals(502, exception.code());
     assertEquals("message", exception.getMessage());
+    assertNull(exception.reason());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+    assertSame(cause, exception.getCause());
+
+    exception = new DnsException(503, "message", cause);
+    assertEquals(503, exception.code());
+    assertEquals("message", exception.getMessage());
+    assertNull(exception.reason());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+    assertSame(cause, exception.getCause());
+
+    exception = new DnsException(429, "message", cause);
+    assertEquals(429, exception.code());
+    assertEquals("message", exception.getMessage());
+    assertNull(exception.reason());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+    assertSame(cause, exception.getCause());
+
+    exception = new DnsException(404, "message", cause);
+    assertEquals(404, exception.code());
+    assertEquals("message", exception.getMessage());
+    assertNull(exception.reason());
+    assertFalse(exception.retryable());
+    assertTrue(exception.idempotent());
+    assertSame(cause, exception.getCause());
+
+    exception = new DnsException(cause, true);
+    assertEquals(DnsException.UNKNOWN_CODE, exception.code());
+    assertNull(exception.reason());
+    assertEquals("socketTimeoutMessage", exception.getMessage());
     assertEquals(cause, exception.getCause());
     assertTrue(exception.retryable());
     assertTrue(exception.idempotent());
+    assertSame(cause, exception.getCause());
+
+    GoogleJsonError error = new GoogleJsonError();
+    error.setCode(503);
+    error.setMessage("message");
+    exception = new DnsException(error, true);
+    assertEquals(503, exception.code());
+    assertEquals("message", exception.getMessage());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
   }
 
   @Test
@@ -78,7 +130,7 @@ public void testTranslateAndThrow() throws Exception {
       assertEquals("message", ex.getMessage());
       assertFalse(ex.retryable());
       assertTrue(ex.idempotent());
-      assertEquals(cause, ex.getCause());
+      assertSame(cause, ex.getCause());
     } finally {
       verify(exceptionMock);
     }

diff --git a/...ourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerException.java b/...ourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerException.java
@@ -47,11 +47,11 @@ public class ResourceManagerException extends BaseServiceException {
       new Error(403, "variableTermLimitExceeded"));
   private static final long serialVersionUID = -9207194488966554136L;
 
-  public ResourceManagerException(int code, String message) {
+  ResourceManagerException(int code, String message) {
     this(code, message, null);
   }
 
-  private ResourceManagerException(int code, String message, Throwable cause) {
+  ResourceManagerException(int code, String message, Throwable cause) {
     super(code, message, null, true, cause);
   }
 

diff --git a/...emanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerExceptionTest.java b/...emanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerExceptionTest.java
@@ -23,6 +23,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 import com.google.cloud.BaseServiceException;
@@ -71,7 +72,15 @@ public void testResourceManagerException() {
     assertNull(exception.getMessage());
     assertTrue(exception.retryable());
     assertTrue(exception.idempotent());
-    assertEquals(cause, exception.getCause());
+    assertSame(cause, exception.getCause());
+
+    exception = new ResourceManagerException(404, "message", cause);
+    assertEquals(404, exception.code());
+    assertEquals("message", exception.getMessage());
+    assertNull(exception.reason());
+    assertFalse(exception.retryable());
+    assertTrue(exception.idempotent());
+    assertSame(cause, exception.getCause());
   }
 
   @Test
@@ -102,7 +111,7 @@ public void testTranslateAndThrow() throws Exception {
       assertEquals("message", ex.getMessage());
       assertFalse(ex.retryable());
       assertTrue(ex.idempotent());
-      assertEquals(cause, ex.getCause());
+      assertSame(cause, ex.getCause());
     } finally {
       verify(exceptionMock);
     }

diff --git a/gcloud-java-storage/src/main/java/com/google/cloud/storage/StorageException.java b/gcloud-java-storage/src/main/java/com/google/cloud/storage/StorageException.java
@@ -49,7 +49,7 @@ public StorageException(int code, String message) {
     this(code, message, null);
   }
 
-  private StorageException(int code, String message, Throwable cause) {
+  StorageException(int code, String message, Throwable cause) {
     super(code, message, null, true, cause);
   }
 

diff --git a/gcloud-java-storage/src/test/java/com/google/cloud/storage/StorageExceptionTest.java b/gcloud-java-storage/src/test/java/com/google/cloud/storage/StorageExceptionTest.java
@@ -23,6 +23,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 import com.google.api.client.googleapis.json.GoogleJsonError;
@@ -93,7 +94,7 @@ public void testStorageException() {
     assertNull(exception.getMessage());
     assertTrue(exception.retryable());
     assertTrue(exception.idempotent());
-    assertEquals(cause, exception.getCause());
+    assertSame(cause, exception.getCause());
 
     GoogleJsonError error = new GoogleJsonError();
     error.setCode(503);
@@ -103,6 +104,14 @@ public void testStorageException() {
     assertEquals("message", exception.getMessage());
     assertTrue(exception.retryable());
     assertTrue(exception.idempotent());
+
+    exception = new StorageException(400, "message", cause);
+    assertEquals(400, exception.code());
+    assertEquals("message", exception.getMessage());
+    assertNull(exception.reason());
+    assertFalse(exception.retryable());
+    assertTrue(exception.idempotent());
+    assertSame(cause, exception.getCause());
   }
 
   @Test
@@ -133,7 +142,7 @@ public void testTranslateAndThrow() throws Exception {
       assertEquals("message", ex.getMessage());
       assertFalse(ex.retryable());
       assertTrue(ex.idempotent());
-      assertEquals(cause, ex.getCause());
+      assertSame(cause, ex.getCause());
     } finally {
       verify(exceptionMock);
     }