Merge pull request square#399 from codecrafters/targetAction

fix square#397, make TargetAction use errorResId and errorDrawable

Author: dnkoutso

picasso/src/main/java/com/squareup/picasso/RequestCreator.java

@@ -329,7 +329,8 @@ public void into(Target target) {
 
     target.onPrepareLoad(drawable);
 
-    Action action = new TargetAction(picasso, target, finalData, skipMemoryCache, requestKey);
+    Action action = new TargetAction(picasso, target, finalData, skipMemoryCache, errorResId,
+        errorDrawable, requestKey);
     picasso.enqueueAndSubmit(action);
   }
 

picasso/src/main/java/com/squareup/picasso/Target.java

@@ -37,9 +37,21 @@ public interface Target {
    */
   void onBitmapLoaded(Bitmap bitmap, LoadedFrom from);
 
-  /** Callback indicating the image could not be successfully loaded. */
+  /**
+   * Callback indicating the image could not be successfully loaded.
+   * <p/>
+   * <strong>Note:</strong> The passed {@link Drawable} may be {@code null} if none has been
+   * specified via {@link RequestCreator#error(android.graphics.drawable.Drawable)}
+   * or {@link RequestCreator#error(int)}.
+   */
   void onBitmapFailed(Drawable errorDrawable);
 
-  /** Callback invoked right before your request is submitted. */
+  /**
+   * Callback invoked right before your request is submitted.
+   * <p/>
+   * <strong>Note:</strong> The passed {@link Drawable} may be {@code null} if none has been
+   * specified via {@link RequestCreator#placeholder(android.graphics.drawable.Drawable)}
+   * or {@link RequestCreator#placeholder(int)}.
+   */
   void onPrepareLoad(Drawable placeHolderDrawable);
 }

picasso/src/main/java/com/squareup/picasso/TargetAction.java

@@ -16,11 +16,13 @@
 package com.squareup.picasso;
 
 import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
 
 final class TargetAction extends Action<Target> {
 
-  TargetAction(Picasso picasso, Target target, Request data, boolean skipCache, String key) {
-    super(picasso, target, data, skipCache, false, 0, null, key);
+  TargetAction(Picasso picasso, Target target, Request data, boolean skipCache,
+        int errorResId, Drawable errorDrawable, String key) {
+    super(picasso, target, data, skipCache, false, errorResId, errorDrawable, key);
   }
 
   @Override void complete(Bitmap result, Picasso.LoadedFrom from) {
@@ -40,7 +42,11 @@ final class TargetAction extends Action<Target> {
   @Override void error() {
     Target target = getTarget();
     if (target != null) {
-      target.onBitmapFailed(errorDrawable);
+      if (errorResId != 0) {
+        target.onBitmapFailed(picasso.context.getResources().getDrawable(errorResId));
+      } else {
+        target.onBitmapFailed(errorDrawable);
+      }
     }
   }
 }

picasso/src/test/java/com/squareup/picasso/TargetActionTest.java

@@ -15,6 +15,8 @@
  */
 package com.squareup.picasso;
 
+import android.content.Context;
+import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import org.junit.Test;
@@ -23,13 +25,16 @@
 import org.robolectric.annotation.Config;
 
 import static com.squareup.picasso.Picasso.LoadedFrom.MEMORY;
+import static com.squareup.picasso.Picasso.RequestTransformer.IDENTITY;
 import static com.squareup.picasso.TestUtils.BITMAP_1;
 import static com.squareup.picasso.TestUtils.BITMAP_3;
+import static com.squareup.picasso.TestUtils.RESOURCE_ID_1;
 import static com.squareup.picasso.TestUtils.URI_KEY_1;
 import static com.squareup.picasso.TestUtils.mockTarget;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
@@ -38,24 +43,42 @@ public class TargetActionTest {
   @Test(expected = AssertionError.class)
   public void throwsErrorWithNullResult() throws Exception {
     TargetAction request =
-        new TargetAction(mock(Picasso.class), mockTarget(), null, false, URI_KEY_1);
+        new TargetAction(mock(Picasso.class), mockTarget(), null, false, 0, null, URI_KEY_1);
     request.complete(null, MEMORY);
   }
 
   @Test
   public void invokesSuccessIfTargetIsNotNull() throws Exception {
     Target target = mockTarget();
-    TargetAction request = new TargetAction(mock(Picasso.class), target, null, false, URI_KEY_1);
+    TargetAction request = new TargetAction(mock(Picasso.class), target, null, false, 0, null, URI_KEY_1);
     request.complete(BITMAP_3, MEMORY);
     verify(target).onBitmapLoaded(BITMAP_3, MEMORY);
   }
 
   @Test
-  public void invokesErrorIfTargetIsNotNull() throws Exception {
+  public void invokesOnBitmapFailedIfTargetIsNotNullWithErrorDrawable() throws Exception {
+    Drawable errorDrawable = mock(Drawable.class);
     Target target = mockTarget();
-    TargetAction request = new TargetAction(mock(Picasso.class), target, null, false, URI_KEY_1);
+    TargetAction request = new TargetAction(mock(Picasso.class), target, null, false, 0, errorDrawable, URI_KEY_1);
     request.error();
-    verify(target).onBitmapFailed(null);
+    verify(target).onBitmapFailed(errorDrawable);
+  }
+
+  @Test
+  public void invokesOnBitmapFailedIfTargetIsNotNullWithErrorResourceId() throws Exception {
+    Drawable errorDrawable = mock(Drawable.class);
+    Target target = mockTarget();
+    Context context = mock(Context.class);
+    Picasso picasso =
+        new Picasso(context, mock(Dispatcher.class), Cache.NONE, null, IDENTITY,
+            mock(Stats.class), true);
+    Resources res = mock(Resources.class);
+    TargetAction request = new TargetAction(picasso, target, null, false, RESOURCE_ID_1, null, URI_KEY_1);
+
+    when(context.getResources()).thenReturn(res);
+    when(res.getDrawable(RESOURCE_ID_1)).thenReturn(errorDrawable);
+    request.error();
+    verify(target).onBitmapFailed(errorDrawable);
   }
 
   @Test public void recyclingInSuccessThrowsException() {
@@ -74,7 +97,7 @@ public void invokesErrorIfTargetIsNotNull() throws Exception {
     };
     Picasso picasso = mock(Picasso.class);
 
-    TargetAction tr = new TargetAction(picasso, bad, null, false, URI_KEY_1);
+    TargetAction tr = new TargetAction(picasso, bad, null, false, 0, null, URI_KEY_1);
     try {
       tr.complete(BITMAP_1, MEMORY);
       fail();