Skip to content

Firestore: Various small improvements to the Android integration tests #1359

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
Jun 30, 2023
Merged

Firestore: Various small improvements to the Android integration tests #1359

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
7d89ff1
firestore_integration_test_android.cc: clean up some comments
dconeybe Jun 23, 2023
9546aaf
firestore_integration_test_android_test.cc: Remove two unnecssary cal…
dconeybe Jun 23, 2023
c4fe7dc
task_test.cc: use RefersToSameJavaObjectAs() instead of JavaEq(except…
dconeybe Jun 23, 2023
42713ff
Merge branch 'main' into dconeybe/AndroidTestRandomImprovements
dconeybe Jun 26, 2023
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
9 changes: 4 additions & 5 deletions firestore/integration_test_internal/src/android/firestore_integration_test_android.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,13 @@ void FirestoreAndroidIntegrationTest::SetUp() {
}

void FirestoreAndroidIntegrationTest::TearDown() {
// Fail the test if there is a pending Java exception. Clear the pending
// exception as well so that it doesn't bleed into the next test.
FailTestIfPendingException();

// Perform the tear-down steps of the superclass.
FirestoreIntegrationTest::TearDown();
}

void FirestoreAndroidIntegrationTest::FailTestIfPendingException() {
// Fail the test if there is a pending Java exception. Clear the pending
// exception as well so that it doesn't bleed into the next test.
Local<Throwable> pending_exception = env().ClearExceptionOccurred();
if (!pending_exception) {
return;
Expand All @@ -86,7 +84,8 @@ void FirestoreAndroidIntegrationTest::FailTestIfPendingException() {
return;
}

// Fail the test since the test completed with a pending exception.
// Fail the test since the test completed with an unexpected pending
// exception.
std::string pending_exception_as_string = pending_exception.ToString(env());
env().ExceptionClear();
FAIL() << "Test completed with a pending Java exception: "
Expand Down
2 changes: 0 additions & 2 deletions firestore/integration_test_internal/src/android/firestore_integration_test_android_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ TEST_F(FirestoreAndroidIntegrationTest,
std::string debug_string = ToDebugString(object);

EXPECT_EQ(debug_string, "Test Value");
env().ExceptionClear();
}

TEST_F(FirestoreAndroidIntegrationTest,
Expand All @@ -75,7 +74,6 @@ TEST_F(FirestoreAndroidIntegrationTest,
std::string debug_string = ToDebugString(null_reference);

EXPECT_EQ(debug_string, "null");
env().ExceptionClear();
}

TEST_F(FirestoreAndroidIntegrationTest, JavaEqShouldReturnTrueForEqualObjects) {
Expand Down
4 changes: 2 additions & 2 deletions firestore/integration_test_internal/src/jni/task_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ TEST_F(TaskTest, GetResultShouldReturnTheResult) {

Local<Object> actual_result = task.GetResult(env());

ASSERT_THAT(actual_result, JavaEq(result));
ASSERT_THAT(actual_result, RefersToSameJavaObjectAs(result));
}

TEST_F(TaskTest, GetExceptionShouldReturnTheException) {
Expand All @@ -87,7 +87,7 @@ TEST_F(TaskTest, GetExceptionShouldReturnTheException) {

Local<Throwable> actual_exception = task.GetException(env());

ASSERT_THAT(actual_exception, JavaEq(exception));
ASSERT_THAT(actual_exception, RefersToSameJavaObjectAs(exception));
}

// Tests for Task.IsComplete()
Expand Down