Database tests, minor bugfix (#322)

Author: samtstern

auth/build.gradle

@@ -11,6 +11,7 @@ android {
         versionCode 1
         versionName "1.0"
     }
+
     buildTypes {
         release {
             minifyEnabled false

auth/src/main/java/com/firebase/ui/auth/ui/email/SignInActivity.java

@@ -105,6 +105,8 @@ private void signIn(String email, final String password) {
                 .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
                     @Override
                     public void onSuccess(AuthResult authResult) {
+                        mActivityHelper.dismissDialog();
+
                         // Save credential in SmartLock (if enabled)
                         SmartlockUtil.saveCredentialOrFinish(
                                 SignInActivity.this,
@@ -118,6 +120,8 @@ public void onSuccess(AuthResult authResult) {
                 .addOnFailureListener(new OnFailureListener() {
                     @Override
                     public void onFailure(@NonNull Exception e) {
+                        mActivityHelper.dismissDialog();
+
                         // Show error message
                         TextInputLayout passwordInput =
                                 (TextInputLayout) findViewById(R.id.password_layout);

auth/src/test/java/com/firebase/ui/auth/util/HeadlessAPIWrapperImplTest.java

@@ -14,10 +14,6 @@
 
 package com.firebase.ui.auth.util;
 
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-import static org.mockito.Mockito.when;
-
 import com.firebase.ui.auth.BuildConfig;
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
@@ -32,8 +28,12 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+import static org.mockito.Mockito.when;
+
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(constants = BuildConfig.class)
+@Config(constants = BuildConfig.class, sdk=23)
 public class HeadlessAPIWrapperImplTest {
 
     private FirebaseAuthWrapperImpl mHeadlessAPIWrapperImpl;

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.0'
         classpath 'com.google.gms:google-services:3.0.0'
 
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'

common/constants.gradle

@@ -1,4 +1,4 @@
-project.ext.firebase_version = '9.4.0'
+project.ext.firebase_version = '9.6.0'
 project.ext.support_library_version = '23.4.0'
 
 project.ext.submodules = ['database', 'auth']

database/build.gradle

@@ -10,6 +10,7 @@ android {
         versionCode 1
         versionName "1.0"
     }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -23,4 +24,9 @@ dependencies {
     compile "com.android.support:recyclerview-v7:${project.ext.support_library_version}"
 
     compile "com.google.firebase:firebase-database:${project.ext.firebase_version}"
+
+    androidTestCompile 'junit:junit:4.12'
+    androidTestCompile "com.android.support:support-annotations:${project.ext.support_library_version}"
+    androidTestCompile 'com.android.support.test:runner:0.5'
+    androidTestCompile 'com.android.support.test:rules:0.5'
 }

library/src/test/java/com/firebase/ui/database/ApplicationTest.java renamed to database/src/androidTest/java/com/firebase/ui/database/ApplicationTest.java

@@ -14,23 +14,19 @@
 
 package com.firebase.ui.database;
 
-import android.app.Application;
 import android.content.Context;
-import android.test.ApplicationTestCase;
 
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
 
 /**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ * Helpers for testing.
  */
-public class ApplicationTest extends ApplicationTestCase<Application> {
+public class ApplicationTest {
 
     private static final String APP_NAME = "firebaseui-tests";
 
-    public ApplicationTest() {
-        super(Application.class);
-    }
+    public ApplicationTest() {}
 
     public static FirebaseApp getAppInstance(Context context) {
         try {
@@ -42,8 +38,8 @@ public static FirebaseApp getAppInstance(Context context) {
 
     public static FirebaseApp initializeApp(Context context) {
         return FirebaseApp.initializeApp(context, new FirebaseOptions.Builder()
-                .setApplicationId("foo-bar")
-                .setDatabaseUrl("https://firebaseui-tests.firebaseio-demo.com/")
+                .setApplicationId("fir-ui-tests")
+                .setDatabaseUrl("https://fir-ui-tests.firebaseio.com/")
                 .build(), APP_NAME);
     }
 }

library/src/test/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java renamed to database/src/androidTest/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java

@@ -14,7 +14,9 @@
 
 package com.firebase.ui.database;
 
-import android.test.AndroidTestCase;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
 
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.database.DatabaseError;
@@ -27,11 +29,14 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
 
-public class FirebaseArrayOfObjectsTest extends AndroidTestCase {
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class FirebaseArrayOfObjectsTest extends InstrumentationTestCase {
     public static class Bean {
         int number;
         String text;
@@ -68,7 +73,7 @@ public boolean isBool() {
 
     @Before
     public void setUp() throws Exception {
-        FirebaseApp app = ApplicationTest.getAppInstance(getContext());
+        FirebaseApp app = ApplicationTest.getAppInstance(getInstrumentation().getContext());
         mRef = FirebaseDatabase.getInstance(app).getReference()
                 .child("firebasearray").child("objects");
         mArray = new FirebaseArray(mRef);
@@ -91,8 +96,13 @@ public Boolean call() throws Exception {
 
     @After
     public void tearDown() throws Exception {
-        mRef.removeValue();
-        mArray.cleanup();
+        if (mRef != null) {
+            mRef.getRoot().removeValue();
+        }
+
+        if (mArray != null) {
+            mArray.cleanup();
+        }
     }
 
     @Test

library/src/test/java/com/firebase/ui/database/FirebaseArrayTest.java renamed to database/src/androidTest/java/com/firebase/ui/database/FirebaseArrayTest.java

@@ -14,7 +14,9 @@
 
 package com.firebase.ui.database;
 
-import android.test.AndroidTestCase;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
 
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.database.DatabaseError;
@@ -27,17 +29,23 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
 
-public class FirebaseArrayTest extends AndroidTestCase {
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class FirebaseArrayTest extends InstrumentationTestCase {
+
+    private static final int TIMEOUT = 5000;
+
     private DatabaseReference mRef;
     private FirebaseArray mArray;
 
     @Before
     public void setUp() throws Exception {
-        FirebaseApp app = ApplicationTest.getAppInstance(getContext());
+        FirebaseApp app = ApplicationTest.getAppInstance(getInstrumentation().getContext());
         mRef = FirebaseDatabase.getInstance(app).getReference().child("firebasearray");
         mArray = new FirebaseArray(mRef);
         mRef.removeValue();
@@ -56,8 +64,13 @@ public Boolean call() throws Exception {
 
     @After
     public void tearDown() throws Exception {
-        mArray.cleanup();
-        mRef.removeValue();
+        if (mRef != null) {
+            mRef.getRoot().removeValue();
+        }
+
+        if (mArray != null) {
+            mArray.cleanup();
+        }
     }
 
     @Test
@@ -155,7 +168,7 @@ public void onCancelled(DatabaseError databaseError) {
         task.run();
         boolean isDone = false;
         long startedAt = System.currentTimeMillis();
-        while (!isDone && System.currentTimeMillis() - startedAt < 5000) {
+        while (!isDone && System.currentTimeMillis() - startedAt < TIMEOUT) {
             semaphore.tryAcquire(1, TimeUnit.SECONDS);
             try {
                 isDone = done.call();

database/src/main/AndroidManifest.xml

@@ -1,4 +1,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.firebase.ui.database">
+
     <uses-permission android:name="android.permission.INTERNET" />
+
+    <application>
+        <meta-data
+            android:name="com.google.android.gms.version"
+            android:value="@integer/google_play_services_version" />
+    </application>
+
 </manifest>

library/build.gradle

@@ -22,8 +22,6 @@ android {
 dependencies {
     compile project(':database')
     compile project(':auth')
-
-    androidTestCompile 'junit:junit:4.12'
 }
 
 /**
@@ -61,7 +59,7 @@ def bintrayUploadTasks() {
  */
 def testTasks() {
     return project.ext.submodules.collect { name ->
-        ":${name}:test"
+        ":${name}:testDebugUnitTest"
     }.toArray()
 }