am 84fb43aa: Merge "Revert "Upgraded Guava to unmodified v14.0.1""

* commit '84fb43aa6a1e752487f2624055ff26b1b6b7c043':
  Revert "Upgraded Guava to unmodified v14.0.1"

1 files changed, 7 insertions, 8 deletions

diff --git a/guava-tests/test/com/google/common/collect/TableCollectionTest.java b/guava-tests/test/com/google/common/collect/TableCollectionTest.java
index 2e85311..9eed028 100644
--- a/guava-tests/test/com/google/common/collect/TableCollectionTest.java
+++ b/guava-tests/test/com/google/common/collect/TableCollectionTest.java
@@ -70,14 +70,14 @@ public class TableCollectionTest extends TestCase {
 
   private static final Feature<?>[] COLLECTION_FEATURES_REMOVE = {
     CollectionSize.ANY,
-    CollectionFeature.SUPPORTS_REMOVE,
+    CollectionFeature.REMOVE_OPERATIONS,
     CollectionFeature.ALLOWS_NULL_QUERIES
   };
 
   private static final Feature<?>[] COLLECTION_FEATURES_REMOVE_ORDER = {
     CollectionSize.ANY,
     CollectionFeature.KNOWN_ORDER,
-    CollectionFeature.SUPPORTS_REMOVE,
+    CollectionFeature.REMOVE_OPERATIONS,
     CollectionFeature.ALLOWS_NULL_QUERIES
   };
 
@@ -214,7 +214,7 @@ public class TableCollectionTest extends TestCase {
         .named("TreeBasedTable.rowKeySet.subSet")
         .withFeatures(COLLECTION_FEATURES_REMOVE_ORDER)
         .createTestSuite());
-
+    
     suite.addTest(SetTestSuiteBuilder.using(new TestStringSetGenerator() {
           @Override protected Set<String> create(String[] elements) {
             Table<String, Integer, Character> table = HashBasedTable.create();
@@ -458,7 +458,7 @@ public class TableCollectionTest extends TestCase {
           }
         })
         .named("HashBasedTable.cellSet")
-        .withFeatures(CollectionSize.ANY, CollectionFeature.SUPPORTS_REMOVE,
+        .withFeatures(CollectionSize.ANY, CollectionFeature.REMOVE_OPERATIONS,
             CollectionFeature.ALLOWS_NULL_QUERIES)
         .createTestSuite());
 
@@ -468,7 +468,7 @@ public class TableCollectionTest extends TestCase {
           }
         })
         .named("TreeBasedTable.cellSet")
-        .withFeatures(CollectionSize.ANY, CollectionFeature.SUPPORTS_REMOVE,
+        .withFeatures(CollectionSize.ANY, CollectionFeature.REMOVE_OPERATIONS,
             CollectionFeature.ALLOWS_NULL_QUERIES)
         .createTestSuite());
 
@@ -480,7 +480,7 @@ public class TableCollectionTest extends TestCase {
           }
         })
         .named("TransposedTable.cellSet")
-        .withFeatures(CollectionSize.ANY, CollectionFeature.SUPPORTS_REMOVE,
+        .withFeatures(CollectionSize.ANY, CollectionFeature.REMOVE_OPERATIONS,
             CollectionFeature.ALLOWS_NULL_QUERIES)
         .createTestSuite());
 
@@ -502,8 +502,7 @@ public class TableCollectionTest extends TestCase {
           }
         })
         .named("TransformValues.cellSet")
-        .withFeatures(CollectionSize.ANY, CollectionFeature.ALLOWS_NULL_QUERIES,
-            CollectionFeature.SUPPORTS_REMOVE)
+        .withFeatures(CollectionSize.ANY, CollectionFeature.ALLOWS_NULL_QUERIES)
         .createTestSuite());
 
     suite.addTest(SetTestSuiteBuilder.using(new TestCellSetGenerator() {