6 files changed, 30 insertions, 12 deletions
diff --git a/test cases/java/1 basic/com/sourceforge/meson/Simple.java b/test cases/java/1 basic/com/mesonbuild/Simple.java
index ef90190..325a49a 100644
--- a/test cases/java/1 basic/com/sourceforge/meson/Simple.java
+++ b/test cases/java/1 basic/com/mesonbuild/Simple.java
@@ -1,4 +1,4 @@
-package com.sourceforge.meson;
+package com.mesonbuild;
 
 class Simple {
     public static void main(String [] args) {
diff --git a/test cases/java/1 basic/meson.build b/test cases/java/1 basic/meson.build
index 8d5f272..bed5c0f 100644
--- a/test cases/java/1 basic/meson.build
+++ b/test cases/java/1 basic/meson.build
@@ -1,5 +1,5 @@
 project('simplejava', 'java')
 
-javaprog = jar('myprog', 'com/sourceforge/meson/Simple.java',
-  main_class : 'com.sourceforge.meson.Simple')
+javaprog = jar('myprog', 'com/mesonbuild/Simple.java',
+  main_class : 'com.mesonbuild.Simple')
 test('mytest', javaprog)
diff --git a/test cases/java/2 subdir/sub/com/mesonbuild/Simple.java b/test cases/java/2 subdir/sub/com/mesonbuild/Simple.java
new file mode 100644
index 0000000..05a73ac
--- /dev/null
+++ b/test cases/java/2 subdir/sub/com/mesonbuild/Simple.java
@@ -0,0 +1,8 @@
+package com.mesonbuild;
+
+class Simple {
+    public static void main(String [] args) {
+        TextPrinter t = new TextPrinter("Printing from Java.");
+        t.print();
+    }
+}
diff --git a/test cases/java/2 subdir/sub/com/mesonbuild/TextPrinter.java b/test cases/java/2 subdir/sub/com/mesonbuild/TextPrinter.java
new file mode 100644
index 0000000..7e330a6
--- /dev/null
+++ b/test cases/java/2 subdir/sub/com/mesonbuild/TextPrinter.java
@@ -0,0 +1,14 @@
+package com.mesonbuild;
+
+class TextPrinter {
+
+    private String msg;
+    
+    TextPrinter(String s) {
+        msg = s;
+    }
+    
+    public void print() {
+        System.out.println(msg);
+    }
+}
diff --git a/test cases/java/2 subdir/sub/com/sourceforge/meson/Simple.java b/test cases/java/2 subdir/sub/com/sourceforge/meson/Simple.java
deleted file mode 100644
index ef90190..0000000
--- a/test cases/java/2 subdir/sub/com/sourceforge/meson/Simple.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.sourceforge.meson;
-
-class Simple {
-    public static void main(String [] args) {
-        System.out.println("Java is working.\n");
-    }
-}
diff --git a/test cases/java/2 subdir/sub/meson.build b/test cases/java/2 subdir/sub/meson.build
index 13a05e2..807ca51 100644
--- a/test cases/java/2 subdir/sub/meson.build
+++ b/test cases/java/2 subdir/sub/meson.build
@@ -1,3 +1,6 @@
-javaprog = jar('myprog', 'com/sourceforge/meson/Simple.java',
-  main_class : 'com.sourceforge.meson.Simple')
+javaprog = jar('myprog',
+ 'com/mesonbuild/Simple.java',
+ 'com/mesonbuild/TextPrinter.java',
+  main_class : 'com.mesonbuild.Simple',
+  include_directories : include_directories('.'))
 test('subdirtest', javaprog)