[java] Fixing NetworkInterceptor (or commands sent by Fetch, even)

SeleniumHQ · Sep 18, 2019 · 66c07d3 · 66c07d3
1 parent 437cca6
commit 66c07d3
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/java/client/src/org/openqa/selenium/devtools/fetch/Fetch.java b/java/client/src/org/openqa/selenium/devtools/fetch/Fetch.java
@@ -70,7 +70,8 @@ public static Command<Void> failRequest(RequestId requestId, ErrorReason errorRe
     Objects.requireNonNull(requestId, "requestId is required");
     Objects.requireNonNull(errorReason, "errorReason is required");
     return new Command<>(
-        "Fetch.failRequest", ImmutableMap.of("requestId", requestId, "errorReason", errorReason));
+        "Fetch.failRequest",
+        ImmutableMap.of("requestId", requestId.toString(), "errorReason", errorReason));
   }
 
   /**
@@ -88,12 +89,12 @@ public static Command<Void> fulfillRequest(
       throw new DevToolsException("Invalid http responseCode");
     }
     responseHeaders = validateHeaders(responseHeaders);
-    params.put("requestId", requestId);
+    params.put("requestId", requestId.toString());
     params.put("responseHeaders", responseHeaders);
     params.put("responseCode", responseCode);
     body.ifPresent(b -> params.put("body", b));
     responsePhrase.ifPresent(phrase -> params.put("responsePhrase", phrase));
-    return new Command<>("Fetch.failRequest", params.build());
+    return new Command<Void>("Fetch.fulfillRequest", params.build());
   }
 
   /**
@@ -107,7 +108,7 @@ public static Command<Void> continueRequest(
       Optional<List<HeaderEntry>> headers) {
     final ImmutableMap.Builder<String, Object> params = ImmutableMap.builder();
     Objects.requireNonNull(requestId, "requestId is required");
-    params.put("requestId", requestId);
+    params.put("requestId", requestId.toString());
     url.ifPresent(s -> params.put("url", s));
     method.ifPresent(s -> params.put("method", s));
     postData.ifPresent(s -> params.put("postData", s));
@@ -124,7 +125,7 @@ public static Command<Void> continueWithAuth(
     Objects.requireNonNull(authChallengeResponse, "authChallengeResponse is required");
     return new Command<>(
         "Fetch.continueWithAuth",
-        ImmutableMap.of("requestId", requestId, "authChallengeResponse", authChallengeResponse));
+        ImmutableMap.of("requestId", requestId.toString(), "authChallengeResponse", authChallengeResponse));
   }
 
   /**
@@ -137,7 +138,7 @@ public static Command<ResponseBody> getResponseBody(RequestId requestId) {
     Objects.requireNonNull(requestId, "requestId is required");
     return new Command<>(
         "Fetch.getResponseBody",
-        ImmutableMap.of("requestId", requestId),
+        ImmutableMap.of("requestId", requestId.toString()),
         map("body", ResponseBody.class));
   }
 
@@ -153,7 +154,7 @@ public static Command<StreamHandle> takeResponseBodyAsStream(RequestId requestId
     Objects.requireNonNull(requestId, "requestId is required");
     return new Command<>(
         "Fetch.takeResponseBodyAsStream",
-        ImmutableMap.of("requestId", requestId),
+        ImmutableMap.of("requestId", requestId.toString()),
         map("stream", StreamHandle.class));
   }
 

diff --git a/java/client/src/org/openqa/selenium/devtools/fetch/model/HeaderEntry.java b/java/client/src/org/openqa/selenium/devtools/fetch/model/HeaderEntry.java
@@ -48,4 +48,12 @@ private static HeaderEntry fromJson(JsonInput input) {
     }
     return new HeaderEntry(name, value);
   }
+
+  public String getName() {
+    return name;
+  }
+
+  public String getValue() {
+    return value;
+  }
 }
diff --git a/java/client/src/org/openqa/selenium/devtools/fetch/model/RequestId.java b/java/client/src/org/openqa/selenium/devtools/fetch/model/RequestId.java
@@ -34,4 +34,8 @@ public RequestId(String id) {
   private static RequestId fromJson(JsonInput input) {
     return new RequestId(input.nextString());
   }
+
+  public String toString() {
+    return id;
+  }
 }
diff --git a/java/client/test/org/openqa/selenium/devtools/ChromeDevToolsFetchTests.java b/java/client/test/org/openqa/selenium/devtools/ChromeDevToolsFetchTests.java
@@ -37,6 +37,7 @@
 import java.util.List;
 import java.util.Optional;
 
+// TODO: Add some checks, the tests does not ensure a listener is actually invoked
 public class ChromeDevToolsFetchTests extends ChromeDevToolsTestBase {
 
   @Test