Preparing Easymock for a future upgrade. (#5510)

sduskis · web-flow · commit 9debbd8d4400 · 2019-06-18T13:03:04.000-04:00
* Upgrading Easymock.

* Reverting the upgrade of easymock, but keeping code changes.
diff --git a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryOptionsTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryOptionsTest.java
@@ -28,6 +28,7 @@ public class BigQueryOptionsTest {
   @Test
   public void testInvalidTransport() {
     thrown.expect(IllegalArgumentException.class);
-    BigQueryOptions.newBuilder().setTransportOptions(EasyMock.createMock(TransportOptions.class));
+    BigQueryOptions.newBuilder()
+        .setTransportOptions(EasyMock.<TransportOptions>createMock(TransportOptions.class));
   }
 }
diff --git a/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ComputeOptionsTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ComputeOptionsTest.java
@@ -29,6 +29,7 @@ public class ComputeOptionsTest {
   @Test
   public void testInvalidTransport() {
     thrown.expect(IllegalArgumentException.class);
-    ComputeOptions.newBuilder().setTransportOptions(EasyMock.createMock(TransportOptions.class));
+    ComputeOptions.newBuilder()
+        .setTransportOptions(EasyMock.<TransportOptions>createMock(TransportOptions.class));
   }
 }
diff --git a/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java
@@ -89,6 +89,7 @@ public void testToBuilder() throws Exception {
   @Test
   public void testInvalidTransport() {
     thrown.expect(IllegalArgumentException.class);
-    DatastoreOptions.newBuilder().setTransportOptions(EasyMock.createMock(TransportOptions.class));
+    DatastoreOptions.newBuilder()
+        .setTransportOptions(EasyMock.<TransportOptions>createMock(TransportOptions.class));
   }
 }
diff --git a/google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsOptionsTest.java b/google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsOptionsTest.java
@@ -29,6 +29,7 @@ public class DnsOptionsTest {
   @Test
   public void testInvalidTransport() {
     thrown.expect(IllegalArgumentException.class);
-    DnsOptions.newBuilder().setTransportOptions(EasyMock.createMock(TransportOptions.class));
+    DnsOptions.newBuilder()
+        .setTransportOptions(EasyMock.<TransportOptions>createMock(TransportOptions.class));
   }
 }
diff --git a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingOptionsTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingOptionsTest.java
@@ -29,6 +29,7 @@ public class LoggingOptionsTest {
   @Test
   public void testInvalidTransport() {
     thrown.expect(IllegalArgumentException.class);
-    LoggingOptions.newBuilder().setTransportOptions(EasyMock.createMock(TransportOptions.class));
+    LoggingOptions.newBuilder()
+        .setTransportOptions(EasyMock.<TransportOptions>createMock(TransportOptions.class));
   }
 }
diff --git a/google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerOptionsTest.java b/google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerOptionsTest.java
@@ -30,6 +30,6 @@ public class ResourceManagerOptionsTest {
   public void testInvalidTransport() {
     thrown.expect(IllegalArgumentException.class);
     ResourceManagerOptions.newBuilder()
-        .setTransportOptions(EasyMock.createMock(TransportOptions.class));
+        .setTransportOptions(EasyMock.<TransportOptions>createMock(TransportOptions.class));
   }
 }
diff --git a/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageOptionsTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageOptionsTest.java
@@ -29,6 +29,7 @@ public class StorageOptionsTest {
   @Test
   public void testInvalidTransport() {
     thrown.expect(IllegalArgumentException.class);
-    StorageOptions.newBuilder().setTransportOptions(EasyMock.createMock(TransportOptions.class));
+    StorageOptions.newBuilder()
+        .setTransportOptions(EasyMock.<TransportOptions>createMock(TransportOptions.class));
   }
 }
diff --git a/google-cloud-clients/google-cloud-translate/src/test/java/com/google/cloud/translate/TranslateOptionsTest.java b/google-cloud-clients/google-cloud-translate/src/test/java/com/google/cloud/translate/TranslateOptionsTest.java
@@ -29,6 +29,7 @@ public class TranslateOptionsTest {
   @Test
   public void testInvalidTransport() {
     thrown.expect(IllegalArgumentException.class);
-    TranslateOptions.newBuilder().setTransportOptions(EasyMock.createMock(TransportOptions.class));
+    TranslateOptions.newBuilder()
+        .setTransportOptions(EasyMock.<TransportOptions>createMock(TransportOptions.class));
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ public class BigQueryOptionsTest {`
`28`	`28`	`@Test`
`29`	`29`	`public void testInvalidTransport() {`
`30`	`30`	`thrown.expect(IllegalArgumentException.class);`
`31`		`- BigQueryOptions.newBuilder().setTransportOptions(EasyMock.createMock(TransportOptions.class));`
	`31`	`+ BigQueryOptions.newBuilder()`
	`32`	`+ .setTransportOptions(EasyMock.<TransportOptions>createMock(TransportOptions.class));`
`32`	`33`	`}`
`33`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ public class ComputeOptionsTest {`
`29`	`29`	`@Test`
`30`	`30`	`public void testInvalidTransport() {`
`31`	`31`	`thrown.expect(IllegalArgumentException.class);`
`32`		`- ComputeOptions.newBuilder().setTransportOptions(EasyMock.createMock(TransportOptions.class));`
	`32`	`+ ComputeOptions.newBuilder()`
	`33`	`+ .setTransportOptions(EasyMock.<TransportOptions>createMock(TransportOptions.class));`
`33`	`34`	`}`
`34`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,7 @@ public void testToBuilder() throws Exception {`
`89`	`89`	`@Test`
`90`	`90`	`public void testInvalidTransport() {`
`91`	`91`	`thrown.expect(IllegalArgumentException.class);`
`92`		`- DatastoreOptions.newBuilder().setTransportOptions(EasyMock.createMock(TransportOptions.class));`
	`92`	`+ DatastoreOptions.newBuilder()`
	`93`	`+ .setTransportOptions(EasyMock.<TransportOptions>createMock(TransportOptions.class));`
`93`	`94`	`}`
`94`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ public class DnsOptionsTest {`
`29`	`29`	`@Test`
`30`	`30`	`public void testInvalidTransport() {`
`31`	`31`	`thrown.expect(IllegalArgumentException.class);`
`32`		`- DnsOptions.newBuilder().setTransportOptions(EasyMock.createMock(TransportOptions.class));`
	`32`	`+ DnsOptions.newBuilder()`
	`33`	`+ .setTransportOptions(EasyMock.<TransportOptions>createMock(TransportOptions.class));`
`33`	`34`	`}`
`34`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ public class LoggingOptionsTest {`
`29`	`29`	`@Test`
`30`	`30`	`public void testInvalidTransport() {`
`31`	`31`	`thrown.expect(IllegalArgumentException.class);`
`32`		`- LoggingOptions.newBuilder().setTransportOptions(EasyMock.createMock(TransportOptions.class));`
	`32`	`+ LoggingOptions.newBuilder()`
	`33`	`+ .setTransportOptions(EasyMock.<TransportOptions>createMock(TransportOptions.class));`
`33`	`34`	`}`
`34`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,6 @@ public class ResourceManagerOptionsTest {`
`30`	`30`	`public void testInvalidTransport() {`
`31`	`31`	`thrown.expect(IllegalArgumentException.class);`
`32`	`32`	`ResourceManagerOptions.newBuilder()`
`33`		`- .setTransportOptions(EasyMock.createMock(TransportOptions.class));`
	`33`	`+ .setTransportOptions(EasyMock.<TransportOptions>createMock(TransportOptions.class));`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ public class StorageOptionsTest {`
`29`	`29`	`@Test`
`30`	`30`	`public void testInvalidTransport() {`
`31`	`31`	`thrown.expect(IllegalArgumentException.class);`
`32`		`- StorageOptions.newBuilder().setTransportOptions(EasyMock.createMock(TransportOptions.class));`
	`32`	`+ StorageOptions.newBuilder()`
	`33`	`+ .setTransportOptions(EasyMock.<TransportOptions>createMock(TransportOptions.class));`
`33`	`34`	`}`
`34`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ public class TranslateOptionsTest {`
`29`	`29`	`@Test`
`30`	`30`	`public void testInvalidTransport() {`
`31`	`31`	`thrown.expect(IllegalArgumentException.class);`
`32`		`- TranslateOptions.newBuilder().setTransportOptions(EasyMock.createMock(TransportOptions.class));`
	`32`	`+ TranslateOptions.newBuilder()`
	`33`	`+ .setTransportOptions(EasyMock.<TransportOptions>createMock(TransportOptions.class));`
`33`	`34`	`}`
`34`	`35`	`}`