From dbe1d30feb2ce57f903094f4db742ac865c901f1 Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Thu, 8 Feb 2024 11:56:04 -0800 Subject: [PATCH] chore: move junit tests into junit package (#1480) --- .../java/com/microsoft/playwright/Server.java | 4 ++-- .../java/com/microsoft/playwright/Utils.java | 4 ++-- .../playwright/{ => junit}/FixtureTest.java | 2 +- .../{ => junit}/ServerLifecycle.java | 3 ++- .../TestFixtureChannelOption.java} | 14 ++++++------- .../TestFixtureContextOptions.java} | 20 +++++++++++-------- .../TestFixtureDeviceOption.java} | 13 ++++++------ .../TestFixtureOptions.java} | 19 +++++++++--------- .../TestFixtures.java} | 6 +++--- 9 files changed, 45 insertions(+), 40 deletions(-) rename playwright/src/test/java/com/microsoft/playwright/{ => junit}/FixtureTest.java (90%) rename playwright/src/test/java/com/microsoft/playwright/{ => junit}/ServerLifecycle.java (93%) rename playwright/src/test/java/com/microsoft/playwright/{TestPlaywrightCustomFixturesChannel.java => junit/TestFixtureChannelOption.java} (76%) rename playwright/src/test/java/com/microsoft/playwright/{TestPlaywrightCustomOptionFixtures.java => junit/TestFixtureContextOptions.java} (50%) rename playwright/src/test/java/com/microsoft/playwright/{TestPlaywrightDeviceOption.java => junit/TestFixtureDeviceOption.java} (69%) rename playwright/src/test/java/com/microsoft/playwright/{TestPlaywrightCustomFixtures.java => junit/TestFixtureOptions.java} (50%) rename playwright/src/test/java/com/microsoft/playwright/{TestPlaywrightFixtures.java => junit/TestFixtures.java} (93%) diff --git a/playwright/src/test/java/com/microsoft/playwright/Server.java b/playwright/src/test/java/com/microsoft/playwright/Server.java index 8774fd50..505dc322 100644 --- a/playwright/src/test/java/com/microsoft/playwright/Server.java +++ b/playwright/src/test/java/com/microsoft/playwright/Server.java @@ -52,7 +52,7 @@ public class Server implements HttpHandler { } } - static Server createHttp(int port) throws IOException { + public static Server createHttp(int port) throws IOException { return new Server(port, false); } @@ -81,7 +81,7 @@ public class Server implements HttpHandler { server.start(); } - void stop() { + public void stop() { server.stop(0); } diff --git a/playwright/src/test/java/com/microsoft/playwright/Utils.java b/playwright/src/test/java/com/microsoft/playwright/Utils.java index f4640f60..01e6cef2 100644 --- a/playwright/src/test/java/com/microsoft/playwright/Utils.java +++ b/playwright/src/test/java/com/microsoft/playwright/Utils.java @@ -36,7 +36,7 @@ import java.util.zip.ZipInputStream; import static org.junit.jupiter.api.Assertions.assertEquals; -class Utils { +public class Utils { private static final AtomicInteger nextUnusedPort = new AtomicInteger(9000); private static boolean available(int port) { @@ -47,7 +47,7 @@ class Utils { } } - static int nextFreePort() { + public static int nextFreePort() { for (int i = 0; i < 100; i++) { int port = nextUnusedPort.getAndIncrement(); if (available(port)) { diff --git a/playwright/src/test/java/com/microsoft/playwright/FixtureTest.java b/playwright/src/test/java/com/microsoft/playwright/junit/FixtureTest.java similarity index 90% rename from playwright/src/test/java/com/microsoft/playwright/FixtureTest.java rename to playwright/src/test/java/com/microsoft/playwright/junit/FixtureTest.java index 8788af0c..3ee4b131 100644 --- a/playwright/src/test/java/com/microsoft/playwright/FixtureTest.java +++ b/playwright/src/test/java/com/microsoft/playwright/junit/FixtureTest.java @@ -1,4 +1,4 @@ -package com.microsoft.playwright; +package com.microsoft.playwright.junit; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/playwright/src/test/java/com/microsoft/playwright/ServerLifecycle.java b/playwright/src/test/java/com/microsoft/playwright/junit/ServerLifecycle.java similarity index 93% rename from playwright/src/test/java/com/microsoft/playwright/ServerLifecycle.java rename to playwright/src/test/java/com/microsoft/playwright/junit/ServerLifecycle.java index dde151e8..0bca2234 100644 --- a/playwright/src/test/java/com/microsoft/playwright/ServerLifecycle.java +++ b/playwright/src/test/java/com/microsoft/playwright/junit/ServerLifecycle.java @@ -1,5 +1,6 @@ -package com.microsoft.playwright; +package com.microsoft.playwright.junit; +import com.microsoft.playwright.Server; import org.junit.jupiter.api.extension.AfterAllCallback; import org.junit.jupiter.api.extension.BeforeAllCallback; import org.junit.jupiter.api.extension.ExtensionContext; diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPlaywrightCustomFixturesChannel.java b/playwright/src/test/java/com/microsoft/playwright/junit/TestFixtureChannelOption.java similarity index 76% rename from playwright/src/test/java/com/microsoft/playwright/TestPlaywrightCustomFixturesChannel.java rename to playwright/src/test/java/com/microsoft/playwright/junit/TestFixtureChannelOption.java index 2a7f8532..5ee3b696 100644 --- a/playwright/src/test/java/com/microsoft/playwright/TestPlaywrightCustomFixturesChannel.java +++ b/playwright/src/test/java/com/microsoft/playwright/junit/TestFixtureChannelOption.java @@ -1,18 +1,18 @@ -package com.microsoft.playwright; +package com.microsoft.playwright.junit; -import com.microsoft.playwright.junit.Options; -import com.microsoft.playwright.junit.OptionsFactory; -import com.microsoft.playwright.junit.UsePlaywright; +import com.microsoft.playwright.Browser; +import com.microsoft.playwright.Page; +import com.microsoft.playwright.Server; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIf; -import static com.microsoft.playwright.ServerLifecycle.serverMap; +import static com.microsoft.playwright.junit.ServerLifecycle.serverMap; import static org.junit.jupiter.api.Assertions.*; @FixtureTest -@UsePlaywright(TestPlaywrightCustomFixturesChannel.CustomOptions.class) +@UsePlaywright(TestFixtureChannelOption.CustomOptions.class) @EnabledIf("isChannelSpecified") -public class TestPlaywrightCustomFixturesChannel { +public class TestFixtureChannelOption { public static class CustomOptions implements OptionsFactory { @Override diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPlaywrightCustomOptionFixtures.java b/playwright/src/test/java/com/microsoft/playwright/junit/TestFixtureContextOptions.java similarity index 50% rename from playwright/src/test/java/com/microsoft/playwright/TestPlaywrightCustomOptionFixtures.java rename to playwright/src/test/java/com/microsoft/playwright/junit/TestFixtureContextOptions.java index 96c0c23e..cdd3a7b0 100644 --- a/playwright/src/test/java/com/microsoft/playwright/TestPlaywrightCustomOptionFixtures.java +++ b/playwright/src/test/java/com/microsoft/playwright/junit/TestFixtureContextOptions.java @@ -1,23 +1,27 @@ -package com.microsoft.playwright; +package com.microsoft.playwright.junit; -import com.microsoft.playwright.junit.Options; -import com.microsoft.playwright.junit.OptionsFactory; -import com.microsoft.playwright.junit.UsePlaywright; +import com.microsoft.playwright.*; import org.junit.jupiter.api.Test; import java.util.regex.Pattern; -import static com.microsoft.playwright.ServerLifecycle.serverMap; +import static com.microsoft.playwright.junit.ServerLifecycle.serverMap; import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @FixtureTest -@UsePlaywright(TestPlaywrightCustomOptionFixtures.CustomOptions.class) -public class TestPlaywrightCustomOptionFixtures { +@UsePlaywright(TestFixtureContextOptions.CustomOptions.class) +public class TestFixtureContextOptions { + public static class CustomOptions implements OptionsFactory { @Override public Options getOptions() { - return new Options().setApiRequestOptions(new APIRequest.NewContextOptions().setBaseURL(serverMap.get(TestPlaywrightCustomOptionFixtures.class).EMPTY_PAGE)).setContextOption(new Browser.NewContextOptions().setBaseURL(serverMap.get(TestPlaywrightCustomOptionFixtures.class).EMPTY_PAGE)); + return new Options() + .setApiRequestOptions(new APIRequest.NewContextOptions() + .setBaseURL(serverMap.get(TestFixtureContextOptions.class).EMPTY_PAGE)) + .setContextOption(new Browser.NewContextOptions() + .setBaseURL(serverMap.get(TestFixtureContextOptions.class).EMPTY_PAGE)); } } diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPlaywrightDeviceOption.java b/playwright/src/test/java/com/microsoft/playwright/junit/TestFixtureDeviceOption.java similarity index 69% rename from playwright/src/test/java/com/microsoft/playwright/TestPlaywrightDeviceOption.java rename to playwright/src/test/java/com/microsoft/playwright/junit/TestFixtureDeviceOption.java index 5074c938..b76f4f54 100644 --- a/playwright/src/test/java/com/microsoft/playwright/TestPlaywrightDeviceOption.java +++ b/playwright/src/test/java/com/microsoft/playwright/junit/TestFixtureDeviceOption.java @@ -1,17 +1,16 @@ -package com.microsoft.playwright; +package com.microsoft.playwright.junit; -import com.microsoft.playwright.junit.Options; -import com.microsoft.playwright.junit.OptionsFactory; -import com.microsoft.playwright.junit.UsePlaywright; +import com.microsoft.playwright.Page; +import com.microsoft.playwright.Server; import org.junit.jupiter.api.Test; -import static com.microsoft.playwright.ServerLifecycle.serverMap; +import static com.microsoft.playwright.junit.ServerLifecycle.serverMap; import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @FixtureTest -@UsePlaywright(TestPlaywrightDeviceOption.CustomOptions.class) -public class TestPlaywrightDeviceOption { +@UsePlaywright(TestFixtureDeviceOption.CustomOptions.class) +public class TestFixtureDeviceOption { public static class CustomOptions implements OptionsFactory { @Override diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPlaywrightCustomFixtures.java b/playwright/src/test/java/com/microsoft/playwright/junit/TestFixtureOptions.java similarity index 50% rename from playwright/src/test/java/com/microsoft/playwright/TestPlaywrightCustomFixtures.java rename to playwright/src/test/java/com/microsoft/playwright/junit/TestFixtureOptions.java index f72c7b58..222528d8 100644 --- a/playwright/src/test/java/com/microsoft/playwright/TestPlaywrightCustomFixtures.java +++ b/playwright/src/test/java/com/microsoft/playwright/junit/TestFixtureOptions.java @@ -1,30 +1,31 @@ -package com.microsoft.playwright; +package com.microsoft.playwright.junit; -import com.microsoft.playwright.junit.Options; -import com.microsoft.playwright.junit.OptionsFactory; -import com.microsoft.playwright.junit.UsePlaywright; +import com.microsoft.playwright.Browser; +import com.microsoft.playwright.Page; import org.junit.jupiter.api.Test; import java.util.regex.Pattern; -import static com.microsoft.playwright.ServerLifecycle.serverMap; +import static com.microsoft.playwright.junit.ServerLifecycle.serverMap; import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @FixtureTest -@UsePlaywright(TestPlaywrightCustomFixtures.CustomOptions.class) -public class TestPlaywrightCustomFixtures { +@UsePlaywright(TestFixtureOptions.CustomOptions.class) +public class TestFixtureOptions { public static class CustomOptions implements OptionsFactory { @Override public Options getOptions() { - return new Options().setBaseUrl(serverMap.get(TestPlaywrightCustomFixtures.class).EMPTY_PAGE).setBrowserName("firefox"); + return new Options() + .setBaseUrl(serverMap.get(TestFixtureOptions.class).EMPTY_PAGE) + .setBrowserName("webkit"); } } @Test public void testCustomBrowser(Browser browser) { - assertEquals(browser.browserType().name(), "firefox"); + assertEquals(browser.browserType().name(), "webkit"); } @Test diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPlaywrightFixtures.java b/playwright/src/test/java/com/microsoft/playwright/junit/TestFixtures.java similarity index 93% rename from playwright/src/test/java/com/microsoft/playwright/TestPlaywrightFixtures.java rename to playwright/src/test/java/com/microsoft/playwright/junit/TestFixtures.java index 44974de4..4f5ab936 100644 --- a/playwright/src/test/java/com/microsoft/playwright/TestPlaywrightFixtures.java +++ b/playwright/src/test/java/com/microsoft/playwright/junit/TestFixtures.java @@ -1,6 +1,6 @@ -package com.microsoft.playwright; +package com.microsoft.playwright.junit; -import com.microsoft.playwright.junit.UsePlaywright; +import com.microsoft.playwright.*; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; @UsePlaywright -public class TestPlaywrightFixtures { +public class TestFixtures { private static Playwright playwrightFromBeforeAll; private static Browser browserFromBeforeAll; private BrowserContext browserContextFromBeforeEach;