From c37130733fd791487a5c01cb0f3e9b2b4786534c Mon Sep 17 00:00:00 2001
From: cushon <cushon@google.com>
Date: Thu, 28 Feb 2019 20:17:01 -0800
Subject: [PATCH] Suppress error for bad implementations of Comparable

RELNOTES=N/A

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=236248361
---
 .../src/com/google/common/testing/ArbitraryInstances.java        | 1 +
 .../test/com/google/common/collect/LegacyComparable.java         | 1 +
 .../test/com/google/common/graph/ElementOrderTest.java           | 1 +
 .../src/com/google/common/testing/ArbitraryInstances.java        | 1 +
 guava-tests/test/com/google/common/collect/LegacyComparable.java | 1 +
 guava-tests/test/com/google/common/graph/ElementOrderTest.java   | 1 +
 6 files changed, 6 insertions(+)

diff --git a/android/guava-testlib/src/com/google/common/testing/ArbitraryInstances.java b/android/guava-testlib/src/com/google/common/testing/ArbitraryInstances.java
index ef8189d29022..906c1c5a9e06 100644
--- a/android/guava-testlib/src/com/google/common/testing/ArbitraryInstances.java
+++ b/android/guava-testlib/src/com/google/common/testing/ArbitraryInstances.java
@@ -468,6 +468,7 @@ public OutputStream openStream() {
   // Compare by toString() to satisfy 2 properties:
   // 1. compareTo(null) should throw NullPointerException
   // 2. the order is deterministic and easy to understand, for debugging purpose.
+  @SuppressWarnings("ComparableType")
   private static final class ByToString implements Comparable<Object>, Serializable {
     private static final ByToString INSTANCE = new ByToString();
 
diff --git a/android/guava-tests/test/com/google/common/collect/LegacyComparable.java b/android/guava-tests/test/com/google/common/collect/LegacyComparable.java
index 3f6da68f73c4..8b0c9620cd68 100644
--- a/android/guava-tests/test/com/google/common/collect/LegacyComparable.java
+++ b/android/guava-tests/test/com/google/common/collect/LegacyComparable.java
@@ -27,6 +27,7 @@
  *
  * @author Kevin Bourrillion
  */
+@SuppressWarnings("ComparableType")
 @GwtCompatible
 class LegacyComparable implements Comparable, Serializable {
   static final LegacyComparable X = new LegacyComparable("x");
diff --git a/android/guava-tests/test/com/google/common/graph/ElementOrderTest.java b/android/guava-tests/test/com/google/common/graph/ElementOrderTest.java
index 68cb3dcf0511..0557fb7babb9 100644
--- a/android/guava-tests/test/com/google/common/graph/ElementOrderTest.java
+++ b/android/guava-tests/test/com/google/common/graph/ElementOrderTest.java
@@ -239,6 +239,7 @@ public String toString() {
     }
   }
 
+  @SuppressWarnings("ComparableType")
   private static class ComparableSubClass extends NonComparableSuperClass
       implements Comparable<NonComparableSuperClass> {
 
diff --git a/guava-testlib/src/com/google/common/testing/ArbitraryInstances.java b/guava-testlib/src/com/google/common/testing/ArbitraryInstances.java
index 8e4b1fcb833e..19eda639fd16 100644
--- a/guava-testlib/src/com/google/common/testing/ArbitraryInstances.java
+++ b/guava-testlib/src/com/google/common/testing/ArbitraryInstances.java
@@ -480,6 +480,7 @@ public OutputStream openStream() {
   // Compare by toString() to satisfy 2 properties:
   // 1. compareTo(null) should throw NullPointerException
   // 2. the order is deterministic and easy to understand, for debugging purpose.
+  @SuppressWarnings("ComparableType")
   private static final class ByToString implements Comparable<Object>, Serializable {
     private static final ByToString INSTANCE = new ByToString();
 
diff --git a/guava-tests/test/com/google/common/collect/LegacyComparable.java b/guava-tests/test/com/google/common/collect/LegacyComparable.java
index 3f6da68f73c4..8b0c9620cd68 100644
--- a/guava-tests/test/com/google/common/collect/LegacyComparable.java
+++ b/guava-tests/test/com/google/common/collect/LegacyComparable.java
@@ -27,6 +27,7 @@
  *
  * @author Kevin Bourrillion
  */
+@SuppressWarnings("ComparableType")
 @GwtCompatible
 class LegacyComparable implements Comparable, Serializable {
   static final LegacyComparable X = new LegacyComparable("x");
diff --git a/guava-tests/test/com/google/common/graph/ElementOrderTest.java b/guava-tests/test/com/google/common/graph/ElementOrderTest.java
index 68cb3dcf0511..0557fb7babb9 100644
--- a/guava-tests/test/com/google/common/graph/ElementOrderTest.java
+++ b/guava-tests/test/com/google/common/graph/ElementOrderTest.java
@@ -239,6 +239,7 @@ public String toString() {
     }
   }
 
+  @SuppressWarnings("ComparableType")
   private static class ComparableSubClass extends NonComparableSuperClass
       implements Comparable<NonComparableSuperClass> {