[java] Adding ability to clear listeners in DevTools and breaking dep…

…endency between DevTools tests
quehanwei · Oct 19, 2019 · 36ff0bf · 36ff0bf
1 parent 2d5cde1
commit 36ff0bf
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/java/client/src/org/openqa/selenium/devtools/Connection.java b/java/client/src/org/openqa/selenium/devtools/Connection.java
@@ -114,6 +114,10 @@ public <X> void addListener(Event<X> event, Consumer<X> handler) {
     eventCallbacks.put(event, handler);
   }
 
+  public void clearListeners() {
+    eventCallbacks.clear();
+  }
+
   @Override
   public void close() {
     socket.close();

diff --git a/java/client/src/org/openqa/selenium/devtools/DevTools.java b/java/client/src/org/openqa/selenium/devtools/DevTools.java
@@ -63,6 +63,10 @@ public <X> void addListener(Event<X> event, Consumer<X> handler) {
     connection.addListener(event, handler);
   }
 
+  public void clearListeners() {
+    connection.clearListeners();
+  }
+
   public void createSessionIfThereIsNotOne() {
     if (cdpSession == null) {
       createSession();

diff --git a/java/client/test/org/openqa/selenium/devtools/ChromeDevToolsNetworkTest.java b/java/client/test/org/openqa/selenium/devtools/ChromeDevToolsNetworkTest.java
@@ -199,12 +199,12 @@ public void verifyCacheDisabledAndClearCache() {
 
     devTools.send(enable(Optional.empty(), Optional.empty(), Optional.of(100000000)));
 
-    devTools.addListener(responseReceived(), responseReceived -> assertEquals(false, responseReceived.getResponse().getFromDiskCache()));
-
     driver.get(appServer.whereIs("simpleTest.html"));
 
     devTools.send(setCacheDisabled(true));
 
+    devTools.addListener(responseReceived(), responseReceived -> assertEquals(false, responseReceived.getResponse().getFromDiskCache()));
+
     driver.get(appServer.whereIs("simpleTest.html"));
 
     devTools.send(clearBrowserCache());

diff --git a/java/client/test/org/openqa/selenium/devtools/DevToolsTestBase.java b/java/client/test/org/openqa/selenium/devtools/DevToolsTestBase.java
@@ -33,5 +33,6 @@ public void setUp() {
 
     devTools = ((HasDevTools) driver).getDevTools();
     devTools.createSessionIfThereIsNotOne();
+    devTools.clearListeners();
   }
 }