Add testing of Class.getResourceAsStream(String) to mx hellomodule

Author: olpaw

substratevm/src/native-image-module-tests/hello.app/src/main/java/hello/Main.java

@@ -61,20 +61,7 @@ public static void main(String[] args) throws NoSuchMethodException, InvocationT
         // testBootLayer(helloAppModule, helloLibModule); // TODO: Re-enable when fixing GR-34444
 
         System.out.println("Now testing resources in modules");
-        String helloAppModuleResourceContents;
-        String sameResourcePathName = "resource-file.txt";
-        try (Scanner s = new Scanner(helloAppModule.getResourceAsStream(sameResourcePathName))) {
-            helloAppModuleResourceContents = s.nextLine();
-        } catch (IOException e) {
-            throw new AssertionError("Unable to access resource " + sameResourcePathName + " from " + helloAppModule);
-        }
-        String helloLibModuleResourceContents;
-        try (Scanner s = new Scanner(helloLibModule.getResourceAsStream(sameResourcePathName))) {
-            helloLibModuleResourceContents = s.nextLine();
-        } catch (IOException e) {
-            throw new AssertionError("Unable to access resource " + sameResourcePathName + " from " + helloLibModule);
-        }
-        assert !helloAppModuleResourceContents.equals(helloLibModuleResourceContents) : sameResourcePathName + " not recognized as different resources";
+        testResourceAccess(helloAppModule, helloLibModule);
     }
 
     private static void testModuleObjects(Module helloAppModule, Module helloLibModule) {
@@ -129,4 +116,31 @@ private static void testBootLayer(Module helloAppModule, Module helloLibModule)
         assert ModuleLayer.boot().modules().contains(helloAppModule);
         assert ModuleLayer.boot().modules().contains(helloLibModule);
     }
+
+    private static void testResourceAccess(Module helloAppModule, Module helloLibModule) {
+        String helloAppModuleResourceContents;
+        String sameResourcePathName = "resource-file.txt";
+
+        // Test Module.getResourceAsStream(String)
+        try (Scanner s = new Scanner(helloAppModule.getResourceAsStream(sameResourcePathName))) {
+            helloAppModuleResourceContents = s.nextLine();
+        } catch (IOException e) {
+            throw new AssertionError("Unable to access resource " + sameResourcePathName + " from " + helloAppModule);
+        }
+        String helloLibModuleResourceContents;
+        try (Scanner s = new Scanner(helloLibModule.getResourceAsStream(sameResourcePathName))) {
+            helloLibModuleResourceContents = s.nextLine();
+        } catch (IOException e) {
+            throw new AssertionError("Unable to access resource " + sameResourcePathName + " from " + helloLibModule);
+        }
+        assert !helloAppModuleResourceContents.equals(helloLibModuleResourceContents) : sameResourcePathName + " not recognized as different resources";
+
+        // Test Class.getResourceAsStream(String)
+        try (Scanner s = new Scanner(Main.class.getResourceAsStream("/" + sameResourcePathName))) {
+            assert helloAppModuleResourceContents.equals(s.nextLine()) : "Class.getResourceAsStream(String) result differs from Module.getResourceAsStream(String) result";
+        }
+        try (Scanner s = new Scanner(Greeter.class.getResourceAsStream("/" + sameResourcePathName))) {
+            assert helloLibModuleResourceContents.equals(s.nextLine()) : "Class.getResourceAsStream(String) result differs from Module.getResourceAsStream(String) result";
+        }
+    }
 }