From 11f227e2035160c65b8cbdbc167c75acfd561775 Mon Sep 17 00:00:00 2001 From: Thibaud Date: Tue, 23 Oct 2018 20:43:00 +0200 Subject: [PATCH] Change test-resources path to src/test/resources --- .../test/java/de/letsbuildacompiler/compiler/CompilerTest.java | 2 +- .../{test-resources => resources}/examples/branch/if_int_false | 0 .../{test-resources => resources}/examples/branch/if_int_true | 0 .../examples/functions/int_parameters | 0 .../{test-resources => resources}/examples/functions/scopes | 0 .../examples/functions/simple_function | 0 .../examples/operators/and-skip-right | 0 .../examples/operators/or-skip-right | 0 8 files changed, 1 insertion(+), 1 deletion(-) rename compiler/src/test/{test-resources => resources}/examples/branch/if_int_false (100%) rename compiler/src/test/{test-resources => resources}/examples/branch/if_int_true (100%) rename compiler/src/test/{test-resources => resources}/examples/functions/int_parameters (100%) rename compiler/src/test/{test-resources => resources}/examples/functions/scopes (100%) rename compiler/src/test/{test-resources => resources}/examples/functions/simple_function (100%) rename compiler/src/test/{test-resources => resources}/examples/operators/and-skip-right (100%) rename compiler/src/test/{test-resources => resources}/examples/operators/or-skip-right (100%) diff --git a/compiler/src/test/java/de/letsbuildacompiler/compiler/CompilerTest.java b/compiler/src/test/java/de/letsbuildacompiler/compiler/CompilerTest.java index 8a8d03c..971a3e9 100644 --- a/compiler/src/test/java/de/letsbuildacompiler/compiler/CompilerTest.java +++ b/compiler/src/test/java/de/letsbuildacompiler/compiler/CompilerTest.java @@ -159,7 +159,7 @@ public class CompilerTest { } private String[] example(String name, String expectedResult) throws IllegalArgumentException { - try (InputStream in = CompilerTest.class.getClassLoader().getResourceAsStream("examples/" + name)) { + try (InputStream in = getClass().getResourceAsStream("/examples/" + name)) { if (in == null) { throw new IllegalArgumentException("No such example " + name); } diff --git a/compiler/src/test/test-resources/examples/branch/if_int_false b/compiler/src/test/resources/examples/branch/if_int_false similarity index 100% rename from compiler/src/test/test-resources/examples/branch/if_int_false rename to compiler/src/test/resources/examples/branch/if_int_false diff --git a/compiler/src/test/test-resources/examples/branch/if_int_true b/compiler/src/test/resources/examples/branch/if_int_true similarity index 100% rename from compiler/src/test/test-resources/examples/branch/if_int_true rename to compiler/src/test/resources/examples/branch/if_int_true diff --git a/compiler/src/test/test-resources/examples/functions/int_parameters b/compiler/src/test/resources/examples/functions/int_parameters similarity index 100% rename from compiler/src/test/test-resources/examples/functions/int_parameters rename to compiler/src/test/resources/examples/functions/int_parameters diff --git a/compiler/src/test/test-resources/examples/functions/scopes b/compiler/src/test/resources/examples/functions/scopes similarity index 100% rename from compiler/src/test/test-resources/examples/functions/scopes rename to compiler/src/test/resources/examples/functions/scopes diff --git a/compiler/src/test/test-resources/examples/functions/simple_function b/compiler/src/test/resources/examples/functions/simple_function similarity index 100% rename from compiler/src/test/test-resources/examples/functions/simple_function rename to compiler/src/test/resources/examples/functions/simple_function diff --git a/compiler/src/test/test-resources/examples/operators/and-skip-right b/compiler/src/test/resources/examples/operators/and-skip-right similarity index 100% rename from compiler/src/test/test-resources/examples/operators/and-skip-right rename to compiler/src/test/resources/examples/operators/and-skip-right diff --git a/compiler/src/test/test-resources/examples/operators/or-skip-right b/compiler/src/test/resources/examples/operators/or-skip-right similarity index 100% rename from compiler/src/test/test-resources/examples/operators/or-skip-right rename to compiler/src/test/resources/examples/operators/or-skip-right