diff options
author | Lucas Bullen | 2018-08-14 15:07:54 +0000 |
---|---|---|
committer | Stephan Herrmann | 2018-08-15 14:41:55 +0000 |
commit | 6432fdd58a28b72dc3736bdded436559d4f912d6 (patch) | |
tree | aabcd30cc3bcd01557fcab61b45cce1bd4f47fc9 | |
parent | 092e038e3ed378d80c1b5abeb77e16a533a9fa75 (diff) | |
download | eclipse.jdt.core-6432fdd58a28b72dc3736bdded436559d4f912d6.tar.gz eclipse.jdt.core-6432fdd58a28b72dc3736bdded436559d4f912d6.tar.xz eclipse.jdt.core-6432fdd58a28b72dc3736bdded436559d4f912d6.zip |
Bug 531057 - Support running tests on JUnit 5I20180815-2000
- Set class loader to work with the new testing suite
Change-Id: Iec085a1e91c5b03cb28afbabbdba258ec4a26717
Signed-off-by: Lucas Bullen <lbullen@redhat.com>
2 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jdt.compiler.apt.tests/src/org/eclipse/jdt/compiler/apt/tests/BatchTestUtils.java b/org.eclipse.jdt.compiler.apt.tests/src/org/eclipse/jdt/compiler/apt/tests/BatchTestUtils.java index 7903d88f26..354b25ce5e 100644 --- a/org.eclipse.jdt.compiler.apt.tests/src/org/eclipse/jdt/compiler/apt/tests/BatchTestUtils.java +++ b/org.eclipse.jdt.compiler.apt.tests/src/org/eclipse/jdt/compiler/apt/tests/BatchTestUtils.java @@ -434,7 +434,7 @@ public class BatchTestUtils { File processorJar = new File(_processorJarPath); junit.framework.TestCase.assertTrue("Couldn't find processor jar at " + processorJar.getAbsolutePath(), processorJar.exists()); - ServiceLoader<JavaCompiler> javaCompilerLoader = ServiceLoader.load(JavaCompiler.class);//, EclipseCompiler.class.getClassLoader()); + ServiceLoader<JavaCompiler> javaCompilerLoader = ServiceLoader.load(JavaCompiler.class, BatchTestUtils.class.getClassLoader()); Class<?> c = null; try { c = Class.forName("org.eclipse.jdt.internal.compiler.tool.EclipseCompiler"); diff --git a/org.eclipse.jdt.compiler.tool.tests/src/org/eclipse/jdt/compiler/tool/tests/CompilerToolTests.java b/org.eclipse.jdt.compiler.tool.tests/src/org/eclipse/jdt/compiler/tool/tests/CompilerToolTests.java index 4bb9cb023f..db76515fd8 100644 --- a/org.eclipse.jdt.compiler.tool.tests/src/org/eclipse/jdt/compiler/tool/tests/CompilerToolTests.java +++ b/org.eclipse.jdt.compiler.tool.tests/src/org/eclipse/jdt/compiler/tool/tests/CompilerToolTests.java @@ -147,7 +147,7 @@ static final String[] FAKE_ZERO_ARG_OPTIONS = new String[] { @Override protected void setUp() throws Exception { - ServiceLoader<JavaCompiler> javaCompilerLoader = ServiceLoader.load(JavaCompiler.class);//, EclipseCompiler.class.getClassLoader()); + ServiceLoader<JavaCompiler> javaCompilerLoader = ServiceLoader.load(JavaCompiler.class, EclipseCompiler.class.getClassLoader()); // int compilerCounter = 0; for (JavaCompiler javaCompiler : javaCompilerLoader) { // compilerCounter++; |