From eba5d4b3ae257812fae2b8945f2c26bb49530254 Mon Sep 17 00:00:00 2001 From: Ajit Thakor Date: Thu, 9 Jan 2020 17:52:01 +0530 Subject: [PATCH 1/2] chore: remove deprecated method --- .../google/cloud/BaseWriteChannelTest.java | 14 ++--- .../google/cloud/ExceptionHandlerTest.java | 22 +++++--- .../com/google/cloud/RetryOptionTest.java | 3 -- .../com/google/cloud/ServiceOptionsTest.java | 13 ++--- .../java/com/google/cloud/StringEnumTest.java | 31 +++++++---- .../java/com/google/cloud/TimestampTest.java | 54 +++++++++++++------ .../com/google/cloud/testing/VersionTest.java | 47 +++++++++++----- 7 files changed, 121 insertions(+), 63 deletions(-) diff --git a/google-cloud-core/src/test/java/com/google/cloud/BaseWriteChannelTest.java b/google-cloud-core/src/test/java/com/google/cloud/BaseWriteChannelTest.java index 3f539e5f64..ab8a648897 100644 --- a/google-cloud-core/src/test/java/com/google/cloud/BaseWriteChannelTest.java +++ b/google-cloud-core/src/test/java/com/google/cloud/BaseWriteChannelTest.java @@ -21,6 +21,7 @@ import static junit.framework.TestCase.assertTrue; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import com.google.cloud.spi.ServiceRpcFactory; @@ -30,10 +31,9 @@ import java.nio.channels.ClosedChannelException; import java.util.Arrays; import java.util.Random; +import org.junit.Assert; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; public class BaseWriteChannelTest { @@ -60,8 +60,6 @@ protected CustomServiceOptions( private static final Random RANDOM = new Random(); private static BaseWriteChannel channel; - @Rule public ExpectedException thrown = ExpectedException.none(); - @Before public void setUp() { channel = @@ -103,8 +101,12 @@ public void testClose() throws IOException { @Test public void testValidateOpen() throws IOException { channel.close(); - thrown.expect(ClosedChannelException.class); - channel.write(ByteBuffer.allocate(42)); + try { + channel.write(ByteBuffer.allocate(42)); + Assert.fail(); + } catch (ClosedChannelException ex) { + assertNotNull(ex); + } } @Test diff --git a/google-cloud-core/src/test/java/com/google/cloud/ExceptionHandlerTest.java b/google-cloud-core/src/test/java/com/google/cloud/ExceptionHandlerTest.java index 96687cac33..35026f0deb 100644 --- a/google-cloud-core/src/test/java/com/google/cloud/ExceptionHandlerTest.java +++ b/google-cloud-core/src/test/java/com/google/cloud/ExceptionHandlerTest.java @@ -17,6 +17,7 @@ package com.google.cloud; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -27,15 +28,12 @@ import java.nio.channels.ClosedByInterruptException; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Rule; +import org.junit.Assert; import org.junit.Test; -import org.junit.rules.ExpectedException; /** Tests for {@link ExceptionHandler}. */ public class ExceptionHandlerTest { - @Rule public ExpectedException thrown = ExpectedException.none(); - @Test public void testVerifyCaller() { class A implements Callable { @@ -188,8 +186,12 @@ public RetryResult afterEval(Exception exception, RetryResult retryResult) { }; ExceptionHandler handler = ExceptionHandler.newBuilder().addInterceptors(interceptor).build(); - thrown.expect(NullPointerException.class); - handler.shouldRetry(new Exception(), null); + try { + handler.shouldRetry(new Exception(), null); + Assert.fail(); + } catch (NullPointerException ex) { + assertNull(ex.getMessage()); + } } @Test @@ -210,7 +212,11 @@ public RetryResult afterEval(Exception exception, RetryResult retryResult) { }; ExceptionHandler handler = ExceptionHandler.newBuilder().addInterceptors(interceptor).build(); - thrown.expect(NullPointerException.class); - handler.shouldRetry(new Exception(), null); + try { + handler.shouldRetry(new Exception(), null); + Assert.fail(); + } catch (NullPointerException ex) { + assertNull(ex.getMessage()); + } } } diff --git a/google-cloud-core/src/test/java/com/google/cloud/RetryOptionTest.java b/google-cloud-core/src/test/java/com/google/cloud/RetryOptionTest.java index e1c906ca23..ebea89f2fc 100644 --- a/google-cloud-core/src/test/java/com/google/cloud/RetryOptionTest.java +++ b/google-cloud-core/src/test/java/com/google/cloud/RetryOptionTest.java @@ -20,13 +20,10 @@ import static org.junit.Assert.assertNotEquals; import com.google.api.gax.retrying.RetrySettings; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; import org.threeten.bp.Duration; public class RetryOptionTest { - @Rule public ExpectedException thrown = ExpectedException.none(); private static final RetryOption TOTAL_TIMEOUT = RetryOption.totalTimeout(Duration.ofMillis(420L)); diff --git a/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java b/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java index 8f8cab08b3..551970f320 100644 --- a/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java +++ b/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java @@ -48,9 +48,8 @@ import java.util.Map; import java.util.Set; import java.util.regex.Pattern; -import org.junit.Rule; +import org.junit.Assert; import org.junit.Test; -import org.junit.rules.ExpectedException; public class ServiceOptionsTest { private static GoogleCredentials credentials; @@ -185,8 +184,6 @@ static GoogleCredentials loadCredentials(String credentialFile) { private static final String LIBRARY_NAME = "gcloud-java"; private static final Pattern APPLICATION_NAME_PATTERN = Pattern.compile(LIBRARY_NAME + "/.*"); - @Rule public ExpectedException thrown = ExpectedException.none(); - private static class TestClock implements ApiClock { @Override public long nanoTime() { @@ -363,8 +360,12 @@ public void testBuilderNoCredentials() { @Test public void testBuilderNullCredentials() { - thrown.expect(NullPointerException.class); - TestServiceOptions.newBuilder().setCredentials(null).build(); + try { + TestServiceOptions.newBuilder().setCredentials(null).build(); + Assert.fail(); + } catch (NullPointerException ex) { + assertNull(ex.getMessage()); + } } @Test diff --git a/google-cloud-core/src/test/java/com/google/cloud/StringEnumTest.java b/google-cloud-core/src/test/java/com/google/cloud/StringEnumTest.java index 716e124f53..2d87c23c70 100644 --- a/google-cloud-core/src/test/java/com/google/cloud/StringEnumTest.java +++ b/google-cloud-core/src/test/java/com/google/cloud/StringEnumTest.java @@ -16,18 +16,17 @@ package com.google.cloud; import static com.google.common.truth.Truth.assertThat; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import com.google.api.core.ApiFunction; import com.google.common.testing.EqualsTester; import java.util.Arrays; -import org.junit.Rule; +import org.junit.Assert; import org.junit.Test; -import org.junit.rules.ExpectedException; public class StringEnumTest { - @Rule public ExpectedException expectedException = ExpectedException.none(); - public static class Letter extends StringEnumValue { private static final long serialVersionUID = -1717976087182628526L; @@ -67,14 +66,22 @@ public static Letter[] values() { @Test public void testNullClass() { - expectedException.expect(NullPointerException.class); - new StringEnumType(null, Letter.CONSTRUCTOR); + try { + new StringEnumType(null, Letter.CONSTRUCTOR); + Assert.fail(); + } catch (NullPointerException ex) { + assertNull(ex.getMessage()); + } } @Test public void testNullConstructor() { - expectedException.expect(NullPointerException.class); - new StringEnumType(Letter.class, null); + try { + new StringEnumType(Letter.class, null); + Assert.fail(); + } catch (NullPointerException ex) { + assertNull(ex.getMessage()); + } } @Test @@ -110,8 +117,12 @@ public void testEquals() { @Test public void testValueOfStrict_invalid() { - expectedException.expect(IllegalArgumentException.class); - Letter.valueOfStrict("NonExistentLetter"); + try { + Letter.valueOfStrict("NonExistentLetter"); + Assert.fail(); + } catch (IllegalArgumentException ex) { + assertNotNull(ex.getMessage()); + } } @Test diff --git a/google-cloud-core/src/test/java/com/google/cloud/TimestampTest.java b/google-cloud-core/src/test/java/com/google/cloud/TimestampTest.java index db9ede84dc..81ef7ce379 100644 --- a/google-cloud-core/src/test/java/com/google/cloud/TimestampTest.java +++ b/google-cloud-core/src/test/java/com/google/cloud/TimestampTest.java @@ -18,6 +18,7 @@ import static com.google.common.testing.SerializableTester.reserializeAndAssert; import static com.google.common.truth.Truth.assertThat; +import static org.junit.Assert.assertNotNull; import com.google.common.testing.EqualsTester; import java.util.Calendar; @@ -25,9 +26,8 @@ import java.util.GregorianCalendar; import java.util.TimeZone; import java.util.concurrent.TimeUnit; -import org.junit.Rule; +import org.junit.Assert; import org.junit.Test; -import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -43,8 +43,6 @@ public class TimestampTest { private static final Date TEST_DATE = new Date(TEST_TIME_MILLISECONDS); private static final Date TEST_DATE_PRE_EPOCH = new Date(TEST_TIME_MILLISECONDS_NEGATIVE); - @Rule public ExpectedException expectedException = ExpectedException.none(); - @Test public void minValue() { // MIN_VALUE is before the start of the Gregorian calendar... use magic value. @@ -119,38 +117,62 @@ public void toFromSqlTimestamp() { @Test public void boundsSecondsMin() { - expectedException.expect(IllegalArgumentException.class); - Timestamp.ofTimeSecondsAndNanos(Timestamp.MIN_VALUE.getSeconds() - 1, 999999999); + try { + Timestamp.ofTimeSecondsAndNanos(Timestamp.MIN_VALUE.getSeconds() - 1, 999999999); + Assert.fail(); + } catch (IllegalArgumentException ex) { + assertNotNull(ex.getMessage()); + } } @Test public void boundsSecondsMax() { - expectedException.expect(IllegalArgumentException.class); - Timestamp.ofTimeSecondsAndNanos(Timestamp.MAX_VALUE.getSeconds() + 1, 0); + try { + Timestamp.ofTimeSecondsAndNanos(Timestamp.MAX_VALUE.getSeconds() + 1, 0); + Assert.fail(); + } catch (IllegalArgumentException ex) { + assertNotNull(ex.getMessage()); + } } @Test public void boundsNanosMin() { - expectedException.expect(IllegalArgumentException.class); - Timestamp.ofTimeSecondsAndNanos(TEST_TIME_SECONDS, -1); + try { + Timestamp.ofTimeSecondsAndNanos(TEST_TIME_SECONDS, -1); + Assert.fail(); + } catch (IllegalArgumentException ex) { + assertNotNull(ex.getMessage()); + } } @Test public void boundsNanosMax() { - expectedException.expect(IllegalArgumentException.class); - Timestamp.ofTimeSecondsAndNanos(TEST_TIME_SECONDS, 1000000000); + try { + Timestamp.ofTimeSecondsAndNanos(TEST_TIME_SECONDS, 1000000000); + Assert.fail(); + } catch (IllegalArgumentException ex) { + assertNotNull(ex.getMessage()); + } } @Test public void boundsSqlTimestampMin() { - expectedException.expect(IllegalArgumentException.class); - Timestamp.of(new java.sql.Timestamp((Timestamp.MIN_VALUE.getSeconds() - 1) * 1000)); + try { + Timestamp.of(new java.sql.Timestamp((Timestamp.MIN_VALUE.getSeconds() - 1) * 1000)); + Assert.fail(); + } catch (IllegalArgumentException ex) { + assertNotNull(ex.getMessage()); + } } @Test public void boundsSqlTimestampMax() { - expectedException.expect(IllegalArgumentException.class); - Timestamp.of(new java.sql.Timestamp((Timestamp.MAX_VALUE.getSeconds() + 1) * 1000)); + try { + Timestamp.of(new java.sql.Timestamp((Timestamp.MAX_VALUE.getSeconds() + 1) * 1000)); + Assert.fail(); + } catch (IllegalArgumentException ex) { + assertNotNull(ex.getMessage()); + } } @Test diff --git a/google-cloud-core/src/test/java/com/google/cloud/testing/VersionTest.java b/google-cloud-core/src/test/java/com/google/cloud/testing/VersionTest.java index 4e1d88f8a2..fe65026b60 100644 --- a/google-cloud-core/src/test/java/com/google/cloud/testing/VersionTest.java +++ b/google-cloud-core/src/test/java/com/google/cloud/testing/VersionTest.java @@ -17,16 +17,15 @@ package com.google.cloud.testing; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import org.junit.Rule; +import org.junit.Assert; import org.junit.Test; -import org.junit.rules.ExpectedException; public class VersionTest { - @Rule public ExpectedException thrown = ExpectedException.none(); - @Test public void testFromString() { Version version = Version.fromString("2016.01.13"); @@ -41,32 +40,52 @@ public void testFromString() { @Test public void testFromStringWithAlphas() { - thrown.expect(IllegalArgumentException.class); - Version.fromString("2016.01.hello"); + try { + Version.fromString("2016.01.hello"); + Assert.fail(); + } catch (IllegalArgumentException ex) { + assertNotNull(ex.getMessage()); + } } @Test public void testFromStringMissingPatch() { - thrown.expect(IllegalArgumentException.class); - Version.fromString("2016.01"); + try { + Version.fromString("2016.01"); + Assert.fail(); + } catch (IllegalArgumentException ex) { + assertNotNull(ex.getMessage()); + } } @Test public void testFromStringMissingMinor() { - thrown.expect(IllegalArgumentException.class); - Version.fromString("2016"); + try { + Version.fromString("2016"); + Assert.fail(); + } catch (IllegalArgumentException ex) { + assertNotNull(ex.getMessage()); + } } @Test public void testFromStringEmpty() { - thrown.expect(IllegalArgumentException.class); - Version.fromString(""); + try { + Version.fromString(""); + Assert.fail(); + } catch (IllegalArgumentException ex) { + assertNotNull(ex.getMessage()); + } } @Test public void testFromStringNull() { - thrown.expect(NullPointerException.class); - Version.fromString(null); + try { + Version.fromString(null); + Assert.fail(); + } catch (NullPointerException ex) { + assertNull(ex.getMessage()); + } } @Test From 3fb465643609bad46c4958d6d69d9750b6381b18 Mon Sep 17 00:00:00 2001 From: Ajit Thakor Date: Fri, 10 Jan 2020 17:51:11 +0530 Subject: [PATCH 2/2] chore: code modified --- .../google/cloud/BaseWriteChannelTest.java | 11 ++-------- .../google/cloud/ExceptionHandlerTest.java | 20 ++++--------------- .../com/google/cloud/ServiceOptionsTest.java | 10 ++-------- .../java/com/google/cloud/StringEnumTest.java | 9 ++------- 4 files changed, 10 insertions(+), 40 deletions(-) diff --git a/google-cloud-core/src/test/java/com/google/cloud/BaseWriteChannelTest.java b/google-cloud-core/src/test/java/com/google/cloud/BaseWriteChannelTest.java index ab8a648897..65743a347a 100644 --- a/google-cloud-core/src/test/java/com/google/cloud/BaseWriteChannelTest.java +++ b/google-cloud-core/src/test/java/com/google/cloud/BaseWriteChannelTest.java @@ -21,7 +21,6 @@ import static junit.framework.TestCase.assertTrue; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import com.google.cloud.spi.ServiceRpcFactory; @@ -31,7 +30,6 @@ import java.nio.channels.ClosedChannelException; import java.util.Arrays; import java.util.Random; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -98,15 +96,10 @@ public void testClose() throws IOException { assertNull(channel.getBuffer()); } - @Test + @Test(expected = ClosedChannelException.class) public void testValidateOpen() throws IOException { channel.close(); - try { - channel.write(ByteBuffer.allocate(42)); - Assert.fail(); - } catch (ClosedChannelException ex) { - assertNotNull(ex); - } + channel.write(ByteBuffer.allocate(42)); } @Test diff --git a/google-cloud-core/src/test/java/com/google/cloud/ExceptionHandlerTest.java b/google-cloud-core/src/test/java/com/google/cloud/ExceptionHandlerTest.java index 35026f0deb..50e0583c89 100644 --- a/google-cloud-core/src/test/java/com/google/cloud/ExceptionHandlerTest.java +++ b/google-cloud-core/src/test/java/com/google/cloud/ExceptionHandlerTest.java @@ -17,7 +17,6 @@ package com.google.cloud; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -28,7 +27,6 @@ import java.nio.channels.ClosedByInterruptException; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Assert; import org.junit.Test; /** Tests for {@link ExceptionHandler}. */ @@ -168,7 +166,7 @@ public RetryResult beforeEval(Exception exception) { assertFalse(handler.shouldRetry(new NullPointerException(), null)); } - @Test + @Test(expected = NullPointerException.class) public void testNullRetryResultFromBeforeEval() { @SuppressWarnings("serial") Interceptor interceptor = @@ -186,15 +184,10 @@ public RetryResult afterEval(Exception exception, RetryResult retryResult) { }; ExceptionHandler handler = ExceptionHandler.newBuilder().addInterceptors(interceptor).build(); - try { - handler.shouldRetry(new Exception(), null); - Assert.fail(); - } catch (NullPointerException ex) { - assertNull(ex.getMessage()); - } + handler.shouldRetry(new Exception(), null); } - @Test + @Test(expected = NullPointerException.class) public void testNullRetryResultFromAfterEval() { @SuppressWarnings("serial") Interceptor interceptor = @@ -212,11 +205,6 @@ public RetryResult afterEval(Exception exception, RetryResult retryResult) { }; ExceptionHandler handler = ExceptionHandler.newBuilder().addInterceptors(interceptor).build(); - try { - handler.shouldRetry(new Exception(), null); - Assert.fail(); - } catch (NullPointerException ex) { - assertNull(ex.getMessage()); - } + handler.shouldRetry(new Exception(), null); } } diff --git a/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java b/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java index 551970f320..6f8763c84b 100644 --- a/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java +++ b/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java @@ -48,7 +48,6 @@ import java.util.Map; import java.util.Set; import java.util.regex.Pattern; -import org.junit.Assert; import org.junit.Test; public class ServiceOptionsTest { @@ -358,14 +357,9 @@ public void testBuilderNoCredentials() { assertEquals("quota-project-id", OPTIONS.getQuotaProjectId()); } - @Test + @Test(expected = NullPointerException.class) public void testBuilderNullCredentials() { - try { - TestServiceOptions.newBuilder().setCredentials(null).build(); - Assert.fail(); - } catch (NullPointerException ex) { - assertNull(ex.getMessage()); - } + TestServiceOptions.newBuilder().setCredentials(null).build(); } @Test diff --git a/google-cloud-core/src/test/java/com/google/cloud/StringEnumTest.java b/google-cloud-core/src/test/java/com/google/cloud/StringEnumTest.java index 2d87c23c70..edef7820cd 100644 --- a/google-cloud-core/src/test/java/com/google/cloud/StringEnumTest.java +++ b/google-cloud-core/src/test/java/com/google/cloud/StringEnumTest.java @@ -64,14 +64,9 @@ public static Letter[] values() { } } - @Test + @Test(expected = NullPointerException.class) public void testNullClass() { - try { - new StringEnumType(null, Letter.CONSTRUCTOR); - Assert.fail(); - } catch (NullPointerException ex) { - assertNull(ex.getMessage()); - } + new StringEnumType(null, Letter.CONSTRUCTOR); } @Test