From eec99b4929764383b728394b66e2ed9d4def32e7 Mon Sep 17 00:00:00 2001 From: Alex Saveau Date: Sat, 10 Sep 2016 15:19:37 -0700 Subject: [PATCH 1/3] Update database tests to support onCancelled and move tests into database location. --- database/build.gradle | 1 + .../com/firebase/ui/database}/ApplicationTest.java | 2 +- .../ui/database/FirebaseArrayOfObjectsTest.java | 10 +++++++--- .../com/firebase/ui/database/FirebaseArrayTest.java | 9 +++++++-- 4 files changed, 16 insertions(+), 6 deletions(-) rename {library/src/androidTest/java/com/firebase/ui => database/src/test/java/com/firebase/ui/database}/ApplicationTest.java (97%) rename {library/src/androidTest => database/src/test}/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java (95%) rename {library/src/androidTest => database/src/test}/java/com/firebase/ui/database/FirebaseArrayTest.java (94%) diff --git a/database/build.gradle b/database/build.gradle index 3b04f5a67..db8300481 100644 --- a/database/build.gradle +++ b/database/build.gradle @@ -19,6 +19,7 @@ android { } dependencies { + testCompile 'junit:junit:4.12' compile "com.android.support:appcompat-v7:${project.ext.support_library_version}" compile "com.android.support:recyclerview-v7:${project.ext.support_library_version}" diff --git a/library/src/androidTest/java/com/firebase/ui/ApplicationTest.java b/database/src/test/java/com/firebase/ui/database/ApplicationTest.java similarity index 97% rename from library/src/androidTest/java/com/firebase/ui/ApplicationTest.java rename to database/src/test/java/com/firebase/ui/database/ApplicationTest.java index 3347e1d6d..a788de9df 100644 --- a/library/src/androidTest/java/com/firebase/ui/ApplicationTest.java +++ b/database/src/test/java/com/firebase/ui/database/ApplicationTest.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.firebase.ui; +package com.firebase.ui.database; import android.app.Application; import android.content.Context; diff --git a/library/src/androidTest/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java b/database/src/test/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java similarity index 95% rename from library/src/androidTest/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java rename to database/src/test/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java index aedaac9e7..4ec54991e 100644 --- a/library/src/androidTest/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java +++ b/database/src/test/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java @@ -16,9 +16,8 @@ import android.test.AndroidTestCase; -import com.firebase.ui.ApplicationTest; -import com.firebase.ui.database.FirebaseArray; import com.google.firebase.FirebaseApp; +import com.google.firebase.database.DatabaseError; import com.google.firebase.database.DatabaseReference; import com.google.firebase.database.FirebaseDatabase; import com.google.firebase.database.Query; @@ -173,9 +172,14 @@ private Bean getBean(FirebaseArray array, int index) { public static void runAndWaitUntil(final FirebaseArray array, Query ref, Runnable task, Callable done) throws InterruptedException { final java.util.concurrent.Semaphore semaphore = new java.util.concurrent.Semaphore(0); array.setOnChangedListener(new FirebaseArray.OnChangedListener() { - public void onChanged(FirebaseArray.OnChangedListener.EventType type, int index, int oldIndex) { + public void onChanged(EventType type, int index, int oldIndex) { semaphore.release(); } + + @Override + public void onCancelled(DatabaseError databaseError) { + throw new IllegalStateException(databaseError.toException()); + } }); task.run(); boolean isDone = false; diff --git a/library/src/androidTest/java/com/firebase/ui/database/FirebaseArrayTest.java b/database/src/test/java/com/firebase/ui/database/FirebaseArrayTest.java similarity index 94% rename from library/src/androidTest/java/com/firebase/ui/database/FirebaseArrayTest.java rename to database/src/test/java/com/firebase/ui/database/FirebaseArrayTest.java index 8fb5dcddd..0332f020c 100644 --- a/library/src/androidTest/java/com/firebase/ui/database/FirebaseArrayTest.java +++ b/database/src/test/java/com/firebase/ui/database/FirebaseArrayTest.java @@ -16,8 +16,8 @@ import android.test.AndroidTestCase; -import com.firebase.ui.ApplicationTest; import com.google.firebase.FirebaseApp; +import com.google.firebase.database.DatabaseError; import com.google.firebase.database.DatabaseReference; import com.google.firebase.database.FirebaseDatabase; import com.google.firebase.database.Query; @@ -143,9 +143,14 @@ private static void print(FirebaseArray array) { public static void runAndWaitUntil(final FirebaseArray array, Query ref, Runnable task, Callable done) throws InterruptedException { final java.util.concurrent.Semaphore semaphore = new java.util.concurrent.Semaphore(0); array.setOnChangedListener(new FirebaseArray.OnChangedListener() { - public void onChanged(FirebaseArray.OnChangedListener.EventType type, int index, int oldIndex) { + public void onChanged(EventType type, int index, int oldIndex) { semaphore.release(); } + + @Override + public void onCancelled(DatabaseError databaseError) { + throw new IllegalStateException(databaseError.toException()); + } }); task.run(); boolean isDone = false; From 01635f9402b4a086e41ee297da0fe8c77aa38561 Mon Sep 17 00:00:00 2001 From: Alex Saveau Date: Sat, 10 Sep 2016 17:06:55 -0700 Subject: [PATCH 2/3] Update database tests to support onCancelled --- database/build.gradle | 1 - .../src/test/java/com/firebase/ui/database/DatabaseTest.java | 4 ++-- .../com/firebase/ui/database/FirebaseArrayOfObjectsTest.java | 2 +- .../test/java/com/firebase/ui/database/FirebaseArrayTest.java | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) rename database/src/test/java/com/firebase/ui/database/ApplicationTest.java => library/src/test/java/com/firebase/ui/database/DatabaseTest.java (93%) rename {database => library}/src/test/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java (98%) rename {database => library}/src/test/java/com/firebase/ui/database/FirebaseArrayTest.java (98%) diff --git a/database/build.gradle b/database/build.gradle index db8300481..3b04f5a67 100644 --- a/database/build.gradle +++ b/database/build.gradle @@ -19,7 +19,6 @@ android { } dependencies { - testCompile 'junit:junit:4.12' compile "com.android.support:appcompat-v7:${project.ext.support_library_version}" compile "com.android.support:recyclerview-v7:${project.ext.support_library_version}" diff --git a/database/src/test/java/com/firebase/ui/database/ApplicationTest.java b/library/src/test/java/com/firebase/ui/database/DatabaseTest.java similarity index 93% rename from database/src/test/java/com/firebase/ui/database/ApplicationTest.java rename to library/src/test/java/com/firebase/ui/database/DatabaseTest.java index a788de9df..09167004e 100644 --- a/database/src/test/java/com/firebase/ui/database/ApplicationTest.java +++ b/library/src/test/java/com/firebase/ui/database/DatabaseTest.java @@ -24,11 +24,11 @@ /** * Testing Fundamentals */ -public class ApplicationTest extends ApplicationTestCase { +public class DatabaseTest extends ApplicationTestCase { private static final String APP_NAME = "firebaseui-tests"; - public ApplicationTest() { + public DatabaseTest() { super(Application.class); } diff --git a/database/src/test/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java b/library/src/test/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java similarity index 98% rename from database/src/test/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java rename to library/src/test/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java index 4ec54991e..42c282b19 100644 --- a/database/src/test/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java +++ b/library/src/test/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java @@ -68,7 +68,7 @@ public boolean isBool() { @Before public void setUp() throws Exception { - FirebaseApp app = ApplicationTest.getAppInstance(getContext()); + FirebaseApp app = DatabaseTest.getAppInstance(getContext()); mRef = FirebaseDatabase.getInstance(app).getReference() .child("firebasearray").child("objects"); mArray = new FirebaseArray(mRef); diff --git a/database/src/test/java/com/firebase/ui/database/FirebaseArrayTest.java b/library/src/test/java/com/firebase/ui/database/FirebaseArrayTest.java similarity index 98% rename from database/src/test/java/com/firebase/ui/database/FirebaseArrayTest.java rename to library/src/test/java/com/firebase/ui/database/FirebaseArrayTest.java index 0332f020c..59910a20d 100644 --- a/database/src/test/java/com/firebase/ui/database/FirebaseArrayTest.java +++ b/library/src/test/java/com/firebase/ui/database/FirebaseArrayTest.java @@ -37,7 +37,7 @@ public class FirebaseArrayTest extends AndroidTestCase { @Before public void setUp() throws Exception { - FirebaseApp app = ApplicationTest.getAppInstance(getContext()); + FirebaseApp app = DatabaseTest.getAppInstance(getContext()); mRef = FirebaseDatabase.getInstance(app).getReference().child("firebasearray"); mArray = new FirebaseArray(mRef); mRef.removeValue(); From bb29f7196087b99a594824d2b20d0874e918eab4 Mon Sep 17 00:00:00 2001 From: Alex Saveau Date: Sat, 10 Sep 2016 17:19:05 -0700 Subject: [PATCH 3/3] Update database tests to support onCancelled --- .../ui/database/{DatabaseTest.java => ApplicationTest.java} | 4 ++-- .../com/firebase/ui/database/FirebaseArrayOfObjectsTest.java | 2 +- .../test/java/com/firebase/ui/database/FirebaseArrayTest.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename library/src/test/java/com/firebase/ui/database/{DatabaseTest.java => ApplicationTest.java} (93%) diff --git a/library/src/test/java/com/firebase/ui/database/DatabaseTest.java b/library/src/test/java/com/firebase/ui/database/ApplicationTest.java similarity index 93% rename from library/src/test/java/com/firebase/ui/database/DatabaseTest.java rename to library/src/test/java/com/firebase/ui/database/ApplicationTest.java index 09167004e..a788de9df 100644 --- a/library/src/test/java/com/firebase/ui/database/DatabaseTest.java +++ b/library/src/test/java/com/firebase/ui/database/ApplicationTest.java @@ -24,11 +24,11 @@ /** * Testing Fundamentals */ -public class DatabaseTest extends ApplicationTestCase { +public class ApplicationTest extends ApplicationTestCase { private static final String APP_NAME = "firebaseui-tests"; - public DatabaseTest() { + public ApplicationTest() { super(Application.class); } diff --git a/library/src/test/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java b/library/src/test/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java index 42c282b19..4ec54991e 100644 --- a/library/src/test/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java +++ b/library/src/test/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java @@ -68,7 +68,7 @@ public boolean isBool() { @Before public void setUp() throws Exception { - FirebaseApp app = DatabaseTest.getAppInstance(getContext()); + FirebaseApp app = ApplicationTest.getAppInstance(getContext()); mRef = FirebaseDatabase.getInstance(app).getReference() .child("firebasearray").child("objects"); mArray = new FirebaseArray(mRef); diff --git a/library/src/test/java/com/firebase/ui/database/FirebaseArrayTest.java b/library/src/test/java/com/firebase/ui/database/FirebaseArrayTest.java index 59910a20d..0332f020c 100644 --- a/library/src/test/java/com/firebase/ui/database/FirebaseArrayTest.java +++ b/library/src/test/java/com/firebase/ui/database/FirebaseArrayTest.java @@ -37,7 +37,7 @@ public class FirebaseArrayTest extends AndroidTestCase { @Before public void setUp() throws Exception { - FirebaseApp app = DatabaseTest.getAppInstance(getContext()); + FirebaseApp app = ApplicationTest.getAppInstance(getContext()); mRef = FirebaseDatabase.getInstance(app).getReference().child("firebasearray"); mArray = new FirebaseArray(mRef); mRef.removeValue();