From ef16fb2e973cf7d5aa4850decdc404be5389b8f3 Mon Sep 17 00:00:00 2001 From: Niclas Moeslund Overby Date: Wed, 16 May 2018 14:52:23 +0200 Subject: tests: Remove redundant test and include_directories('.') --- test cases/java/2 subdir/sub/meson.build | 3 +-- test cases/java/5 includedirs/meson.build | 1 - test cases/java/6 codegen/com/mesonbuild/Config.java.in | 5 +++++ test cases/java/6 codegen/com/mesonbuild/Simple.java | 12 ++++++++++++ test cases/java/6 codegen/com/mesonbuild/TextPrinter.java | 14 ++++++++++++++ test cases/java/6 codegen/com/mesonbuild/meson.build | 6 ++++++ test cases/java/6 codegen/meson.build | 15 +++++++++++++++ .../java/6 no includedirs/com/mesonbuild/Simple.java | 8 -------- .../java/6 no includedirs/com/mesonbuild/TextPrinter.java | 14 -------------- test cases/java/6 no includedirs/meson.build | 14 -------------- test cases/java/7 codegen/com/mesonbuild/Config.java.in | 5 ----- test cases/java/7 codegen/com/mesonbuild/Simple.java | 12 ------------ test cases/java/7 codegen/com/mesonbuild/TextPrinter.java | 14 -------------- test cases/java/7 codegen/com/mesonbuild/meson.build | 6 ------ test cases/java/7 codegen/meson.build | 15 --------------- 15 files changed, 53 insertions(+), 91 deletions(-) create mode 100644 test cases/java/6 codegen/com/mesonbuild/Config.java.in create mode 100644 test cases/java/6 codegen/com/mesonbuild/Simple.java create mode 100644 test cases/java/6 codegen/com/mesonbuild/TextPrinter.java create mode 100644 test cases/java/6 codegen/com/mesonbuild/meson.build create mode 100644 test cases/java/6 codegen/meson.build delete mode 100644 test cases/java/6 no includedirs/com/mesonbuild/Simple.java delete mode 100644 test cases/java/6 no includedirs/com/mesonbuild/TextPrinter.java delete mode 100644 test cases/java/6 no includedirs/meson.build delete mode 100644 test cases/java/7 codegen/com/mesonbuild/Config.java.in delete mode 100644 test cases/java/7 codegen/com/mesonbuild/Simple.java delete mode 100644 test cases/java/7 codegen/com/mesonbuild/TextPrinter.java delete mode 100644 test cases/java/7 codegen/com/mesonbuild/meson.build delete mode 100644 test cases/java/7 codegen/meson.build diff --git a/test cases/java/2 subdir/sub/meson.build b/test cases/java/2 subdir/sub/meson.build index 807ca51..2111c06 100644 --- a/test cases/java/2 subdir/sub/meson.build +++ b/test cases/java/2 subdir/sub/meson.build @@ -1,6 +1,5 @@ javaprog = jar('myprog', 'com/mesonbuild/Simple.java', 'com/mesonbuild/TextPrinter.java', - main_class : 'com.mesonbuild.Simple', - include_directories : include_directories('.')) + main_class : 'com.mesonbuild.Simple') test('subdirtest', javaprog) diff --git a/test cases/java/5 includedirs/meson.build b/test cases/java/5 includedirs/meson.build index 0b2942d..cf0b565 100644 --- a/test cases/java/5 includedirs/meson.build +++ b/test cases/java/5 includedirs/meson.build @@ -10,6 +10,5 @@ javaprog = jar('myprog', 'com/mesonbuild/TextPrinter.java', main_class : 'com.mesonbuild.Simple', include_directories : [ include_directories('com'), - include_directories('.'), include_directories('com/mesonbuild') ]) test('subdirtest', javaprog) diff --git a/test cases/java/6 codegen/com/mesonbuild/Config.java.in b/test cases/java/6 codegen/com/mesonbuild/Config.java.in new file mode 100644 index 0000000..fcc8811 --- /dev/null +++ b/test cases/java/6 codegen/com/mesonbuild/Config.java.in @@ -0,0 +1,5 @@ +package com.mesonbuild; + +public class Config { + public static final boolean FOOBAR = @foobar@; +} diff --git a/test cases/java/6 codegen/com/mesonbuild/Simple.java b/test cases/java/6 codegen/com/mesonbuild/Simple.java new file mode 100644 index 0000000..df3c53d --- /dev/null +++ b/test cases/java/6 codegen/com/mesonbuild/Simple.java @@ -0,0 +1,12 @@ +package com.mesonbuild; + +import com.mesonbuild.Config; + +class Simple { + public static void main(String [] args) { + if (Config.FOOBAR) { + TextPrinter t = new TextPrinter("Printing from Java."); + t.print(); + } + } +} diff --git a/test cases/java/6 codegen/com/mesonbuild/TextPrinter.java b/test cases/java/6 codegen/com/mesonbuild/TextPrinter.java new file mode 100644 index 0000000..7e330a6 --- /dev/null +++ b/test cases/java/6 codegen/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/6 codegen/com/mesonbuild/meson.build b/test cases/java/6 codegen/com/mesonbuild/meson.build new file mode 100644 index 0000000..188bedf --- /dev/null +++ b/test cases/java/6 codegen/com/mesonbuild/meson.build @@ -0,0 +1,6 @@ + +conf_data = configuration_data() +conf_data.set('foobar', 'true') +config_file = configure_file(input : 'Config.java.in', + output : 'Config.java', + configuration : conf_data) diff --git a/test cases/java/6 codegen/meson.build b/test cases/java/6 codegen/meson.build new file mode 100644 index 0000000..f85d45a --- /dev/null +++ b/test cases/java/6 codegen/meson.build @@ -0,0 +1,15 @@ +# If we generate code under the build directory then the backend needs to add +# the build directory to the -sourcepath passed to javac otherwise the compiler +# won't be able to handle the -implicit:class behaviour of automatically +# compiling dependency classes. + +project('codegenjava', 'java') + +subdir('com/mesonbuild') + +javaprog = jar('myprog', + config_file, + 'com/mesonbuild/Simple.java', + 'com/mesonbuild/TextPrinter.java', + main_class : 'com.mesonbuild.Simple') +test('subdirtest', javaprog) diff --git a/test cases/java/6 no includedirs/com/mesonbuild/Simple.java b/test cases/java/6 no includedirs/com/mesonbuild/Simple.java deleted file mode 100644 index 05a73ac..0000000 --- a/test cases/java/6 no includedirs/com/mesonbuild/Simple.java +++ /dev/null @@ -1,8 +0,0 @@ -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/6 no includedirs/com/mesonbuild/TextPrinter.java b/test cases/java/6 no includedirs/com/mesonbuild/TextPrinter.java deleted file mode 100644 index 7e330a6..0000000 --- a/test cases/java/6 no includedirs/com/mesonbuild/TextPrinter.java +++ /dev/null @@ -1,14 +0,0 @@ -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/6 no includedirs/meson.build b/test cases/java/6 no includedirs/meson.build deleted file mode 100644 index b399211..0000000 --- a/test cases/java/6 no includedirs/meson.build +++ /dev/null @@ -1,14 +0,0 @@ -# It used to be necessary to pass: -# -# include_directories: include_directories('.') -# -# to any use of jar() to compile source code with inter-file class -# dependencies. This is now the default behaviour. - -project('noincludedirsjava', 'java') - -javaprog = jar('myprog', - 'com/mesonbuild/Simple.java', - 'com/mesonbuild/TextPrinter.java', - main_class : 'com.mesonbuild.Simple') -test('subdirtest', javaprog) diff --git a/test cases/java/7 codegen/com/mesonbuild/Config.java.in b/test cases/java/7 codegen/com/mesonbuild/Config.java.in deleted file mode 100644 index fcc8811..0000000 --- a/test cases/java/7 codegen/com/mesonbuild/Config.java.in +++ /dev/null @@ -1,5 +0,0 @@ -package com.mesonbuild; - -public class Config { - public static final boolean FOOBAR = @foobar@; -} diff --git a/test cases/java/7 codegen/com/mesonbuild/Simple.java b/test cases/java/7 codegen/com/mesonbuild/Simple.java deleted file mode 100644 index df3c53d..0000000 --- a/test cases/java/7 codegen/com/mesonbuild/Simple.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.mesonbuild; - -import com.mesonbuild.Config; - -class Simple { - public static void main(String [] args) { - if (Config.FOOBAR) { - TextPrinter t = new TextPrinter("Printing from Java."); - t.print(); - } - } -} diff --git a/test cases/java/7 codegen/com/mesonbuild/TextPrinter.java b/test cases/java/7 codegen/com/mesonbuild/TextPrinter.java deleted file mode 100644 index 7e330a6..0000000 --- a/test cases/java/7 codegen/com/mesonbuild/TextPrinter.java +++ /dev/null @@ -1,14 +0,0 @@ -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/7 codegen/com/mesonbuild/meson.build b/test cases/java/7 codegen/com/mesonbuild/meson.build deleted file mode 100644 index 188bedf..0000000 --- a/test cases/java/7 codegen/com/mesonbuild/meson.build +++ /dev/null @@ -1,6 +0,0 @@ - -conf_data = configuration_data() -conf_data.set('foobar', 'true') -config_file = configure_file(input : 'Config.java.in', - output : 'Config.java', - configuration : conf_data) diff --git a/test cases/java/7 codegen/meson.build b/test cases/java/7 codegen/meson.build deleted file mode 100644 index f85d45a..0000000 --- a/test cases/java/7 codegen/meson.build +++ /dev/null @@ -1,15 +0,0 @@ -# If we generate code under the build directory then the backend needs to add -# the build directory to the -sourcepath passed to javac otherwise the compiler -# won't be able to handle the -implicit:class behaviour of automatically -# compiling dependency classes. - -project('codegenjava', 'java') - -subdir('com/mesonbuild') - -javaprog = jar('myprog', - config_file, - 'com/mesonbuild/Simple.java', - 'com/mesonbuild/TextPrinter.java', - main_class : 'com.mesonbuild.Simple') -test('subdirtest', javaprog) -- cgit v1.1