Stub in test (presently fails)

niloc132 · Aug 24, 2023 · 9add55b · 9add55b
1 parent 7e32721
commit 9add55b
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 4 deletions.
diff --git a/user/super/com/google/gwt/emul/java/util/Collections.java b/user/super/com/google/gwt/emul/java/util/Collections.java
@@ -350,10 +350,6 @@ public static <T> SortedSet<T> synchronizedSortedSet(SortedSet<T> s) {
     return s;
   }
 
-  /*
-   * TODO: make the unmodifiable collections serializable.
-   */
-
   static class UnmodifiableCollection<T> implements Collection<T>, Serializable {
     protected final Collection<? extends T> coll;
 

diff --git a/user/test/com/google/gwt/user/client/rpc/CollectionsTest.java b/user/test/com/google/gwt/user/client/rpc/CollectionsTest.java
@@ -36,6 +36,7 @@
 import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeSingleton;
 import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeTreeMap;
 import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeTreeSet;
+import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeUnmodifiable;
 import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeVector;
 import com.google.gwt.user.client.rpc.core.java.util.LinkedHashMap_CustomFieldSerializer;
 
@@ -854,6 +855,25 @@ public void onSuccess(List<MarkerTypeSingleton> result) {
         });
   }
 
+  public void testUnmodifiableList() {
+    CollectionsTestServiceAsync service = getServiceAsync();
+    delayTestFinishForRpc();
+    service.echoUnmodifiableList(TestSetFactory.createUnmodifiableList(),
+        new AsyncCallback<List<MarkerTypeUnmodifiable>>() {
+          @Override
+          public void onFailure(Throwable caught) {
+            TestSetValidator.rethrowException(caught);
+          }
+
+          @Override
+          public void onSuccess(List<MarkerTypeUnmodifiable> result) {
+            assertNotNull(result);
+            assertTrue(TestSetValidator.isValidUnmodifiableList(result));
+            finishTest();
+          }
+        });
+  }
+
   public void testSqlDateArray() {
     CollectionsTestServiceAsync service = getServiceAsync();
     final java.sql.Date[] expected = TestSetFactory.createSqlDateArray();

diff --git a/user/test/com/google/gwt/user/client/rpc/CollectionsTestService.java b/user/test/com/google/gwt/user/client/rpc/CollectionsTestService.java
@@ -35,6 +35,7 @@
 import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeSingleton;
 import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeTreeMap;
 import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeTreeSet;
+import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeUnmodifiable;
 import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeVector;
 
 import java.sql.Time;
@@ -193,4 +194,8 @@ IdentityHashMap<MarkerTypeEnum, MarkerTypeIdentityHashMapValue> echoEnumKey(
   // For Collections.singletonList()
   List<MarkerTypeSingleton> echoSingletonList(List<MarkerTypeSingleton> value)
       throws CollectionsTestServiceException;
+
+  // For Collections.unmodifiableList()
+  List<MarkerTypeUnmodifiable> echoUnmodifiableList(List<MarkerTypeUnmodifiable> value)
+      throws CollectionsTestServiceException;
 }
diff --git a/user/test/com/google/gwt/user/client/rpc/CollectionsTestServiceAsync.java b/user/test/com/google/gwt/user/client/rpc/CollectionsTestServiceAsync.java
@@ -35,6 +35,7 @@
 import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeSingleton;
 import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeTreeMap;
 import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeTreeSet;
+import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeUnmodifiable;
 import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeVector;
 
 import java.sql.Time;
@@ -168,4 +169,8 @@ void echoEnumKey(IdentityHashMap<MarkerTypeEnum, MarkerTypeIdentityHashMapValue>
   // For Collections.singletonList()
   void echoSingletonList(List<MarkerTypeSingleton> value,
       AsyncCallback<List<MarkerTypeSingleton>> callback);
+
+  // For Collections.unmodifiableList()
+  void echoUnmodifiableList(List<MarkerTypeUnmodifiable> value,
+                         AsyncCallback<List<MarkerTypeUnmodifiable>> callback);
 }
diff --git a/user/test/com/google/gwt/user/client/rpc/TestSetFactory.java b/user/test/com/google/gwt/user/client/rpc/TestSetFactory.java
@@ -22,6 +22,7 @@
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.EnumMap;
@@ -313,6 +314,15 @@ public static final class MarkerTypeSingleton extends MarkerBase {
       super("singleton");
     }
   }
