aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-05-07 17:42:20 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-05-07 17:42:20 +0000
commit814caca4fb8994a0857dfe7559f58d29eabc6951 (patch)
treeaea3bdc0219699e9a437fc0f0d5df38eb5e9753f
parentb236248e3e65ce42467961b2093266db4a915390 (diff)
parent00fd91fa63c074c22e9b4e0319b91bbf38aa0696 (diff)
downloadguava-master.tar.gz
Merge "Update the imports to androidx.test.filters.*" into mainHEADmastermain
-rw-r--r--android/guava-tests/test/com/google/common/base/AndroidIncompatible.java4
-rw-r--r--guava-tests/test/com/google/common/base/AndroidIncompatible.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/android/guava-tests/test/com/google/common/base/AndroidIncompatible.java b/android/guava-tests/test/com/google/common/base/AndroidIncompatible.java
index 9ed987a26..0be1c11ae 100644
--- a/android/guava-tests/test/com/google/common/base/AndroidIncompatible.java
+++ b/android/guava-tests/test/com/google/common/base/AndroidIncompatible.java
@@ -32,8 +32,8 @@ import java.lang.annotation.Target;
* Google-internal Android suite generators. Note that those generators also suppress any test
* annotated with LargeTest.
*
- * <p>Why use a custom annotation instead of {@code android.test.suitebuilder.annotation.Suppress}?
- * I'm not completely sure that this is the right choice, but it has various advantages:
+ * <p>Why use a custom annotation instead of {@code androidx.test.filters.Suppress}? I'm not
+ * completely sure that this is the right choice, but it has various advantages:
*
* <ul>
* <li>An annotation named just "Suppress" might someday be treated by a non-Android tool as a
diff --git a/guava-tests/test/com/google/common/base/AndroidIncompatible.java b/guava-tests/test/com/google/common/base/AndroidIncompatible.java
index 9ed987a26..0be1c11ae 100644
--- a/guava-tests/test/com/google/common/base/AndroidIncompatible.java
+++ b/guava-tests/test/com/google/common/base/AndroidIncompatible.java
@@ -32,8 +32,8 @@ import java.lang.annotation.Target;
* Google-internal Android suite generators. Note that those generators also suppress any test
* annotated with LargeTest.
*
- * <p>Why use a custom annotation instead of {@code android.test.suitebuilder.annotation.Suppress}?
- * I'm not completely sure that this is the right choice, but it has various advantages:
+ * <p>Why use a custom annotation instead of {@code androidx.test.filters.Suppress}? I'm not
+ * completely sure that this is the right choice, but it has various advantages:
*
* <ul>
* <li>An annotation named just "Suppress" might someday be treated by a non-Android tool as a