From 491429b7685a23d9a2cd0b820b5faa21df057050 Mon Sep 17 00:00:00 2001
From: Yury Semikhatsky <yurys@chromium.org>
Date: Mon, 5 Oct 2020 14:30:10 -0700
Subject: [PATCH] chore: simplify test setup

---
 .../playwright/tools/ApiGenerator.java        |  2 +-
 .../playwright/ChromiumBrowserContext.java    |  2 +-
 .../playwright/TestElementHandleClick.java    |  9 +-------
 .../com/microsoft/playwright/TestPopup.java   | 23 ++++++++-----------
 4 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/api-generator/src/main/java/com/microsoft/playwright/tools/ApiGenerator.java b/api-generator/src/main/java/com/microsoft/playwright/tools/ApiGenerator.java
index 5d9413d0..3e5e39ce 100644
--- a/api-generator/src/main/java/com/microsoft/playwright/tools/ApiGenerator.java
+++ b/api-generator/src/main/java/com/microsoft/playwright/tools/ApiGenerator.java
@@ -464,7 +464,7 @@ class Interface extends TypeDefinition {
     "\n" +
     "package com.microsoft.playwright;\n";
 
-  private static Set<String> allowedBaseInterfaces = new HashSet<>(Arrays.asList("Browser", "JSHandle"));
+  private static Set<String> allowedBaseInterfaces = new HashSet<>(Arrays.asList("Browser", "JSHandle", "BrowserContext"));
 
   Interface(JsonObject jsonElement) {
     super(null, jsonElement);
diff --git a/lib/src/main/java/com/microsoft/playwright/ChromiumBrowserContext.java b/lib/src/main/java/com/microsoft/playwright/ChromiumBrowserContext.java
index 2270b78c..18912f73 100644
--- a/lib/src/main/java/com/microsoft/playwright/ChromiumBrowserContext.java
+++ b/lib/src/main/java/com/microsoft/playwright/ChromiumBrowserContext.java
@@ -19,7 +19,7 @@ package com.microsoft.playwright;
 import java.util.*;
 import java.util.function.BiConsumer;
 
-public interface ChromiumBrowserContext {
+public interface ChromiumBrowserContext extends BrowserContext {
   List<Page> backgroundPages();
   CDPSession newCDPSession(Page page);
   List<Worker> serviceWorkers();
diff --git a/lib/src/test/java/com/microsoft/playwright/TestElementHandleClick.java b/lib/src/test/java/com/microsoft/playwright/TestElementHandleClick.java
index d7e045da..2a27ecbb 100644
--- a/lib/src/test/java/com/microsoft/playwright/TestElementHandleClick.java
+++ b/lib/src/test/java/com/microsoft/playwright/TestElementHandleClick.java
@@ -23,23 +23,16 @@ import java.io.IOException;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class TestElementHandleClick {
-  private static Playwright playwright;
   private static Server server;
   private static Browser browser;
-  private static boolean isChromium;
-  private static boolean isWebKit;
-  private static boolean headful;
   private BrowserContext context;
   private Page page;
 
   @BeforeAll
   static void launchBrowser() {
-    playwright = Playwright.create();
+    Playwright playwright = Playwright.create();
     BrowserType.LaunchOptions options = new BrowserType.LaunchOptions();
     browser = playwright.chromium().launch(options);
-    isChromium = true;
-    isWebKit = false;
-    headful = false;
   }
 
   @BeforeAll
diff --git a/lib/src/test/java/com/microsoft/playwright/TestPopup.java b/lib/src/test/java/com/microsoft/playwright/TestPopup.java
index 5ef2eb21..f39142cf 100644
--- a/lib/src/test/java/com/microsoft/playwright/TestPopup.java
+++ b/lib/src/test/java/com/microsoft/playwright/TestPopup.java
@@ -28,18 +28,16 @@ import static com.microsoft.playwright.Utils.mapOf;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class TestPopup {
-  private static Playwright playwright;
   private static Server server;
-  private Browser browser;
-  private boolean isChromium;
-  private boolean isWebKit;
-  private boolean headful;
+  private static Browser browser;
   private BrowserContext context;
   private Page page;
 
   @BeforeAll
-  static void createPlaywright() {
-    playwright = Playwright.create();
+  static void launchBrowser() {
+    Playwright playwright = Playwright.create();
+    BrowserType.LaunchOptions options = new BrowserType.LaunchOptions();
+    browser = playwright.chromium().launch(options);
   }
 
   @BeforeAll
@@ -49,25 +47,22 @@ public class TestPopup {
 
   @AfterAll
   static void stopServer() throws IOException {
+    browser.close();
     server.stop();
     server = null;
   }
 
   @BeforeEach
   void setUp() {
-//    BrowserType.LaunchOptions options = new BrowserType.LaunchOptions().withHeadless(false).withSlowMo(1000);
-    BrowserType.LaunchOptions options = new BrowserType.LaunchOptions();
-    browser = playwright.chromium().launch(options);
-    isChromium = true;
-    isWebKit = false;
-    headful = false;
     context = browser.newContext();
     page = context.newPage();
   }
 
   @AfterEach
   void tearDown() {
-    browser.close();
+    context.close();
+    context = null;
+    page = null;
   }
 
   @Test