Unify use of reparceling error.

mg6maciej · Apr 4, 2015 · fa379ff · fa379ff
1 parent bcac6e2
commit fa379ff
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/src/androidTest/java/pl/mg6/testsupport/ReparcelerErrorTestCase.java b/src/androidTest/java/pl/mg6/testsupport/ReparcelerErrorTestCase.java
@@ -14,7 +14,7 @@ public void testWithProtectedCreatorShouldFail() {
         ReparcelingResult<WithProtectedCreator> result = reparceler.reparcel(original);
         assertSame(original, result.getOriginal());
         assertNull(result.getReparceled());
-        assertTrue(result.getError() instanceof ReparcelingError);
+        assertNotNull(result.getError());
         assertEquals("Missing public static CREATOR field on class WithProtectedCreator.", result.getError().getMessage());
     }
 
@@ -23,7 +23,7 @@ public void testWithoutCreatorShouldFail() {
         ReparcelingResult<WithNonStaticCreator> result = reparceler.reparcel(original);
         assertSame(original, result.getOriginal());
         assertNull(result.getReparceled());
-        assertTrue(result.getError() instanceof ReparcelingError);
+        assertNotNull(result.getError());
         assertEquals("Missing public static CREATOR field on class WithNonStaticCreator.", result.getError().getMessage());
     }
 }
diff --git a/src/androidTest/java/pl/mg6/testsupport/data/Complex.java b/src/androidTest/java/pl/mg6/testsupport/data/Complex.java
@@ -18,7 +18,6 @@ public Complex(Simple simple, Hrisey hrisey, List<String> list) {
         this.list = list;
     }
 
-
     @Override
     public int describeContents() {
         return 0;

diff --git a/src/main/java/pl/mg6/testsupport/FactoryReparceler.java b/src/main/java/pl/mg6/testsupport/FactoryReparceler.java
@@ -32,7 +32,14 @@ private static <T extends Parcelable> ReparcelingResult<T> reparcel(Method metho
             T original = (T) method.invoke(null);
             return Reparceler.reparcel(original, method.getName());
         } catch (Throwable error) {
-            return new ReparcelingResult<>(null, null, false, method.getName(), error);
+            return new ReparcelingResult<>(null, null, false, method.getName(), createError(method, error));
         }
     }
+
+    private static ReparcelingError createError(Method method, Throwable error) {
+        String methodName = method.getName();
+        String className = method.getDeclaringClass().getSimpleName();
+        String message = String.format("Cannot invoke method %s on class %s.", methodName, className);
+        return new ReparcelingError(message, error);
+    }
 }
diff --git a/src/main/java/pl/mg6/testsupport/Reparceler.java b/src/main/java/pl/mg6/testsupport/Reparceler.java
@@ -34,6 +34,7 @@ private static <T extends Parcelable> T reparcelImpl(T original) throws Throwabl
 
     private static ReparcelingError createError(Parcelable original, Throwable error) {
         String name = original.getClass().getSimpleName();
-        return new ReparcelingError(String.format("Missing public static CREATOR field on class %s.", name), error);
+        String message = String.format("Missing public static CREATOR field on class %s.", name);
+        return new ReparcelingError(message, error);
     }
 }
diff --git a/src/main/java/pl/mg6/testsupport/ReparcelingResult.java b/src/main/java/pl/mg6/testsupport/ReparcelingResult.java
@@ -8,9 +8,9 @@ public class ReparcelingResult<T extends Parcelable> {
     private final T reparceled;
     private final boolean areEqual;
     private final String methodName;
-    private final Throwable error;
+    private final ReparcelingError error;
 
-    public ReparcelingResult(T original, T reparceled, boolean areEqual, String methodName, Throwable error) {
+    public ReparcelingResult(T original, T reparceled, boolean areEqual, String methodName, ReparcelingError error) {
         this.original = original;
         this.reparceled = reparceled;
         this.areEqual = areEqual;
@@ -34,7 +34,7 @@ public String getMethodName() {
         return methodName;
     }
 
-    public Throwable getError() {
+    public ReparcelingError getError() {
         return error;
     }
 }