[java] Fixing a test to call Fetch.enable properly

SeleniumHQ · Oct 21, 2019 · 3631b4e · 3631b4e
1 parent e5f1248
commit 3631b4e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/java/client/src/org/openqa/selenium/devtools/fetch/model/RequestPattern.java b/java/client/src/org/openqa/selenium/devtools/fetch/model/RequestPattern.java
@@ -19,6 +19,8 @@
 import org.openqa.selenium.devtools.network.model.ResourceType;
 import org.openqa.selenium.json.JsonInput;
 
+import java.util.Map;
+
 public class RequestPattern {
 
   /**
@@ -43,6 +45,18 @@ public RequestPattern(String urlPattern,
     this.requestStage = (null == requestStage) ? RequestStage.REQUEST : requestStage;
   }
 
+  public String getUrlPattern() {
+    return urlPattern;
+  }
+
+  public ResourceType getResourceType() {
+    return resourceType;
+  }
+
+  public RequestStage getRequestStage() {
+    return requestStage;
+  }
+
   private static RequestPattern fromJson(JsonInput input) {
     String urlPattern = null;
     ResourceType resourceType = null;

diff --git a/java/client/test/org/openqa/selenium/devtools/ChromeDevToolsFetchTests.java b/java/client/test/org/openqa/selenium/devtools/ChromeDevToolsFetchTests.java
@@ -17,6 +17,7 @@
 package org.openqa.selenium.devtools;
 
 import static org.openqa.selenium.devtools.fetch.Fetch.continueRequest;
+import static org.openqa.selenium.devtools.fetch.Fetch.disable;
 import static org.openqa.selenium.devtools.fetch.Fetch.enable;
 import static org.openqa.selenium.devtools.fetch.Fetch.failRequest;
 import static org.openqa.selenium.devtools.fetch.Fetch.fulfillRequest;
@@ -26,6 +27,7 @@
 
 import org.junit.Assert;
 import org.junit.Test;
+import org.openqa.selenium.devtools.fetch.model.HeaderEntry;
 import org.openqa.selenium.devtools.io.model.StreamHandle;
 import org.openqa.selenium.devtools.fetch.model.RequestPattern;
 import org.openqa.selenium.devtools.fetch.model.RequestStage;
@@ -36,6 +38,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 // TODO: Add some checks, the tests does not ensure a listener is actually invoked
 public class ChromeDevToolsFetchTests extends ChromeDevToolsTestBase {
@@ -55,7 +58,7 @@ public void testFulfillRequest() {
                   Optional.empty()));
         });
     List<RequestPattern> patterns = new ArrayList<>();
-    patterns.add(new RequestPattern("*://*.*", ResourceType.EVENTSOURCE, RequestStage.REQUEST));
+    patterns.add(new RequestPattern("*://*.*", ResourceType.DOCUMENT, RequestStage.REQUEST));
     devTools.send(enable(Optional.of(patterns), Optional.empty()));
     chromeDriver.get(appServer.whereIs("simpleTest.html"));
   }
@@ -72,15 +75,16 @@ public void testContinueRequest() {
                   Optional.of(appServer.whereIs("simpleTest.html")),
                   Optional.of("GET"),
                   Optional.empty(),
-                  Optional.of(p.getResponseHeaders())));
+                  Optional.of(p.getRequest().getHeaders().entrySet().stream().map(e -> new HeaderEntry(e.getKey(), e.getValue().toString())).collect(
+                      Collectors.toList()))));
           ResponseBody body = devTools.send(getResponseBody(p.getRequestId()));
           Assert.assertNotNull(body);
           StreamHandle stream = devTools.send(takeResponseBodyAsStream(p.getRequestId()));
           Assert.assertNotNull(stream);
 
         });
     List<RequestPattern> patterns = new ArrayList<>();
-    patterns.add(new RequestPattern("*://*.*", ResourceType.EVENTSOURCE, RequestStage.REQUEST));
+    patterns.add(new RequestPattern("*://*.*", ResourceType.DOCUMENT, RequestStage.REQUEST));
     devTools.send(enable(Optional.of(patterns), Optional.empty()));
     chromeDriver.get(appServer.whereIs("simpleTest.html"));
   }
@@ -94,7 +98,7 @@ public void testFailRequest() {
           devTools.send(failRequest(p.getRequestId(), ErrorReason.BLOCKEDBYCLIENT));
         });
     List<RequestPattern> patterns = new ArrayList<>();
-    patterns.add(new RequestPattern("*://*.*", ResourceType.EVENTSOURCE, RequestStage.REQUEST));
+    patterns.add(new RequestPattern("*://*.*", ResourceType.DOCUMENT, RequestStage.REQUEST));
     devTools.send(enable(Optional.of(patterns), Optional.empty()));
     chromeDriver.get(appServer.whereIs("simpleTest.html"));
   }