Skip to content

Commit fe58376

Browse files
committed
test(firestore): guard super.after() in ITLargeDocumentTest when firestore is null
1 parent f4aa344 commit fe58376

1 file changed

Lines changed: 12 additions & 10 deletions

File tree

java-firestore/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITLargeDocumentTest.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -117,18 +117,20 @@ public void before() throws Exception {
117117
@After
118118
@Override
119119
public void after() throws Exception {
120-
if (firestore != null && collectionName != null) {
121-
try {
122-
// Delete documents in parallel
123-
ApiFuture<WriteResult> d1 = docRef.delete();
124-
ApiFuture<WriteResult> d2 = docA.delete();
125-
ApiFuture<WriteResult> d3 = docB.delete();
126-
ApiFutures.allAsList(Arrays.asList(d1, d2, d3)).get(30, TimeUnit.SECONDS);
127-
} catch (Exception e) {
128-
// Suppress errors during cleanup to not mask test failures
120+
if (firestore != null) {
121+
if (collectionName != null) {
122+
try {
123+
// Delete documents in parallel
124+
ApiFuture<WriteResult> d1 = docRef.delete();
125+
ApiFuture<WriteResult> d2 = docA.delete();
126+
ApiFuture<WriteResult> d3 = docB.delete();
127+
ApiFutures.allAsList(Arrays.asList(d1, d2, d3)).get(30, TimeUnit.SECONDS);
128+
} catch (Exception e) {
129+
// Suppress errors during cleanup to not mask test failures
130+
}
129131
}
132+
super.after();
130133
}
131-
super.after();
132134
}
133135

134136
@Test

0 commit comments

Comments
 (0)