From 81258a25539e9edb29a744c85de294a6b5c15bd3 Mon Sep 17 00:00:00 2001 From: Tobrun Date: Fri, 2 Nov 2018 15:53:31 +0100 Subject: [android] - nullify codebase with annotations --- .../test/java/com/mapbox/mapboxsdk/utils/MockParcel.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/utils/MockParcel.java') diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/utils/MockParcel.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/utils/MockParcel.java index dd4c7b25ee..fac69826a1 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/utils/MockParcel.java +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/utils/MockParcel.java @@ -4,6 +4,7 @@ import android.os.Parcel; import android.os.Parcelable; import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -28,10 +29,12 @@ import static org.mockito.Mockito.when; public class MockParcel { + @Nullable public static Parcelable obtain(@NonNull Parcelable object) { return obtain(object, 0); } + @Nullable public static Parcelable obtain(@NonNull Parcelable object, int describeContentsValue) { testDescribeContents(object, describeContentsValue); testParcelableArray(object); @@ -166,48 +169,56 @@ public class MockParcel { private void setupReads() { when(mockedParcel.readInt()).then(new Answer() { + @NonNull @Override public Integer answer(InvocationOnMock invocation) throws Throwable { return (Integer) objects.get(position++); } }); when(mockedParcel.readByte()).thenAnswer(new Answer() { + @NonNull @Override public Byte answer(InvocationOnMock invocation) throws Throwable { return (Byte) objects.get(position++); } }); when(mockedParcel.readLong()).thenAnswer(new Answer() { + @NonNull @Override public Long answer(InvocationOnMock invocation) throws Throwable { return (Long) objects.get(position++); } }); when(mockedParcel.readString()).thenAnswer(new Answer() { + @NonNull @Override public String answer(InvocationOnMock invocation) throws Throwable { return (String) objects.get(position++); } }); when(mockedParcel.readDouble()).thenAnswer(new Answer() { + @NonNull @Override public Double answer(InvocationOnMock invocation) throws Throwable { return (Double) objects.get(position++); } }); when(mockedParcel.readFloat()).thenAnswer(new Answer() { + @NonNull @Override public Float answer(InvocationOnMock invocation) throws Throwable { return (Float) objects.get(position++); } }); when(mockedParcel.readParcelable(Parcelable.class.getClassLoader())).thenAnswer(new Answer() { + @NonNull @Override public Parcelable answer(InvocationOnMock invocation) throws Throwable { return (Parcelable) objects.get(position++); } }); when(mockedParcel.readParcelableArray(Parcelable.class.getClassLoader())).thenAnswer(new Answer() { + @NonNull @Override public Object[] answer(InvocationOnMock invocation) throws Throwable { int size = (Integer) objects.get(position++); @@ -224,6 +235,7 @@ public class MockParcel { } }); when(mockedParcel.createIntArray()).then(new Answer() { + @Nullable @Override public int[] answer(InvocationOnMock invocation) throws Throwable { int size = (Integer) objects.get(position++); @@ -243,8 +255,9 @@ public class MockParcel { private void setupOthers() { doAnswer(new Answer() { + @Nullable @Override - public Void answer(InvocationOnMock invocation) throws Throwable { + public Void answer(@NonNull InvocationOnMock invocation) throws Throwable { position = ((Integer) invocation.getArguments()[0]); return null; } -- cgit v1.2.1