Skip to content

Commit b25c4bc

Browse files
cpovirkGoogle Java Core Libraries
cpovirk
authored and
Google Java Core Libraries
committed
Internal change.
RELNOTES=n/a PiperOrigin-RevId: 777745052
1 parent 990557c commit b25c4bc

File tree

4 files changed

+40
-2
lines changed

4 files changed

+40
-2
lines changed

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ public void testGetIfPresent_whenNoMatchingConstant() {
8383

8484

8585
@J2ktIncompatible
86+
@GwtIncompatible // weak references
8687
@AndroidIncompatible // depends on details of GC and classloading
8788
public void testGetIfPresent_doesNotPreventClassUnloading() throws Exception {
8889
WeakReference<?> shadowLoaderReference = doTestClassUnloading();
@@ -95,6 +96,7 @@ public void testGetIfPresent_doesNotPreventClassUnloading() throws Exception {
9596
// (and therefore its ClassLoader) from being unloaded, then this WeakReference will never be
9697
// cleared.
9798
@J2ktIncompatible
99+
@GwtIncompatible // weak references
98100
private WeakReference<?> doTestClassUnloading() throws Exception {
99101
URLClassLoader shadowLoader = new URLClassLoader(getClassPathUrls(), null);
100102
@SuppressWarnings("unchecked")
@@ -115,6 +117,7 @@ private WeakReference<?> doTestClassUnloading() throws Exception {
115117
return new WeakReference<>(shadowLoader);
116118
}
117119

120+
@GwtIncompatible // stringConverter
118121
public void testStringConverter_convert() {
119122
Converter<String, TestEnum> converter = Enums.stringConverter(TestEnum.class);
120123
assertEquals(TestEnum.CHEETO, converter.convert("CHEETO"));
@@ -124,11 +127,13 @@ public void testStringConverter_convert() {
124127
assertNull(converter.reverse().convert(null));
125128
}
126129

130+
@GwtIncompatible // stringConverter
127131
public void testStringConverter_convertError() {
128132
Converter<String, TestEnum> converter = Enums.stringConverter(TestEnum.class);
129133
assertThrows(IllegalArgumentException.class, () -> converter.convert("xxx"));
130134
}
131135

136+
@GwtIncompatible // stringConverter
132137
public void testStringConverter_reverse() {
133138
Converter<String, TestEnum> converter = Enums.stringConverter(TestEnum.class);
134139
assertEquals("CHEETO", converter.reverse().convert(TestEnum.CHEETO));
@@ -137,30 +142,35 @@ public void testStringConverter_reverse() {
137142
}
138143

139144
@J2ktIncompatible
145+
@GwtIncompatible // stringConverter
140146
public void testStringConverter_nullPointerTester() throws Exception {
141147
Converter<String, TestEnum> converter = Enums.stringConverter(TestEnum.class);
142148
NullPointerTester tester = new NullPointerTester();
143149
tester.testAllPublicInstanceMethods(converter);
144150
}
145151

152+
@GwtIncompatible // stringConverter
146153
public void testStringConverter_nullConversions() {
147154
Converter<String, TestEnum> converter = Enums.stringConverter(TestEnum.class);
148155
assertNull(converter.convert(null));
149156
assertNull(converter.reverse().convert(null));
150157
}
151158

152159
@J2ktIncompatible
160+
@GwtIncompatible // Class.getName()
153161
public void testStringConverter_toString() {
154162
assertEquals(
155163
"Enums.stringConverter(com.google.common.base.EnumsTest$TestEnum.class)",
156164
Enums.stringConverter(TestEnum.class).toString());
157165
}
158166

167+
@GwtIncompatible // stringConverter
159168
public void testStringConverter_serialization() {
160169
SerializableTester.reserializeAndAssert(Enums.stringConverter(TestEnum.class));
161170
}
162171

163172
@J2ktIncompatible
173+
@GwtIncompatible // NullPointerTester
164174
public void testNullPointerExceptions() {
165175
NullPointerTester tester = new NullPointerTester();
166176
tester.testAllPublicStaticMethods(Enums.class);
@@ -176,6 +186,7 @@ private enum AnEnum {
176186
}
177187

178188
@J2ktIncompatible
189+
@GwtIncompatible // reflection
179190
public void testGetField() {
180191
Field foo = Enums.getField(AnEnum.FOO);
181192
assertEquals("FOO", foo.getName());
@@ -187,6 +198,7 @@ public void testGetField() {
187198
}
188199

189200
@J2ktIncompatible
201+
@GwtIncompatible // Class.getClassLoader()
190202
private URL[] getClassPathUrls() {
191203
ClassLoader classLoader = getClass().getClassLoader();
192204
return classLoader instanceof URLClassLoader
@@ -200,6 +212,7 @@ private URL[] getClassPathUrls() {
200212
*/
201213
// TODO(b/65488446): Make this a public API.
202214
@J2ktIncompatible
215+
@GwtIncompatible
203216
private static ImmutableList<URL> parseJavaClassPath() {
204217
ImmutableList.Builder<URL> urls = ImmutableList.builder();
205218
for (String entry : Splitter.on(PATH_SEPARATOR.value()).split(JAVA_CLASS_PATH.value())) {

‎android/guava/src/com/google/common/base/Enums.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ private Enums() {}
4646
*
4747
* @since 12.0
4848
*/
49+
@GwtIncompatible // reflection
4950
public static Field getField(Enum<?> enumValue) {
5051
Class<?>
5152
clazz = enumValue.getDeclaringClass();
@@ -70,9 +71,11 @@ public static <T extends Enum<T>> Optional<T> getIfPresent(Class<T> enumClass, S
7071
return Platform.getEnumIfPresent(enumClass, value);
7172
}
7273

74+
@GwtIncompatible // java.lang.ref.WeakReference
7375
private static final Map<Class<? extends Enum<?>>, Map<String, WeakReference<? extends Enum<?>>>>
7476
enumConstantCache = new WeakHashMap<>();
7577

78+
@GwtIncompatible // java.lang.ref.WeakReference
7679
private static <T extends Enum<T>> Map<String, WeakReference<? extends Enum<?>>> populateCache(
7780
Class<T> enumClass) {
7881
Map<String, WeakReference<? extends Enum<?>>> result = new HashMap<>();
@@ -83,6 +86,7 @@ private static <T extends Enum<T>> Map<String, WeakReference<? extends Enum<?>>>
8386
return result;
8487
}
8588

89+
@GwtIncompatible // java.lang.ref.WeakReference
8690
static <T extends Enum<T>> Map<String, WeakReference<? extends Enum<?>>> getEnumConstants(
8791
Class<T> enumClass) {
8892
synchronized (enumConstantCache) {
@@ -102,10 +106,12 @@ static <T extends Enum<T>> Map<String, WeakReference<? extends Enum<?>>> getEnum
102106
*
103107
* @since 16.0
104108
*/
109+
@GwtIncompatible
105110
public static <T extends Enum<T>> Converter<String, T> stringConverter(Class<T> enumClass) {
106111
return new StringConverter<>(enumClass);
107112
}
108113

114+
@GwtIncompatible
109115
private static final class StringConverter<T extends Enum<T>> extends Converter<String, T>
110116
implements Serializable {
111117

@@ -144,6 +150,6 @@ public String toString() {
144150
return "Enums.stringConverter(" + enumClass.getName() + ".class)";
145151
}
146152

147-
@J2ktIncompatible private static final long serialVersionUID = 0L;
153+
@GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0L;
148154
}
149155
}

‎guava-tests/test/com/google/common/base/EnumsTest.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ public void testGetIfPresent_whenNoMatchingConstant() {
8383

8484

8585
@J2ktIncompatible
86+
@GwtIncompatible // weak references
8687
@AndroidIncompatible // depends on details of GC and classloading
8788
public void testGetIfPresent_doesNotPreventClassUnloading() throws Exception {
8889
WeakReference<?> shadowLoaderReference = doTestClassUnloading();
@@ -95,6 +96,7 @@ public void testGetIfPresent_doesNotPreventClassUnloading() throws Exception {
9596
// (and therefore its ClassLoader) from being unloaded, then this WeakReference will never be
9697
// cleared.
9798
@J2ktIncompatible
99+
@GwtIncompatible // weak references
98100
private WeakReference<?> doTestClassUnloading() throws Exception {
99101
URLClassLoader shadowLoader = new URLClassLoader(getClassPathUrls(), null);
100102
@SuppressWarnings("unchecked")
@@ -115,6 +117,7 @@ private WeakReference<?> doTestClassUnloading() throws Exception {
115117
return new WeakReference<>(shadowLoader);
116118
}
117119

120+
@GwtIncompatible // stringConverter
118121
public void testStringConverter_convert() {
119122
Converter<String, TestEnum> converter = Enums.stringConverter(TestEnum.class);
120123
assertEquals(TestEnum.CHEETO, converter.convert("CHEETO"));
@@ -124,11 +127,13 @@ public void testStringConverter_convert() {
124127
assertNull(converter.reverse().convert(null));
125128
}
126129

130+
@GwtIncompatible // stringConverter
127131
public void testStringConverter_convertError() {
128132
Converter<String, TestEnum> converter = Enums.stringConverter(TestEnum.class);
129133
assertThrows(IllegalArgumentException.class, () -> converter.convert("xxx"));
130134
}
131135

136+
@GwtIncompatible // stringConverter
132137
public void testStringConverter_reverse() {
133138
Converter<String, TestEnum> converter = Enums.stringConverter(TestEnum.class);
134139
assertEquals("CHEETO", converter.reverse().convert(TestEnum.CHEETO));
@@ -137,30 +142,35 @@ public void testStringConverter_reverse() {
137142
}
138143

139144
@J2ktIncompatible
145+
@GwtIncompatible // stringConverter
140146
public void testStringConverter_nullPointerTester() throws Exception {
141147
Converter<String, TestEnum> converter = Enums.stringConverter(TestEnum.class);
142148
NullPointerTester tester = new NullPointerTester();
143149
tester.testAllPublicInstanceMethods(converter);
144150
}
145151

152+
@GwtIncompatible // stringConverter
146153
public void testStringConverter_nullConversions() {
147154
Converter<String, TestEnum> converter = Enums.stringConverter(TestEnum.class);
148155
assertNull(converter.convert(null));
149156
assertNull(converter.reverse().convert(null));
150157
}
151158

152159
@J2ktIncompatible
160+
@GwtIncompatible // Class.getName()
153161
public void testStringConverter_toString() {
154162
assertEquals(
155163
"Enums.stringConverter(com.google.common.base.EnumsTest$TestEnum.class)",
156164
Enums.stringConverter(TestEnum.class).toString());
157165
}
158166

167+
@GwtIncompatible // stringConverter
159168
public void testStringConverter_serialization() {
160169
SerializableTester.reserializeAndAssert(Enums.stringConverter(TestEnum.class));
161170
}
162171

163172
@J2ktIncompatible
173+
@GwtIncompatible // NullPointerTester
164174
public void testNullPointerExceptions() {
165175
NullPointerTester tester = new NullPointerTester();
166176
tester.testAllPublicStaticMethods(Enums.class);
@@ -176,6 +186,7 @@ private enum AnEnum {
176186
}
177187

178188
@J2ktIncompatible
189+
@GwtIncompatible // reflection
179190
public void testGetField() {
180191
Field foo = Enums.getField(AnEnum.FOO);
181192
assertEquals("FOO", foo.getName());
@@ -187,6 +198,7 @@ public void testGetField() {
187198
}
188199

189200
@J2ktIncompatible
201+
@GwtIncompatible // Class.getClassLoader()
190202
private URL[] getClassPathUrls() {
191203
ClassLoader classLoader = getClass().getClassLoader();
192204
return classLoader instanceof URLClassLoader
@@ -200,6 +212,7 @@ private URL[] getClassPathUrls() {
200212
*/
201213
// TODO(b/65488446): Make this a public API.
202214
@J2ktIncompatible
215+
@GwtIncompatible
203216
private static ImmutableList<URL> parseJavaClassPath() {
204217
ImmutableList.Builder<URL> urls = ImmutableList.builder();
205218
for (String entry : Splitter.on(PATH_SEPARATOR.value()).split(JAVA_CLASS_PATH.value())) {

‎guava/src/com/google/common/base/Enums.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ private Enums() {}
4646
*
4747
* @since 12.0
4848
*/
49+
@GwtIncompatible // reflection
4950
public static Field getField(Enum<?> enumValue) {
5051
Class<?>
5152
clazz = enumValue.getDeclaringClass();
@@ -70,9 +71,11 @@ public static <T extends Enum<T>> Optional<T> getIfPresent(Class<T> enumClass, S
7071
return Platform.getEnumIfPresent(enumClass, value);
7172
}
7273

74+
@GwtIncompatible // java.lang.ref.WeakReference
7375
private static final Map<Class<? extends Enum<?>>, Map<String, WeakReference<? extends Enum<?>>>>
7476
enumConstantCache = new WeakHashMap<>();
7577

78+
@GwtIncompatible // java.lang.ref.WeakReference
7679
private static <T extends Enum<T>> Map<String, WeakReference<? extends Enum<?>>> populateCache(
7780
Class<T> enumClass) {
7881
Map<String, WeakReference<? extends Enum<?>>> result = new HashMap<>();
@@ -83,6 +86,7 @@ private static <T extends Enum<T>> Map<String, WeakReference<? extends Enum<?>>>
8386
return result;
8487
}
8588

89+
@GwtIncompatible // java.lang.ref.WeakReference
8690
static <T extends Enum<T>> Map<String, WeakReference<? extends Enum<?>>> getEnumConstants(
8791
Class<T> enumClass) {
8892
synchronized (enumConstantCache) {
@@ -102,10 +106,12 @@ static <T extends Enum<T>> Map<String, WeakReference<? extends Enum<?>>> getEnum
102106
*
103107
* @since 16.0
104108
*/
109+
@GwtIncompatible
105110
public static <T extends Enum<T>> Converter<String, T> stringConverter(Class<T> enumClass) {
106111
return new StringConverter<>(enumClass);
107112
}
108113

114+
@GwtIncompatible
109115
private static final class StringConverter<T extends Enum<T>> extends Converter<String, T>
110116
implements Serializable {
111117

@@ -144,6 +150,6 @@ public String toString() {
144150
return "Enums.stringConverter(" + enumClass.getName() + ".class)";
145151
}
146152

147-
@J2ktIncompatible private static final long serialVersionUID = 0L;
153+
@GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0L;
148154
}
149155
}

0 commit comments

Comments
 (0)