Skip to content

Commit 04b40cf

Browse files
committed
refactor: delete classloader test and add async execution support in springboot test
1 parent 3c925b1 commit 04b40cf

File tree

5 files changed

+22
-101
lines changed

5 files changed

+22
-101
lines changed

.github/workflows/test_docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ jobs:
4141
BROWSER: ${{ matrix.browser }}
4242
run: |
4343
CONTAINER_ID="$(docker run --rm -e CI --ipc=host -v $(pwd):/root/playwright --name playwright-docker-test -d -t playwright-java:localbuild-${{ matrix.flavor }} /bin/bash)"
44-
docker exec "${CONTAINER_ID}" /root/playwright/tools/test-spring-classloader/package_and_run_classloader_test.sh
44+
docker exec "${CONTAINER_ID}" /root/playwright/tools/test-spring-boot-starter/package_and_run_async_test.sh

tools/test-spring-classloader/package_and_run_classloader_test.sh renamed to tools/test-spring-boot-starter/package_and_run_async_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ set +x
55

66
cd "$(dirname "$0")"
77
mvn package -D skipTests --no-transfer-progress
8-
java -jar target/test-spring-classloader*.jar
8+
java -jar target/test-spring-boot-starter*.jar --async

tools/test-spring-boot-starter/src/main/java/com/microsoft/playwright/springboottest/TestApp.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import org.springframework.boot.SpringApplication;
66
import org.springframework.boot.autoconfigure.SpringBootApplication;
77

8+
import java.util.concurrent.CompletableFuture;
9+
810
@SpringBootApplication
911
public class TestApp implements CommandLineRunner {
1012

@@ -14,6 +16,24 @@ public static void main(String[] args) {
1416

1517
@Override
1618
public void run(String... args) {
19+
if (args.length == 0) {
20+
runSync();
21+
} else {
22+
if ("--async".equals(args[0])) {
23+
runAsync();
24+
}
25+
else {
26+
runSync();
27+
}
28+
}
29+
}
30+
31+
private void runAsync() {
32+
CompletableFuture<Void> voidCompletableFuture = CompletableFuture.runAsync(this::runSync);
33+
voidCompletableFuture.join();
34+
}
35+
36+
private void runSync() {
1737
try (Playwright playwright = Playwright.create()) {
1838
BrowserType browserType = getBrowserTypeFromEnv(playwright);
1939
System.out.println("Running test with " + browserType.name());

tools/test-spring-classloader/pom.xml

Lines changed: 0 additions & 36 deletions
This file was deleted.

tools/test-spring-classloader/src/main/java/com/microsoft/playwright/springboottest/TestApp.java

Lines changed: 0 additions & 63 deletions
This file was deleted.

0 commit comments

Comments
 (0)