From 453549c87a83412ba3521201fe85d77ffe7d495d Mon Sep 17 00:00:00 2001 From: cpovirk Date: Tue, 4 Feb 2025 13:37:04 -0800 Subject: [PATCH] Run a test under more environments. It hasn't actually used "mocks" in the sense of "things from a mocking framework" since cl/85631779, which (confusingly) appears to have been the CL that _added_ the "mocks" comment (to replace a previous `@GwtIncompatible` comment about `withFallback`, which wasn't available under GWT until then). (Probably the author had switched away from using a mocking framework during development but then forgotten to remove `@GwtIncompatible` afterward.) It looks like I carried that comment over from `withFallback` to `catchingAsync` in cl/86180055, and then I added a corresponding TODO in cl/116759522. None of that seems to have been necessary. RELNOTES=n/a PiperOrigin-RevId: 723210249 --- .../test/com/google/common/util/concurrent/FuturesTest.java | 3 --- .../test/com/google/common/util/concurrent/FuturesTest.java | 3 --- 2 files changed, 6 deletions(-) diff --git a/android/guava-tests/test/com/google/common/util/concurrent/FuturesTest.java b/android/guava-tests/test/com/google/common/util/concurrent/FuturesTest.java index 574e5b251027..cc6b2d53b6eb 100644 --- a/android/guava-tests/test/com/google/common/util/concurrent/FuturesTest.java +++ b/android/guava-tests/test/com/google/common/util/concurrent/FuturesTest.java @@ -1015,9 +1015,6 @@ public void testCatchingAsync_resultCancelledBeforeFallback() throws Exception { assertFalse(primary.wasInterrupted()); } - @J2ktIncompatible - @GwtIncompatible // mocks - // TODO(cpovirk): eliminate use of mocks public void testCatchingAsync_resultCancelledAfterFallback() throws Exception { final SettableFuture secondary = SettableFuture.create(); final RuntimeException raisedException = new RuntimeException(); diff --git a/guava-tests/test/com/google/common/util/concurrent/FuturesTest.java b/guava-tests/test/com/google/common/util/concurrent/FuturesTest.java index 574e5b251027..cc6b2d53b6eb 100644 --- a/guava-tests/test/com/google/common/util/concurrent/FuturesTest.java +++ b/guava-tests/test/com/google/common/util/concurrent/FuturesTest.java @@ -1015,9 +1015,6 @@ public void testCatchingAsync_resultCancelledBeforeFallback() throws Exception { assertFalse(primary.wasInterrupted()); } - @J2ktIncompatible - @GwtIncompatible // mocks - // TODO(cpovirk): eliminate use of mocks public void testCatchingAsync_resultCancelledAfterFallback() throws Exception { final SettableFuture secondary = SettableFuture.create(); final RuntimeException raisedException = new RuntimeException();