Undo changes that are covered in #1359

Author: dconeybe

firestore/integration_test_internal/src/android/firestore_integration_test_android.cc

@@ -67,13 +67,15 @@ 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;
@@ -84,8 +86,7 @@ void FirestoreAndroidIntegrationTest::FailTestIfPendingException() {
     return;
   }
 
-  // Fail the test since the test completed with an unexpected pending
-  // exception.
+  // Fail the test since the test completed with a pending exception.
   std::string pending_exception_as_string = pending_exception.ToString(env());
   env().ExceptionClear();
   FAIL() << "Test completed with a pending Java exception: "

firestore/integration_test_internal/src/android/firestore_integration_test_android_test.cc

@@ -63,6 +63,7 @@ TEST_F(FirestoreAndroidIntegrationTest,
   std::string debug_string = ToDebugString(object);
 
   EXPECT_EQ(debug_string, "Test Value");
+  env().ExceptionClear();
 }
 
 TEST_F(FirestoreAndroidIntegrationTest,
@@ -74,6 +75,7 @@ TEST_F(FirestoreAndroidIntegrationTest,
   std::string debug_string = ToDebugString(null_reference);
 
   EXPECT_EQ(debug_string, "null");
+  env().ExceptionClear();
 }
 
 TEST_F(FirestoreAndroidIntegrationTest, JavaEqShouldReturnTrueForEqualObjects) {

firestore/integration_test_internal/src/jni/task_test.cc

@@ -78,7 +78,7 @@ TEST_F(TaskTest, GetResultShouldReturnTheResult) {
 
   Local<Object> actual_result = task.GetResult(env());
 
-  ASSERT_THAT(actual_result, RefersToSameJavaObjectAs(result));
+  ASSERT_THAT(actual_result, JavaEq(result));
 }
 
 TEST_F(TaskTest, GetExceptionShouldReturnTheException) {
@@ -87,7 +87,7 @@ TEST_F(TaskTest, GetExceptionShouldReturnTheException) {
 
   Local<Throwable> actual_exception = task.GetException(env());
 
-  ASSERT_THAT(actual_exception, RefersToSameJavaObjectAs(exception));
+  ASSERT_THAT(actual_exception, JavaEq(exception));
 }
 
 // Tests for Task.IsComplete()