equal
deleted
inserted
replaced
333 "q-/Type.class", // not a legal package name |
333 "q-/Type.class", // not a legal package name |
334 "q-/resources/m/properties"); |
334 "q-/resources/m/properties"); |
335 |
335 |
336 ModuleFinder finder = ModuleFinder.of(jar); |
336 ModuleFinder finder = ModuleFinder.of(jar); |
337 Optional<ModuleReference> mref = finder.find("m"); |
337 Optional<ModuleReference> mref = finder.find("m"); |
338 assertTrue(mref.isPresent(), "m not found"); |
338 assertTrue(mref.isPresent(), "m1 not found"); |
339 |
339 |
340 ModuleDescriptor descriptor = mref.get().descriptor(); |
340 ModuleDescriptor descriptor = mref.get().descriptor(); |
341 |
341 |
342 assertTrue(descriptor.packages().size() == 2); |
342 assertTrue(descriptor.packages().size() == 2); |
343 assertTrue(descriptor.packages().contains("p")); |
343 assertTrue(descriptor.packages().contains("p")); |
746 } else { |
746 } else { |
747 mn = mid.substring(0, i); |
747 mn = mid.substring(0, i); |
748 vs = mid.substring(i+1); |
748 vs = mid.substring(i+1); |
749 } |
749 } |
750 ModuleDescriptor.Builder builder |
750 ModuleDescriptor.Builder builder |
751 = new ModuleDescriptor.Builder(mn).requires("java.base"); |
751 = ModuleDescriptor.module(mn).requires("java.base"); |
752 if (vs != null) |
752 if (vs != null) |
753 builder.version(vs); |
753 builder.version(vs); |
754 return builder.build(); |
754 return builder.build(); |
755 } |
755 } |
756 |
756 |