diff --git a/android/guava-tests/test/com/google/common/collect/HashBiMapTest.java b/android/guava-tests/test/com/google/common/collect/HashBiMapTest.java index 32988d42bd3d..06669ee30c10 100644 --- 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 create(Entry[] 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 index f2d56cda9a17..24ad901b5501 100644 --- 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 index d02b2429bb65..8510a5130b30 100644 --- 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 create(Entry[] 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 index 1f3c9aefec14..79218b03214a 100644 --- 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 create(Entry[] entries) { @@ -63,6 +64,7 @@ protected ListMultimap create(Entry[] 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 index 898f41bde878..91f7cc02566a 100644 --- 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 create(Entry[] entries) { @@ -62,6 +63,7 @@ protected SetMultimap create(Entry[] 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 index 7300941887ef..739748a6a902 100644 --- 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 index 29f2d890f5be..9425722c141c 100644 --- 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> { @Override diff --git a/guava-tests/test/com/google/common/collect/HashBiMapTest.java b/guava-tests/test/com/google/common/collect/HashBiMapTest.java index 32988d42bd3d..06669ee30c10 100644 --- 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 create(Entry[] entries) { diff --git a/guava-tests/test/com/google/common/collect/HashMultisetTest.java b/guava-tests/test/com/google/common/collect/HashMultisetTest.java index f2d56cda9a17..24ad901b5501 100644 --- 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 index e6ab485fa565..254a73df63d4 100644 --- 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 create(Entry[] entries) { diff --git a/guava-tests/test/com/google/common/collect/ImmutableListMultimapTest.java b/guava-tests/test/com/google/common/collect/ImmutableListMultimapTest.java index 8eeefa4bcccc..9693e59bacc2 100644 --- 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 create(Entry[] entries) { @@ -71,6 +72,7 @@ protected ListMultimap create(Entry[] 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 index 71777cf78680..abe2f9a7dd93 100644 --- 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 create(Entry[] entries) { @@ -70,6 +71,7 @@ protected SetMultimap create(Entry[] 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 index 7300941887ef..739748a6a902 100644 --- 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 index 29f2d890f5be..9425722c141c 100644 --- 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> { @Override