test/java/lang/module/ModuleReader/ModuleReaderTest.java

*** 77,94 ****
      // resources in the base module
      private static final String[] BASE_RESOURCES = {
          "java/lang/Object.class"
      };
  
      // resources in test module (can't use module-info.class as a test
      // resource as it will be modified by the jmod tool)
      private static final String[] TEST_RESOURCES = {
          "p/Main.class"
      };
  
!     // a resource that is not in the base or test module
!     private static final String NOT_A_RESOURCE = "NotAResource";
  
  
      @BeforeTest
      public void compileTestModule() throws Exception {
  
--- 77,132 ----
      // resources in the base module
      private static final String[] BASE_RESOURCES = {
          "java/lang/Object.class"
      };
  
+     // resource names that should not be found in the base module
+     private static final String[] BAD_BASE_RESOURCES = {
+         "NotFound",
+         "java",
+         "/java",
+         "//java",
+         "java/",
+         "java/lang",
+         "/java/lang",
+         "//java/lang",
+         "java/lang/",
+         "java//lang",
+         "/java/lang/Object.class",
+         "//java/lang/Object.class",
+         "java/lang/Object.class/",
+         "java//lang//Object.class",
+         "./java/lang/Object.class",
+         "java/./lang/Object.class",
+         "java/lang/./Object.class",
+         "../java/lang/Object.class",
+         "java/../lang/Object.class",
+         "java/lang/../Object.class",
+     };
+ 
      // resources in test module (can't use module-info.class as a test
      // resource as it will be modified by the jmod tool)
      private static final String[] TEST_RESOURCES = {
          "p/Main.class"
      };
  
!     // resource names that should not be found in the test module
!     private static final String[] BAD_TEST_RESOURCES = {
!         "NotFound",
!         "p",
!         "/p",
!         "//p",
!         "p/",
!         "/p/Main.class",
!         "//p/Main.class",
!         "p/Main.class/",
!         "p//Main.class",
!         "./p/Main.class",
!         "p/./Main.class",
!         "../p/Main.class",
!         "p/../p/Main.class"
!     };
  
  
      @BeforeTest
      public void compileTestModule() throws Exception {
  
*** 124,137 ****
                  testList(reader, name);
  
              }
  
              // test "not found"
!             assertFalse(reader.find(NOT_A_RESOURCE).isPresent());
!             assertFalse(reader.open(NOT_A_RESOURCE).isPresent());
!             assertFalse(reader.read(NOT_A_RESOURCE).isPresent());
! 
  
              // test nulls
              try {
                  reader.find(null);
                  assertTrue(false);
--- 162,176 ----
                  testList(reader, name);
  
              }
  
              // test "not found"
!             for (String name : BAD_BASE_RESOURCES) {
!                 assertFalse(reader.find(name).isPresent());
!                 assertFalse(reader.open(name).isPresent());
!                 assertFalse(reader.read(name).isPresent());
!             }
  
              // test nulls
              try {
                  reader.find(null);
                  assertTrue(false);
*** 234,246 ****
                  testRead(reader, name, expectedBytes);
                  testList(reader, name);
              }
  
              // test "not found"
!             assertFalse(reader.find(NOT_A_RESOURCE).isPresent());
!             assertFalse(reader.open(NOT_A_RESOURCE).isPresent());
!             assertFalse(reader.read(NOT_A_RESOURCE).isPresent());
  
              // test nulls
              try {
                  reader.find(null);
                  assertTrue(false);
--- 273,287 ----
                  testRead(reader, name, expectedBytes);
                  testList(reader, name);
              }
  
              // test "not found"
!             for (String name : BAD_TEST_RESOURCES) {
!                 assertFalse(reader.find(name).isPresent());
!                 assertFalse(reader.open(name).isPresent());
!                 assertFalse(reader.read(name).isPresent());
!             }
  
              // test nulls
              try {
                  reader.find(null);
                  assertTrue(false);