Merge pull request square#673 from f2prateek/fail/test

Simply fail if assertion is not thrown

Author: JakeWharton

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

@@ -187,11 +187,8 @@ public class PicassoTest {
     boolean caught = false;
     try {
       picasso.complete(hunter);
-    } catch (AssertionError error) {
-      caught = true;
-    }
-    if (!caught) {
       fail("Calling complete() with null LoadedFrom should throw");
+    } catch (AssertionError expected) {
     }
   }