diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-06-15 07:53:19 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-15 07:53:19 +0200 |
commit | 70c0e99b8fcd2f935f1d749ac829ff724c4dbc70 (patch) | |
tree | e81e1385503e000d56b75c74977a588a7279ffae /vespa-osgi-testrunner/src | |
parent | 21952802fbb091a470a384c0287dbdbbb4bd3a85 (diff) |
Revert "Set context class loader for JUnit"
Diffstat (limited to 'vespa-osgi-testrunner/src')
-rw-r--r-- | vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java index 75873e7b997..54f0941208d 100644 --- a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java +++ b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java @@ -103,7 +103,7 @@ public class JunitRunner extends AbstractComponent implements TestRunner { private TestReport launchJunit(Suite suite, byte[] testConfig) { List<Class<?>> testClasses = classLoader.apply(suite); - if (testClasses == null || testClasses.isEmpty()) + if (testClasses == null) return null; testRuntimeProvider.initialize(testConfig); @@ -117,14 +117,7 @@ public class JunitRunner extends AbstractComponent implements TestRunner { .map(DiscoverySelectors::selectClass) .collect(toList())) .build(); - ClassLoader old = Thread.currentThread().getContextClassLoader(); - try { - Thread.currentThread().setContextClassLoader(testClasses.get(0).getClassLoader()); - testExecutor.accept(discoveryRequest, new TestExecutionListener[] { testReportListener }); - } - finally { - Thread.currentThread().setContextClassLoader(old); - } + testExecutor.accept(discoveryRequest, new TestExecutionListener[] { testReportListener }); return testReportListener.report(); } |