Merge pull request #124 from ParsePlatform/grantland.tests

Update tests

Author: grantland

ParseUI-Widget/build.gradle

@@ -28,10 +28,13 @@ group = 'com.parse'
 dependencies {
     compile 'com.parse:parse-android:1.10.3'
 
-    androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
-    androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
+    androidTestCompile 'com.crittercism.dexmaker:dexmaker:1.4'
+    androidTestCompile 'com.crittercism.dexmaker:dexmaker-mockito:1.4'
+    androidTestCompile 'com.crittercism.dexmaker:dexmaker-dx:1.4'
     androidTestCompile 'org.mockito:mockito-core:1.10.19'
-    androidTestCompile 'org.skyscreamer:jsonassert:1.2.3'
+    androidTestCompile ('org.skyscreamer:jsonassert:1.2.3') {
+        exclude module: 'json'
+    }
 }
 
 android {

ParseUI-Widget/src/androidTest/java/com/parse/BaseActivityInstrumentationTestCase2.java

@@ -33,6 +33,11 @@
 import java.io.ByteArrayOutputStream;
 import java.util.Arrays;
 
+import bolts.Task;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 public class ParseImageViewTest extends InstrumentationTestCase {
 
   public void testParseImageViewWithNullParseFile() throws Exception {
@@ -49,7 +54,8 @@ public void testParseImageViewWithNullParseFile() throws Exception {
 
   public void testParseImageViewWithNotImageParseFile() throws Exception {
     byte[] data = "hello".getBytes();
-    ParseFile file = new ParseFile(data);
+    ParseFile file = mock(ParseFile.class);
+    when(file.getDataInBackground()).thenReturn(Task.forResult(data));
 
     final Drawable drawable = new ColorDrawable();
     final ParseImageView imageView = new ParseImageView(getInstrumentation().getTargetContext());
@@ -70,7 +76,9 @@ public void testParseImageViewWithImageParseFile() throws Exception {
     ByteArrayOutputStream stream = new ByteArrayOutputStream();
     iconBitmap.compress(Bitmap.CompressFormat.PNG, 100, stream);
     final byte[] imageData = stream.toByteArray();
-    ParseFile file = new ParseFile(imageData);
+
+    ParseFile file = mock(ParseFile.class);
+    when(file.getDataInBackground()).thenReturn(Task.forResult(imageData));
 
     final Drawable drawable = new ColorDrawable();
     final ParseImageView imageView = new ParseImageView(context);

ParseUI-Widget/src/androidTest/java/com/parse/ParseImageViewTest.java

@@ -21,7 +21,9 @@
 
 package com.parse;
 
+import android.app.Activity;
 import android.database.DataSetObserver;
+import android.test.ActivityInstrumentationTestCase2;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.ListView;
@@ -49,7 +51,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class ParseQueryAdapterTest extends BaseActivityInstrumentationTestCase2<TestActivity> {
+public class ParseQueryAdapterTest extends ActivityInstrumentationTestCase2<TestActivity> {
 
   @ParseClassName("Thing")
   public static class Thing extends ParseObject {
@@ -69,7 +71,7 @@ public ParseQueryAdapterTest() {
   public void setUp() throws Exception {
     super.setUp();
 
-    listView = new ListView(activity);
+    listView = new ListView(getActivity());
     savedThings = new ArrayList<>();
     totalThings = 10;
 
@@ -141,7 +143,7 @@ public void tearDown() throws Exception {
   }
 
   public void testLoadObjects() throws Exception {
-    final ParseQueryAdapter<Thing> adapter = new ParseQueryAdapter<>(activity, Thing.class);
+    final ParseQueryAdapter<Thing> adapter = new ParseQueryAdapter<>(getActivity(), Thing.class);
     final Semaphore done = new Semaphore(0);
     adapter.addOnQueryLoadListener(new OnQueryLoadListener<Thing>() {
       @Override
@@ -164,7 +166,7 @@ public void onLoaded(List<Thing> objects, Exception e) {
 
   public void testLoadObjectsWithGenericParseObjects() throws Exception {
     final ParseQueryAdapter<ParseObject> adapter =
-        new ParseQueryAdapter<>(activity, Thing.class);
+        new ParseQueryAdapter<>(getActivity(), Thing.class);
     final Semaphore done = new Semaphore(0);
     adapter.addOnQueryLoadListener(new OnQueryLoadListener<ParseObject>() {
       @Override
@@ -186,19 +188,19 @@ public void onLoaded(List<ParseObject> objects, Exception e) {
   }
 
   public void testGetItemViewWithTextKey() {
-    ParseQueryAdapter<ParseObject> adapter =
-        new ParseQueryAdapter<>(activity, Thing.class);
+    Activity activity = getActivity();
+    ParseQueryAdapter<ParseObject> adapter = new ParseQueryAdapter<>(activity, Thing.class);
     adapter.setTextKey("name");
 
-    View view = adapter.getItemView(savedThings.get(0), buildReusableListCell(), listView);
+    View view = adapter.getItemView(savedThings.get(0), buildReusableListCell(activity), listView);
     TextView textView = (TextView) view.findViewById(android.R.id.text1);
 
     assertEquals("Thing 0", textView.getText());
   }
 
   public void testGetItemViewWithCustomLayout() {
     ParseQueryAdapter<ParseObject> adapter =
-        new ParseQueryAdapter<>(activity, Thing.class, R.layout.view_item);
+        new ParseQueryAdapter<>(getActivity(), Thing.class, R.layout.view_item);
     adapter.setTextKey("name");
 
     View view = adapter.getItemView(savedThings.get(0), null, listView);
@@ -211,7 +213,7 @@ public void testGetItemViewWithCustomLayout() {
 
   public void testGetItemViewWithNoTextKey() throws ParseException {
     ParseQueryAdapter<ParseObject> adapter =
-        new ParseQueryAdapter<>(activity, Thing.class);
+        new ParseQueryAdapter<>(getActivity(), Thing.class);
 
     View view = adapter.getItemView(savedThings.get(0), null, listView);
     TextView textView = (TextView) view.findViewById(android.R.id.text1);
@@ -221,7 +223,7 @@ public void testGetItemViewWithNoTextKey() throws ParseException {
   }
 
   public void testLoadObjectsWithLimitsObjectsPerPage() throws Exception {
-    final ParseQueryAdapter<Thing> adapter = new ParseQueryAdapter<>(activity, Thing.class);
+    final ParseQueryAdapter<Thing> adapter = new ParseQueryAdapter<>(getActivity(), Thing.class);
     final int pageSize = 4;
     adapter.setObjectsPerPage(pageSize);
     final Capture<Integer> timesThrough = new Capture<>(0);
@@ -268,7 +270,7 @@ public void onLoaded(List<Thing> objects, Exception e) {
   }
 
   public void testLoadObjectsWithLimitsObjectsPerPageAndNoRemainder() throws Exception {
-    final ParseQueryAdapter<Thing> adapter = new ParseQueryAdapter<>(activity, Thing.class);
+    final ParseQueryAdapter<Thing> adapter = new ParseQueryAdapter<>(getActivity(), Thing.class);
     final int pageSize = 5;
     adapter.setObjectsPerPage(pageSize);
     final Capture<Integer> timesThrough = new Capture<>(0);
@@ -311,7 +313,7 @@ public void onLoaded(List<Thing> objects, Exception e) {
   }
 
   public void testLoadObjectsWithPaginationNextPageView() throws Exception {
-    final ParseQueryAdapter<Thing> adapter = new ParseQueryAdapter<>(activity, Thing.class);
+    final ParseQueryAdapter<Thing> adapter = new ParseQueryAdapter<>(getActivity(), Thing.class);
     final int pageSize = 5;
     adapter.setObjectsPerPage(pageSize);
     final Capture<Integer> timesThrough = new Capture<>(0);
@@ -363,7 +365,7 @@ public void testLoadObjectsWithNoPagination() throws Exception {
     }
     totalThings += additional;
 
-    final ParseQueryAdapter<Thing> adapter = new ParseQueryAdapter<>(activity, Thing.class);
+    final ParseQueryAdapter<Thing> adapter = new ParseQueryAdapter<>(getActivity(), Thing.class);
     adapter.setPaginationEnabled(false);
     final Semaphore done = new Semaphore(0);
     adapter.addOnQueryLoadListener(new OnQueryLoadListener<Thing>() {
@@ -387,7 +389,7 @@ public void onLoaded(List<Thing> objects, Exception e) {
   }
 
   public void testClear() throws Exception {
-    final ParseQueryAdapter<Thing> adapter = new ParseQueryAdapter<>(activity, Thing.class);
+    final ParseQueryAdapter<Thing> adapter = new ParseQueryAdapter<>(getActivity(), Thing.class);
     final Semaphore done = new Semaphore(0);
     final Capture<Integer> counter = new Capture<>(0);
     adapter.addOnQueryLoadListener(new OnQueryLoadListener<Thing>() {
@@ -433,7 +435,7 @@ public ParseQuery<Thing> create() {
       }
     };
 
-    final ParseQueryAdapter<Thing> adapter = new ParseQueryAdapter<>(activity, factory);
+    final ParseQueryAdapter<Thing> adapter = new ParseQueryAdapter<>(getActivity(), factory);
     final int pageSize = 5;
     adapter.setObjectsPerPage(pageSize);
     adapter.setPaginationEnabled(true);
@@ -497,7 +499,7 @@ public void onLoaded(List<Thing> objects, Exception e) {
   }
 
   public void testLoadObjectsWithOnLoadingAndOnLoadedCallback() throws Exception {
-    final ParseQueryAdapter<Thing> adapter = new ParseQueryAdapter<>(activity, Thing.class);
+    final ParseQueryAdapter<Thing> adapter = new ParseQueryAdapter<>(getActivity(), Thing.class);
     adapter.setObjectsPerPage(5);
     final Capture<Boolean> flag = new Capture<>(false);
     final Semaphore done = new Semaphore(0);
@@ -525,7 +527,7 @@ public void onLoaded(List<Thing> objects, Exception e) {
   }
 
   public void testLoadNextPageBeforeLoadObjects() throws Exception {
-    final ParseQueryAdapter<Thing> adapter = new ParseQueryAdapter<>(activity, Thing.class);
+    final ParseQueryAdapter<Thing> adapter = new ParseQueryAdapter<>(getActivity(), Thing.class);
     final Semaphore done = new Semaphore(0);
     adapter.addOnQueryLoadListener(new OnQueryLoadListener<Thing>() {
       @Override
@@ -547,7 +549,7 @@ public void onLoaded(List<Thing> objects, Exception e) {
   }
 
   public void testIncomingQueryResultAfterClearing() throws Exception {
-    final ParseQueryAdapter<Thing> adapter = new ParseQueryAdapter<>(activity, Thing.class);
+    final ParseQueryAdapter<Thing> adapter = new ParseQueryAdapter<>(getActivity(), Thing.class);
     final int pageSize = 4;
     adapter.setObjectsPerPage(pageSize);
     final Semaphore done = new Semaphore(0);
@@ -578,7 +580,7 @@ public void onLoaded(List<Thing> objects, Exception e) {
   public void testLoadObjectsWithOverrideSetPageOnQuery() throws Exception {
     final int arbitraryLimit = 3;
     final ParseQueryAdapter<Thing> adapter =
-        new ParseQueryAdapter<Thing>(activity, Thing.class) {
+        new ParseQueryAdapter<Thing>(getActivity(), Thing.class) {
           @Override
           public void setPageOnQuery(int page, ParseQuery<Thing> query) {
             // Make sure that this method is being used + respected.
@@ -605,7 +607,7 @@ public void onLoaded(List<Thing> objects, Exception e) {
   }
 
   public void testLoadObjectsWithtAutoload() throws Exception {
-    final ParseQueryAdapter<Thing> adapter = new ParseQueryAdapter<>(activity, Thing.class);
+    final ParseQueryAdapter<Thing> adapter = new ParseQueryAdapter<>(getActivity(), Thing.class);
     final Capture<Boolean> flag = new Capture<>(false);
     // Make sure that the Adapter doesn't start trying to load objects until AFTER we set this flag
     // to true (= triggered by calling setAutoload, NOT registerDataSetObserver, if autoload is
@@ -634,7 +636,7 @@ public void onLoaded(List<Thing> objects, Exception e) {
     assertTrue(done.tryAcquire(10, TimeUnit.SECONDS));
   }
 
-  private LinearLayout buildReusableListCell() {
+  private static LinearLayout buildReusableListCell(Activity activity) {
     LinearLayout view = new LinearLayout(activity);
     TextView textView = new TextView(activity);
     textView.setId(android.R.id.text1);