Skip to content

Update database tests to support onCancelled #298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 12, 2016
Merged

Update database tests to support onCancelled #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad98c24
Merge pull request #7 from firebase/master
SUPERCILEX Sep 10, 2016
eec99b4
Update database tests to support onCancelled and move tests into data…
SUPERCILEX Sep 10, 2016
01635f9
Update database tests to support onCancelled
SUPERCILEX Sep 11, 2016
bb29f71
Update database tests to support onCancelled
SUPERCILEX Sep 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...java/com/firebase/ui/ApplicationTest.java → ...firebase/ui/database/ApplicationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 7 additions & 3 deletions .../database/FirebaseArrayOfObjectsTest.java → .../database/FirebaseArrayOfObjectsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -173,9 +172,14 @@ private Bean getBean(FirebaseArray array, int index) {
public static void runAndWaitUntil(final FirebaseArray array, Query ref, Runnable task, Callable<Boolean> 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;
Expand Down
9 changes: 7 additions & 2 deletions ...rebase/ui/database/FirebaseArrayTest.java → ...rebase/ui/database/FirebaseArrayTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -143,9 +143,14 @@ private static void print(FirebaseArray array) {
public static void runAndWaitUntil(final FirebaseArray array, Query ref, Runnable task, Callable<Boolean> 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;
Expand Down