Moe Sync

android/guava-testlib/src/com/google/common/collect/testing/google/AbstractListMultimapTester.java

@@ -32,10 +32,12 @@
 public class AbstractListMultimapTester<K, V>
     extends AbstractMultimapTester<K, V, ListMultimap<K, V>> {
 
+  @Override
   protected void assertGet(K key, V... values) {
     assertGet(key, Arrays.asList(values));
   }
 
+  @Override
   protected void assertGet(K key, Collection<V> values) {
     assertEqualInOrder(values, multimap().get(key));
 

android/guava-testlib/src/com/google/common/collect/testing/google/AbstractMultisetSetCountTester.java

@@ -315,9 +315,8 @@ public void testSetCount_removeNull_nullSupported() {
   }
 
   @CollectionFeature.Require(
-    value = {SUPPORTS_ADD, ALLOWS_NULL_VALUES},
-    absent = RESTRICTS_ELEMENTS
-  )
+      value = {SUPPORTS_ADD, ALLOWS_NULL_VALUES},
+      absent = RESTRICTS_ELEMENTS)
   public void testSetCount_addNull_nullSupported() {
     assertSetCount(null, 1);
   }

android/guava-testlib/src/com/google/common/collect/testing/google/DerivedGoogleCollectionGenerators.java

@@ -81,6 +81,7 @@ public V[] createValueArray(int length) {
       return (V[]) new Object[length];
     }
 
+    @Override
     public TestSubjectGenerator<?> getInnerGenerator() {
       return generator;
     }
@@ -144,6 +145,7 @@ public K[] createValueArray(int length) {
       return (K[]) new Object[length];
     }
 
+    @Override
     public TestSubjectGenerator<?> getInnerGenerator() {
       return generator;
     }
@@ -202,6 +204,7 @@ public Iterable<V> order(List<V> insertionOrder) {
       return insertionOrder;
     }
 
+    @Override
     public TestSubjectGenerator<?> getInnerGenerator() {
       return mapGenerator;
     }

android/guava-testlib/src/com/google/common/collect/testing/testers/CollectionAddAllTester.java

@@ -128,9 +128,8 @@ public void testAddAll_unsupportedAllPresent() {
   }
 
   @CollectionFeature.Require(
-    value = {SUPPORTS_ADD, ALLOWS_NULL_VALUES},
-    absent = RESTRICTS_ELEMENTS
-  )
+      value = {SUPPORTS_ADD, ALLOWS_NULL_VALUES},
+      absent = RESTRICTS_ELEMENTS)
   public void testAddAll_nullSupported() {
     List<E> containsNull = singletonList(null);
     assertTrue("addAll(containsNull) should return true", collection.addAll(containsNull));

android/guava-testlib/src/com/google/common/collect/testing/testers/CollectionAddTester.java

@@ -72,9 +72,8 @@ public void testAdd_unsupportedPresent() {
   }
 
   @CollectionFeature.Require(
-    value = {SUPPORTS_ADD, ALLOWS_NULL_VALUES},
-    absent = RESTRICTS_ELEMENTS
-  )
+      value = {SUPPORTS_ADD, ALLOWS_NULL_VALUES},
+      absent = RESTRICTS_ELEMENTS)
   public void testAdd_nullSupported() {
     assertTrue("add(null) should return true", collection.add(null));
     expectAdded((E) null);

android/guava-testlib/src/com/google/common/testing/GcFinalization.java

@@ -264,6 +264,7 @@ public interface FinalizationPredicate {
   public static void awaitClear(final WeakReference<?> ref) {
     awaitDone(
         new FinalizationPredicate() {
+          @Override
           public boolean isDone() {
             return ref.get() == null;
           }

android/guava-tests/benchmark/com/google/common/collect/BinaryTreeTraverserBenchmark.java

@@ -18,7 +18,6 @@
 import com.google.caliper.Benchmark;
 import com.google.caliper.Param;
 import com.google.common.base.Optional;
-import com.google.common.collect.ImmutableList;
 import com.google.common.primitives.Ints;
 import java.util.List;
 import java.util.Random;

android/guava-tests/test/com/google/common/base/StringsTest.java

@@ -242,8 +242,7 @@ public void testLenientFormat_badArgumentToString() {
 
   public void testLenientFormat_badArgumentToString_gwtFriendly() {
     assertThat(Strings.lenientFormat("boiler %s plate", new ThrowsOnToString()))
-        .matches(
-            "boiler <.*> plate");
+        .matches("boiler <.*> plate");
   }
 
   private static class ThrowsOnToString {

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

@@ -37,22 +37,27 @@
 public class CompactHashMapTest extends TestCase {
   public static Test suite() {
     TestSuite suite = new TestSuite();
-    suite.addTest(MapTestSuiteBuilder.using(new TestStringMapGenerator() {
-        @Override
-        protected Map<String, String> create(Entry<String, String>[] entries) {
-          Map<String, String> map = CompactHashMap.create();
-          for (Entry<String, String> entry : entries) {
-            map.put(entry.getKey(), entry.getValue());
-          }
-          return map;
-        }
-      })
-      .named("CompactHashMap")
-      .withFeatures(
-        CollectionSize.ANY, MapFeature.GENERAL_PURPOSE, MapFeature.ALLOWS_NULL_KEYS,
-        MapFeature.ALLOWS_NULL_VALUES, CollectionFeature.SERIALIZABLE,
-        CollectionFeature.SUPPORTS_ITERATOR_REMOVE)
-      .createTestSuite());
+    suite.addTest(
+        MapTestSuiteBuilder.using(
+                new TestStringMapGenerator() {
+                  @Override
+                  protected Map<String, String> create(Entry<String, String>[] entries) {
+                    Map<String, String> map = CompactHashMap.create();
+                    for (Entry<String, String> entry : entries) {
+                      map.put(entry.getKey(), entry.getValue());
+                    }
+                    return map;
+                  }
+                })
+            .named("CompactHashMap")
+            .withFeatures(
+                CollectionSize.ANY,
+                MapFeature.GENERAL_PURPOSE,
+                MapFeature.ALLOWS_NULL_KEYS,
+                MapFeature.ALLOWS_NULL_VALUES,
+                CollectionFeature.SERIALIZABLE,
+                CollectionFeature.SUPPORTS_ITERATOR_REMOVE)
+            .createTestSuite());
     suite.addTestSuite(CompactHashMapTest.class);
     return suite;
   }

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

@@ -37,40 +37,49 @@
 @GwtIncompatible // java.util.Arrays#copyOf(Object[], int), java.lang.reflect.Array
 public class CompactHashSetTest extends TestCase {
   public static Test suite() {
-    List<Feature<?>> allFeatures = Arrays.<Feature<?>>asList(
-        CollectionSize.ANY,
-        CollectionFeature.ALLOWS_NULL_VALUES,
-        CollectionFeature.FAILS_FAST_ON_CONCURRENT_MODIFICATION,
-        CollectionFeature.GENERAL_PURPOSE,
-        CollectionFeature.REMOVE_OPERATIONS,
-        CollectionFeature.SERIALIZABLE,
-        CollectionFeature.SUPPORTS_ADD,
-        CollectionFeature.SUPPORTS_REMOVE);
+    List<Feature<?>> allFeatures =
+        Arrays.<Feature<?>>asList(
+            CollectionSize.ANY,
+            CollectionFeature.ALLOWS_NULL_VALUES,
+            CollectionFeature.FAILS_FAST_ON_CONCURRENT_MODIFICATION,
+            CollectionFeature.GENERAL_PURPOSE,
+            CollectionFeature.REMOVE_OPERATIONS,
+            CollectionFeature.SERIALIZABLE,
+            CollectionFeature.SUPPORTS_ADD,
+            CollectionFeature.SUPPORTS_REMOVE);
 
     TestSuite suite = new TestSuite();
     suite.addTestSuite(CompactHashSetTest.class);
-    suite.addTest(SetTestSuiteBuilder.using(new TestStringSetGenerator() {
-      @Override protected Set<String> create(String[] elements) {
-        return CompactHashSet.create(Arrays.asList(elements));
-      }
-    }).named("CompactHashSet")
-      .withFeatures(allFeatures)
-      .createTestSuite());
-    suite.addTest(SetTestSuiteBuilder.using(new TestStringSetGenerator() {
-      @Override protected Set<String> create(String[] elements) {
-        CompactHashSet set = CompactHashSet.create(Arrays.asList(elements));
-        for (int i = 0; i < 100; i++) {
-          set.add(i);
-        }
-        for (int i = 0; i < 100; i++) {
-          set.remove(i);
-        }
-        set.trimToSize();
-        return set;
-      }
-    }).named("CompactHashSet#TrimToSize")
-      .withFeatures(allFeatures)
-      .createTestSuite());
+    suite.addTest(
+        SetTestSuiteBuilder.using(
+                new TestStringSetGenerator() {
+                  @Override
+                  protected Set<String> create(String[] elements) {
+                    return CompactHashSet.create(Arrays.asList(elements));
+                  }
+                })
+            .named("CompactHashSet")
+            .withFeatures(allFeatures)
+            .createTestSuite());
+    suite.addTest(
+        SetTestSuiteBuilder.using(
+                new TestStringSetGenerator() {
+                  @Override
+                  protected Set<String> create(String[] elements) {
+                    CompactHashSet set = CompactHashSet.create(Arrays.asList(elements));
+                    for (int i = 0; i < 100; i++) {
+                      set.add(i);
+                    }
+                    for (int i = 0; i < 100; i++) {
+                      set.remove(i);
+                    }
+                    set.trimToSize();
+                    return set;
+                  }
+                })
+            .named("CompactHashSet#TrimToSize")
+            .withFeatures(allFeatures)
+            .createTestSuite());
     return suite;
   }
 

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

@@ -35,22 +35,28 @@
 public class CompactLinkedHashMapTest extends TestCase {
   public static Test suite() {
     TestSuite suite = new TestSuite();
-    suite.addTest(MapTestSuiteBuilder.using(new TestStringMapGenerator() {
-        @Override
-        protected Map<String, String> create(Entry<String, String>[] entries) {
-          Map<String, String> map = CompactLinkedHashMap.create();
-          for (Entry<String, String> entry : entries) {
-            map.put(entry.getKey(), entry.getValue());
-          }
-          return map;
-        }
-      }).named("CompactLinkedHashMap").withFeatures(CollectionSize.ANY,
-          CollectionFeature.SUPPORTS_ITERATOR_REMOVE,
-          MapFeature.GENERAL_PURPOSE,
-          MapFeature.ALLOWS_NULL_KEYS,
-          MapFeature.ALLOWS_NULL_VALUES,
-          CollectionFeature.SERIALIZABLE,
-          CollectionFeature.KNOWN_ORDER).createTestSuite());
+    suite.addTest(
+        MapTestSuiteBuilder.using(
+                new TestStringMapGenerator() {
+                  @Override
+                  protected Map<String, String> create(Entry<String, String>[] entries) {
+                    Map<String, String> map = CompactLinkedHashMap.create();
+                    for (Entry<String, String> entry : entries) {
+                      map.put(entry.getKey(), entry.getValue());
+                    }
+                    return map;
+                  }
+                })
+            .named("CompactLinkedHashMap")
+            .withFeatures(
+                CollectionSize.ANY,
+                CollectionFeature.SUPPORTS_ITERATOR_REMOVE,
+                MapFeature.GENERAL_PURPOSE,
+                MapFeature.ALLOWS_NULL_KEYS,
+                MapFeature.ALLOWS_NULL_VALUES,
+                CollectionFeature.SERIALIZABLE,
+                CollectionFeature.KNOWN_ORDER)
+            .createTestSuite());
     suite.addTestSuite(CompactLinkedHashMapTest.class);
     return suite;
   }
@@ -119,8 +125,7 @@ public void testTrimToSize() {
     testHasMapEntriesInOrder(map, 1, "a", 4, "b", 3, "d", 2, "c");
   }
 
-  private void testHasMapEntriesInOrder(Map<?, ?> map,
-      Object... alternatingKeysAndValues) {
+  private void testHasMapEntriesInOrder(Map<?, ?> map, Object... alternatingKeysAndValues) {
     List<? extends Entry<?, ?>> entries = Lists.newArrayList(map.entrySet());
     List<Object> keys = Lists.newArrayList(map.keySet());
     List<Object> values = Lists.newArrayList(map.values());
@@ -130,8 +135,7 @@ private void testHasMapEntriesInOrder(Map<?, ?> map,
     for (int i = 0; i < map.size(); i++) {
       Object expectedKey = alternatingKeysAndValues[2 * i];
       Object expectedValue = alternatingKeysAndValues[2 * i + 1];
-      Entry<Object, Object> expectedEntry = Maps.immutableEntry(
-          expectedKey, expectedValue);
+      Entry<Object, Object> expectedEntry = Maps.immutableEntry(expectedKey, expectedValue);
       assertEquals(expectedEntry, entries.get(i));
       assertEquals(expectedKey, keys.get(i));
       assertEquals(expectedValue, values.get(i));

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

@@ -37,26 +37,31 @@
 @GwtIncompatible // java.util.Arrays#copyOf(Object[], int), java.lang.reflect.Array
 public class CompactLinkedHashSetTest extends TestCase {
   public static Test suite() {
-    List<Feature<?>> allFeatures = Arrays.<Feature<?>>asList(
-        CollectionSize.ANY,
-        CollectionFeature.ALLOWS_NULL_VALUES,
-        CollectionFeature.FAILS_FAST_ON_CONCURRENT_MODIFICATION,
-        CollectionFeature.GENERAL_PURPOSE,
-        CollectionFeature.REMOVE_OPERATIONS,
-        CollectionFeature.SERIALIZABLE,
-        CollectionFeature.KNOWN_ORDER,
-        CollectionFeature.SUPPORTS_ADD,
-        CollectionFeature.SUPPORTS_REMOVE);
+    List<Feature<?>> allFeatures =
+        Arrays.<Feature<?>>asList(
+            CollectionSize.ANY,
+            CollectionFeature.ALLOWS_NULL_VALUES,
+            CollectionFeature.FAILS_FAST_ON_CONCURRENT_MODIFICATION,
+            CollectionFeature.GENERAL_PURPOSE,
+            CollectionFeature.REMOVE_OPERATIONS,
+            CollectionFeature.SERIALIZABLE,
+            CollectionFeature.KNOWN_ORDER,
+            CollectionFeature.SUPPORTS_ADD,
+            CollectionFeature.SUPPORTS_REMOVE);
 
     TestSuite suite = new TestSuite();
     suite.addTestSuite(CompactLinkedHashSetTest.class);
-    suite.addTest(SetTestSuiteBuilder.using(new TestStringSetGenerator() {
-      @Override protected Set<String> create(String[] elements) {
-        return CompactLinkedHashSet.create(Arrays.asList(elements));
-      }
-    }).named("CompactLinkedHashSet")
-      .withFeatures(allFeatures)
-      .createTestSuite());
+    suite.addTest(
+        SetTestSuiteBuilder.using(
+                new TestStringSetGenerator() {
+                  @Override
+                  protected Set<String> create(String[] elements) {
+                    return CompactLinkedHashSet.create(Arrays.asList(elements));
+                  }
+                })
+            .named("CompactLinkedHashSet")
+            .withFeatures(allFeatures)
+            .createTestSuite());
     return suite;
   }
 

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

@@ -329,10 +329,11 @@ protected Map<K, V> delegate() {
     };
   }
 
-  private static final ImmutableMap<String, String> JUF_METHODS = ImmutableMap.of(
-      "java.util.function.Predicate", "test",
-      "java.util.function.Consumer", "accept",
-      "java.util.function.IntFunction", "apply");
+  private static final ImmutableMap<String, String> JUF_METHODS =
+      ImmutableMap.of(
+          "java.util.function.Predicate", "test",
+          "java.util.function.Consumer", "accept",
+          "java.util.function.IntFunction", "apply");
 
   private static Object getDefaultValue(final TypeToken<?> type) {
     Class<?> rawType = type.getRawType();
@@ -387,8 +388,7 @@ private static <T> void callAllPublicMethods(TypeToken<T> type, T object)
           }
         }
       } catch (Throwable cause) {
-        throw new InvocationTargetException(
-            cause, method + " with args: " + Arrays.toString(args));
+        throw new InvocationTargetException(cause, method + " with args: " + Arrays.toString(args));
       }
     }
   }