This is an automated email from the ASF dual-hosted git repository. joshtynjala pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit 34c9fb9f0a34cacae19ded35f9e580c24e2c8edc Author: Josh Tynjala <[email protected]> AuthorDate: Tue Aug 2 09:00:11 2022 -0700 RoyaleUnit: all calls to update classpath for Playwright happen in DefaultPlaywrightContext instead of split between Command and Context --- .../ant/launcher/commands/playwright/DefaultPlaywrightCommand.java | 7 ------- .../test/ant/launcher/contexts/DefaultPlaywrightContext.java | 6 ++++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/royaleunit-ant-tasks/src/main/java/org/apache/royale/test/ant/launcher/commands/playwright/DefaultPlaywrightCommand.java b/royaleunit-ant-tasks/src/main/java/org/apache/royale/test/ant/launcher/commands/playwright/DefaultPlaywrightCommand.java index c591f34bf..05b5f2bdd 100644 --- a/royaleunit-ant-tasks/src/main/java/org/apache/royale/test/ant/launcher/commands/playwright/DefaultPlaywrightCommand.java +++ b/royaleunit-ant-tasks/src/main/java/org/apache/royale/test/ant/launcher/commands/playwright/DefaultPlaywrightCommand.java @@ -20,13 +20,10 @@ import java.io.File; import java.io.IOException; import java.util.HashMap; import java.util.Map; -import java.util.Vector; import java.util.function.Consumer; import org.apache.royale.test.ant.LoggingUtil; -import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.Project; -import org.apache.tools.ant.taskdefs.Execute; import com.microsoft.playwright.Browser; import com.microsoft.playwright.BrowserType; @@ -82,10 +79,6 @@ public class DefaultPlaywrightCommand implements PlaywrightCommand public void prepare() { - // must also call resetThreadContextLoader() after test run completes. - // that happens in stop() method of DefaultPlaywrightContext - ((AntClassLoader)getClass().getClassLoader()).setThreadContextLoader(); - CreateOptions createOptions = new CreateOptions(); createOptions.setEnv(getEnvironmentMap()); playwright = PlaywrightImpl.create(createOptions); diff --git a/royaleunit-ant-tasks/src/main/java/org/apache/royale/test/ant/launcher/contexts/DefaultPlaywrightContext.java b/royaleunit-ant-tasks/src/main/java/org/apache/royale/test/ant/launcher/contexts/DefaultPlaywrightContext.java index 979de5631..34e35f20a 100644 --- a/royaleunit-ant-tasks/src/main/java/org/apache/royale/test/ant/launcher/contexts/DefaultPlaywrightContext.java +++ b/royaleunit-ant-tasks/src/main/java/org/apache/royale/test/ant/launcher/contexts/DefaultPlaywrightContext.java @@ -43,6 +43,9 @@ public class DefaultPlaywrightContext implements PlaywrightExecutionContext public void start() throws IOException { + // calls resetThreadContextLoader() in stop() after test run completes + ((AntClassLoader)getClass().getClassLoader()).setThreadContextLoader(); + //prep anything the command needs to run command.prepare(); } @@ -52,8 +55,7 @@ public class DefaultPlaywrightContext implements PlaywrightExecutionContext //destroy the playwright instance, if it exists if(playwright != null) { - // setThreadContextLoader() was called in DefaultPlaywrightCommand, - // and this is the matching call to resetThreadContextLoader() + // setThreadContextLoader() was called in start() ((AntClassLoader)getClass().getClassLoader()).resetThreadContextLoader(); playwright.close();