+  /**
+   * A single-use marker type to independently check type parameter exposure in
+   * unmodifiable collections.
+   */
+  public static final class MarkerTypeUnmodifiable extends MarkerBase {
+    MarkerTypeUnmodifiable() {
+      super("unmodifiable");
+    }
+  }
 
   /**
    * A single-use marker type to independently check type parameter exposure in
@@ -783,6 +793,10 @@ public static List<MarkerTypeSingleton> createSingletonList() {
     return java.util.Collections.singletonList(new MarkerTypeSingleton());
   }
 
+  public static List<MarkerTypeUnmodifiable> createUnmodifiableList() {
+    return java.util.Collections.unmodifiableList(Collections.singletonList(new MarkerTypeUnmodifiable()));
+  }
+
   public static java.sql.Date[] createSqlDateArray() {
     return new java.sql.Date[]{new java.sql.Date(500L), new java.sql.Date(500000000L)};
   }

diff --git a/user/test/com/google/gwt/user/client/rpc/TestSetValidator.java b/user/test/com/google/gwt/user/client/rpc/TestSetValidator.java
@@ -28,6 +28,7 @@
 import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeSingleton;
 import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeTreeMap;
 import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeTreeSet;
+import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeUnmodifiable;
 import com.google.gwt.user.client.rpc.TestSetFactory.SerializableDoublyLinkedNode;
 import com.google.gwt.user.client.rpc.TestSetFactory.SerializableGraphWithCFS;
 import com.google.gwt.user.client.rpc.TestSetFactory.SerializablePrivateNoArg;
@@ -822,6 +823,28 @@ public static boolean isValidSingletonList(List<MarkerTypeSingleton> list) {
     return true;
   }
 
+  public static boolean isValidUnmodifiableList(List<MarkerTypeUnmodifiable> list) {
+    if (list == null) {
+      return false;
+    }
+    try {
+      list.add(new MarkerTypeUnmodifiable());
+      return false;
+    } catch (UnsupportedOperationException ignored) {
+      // expected
+    }
+    Object value = list.get(0);
+    // Perform instanceof check in case RPC did the wrong thing
+    if (!(value instanceof MarkerTypeUnmodifiable)) {
+      return false;
+    }
+    MarkerTypeSingleton singleton = (MarkerTypeSingleton) value;
+    if (!"unmodifiable".equals(singleton.getValue())) {
+      return false;
+    }
+    return true;
+  }
+
   public static boolean isValidTrivialCyclicGraph(
       SerializableDoublyLinkedNode actual) {
     if (actual == null) {

diff --git a/user/test/com/google/gwt/user/server/rpc/CollectionsTestServiceImpl.java b/user/test/com/google/gwt/user/server/rpc/CollectionsTestServiceImpl.java
@@ -37,6 +37,7 @@
 import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeSingleton;
 import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeTreeMap;
 import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeTreeSet;
+import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeUnmodifiable;
 import com.google.gwt.user.client.rpc.TestSetFactory.MarkerTypeVector;
 import com.google.gwt.user.client.rpc.TestSetValidator;
 
@@ -564,6 +565,15 @@ public List<MarkerTypeSingleton> echoSingletonList(
       throw new CollectionsTestServiceException();
     }
 
+    return value;
+  }
+  @Override
+  public List<MarkerTypeUnmodifiable> echoUnmodifiableList(
+      List<MarkerTypeUnmodifiable> value) throws CollectionsTestServiceException {
+    if (!TestSetValidator.isValidUnmodifiableList(value)) {
+      throw new CollectionsTestServiceException();
+    }
+
     return value;
   }
 }