[j9] Basic read/write of Module attribute

33 files changed, 71 insertions, 0 deletions

diff --git a/bcel-builder/testdata/modules/cpl.sh b/bcel-builder/testdata/modules/cpl.sh
new file mode 100755
index 000000000..0ac21453d
--- /dev/null
+++ b/bcel-builder/testdata/modules/cpl.sh
@@ -0,0 +1,24 @@
+cd one
+javac module-info.java
+cd ..
+cd two/a
+javac module-info.java
+cd ../..
+cd two/b
+javac module-info.java
+cd ../..
+cd two/c
+javac module-info.java
+cd ../..
+cd two/d
+javac module-info.java -modulepath ../a:../b
+cd ../..
+cd two/e
+javac module-info.java C1.java C2.java C3.java -d . -modulepath ../a:../b
+cd ../..
+cd two/f
+javac module-info.java I1.java -d . 
+cd ../..
+cd two/g
+javac module-info.java I1.java I2.java C1.java C2.java -d . 
+cd ../..
diff --git a/bcel-builder/testdata/modules/one/module-info.class b/bcel-builder/testdata/modules/one/module-info.class
new file mode 100644
index 000000000..0088bd13a
--- /dev/null
+++ b/bcel-builder/testdata/modules/one/module-info.class
diff --git a/bcel-builder/testdata/modules/one/module-info.java b/bcel-builder/testdata/modules/one/module-info.java
new file mode 100644
index 000000000..d0913deeb
--- /dev/null
+++ b/bcel-builder/testdata/modules/one/module-info.java
@@ -0,0 +1 @@
+module one {}
diff --git a/bcel-builder/testdata/modules/two/a/module-info.class b/bcel-builder/testdata/modules/two/a/module-info.class
new file mode 100644
index 000000000..c0003b8f6
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/a/module-info.class
diff --git a/bcel-builder/testdata/modules/two/a/module-info.java b/bcel-builder/testdata/modules/two/a/module-info.java
new file mode 100644
index 000000000..8ab4a7dc9
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/a/module-info.java
@@ -0,0 +1,2 @@
+module a.b.c {
+}
diff --git a/bcel-builder/testdata/modules/two/b/module-info.class b/bcel-builder/testdata/modules/two/b/module-info.class
new file mode 100644
index 000000000..6721be124
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/b/module-info.class
diff --git a/bcel-builder/testdata/modules/two/b/module-info.java b/bcel-builder/testdata/modules/two/b/module-info.java
new file mode 100644
index 000000000..308ba05bb
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/b/module-info.java
@@ -0,0 +1,2 @@
+module b.c.d {
+}
diff --git a/bcel-builder/testdata/modules/two/c/module-info.class b/bcel-builder/testdata/modules/two/c/module-info.class
new file mode 100644
index 000000000..0c81601d5
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/c/module-info.class
diff --git a/bcel-builder/testdata/modules/two/c/module-info.java b/bcel-builder/testdata/modules/two/c/module-info.java
new file mode 100644
index 000000000..501d75a06
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/c/module-info.java
@@ -0,0 +1,2 @@
+module c.d.e {
+}
diff --git a/bcel-builder/testdata/modules/two/d/module-info.class b/bcel-builder/testdata/modules/two/d/module-info.class
new file mode 100644
index 000000000..358624633
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/d/module-info.class
diff --git a/bcel-builder/testdata/modules/two/d/module-info.java b/bcel-builder/testdata/modules/two/d/module-info.java
new file mode 100644
index 000000000..5b9446eed
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/d/module-info.java
@@ -0,0 +1,4 @@
+module d.e.f {
+  requires a.b.c;
+  requires public b.c.d;
+}
diff --git a/bcel-builder/testdata/modules/two/e/C1.java b/bcel-builder/testdata/modules/two/e/C1.java
new file mode 100644
index 000000000..eb087840d
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/e/C1.java
@@ -0,0 +1,3 @@
+package com.foo1;
+
+public class C1 {}
diff --git a/bcel-builder/testdata/modules/two/e/C2.java b/bcel-builder/testdata/modules/two/e/C2.java
new file mode 100644
index 000000000..528b87e02
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/e/C2.java
@@ -0,0 +1,3 @@
+package com.foo2;
+
+public class C2 {}
diff --git a/bcel-builder/testdata/modules/two/e/C3.java b/bcel-builder/testdata/modules/two/e/C3.java
new file mode 100644
index 000000000..205f75fac
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/e/C3.java
@@ -0,0 +1,3 @@
+package com.foo3;
+
+public class C3 {}
diff --git a/bcel-builder/testdata/modules/two/e/com/foo1/C1.class b/bcel-builder/testdata/modules/two/e/com/foo1/C1.class
new file mode 100644
index 000000000..6b5bb5fd4
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/e/com/foo1/C1.class
diff --git a/bcel-builder/testdata/modules/two/e/com/foo2/C2.class b/bcel-builder/testdata/modules/two/e/com/foo2/C2.class
new file mode 100644
index 000000000..d9eec8bcd
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/e/com/foo2/C2.class
diff --git a/bcel-builder/testdata/modules/two/e/com/foo3/C3.class b/bcel-builder/testdata/modules/two/e/com/foo3/C3.class
new file mode 100644
index 000000000..d64d2fc98
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/e/com/foo3/C3.class
diff --git a/bcel-builder/testdata/modules/two/e/module-info.class b/bcel-builder/testdata/modules/two/e/module-info.class
new file mode 100644
index 000000000..565bbbea7
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/e/module-info.class
diff --git a/bcel-builder/testdata/modules/two/e/module-info.java b/bcel-builder/testdata/modules/two/e/module-info.java
new file mode 100644
index 000000000..230097050
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/e/module-info.java
@@ -0,0 +1,5 @@
+module e.f.g {
+  exports com.foo1;
+  exports com.foo2 to a.b.c;
+  exports com.foo3 to a.b.c, b.c.d;
+}
diff --git a/bcel-builder/testdata/modules/two/f/I1.java b/bcel-builder/testdata/modules/two/f/I1.java
new file mode 100644
index 000000000..88029d83c
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/f/I1.java
@@ -0,0 +1,3 @@
+package com.foo1;
+
+public interface I1 {}
diff --git a/bcel-builder/testdata/modules/two/f/com/foo1/I1.class b/bcel-builder/testdata/modules/two/f/com/foo1/I1.class
new file mode 100644
index 000000000..da13682c4
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/f/com/foo1/I1.class
diff --git a/bcel-builder/testdata/modules/two/f/module-info.class b/bcel-builder/testdata/modules/two/f/module-info.class
new file mode 100644
index 000000000..9377bb8cc
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/f/module-info.class
diff --git a/bcel-builder/testdata/modules/two/f/module-info.java b/bcel-builder/testdata/modules/two/f/module-info.java
new file mode 100644
index 000000000..78978622c
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/f/module-info.java
@@ -0,0 +1,3 @@
+module f.g.h {
+  uses com.foo1.I1;
+}
diff --git a/bcel-builder/testdata/modules/two/g/C1.java b/bcel-builder/testdata/modules/two/g/C1.java
new file mode 100644
index 000000000..e25a57ec8
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/g/C1.java
@@ -0,0 +1,3 @@
+package com.foo1;
+
+public class C1 implements I1 {}
diff --git a/bcel-builder/testdata/modules/two/g/C2.java b/bcel-builder/testdata/modules/two/g/C2.java
new file mode 100644
index 000000000..100c37b18
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/g/C2.java
@@ -0,0 +1,3 @@
+package com.foo2;
+
+public class C2 implements I2 {}
diff --git a/bcel-builder/testdata/modules/two/g/I1.java b/bcel-builder/testdata/modules/two/g/I1.java
new file mode 100644
index 000000000..88029d83c
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/g/I1.java
@@ -0,0 +1,3 @@
+package com.foo1;
+
+public interface I1 {}
diff --git a/bcel-builder/testdata/modules/two/g/I2.java b/bcel-builder/testdata/modules/two/g/I2.java
new file mode 100644
index 000000000..bd52da822
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/g/I2.java
@@ -0,0 +1,3 @@
+package com.foo2;
+
+public interface I2 {}
diff --git a/bcel-builder/testdata/modules/two/g/com/foo1/C1.class b/bcel-builder/testdata/modules/two/g/com/foo1/C1.class
new file mode 100644
index 000000000..dfc944836
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/g/com/foo1/C1.class
diff --git a/bcel-builder/testdata/modules/two/g/com/foo1/I1.class b/bcel-builder/testdata/modules/two/g/com/foo1/I1.class
new file mode 100644
index 000000000..da13682c4
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/g/com/foo1/I1.class
diff --git a/bcel-builder/testdata/modules/two/g/com/foo2/C2.class b/bcel-builder/testdata/modules/two/g/com/foo2/C2.class
new file mode 100644
index 000000000..aae7ea279
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/g/com/foo2/C2.class
diff --git a/bcel-builder/testdata/modules/two/g/com/foo2/I2.class b/bcel-builder/testdata/modules/two/g/com/foo2/I2.class
new file mode 100644
index 000000000..c31533fbf
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/g/com/foo2/I2.class
diff --git a/bcel-builder/testdata/modules/two/g/module-info.class b/bcel-builder/testdata/modules/two/g/module-info.class
new file mode 100644
index 000000000..415a54036
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/g/module-info.class
diff --git a/bcel-builder/testdata/modules/two/g/module-info.java b/bcel-builder/testdata/modules/two/g/module-info.java
new file mode 100644
index 000000000..00633c573
--- /dev/null
+++ b/bcel-builder/testdata/modules/two/g/module-info.java
@@ -0,0 +1,4 @@
+module g.h.i {
+  provides com.foo1.I1 with com.foo1.C1;
+  provides com.foo2.I2 with com.foo2.C2;
+}