test/langtools/tools/jdeps/jdkinternals/RemovedJDKInternals.java

*** 83,93 ****
              { "classes", new ModuleMetaData("classes", false)
                  .reference("p.Main", "java.lang.Class", "java.base")
                  .reference("p.Main", "java.lang.Object", "java.base")
                  .reference("p.Main", "java.util.Iterator", "java.base")
                  .reference("p.S", "java.lang.Object", "java.base")
!                 .jdkInternal("p.Main", "sun.reflect.Reflection", "jdk.unsupported")
                  .removedJdkInternal("p.Main", "com.sun.image.codec.jpeg.JPEGCodec")
                  .removedJdkInternal("p.Main", "sun.misc.Service")
                  .removedJdkInternal("p.Main", "sun.misc.SoftCache")
              },
          };
--- 83,94 ----
              { "classes", new ModuleMetaData("classes", false)
                  .reference("p.Main", "java.lang.Class", "java.base")
                  .reference("p.Main", "java.lang.Object", "java.base")
                  .reference("p.Main", "java.util.Iterator", "java.base")
                  .reference("p.S", "java.lang.Object", "java.base")
!                 .jdkInternal("p.Main", "sun.reflect.ReflectionFactory", "jdk.unsupported")
!                 .removedJdkInternal("p.Main", "sun.reflect.Reflection")
                  .removedJdkInternal("p.Main", "com.sun.image.codec.jpeg.JPEGCodec")
                  .removedJdkInternal("p.Main", "sun.misc.Service")
                  .removedJdkInternal("p.Main", "sun.misc.SoftCache")
              },
          };
*** 116,126 ****
  
      private static final Map<String, String> REPLACEMENTS = Map.of(
          "com.sun.image.codec.jpeg.JPEGCodec", "Use javax.imageio @since 1.4",
          "sun.misc.Service", "Use java.util.ServiceLoader @since 1.6",
          "sun.misc.SoftCache", "Removed. See http://openjdk.java.net/jeps/260",
!         "sun.reflect.Reflection", "Use java.lang.StackWalker @since 9"
      );
  
      @Test
      public void checkReplacement() {
          JdepsRunner jdeps = JdepsRunner.run("-jdkinternals", CLASSES_DIR.toString());
--- 117,128 ----
  
      private static final Map<String, String> REPLACEMENTS = Map.of(
          "com.sun.image.codec.jpeg.JPEGCodec", "Use javax.imageio @since 1.4",
          "sun.misc.Service", "Use java.util.ServiceLoader @since 1.6",
          "sun.misc.SoftCache", "Removed. See http://openjdk.java.net/jeps/260",
!         "sun.reflect.Reflection", "Use java.lang.StackWalker @since 9",
!         "sun.reflect.ReflectionFactory", "See http://openjdk.java.net/jeps/260"
      );
  
      @Test
      public void checkReplacement() {
          JdepsRunner jdeps = JdepsRunner.run("-jdkinternals", CLASSES_DIR.toString());
*** 137,146 ****
--- 139,150 ----
          for (int j=i+2; j < output.length; j++) {
              String line = output[j];
              int pos = line.indexOf("Use ");
              if (pos < 0)
                  pos = line.indexOf("Removed. ");
+             if (pos < 0)
+                 pos = line.indexOf("See ");
  
              assertTrue(pos > 0);
              String name = line.substring(0, pos).trim();
              String repl = line.substring(pos, line.length()).trim();
              assertEquals(REPLACEMENTS.get(name), repl);