Skip to content

Commit dbb0a80

Browse files
cpovirkGoogle Java Core Libraries
authored andcommitted
...again, having previously done so in 12bf71e. Some remaining warnings came up in 0f05bb4. RELNOTES=n/a PiperOrigin-RevId: 843385402
1 parent 156c24e commit dbb0a80

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

android/guava-tests/test/com/google/common/collect/MapsTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,6 @@ public void testFromProperties() throws IOException {
10371037

10381038
@J2ktIncompatible
10391039
@GwtIncompatible // Maps.fromProperties
1040-
@SuppressWarnings("serial") // never serialized
10411040
public void testFromPropertiesNullKey() {
10421041
Properties properties =
10431042
new Properties() {
@@ -1054,7 +1053,6 @@ public Enumeration<?> propertyNames() {
10541053

10551054
@J2ktIncompatible
10561055
@GwtIncompatible // Maps.fromProperties
1057-
@SuppressWarnings("serial") // never serialized
10581056
public void testFromPropertiesNonStringKeys() {
10591057
Properties properties =
10601058
new Properties() {

android/guava-tests/test/com/google/common/primitives/BooleansTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -593,9 +593,11 @@ public void testAsListCanonicalValues() {
593593
List<Boolean> list = Booleans.asList(true, false);
594594
assertThat(list.get(0)).isSameInstanceAs(true);
595595
assertThat(list.get(1)).isSameInstanceAs(false);
596-
@SuppressWarnings("deprecation")
596+
// The constructor is deprecated only in some versions of java.lang.Boolean.
597+
@SuppressWarnings({"deprecation", "UnnecessaryJavacSuppressWarnings"})
597598
Boolean anotherTrue = new Boolean(true);
598-
@SuppressWarnings("deprecation")
599+
// The constructor is deprecated only in some versions of java.lang.Boolean.
600+
@SuppressWarnings({"deprecation", "UnnecessaryJavacSuppressWarnings"})
599601
Boolean anotherFalse = new Boolean(false);
600602
list.set(0, anotherTrue);
601603
assertThat(list.get(0)).isSameInstanceAs(true);

guava-tests/test/com/google/common/collect/MapsTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,6 @@ public void testFromProperties() throws IOException {
10371037

10381038
@J2ktIncompatible
10391039
@GwtIncompatible // Maps.fromProperties
1040-
@SuppressWarnings("serial") // never serialized
10411040
public void testFromPropertiesNullKey() {
10421041
Properties properties =
10431042
new Properties() {
@@ -1054,7 +1053,6 @@ public Enumeration<?> propertyNames() {
10541053

10551054
@J2ktIncompatible
10561055
@GwtIncompatible // Maps.fromProperties
1057-
@SuppressWarnings("serial") // never serialized
10581056
public void testFromPropertiesNonStringKeys() {
10591057
Properties properties =
10601058
new Properties() {

guava-tests/test/com/google/common/primitives/BooleansTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -593,9 +593,11 @@ public void testAsListCanonicalValues() {
593593
List<Boolean> list = Booleans.asList(true, false);
594594
assertThat(list.get(0)).isSameInstanceAs(true);
595595
assertThat(list.get(1)).isSameInstanceAs(false);
596-
@SuppressWarnings("deprecation")
596+
// The constructor is deprecated only in some versions of java.lang.Boolean.
597+
@SuppressWarnings({"deprecation", "UnnecessaryJavacSuppressWarnings"})
597598
Boolean anotherTrue = new Boolean(true);
598-
@SuppressWarnings("deprecation")
599+
// The constructor is deprecated only in some versions of java.lang.Boolean.
600+
@SuppressWarnings({"deprecation", "UnnecessaryJavacSuppressWarnings"})
599601
Boolean anotherFalse = new Boolean(false);
600602
list.set(0, anotherTrue);
601603
assertThat(list.get(0)).isSameInstanceAs(true);

0 commit comments

Comments
 (0)