Stop building collection-test-suite-builder code for J2KT.

RELNOTES=n/a PiperOrigin-RevId: 707907388
google · Dec 19, 2024 · c8bb798 · c8bb798
1 parent d9ed9b9
commit c8bb798
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 0 deletions.
diff --git a/android/guava-tests/test/com/google/common/collect/HashBiMapTest.java b/android/guava-tests/test/com/google/common/collect/HashBiMapTest.java
@@ -44,6 +44,7 @@
 @ElementTypesAreNonnullByDefault
 public class HashBiMapTest extends TestCase {
 
+  @J2ktIncompatible
   public static final class HashBiMapGenerator extends TestStringBiMapGenerator {
     @Override
     protected BiMap<String, String> create(Entry<String, String>[] entries) {

diff --git a/android/guava-tests/test/com/google/common/collect/HashMultisetTest.java b/android/guava-tests/test/com/google/common/collect/HashMultisetTest.java
@@ -61,6 +61,7 @@ public static Test suite() {
     return suite;
   }
 
+  @J2ktIncompatible
   private static TestStringMultisetGenerator hashMultisetGenerator() {
     return new TestStringMultisetGenerator() {
       @Override

diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableEnumMapTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableEnumMapTest.java
@@ -44,6 +44,7 @@
 @GwtCompatible(emulated = true)
 @ElementTypesAreNonnullByDefault
 public class ImmutableEnumMapTest extends TestCase {
+  @J2ktIncompatible
   public static class ImmutableEnumMapGenerator extends TestEnumMapGenerator {
     @Override
     protected Map<AnEnum, String> create(Entry<AnEnum, String>[] entries) {

diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableListMultimapTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableListMultimapTest.java
@@ -52,6 +52,7 @@
 @GwtCompatible(emulated = true)
 @ElementTypesAreNonnullByDefault
 public class ImmutableListMultimapTest extends TestCase {
+  @J2ktIncompatible
   public static class ImmutableListMultimapGenerator extends TestStringListMultimapGenerator {
     @Override
     protected ListMultimap<String, String> create(Entry<String, String>[] entries) {
@@ -63,6 +64,7 @@ protected ListMultimap<String, String> create(Entry<String, String>[] entries) {
     }
   }
 
+  @J2ktIncompatible
   public static class ImmutableListMultimapCopyOfEntriesGenerator
       extends TestStringListMultimapGenerator {
     @Override

diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableSetMultimapTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableSetMultimapTest.java
@@ -51,6 +51,7 @@
 @GwtCompatible(emulated = true)
 @ElementTypesAreNonnullByDefault
 public class ImmutableSetMultimapTest extends TestCase {
+  @J2ktIncompatible
   private static final class ImmutableSetMultimapGenerator extends TestStringSetMultimapGenerator {
     @Override
     protected SetMultimap<String, String> create(Entry<String, String>[] entries) {
@@ -62,6 +63,7 @@ protected SetMultimap<String, String> create(Entry<String, String>[] entries) {
     }
   }
 
+  @J2ktIncompatible
   private static final class ImmutableSetMultimapCopyOfEntriesGenerator
       extends TestStringSetMultimapGenerator {
     @Override

diff --git a/android/guava-tests/test/com/google/common/collect/LinkedHashMultisetTest.java b/android/guava-tests/test/com/google/common/collect/LinkedHashMultisetTest.java
@@ -61,6 +61,7 @@ public static Test suite() {
     return suite;
   }
 
+  @J2ktIncompatible
   private static TestStringMultisetGenerator linkedHashMultisetGenerator() {
     return new TestStringMultisetGenerator() {
       @Override

diff --git a/android/guava-tests/test/com/google/common/collect/TableCollectionTest.java b/android/guava-tests/test/com/google/common/collect/TableCollectionTest.java
@@ -63,18 +63,22 @@
 @ElementTypesAreNonnullByDefault
 public class TableCollectionTest extends TestCase {
 
+  @J2ktIncompatible
   private static final Feature<?>[] COLLECTION_FEATURES = {
     CollectionSize.ANY, CollectionFeature.ALLOWS_NULL_QUERIES
   };
 
+  @J2ktIncompatible
   private static final Feature<?>[] COLLECTION_FEATURES_ORDER = {
     CollectionSize.ANY, CollectionFeature.KNOWN_ORDER, CollectionFeature.ALLOWS_NULL_QUERIES
   };
 
+  @J2ktIncompatible
   private static final Feature<?>[] COLLECTION_FEATURES_REMOVE = {
     CollectionSize.ANY, CollectionFeature.SUPPORTS_REMOVE, CollectionFeature.ALLOWS_NULL_QUERIES
   };
 
+  @J2ktIncompatible
   private static final Feature<?>[] COLLECTION_FEATURES_REMOVE_ORDER = {
     CollectionSize.ANY,
     CollectionFeature.KNOWN_ORDER,
@@ -680,6 +684,7 @@ private static void populateForValues(
     }
   }
 
+  @J2ktIncompatible
   private abstract static class TestCellSetGenerator
       implements TestSetGenerator<Cell<String, Integer, Character>> {
     @Override

diff --git a/guava-tests/test/com/google/common/collect/HashBiMapTest.java b/guava-tests/test/com/google/common/collect/HashBiMapTest.java
@@ -44,6 +44,7 @@
 @ElementTypesAreNonnullByDefault
 public class HashBiMapTest extends TestCase {
 
+  @J2ktIncompatible
   public static final class HashBiMapGenerator extends TestStringBiMapGenerator {
     @Override
     protected BiMap<String, String> create(Entry<String, String>[] entries) {

diff --git a/guava-tests/test/com/google/common/collect/HashMultisetTest.java b/guava-tests/test/com/google/common/collect/HashMultisetTest.java
@@ -61,6 +61,7 @@ public static Test suite() {
     return suite;
   }
 
+  @J2ktIncompatible
   private static TestStringMultisetGenerator hashMultisetGenerator() {
     return new TestStringMultisetGenerator() {
       @Override

diff --git a/guava-tests/test/com/google/common/collect/ImmutableEnumMapTest.java b/guava-tests/test/com/google/common/collect/ImmutableEnumMapTest.java
@@ -50,6 +50,7 @@
 @GwtCompatible(emulated = true)
 @ElementTypesAreNonnullByDefault
 public class ImmutableEnumMapTest extends TestCase {
+  @J2ktIncompatible
   public static class ImmutableEnumMapGenerator extends TestEnumMapGenerator {
     @Override
     protected Map<AnEnum, String> create(Entry<AnEnum, String>[] entries) {

diff --git a/guava-tests/test/com/google/common/collect/ImmutableListMultimapTest.java b/guava-tests/test/com/google/common/collect/ImmutableListMultimapTest.java
@@ -60,6 +60,7 @@
 @GwtCompatible(emulated = true)
 @ElementTypesAreNonnullByDefault
 public class ImmutableListMultimapTest extends TestCase {
+  @J2ktIncompatible
   public static class ImmutableListMultimapGenerator extends TestStringListMultimapGenerator {
     @Override
     protected ListMultimap<String, String> create(Entry<String, String>[] entries) {
@@ -71,6 +72,7 @@ protected ListMultimap<String, String> create(Entry<String, String>[] entries) {
     }
   }
 
+  @J2ktIncompatible
   public static class ImmutableListMultimapCopyOfEntriesGenerator
       extends TestStringListMultimapGenerator {
     @Override

diff --git a/guava-tests/test/com/google/common/collect/ImmutableSetMultimapTest.java b/guava-tests/test/com/google/common/collect/ImmutableSetMultimapTest.java
@@ -59,6 +59,7 @@
 @GwtCompatible(emulated = true)
 @ElementTypesAreNonnullByDefault
 public class ImmutableSetMultimapTest extends TestCase {
+  @J2ktIncompatible
   private static final class ImmutableSetMultimapGenerator extends TestStringSetMultimapGenerator {
     @Override
     protected SetMultimap<String, String> create(Entry<String, String>[] entries) {
@@ -70,6 +71,7 @@ protected SetMultimap<String, String> create(Entry<String, String>[] entries) {
     }
   }
 
+  @J2ktIncompatible
   private static final class ImmutableSetMultimapCopyOfEntriesGenerator
       extends TestStringSetMultimapGenerator {
     @Override

diff --git a/guava-tests/test/com/google/common/collect/LinkedHashMultisetTest.java b/guava-tests/test/com/google/common/collect/LinkedHashMultisetTest.java
@@ -61,6 +61,7 @@ public static Test suite() {
     return suite;
   }
 
+  @J2ktIncompatible
   private static TestStringMultisetGenerator linkedHashMultisetGenerator() {
     return new TestStringMultisetGenerator() {
       @Override

diff --git a/guava-tests/test/com/google/common/collect/TableCollectionTest.java b/guava-tests/test/com/google/common/collect/TableCollectionTest.java
@@ -63,18 +63,22 @@
 @ElementTypesAreNonnullByDefault
 public class TableCollectionTest extends TestCase {
 
+  @J2ktIncompatible
   private static final Feature<?>[] COLLECTION_FEATURES = {
     CollectionSize.ANY, CollectionFeature.ALLOWS_NULL_QUERIES
   };
 
+  @J2ktIncompatible
   private static final Feature<?>[] COLLECTION_FEATURES_ORDER = {
     CollectionSize.ANY, CollectionFeature.KNOWN_ORDER, CollectionFeature.ALLOWS_NULL_QUERIES
   };
 
+  @J2ktIncompatible
   private static final Feature<?>[] COLLECTION_FEATURES_REMOVE = {
     CollectionSize.ANY, CollectionFeature.SUPPORTS_REMOVE, CollectionFeature.ALLOWS_NULL_QUERIES
   };
 
+  @J2ktIncompatible
   private static final Feature<?>[] COLLECTION_FEATURES_REMOVE_ORDER = {
     CollectionSize.ANY,
     CollectionFeature.KNOWN_ORDER,
@@ -680,6 +684,7 @@ private static void populateForValues(
     }
   }
 
+  @J2ktIncompatible
   private abstract static class TestCellSetGenerator
       implements TestSetGenerator<Cell<String, Integer, Character>> {
     @Override