From b331769af3f2e00c5046ed0fe79c5ec22e3fd0bf Mon Sep 17 00:00:00 2001 From: Kurt Alfred Kluever Date: Fri, 12 May 2023 12:19:32 -0700 Subject: [PATCH] Remove `@Beta` from various `testing` APIs. RELNOTES=`testing`: Remove `@Beta` from various `testing` APIs. PiperOrigin-RevId: 531573028 --- .../com/google/common/testing/AbstractPackageSanityTests.java | 2 -- .../src/com/google/common/testing/ClassSanityTester.java | 2 -- .../src/com/google/common/testing/SloppyTearDown.java | 2 -- .../guava-testlib/src/com/google/common/testing/TearDown.java | 2 -- .../src/com/google/common/testing/TearDownAccepter.java | 2 -- .../src/com/google/common/testing/TearDownStack.java | 2 -- .../com/google/common/testing/AbstractPackageSanityTests.java | 2 -- .../src/com/google/common/testing/ClassSanityTester.java | 2 -- guava-testlib/src/com/google/common/testing/SloppyTearDown.java | 2 -- guava-testlib/src/com/google/common/testing/TearDown.java | 2 -- .../src/com/google/common/testing/TearDownAccepter.java | 2 -- guava-testlib/src/com/google/common/testing/TearDownStack.java | 2 -- 12 files changed, 24 deletions(-) diff --git a/android/guava-testlib/src/com/google/common/testing/AbstractPackageSanityTests.java b/android/guava-testlib/src/com/google/common/testing/AbstractPackageSanityTests.java index 6153367c9450..67179415db57 100644 --- a/android/guava-testlib/src/com/google/common/testing/AbstractPackageSanityTests.java +++ b/android/guava-testlib/src/com/google/common/testing/AbstractPackageSanityTests.java @@ -20,7 +20,6 @@ import static com.google.common.base.Predicates.not; import static com.google.common.testing.AbstractPackageSanityTests.Chopper.suffix; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.annotations.VisibleForTesting; @@ -102,7 +101,6 @@ * @author Ben Yu * @since 14.0 */ -@Beta // TODO: Switch to JUnit 4 and use @Parameterized and @BeforeClass // Note: @Test annotations are deliberate, as some subclasses specify @RunWith(JUnit4). @GwtIncompatible diff --git a/android/guava-testlib/src/com/google/common/testing/ClassSanityTester.java b/android/guava-testlib/src/com/google/common/testing/ClassSanityTester.java index 8c4ee4705bc0..3a41a7fe133f 100644 --- a/android/guava-testlib/src/com/google/common/testing/ClassSanityTester.java +++ b/android/guava-testlib/src/com/google/common/testing/ClassSanityTester.java @@ -21,7 +21,6 @@ import static com.google.common.base.Throwables.throwIfUnchecked; import static com.google.common.testing.NullPointerTester.isNullable; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.annotations.VisibleForTesting; @@ -80,7 +79,6 @@ * @author Ben Yu * @since 14.0 */ -@Beta @GwtIncompatible @J2ktIncompatible public final class ClassSanityTester { diff --git a/android/guava-testlib/src/com/google/common/testing/SloppyTearDown.java b/android/guava-testlib/src/com/google/common/testing/SloppyTearDown.java index 478e8b7e4d88..10d9dc04ecd4 100644 --- a/android/guava-testlib/src/com/google/common/testing/SloppyTearDown.java +++ b/android/guava-testlib/src/com/google/common/testing/SloppyTearDown.java @@ -16,7 +16,6 @@ package com.google.common.testing; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import java.util.logging.Level; import java.util.logging.Logger; @@ -30,7 +29,6 @@ * @author Luiz-Otavio Zorzella * @since 10.0 */ -@Beta @GwtCompatible @ElementTypesAreNonnullByDefault public abstract class SloppyTearDown implements TearDown { diff --git a/android/guava-testlib/src/com/google/common/testing/TearDown.java b/android/guava-testlib/src/com/google/common/testing/TearDown.java index 9a907761d010..45aebe2a2448 100644 --- a/android/guava-testlib/src/com/google/common/testing/TearDown.java +++ b/android/guava-testlib/src/com/google/common/testing/TearDown.java @@ -16,7 +16,6 @@ package com.google.common.testing; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; /** @@ -25,7 +24,6 @@ * @author Kevin Bourrillion * @since 10.0 */ -@Beta @GwtCompatible @ElementTypesAreNonnullByDefault public interface TearDown { diff --git a/android/guava-testlib/src/com/google/common/testing/TearDownAccepter.java b/android/guava-testlib/src/com/google/common/testing/TearDownAccepter.java index 52134256a4c4..ec4319bab550 100644 --- a/android/guava-testlib/src/com/google/common/testing/TearDownAccepter.java +++ b/android/guava-testlib/src/com/google/common/testing/TearDownAccepter.java @@ -16,7 +16,6 @@ package com.google.common.testing; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.DoNotMock; @@ -26,7 +25,6 @@ * @author Kevin Bourrillion * @since 10.0 */ -@Beta @DoNotMock("Implement with a lambda") @GwtCompatible @ElementTypesAreNonnullByDefault diff --git a/android/guava-testlib/src/com/google/common/testing/TearDownStack.java b/android/guava-testlib/src/com/google/common/testing/TearDownStack.java index 1f7e855e0698..c22b54c40486 100644 --- a/android/guava-testlib/src/com/google/common/testing/TearDownStack.java +++ b/android/guava-testlib/src/com/google/common/testing/TearDownStack.java @@ -18,7 +18,6 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.collect.Lists; import com.google.errorprone.annotations.concurrent.GuardedBy; @@ -36,7 +35,6 @@ * @author Kevin Bourrillion * @since 10.0 */ -@Beta @GwtCompatible @ElementTypesAreNonnullByDefault public class TearDownStack implements TearDownAccepter { diff --git a/guava-testlib/src/com/google/common/testing/AbstractPackageSanityTests.java b/guava-testlib/src/com/google/common/testing/AbstractPackageSanityTests.java index 184a8c21fdaa..1836b9dedf69 100644 --- a/guava-testlib/src/com/google/common/testing/AbstractPackageSanityTests.java +++ b/guava-testlib/src/com/google/common/testing/AbstractPackageSanityTests.java @@ -20,7 +20,6 @@ import static com.google.common.base.Predicates.not; import static com.google.common.testing.AbstractPackageSanityTests.Chopper.suffix; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.annotations.VisibleForTesting; @@ -102,7 +101,6 @@ * @author Ben Yu * @since 14.0 */ -@Beta // TODO: Switch to JUnit 4 and use @Parameterized and @BeforeClass // Note: @Test annotations are deliberate, as some subclasses specify @RunWith(JUnit4). @GwtIncompatible diff --git a/guava-testlib/src/com/google/common/testing/ClassSanityTester.java b/guava-testlib/src/com/google/common/testing/ClassSanityTester.java index 0af86684bbe6..d327666fee95 100644 --- a/guava-testlib/src/com/google/common/testing/ClassSanityTester.java +++ b/guava-testlib/src/com/google/common/testing/ClassSanityTester.java @@ -21,7 +21,6 @@ import static com.google.common.base.Throwables.throwIfUnchecked; import static com.google.common.testing.NullPointerTester.isNullable; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.annotations.VisibleForTesting; @@ -80,7 +79,6 @@ * @author Ben Yu * @since 14.0 */ -@Beta @GwtIncompatible @J2ktIncompatible public final class ClassSanityTester { diff --git a/guava-testlib/src/com/google/common/testing/SloppyTearDown.java b/guava-testlib/src/com/google/common/testing/SloppyTearDown.java index 478e8b7e4d88..10d9dc04ecd4 100644 --- a/guava-testlib/src/com/google/common/testing/SloppyTearDown.java +++ b/guava-testlib/src/com/google/common/testing/SloppyTearDown.java @@ -16,7 +16,6 @@ package com.google.common.testing; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import java.util.logging.Level; import java.util.logging.Logger; @@ -30,7 +29,6 @@ * @author Luiz-Otavio Zorzella * @since 10.0 */ -@Beta @GwtCompatible @ElementTypesAreNonnullByDefault public abstract class SloppyTearDown implements TearDown { diff --git a/guava-testlib/src/com/google/common/testing/TearDown.java b/guava-testlib/src/com/google/common/testing/TearDown.java index 877e5c2391fb..0259a1f3ba1c 100644 --- a/guava-testlib/src/com/google/common/testing/TearDown.java +++ b/guava-testlib/src/com/google/common/testing/TearDown.java @@ -16,7 +16,6 @@ package com.google.common.testing; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; /** @@ -25,7 +24,6 @@ * @author Kevin Bourrillion * @since 10.0 */ -@Beta @FunctionalInterface @GwtCompatible @ElementTypesAreNonnullByDefault diff --git a/guava-testlib/src/com/google/common/testing/TearDownAccepter.java b/guava-testlib/src/com/google/common/testing/TearDownAccepter.java index 52134256a4c4..ec4319bab550 100644 --- a/guava-testlib/src/com/google/common/testing/TearDownAccepter.java +++ b/guava-testlib/src/com/google/common/testing/TearDownAccepter.java @@ -16,7 +16,6 @@ package com.google.common.testing; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.DoNotMock; @@ -26,7 +25,6 @@ * @author Kevin Bourrillion * @since 10.0 */ -@Beta @DoNotMock("Implement with a lambda") @GwtCompatible @ElementTypesAreNonnullByDefault diff --git a/guava-testlib/src/com/google/common/testing/TearDownStack.java b/guava-testlib/src/com/google/common/testing/TearDownStack.java index 1f7e855e0698..c22b54c40486 100644 --- a/guava-testlib/src/com/google/common/testing/TearDownStack.java +++ b/guava-testlib/src/com/google/common/testing/TearDownStack.java @@ -18,7 +18,6 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.collect.Lists; import com.google.errorprone.annotations.concurrent.GuardedBy; @@ -36,7 +35,6 @@ * @author Kevin Bourrillion * @since 10.0 */ -@Beta @GwtCompatible @ElementTypesAreNonnullByDefault public class TearDownStack implements TearDownAccepter {