Merge remote-tracking branch 'origin/trunk' into grid-slot-matcher

VietND96 · VietND96 · commit c090c62f9d35 · 2024-12-24T15:44:43.000+07:00
diff --git a/common/src/web/locators_tests/locators.html b/common/src/web/locators_tests/locators.html
@@ -0,0 +1,30 @@
+<html>
+<body>
+<style>
+.information {
+  background-color: white;
+  color: black;
+  padding: 10px;
+}
+</style>
+<h2>Contact Selenium</h2>
+
+<form>
+  <input type="radio" name="gender" value="m" />Male &nbsp;
+  <input type="radio" name="gender" value="f" />Female <br>
+  <br>
+  <label for="fname">First name:</label><br>
+  <input class="information" type="text" id="fname" name="fname" value="Jane"><br><br>
+  <label for="lname">Last name:</label><br>
+  <input class="information" type="text" id="lname" name="lname" value="Doe"><br><br>
+  <label for="newsletter">Newsletter:</label>
+  <input type="checkbox" name="newsletter" value="1" /><br><br>
+  <input type="submit" value="Submit">
+</form>
+
+<p>To know more about Selenium, visit the official page
+<a href ="https://www.selenium.dev/">Selenium Official Page</a>
+</p>
+
+</body>
+</html>
diff --git a/java/src/org/openqa/selenium/json/JsonInput.java b/java/src/org/openqa/selenium/json/JsonInput.java
@@ -39,8 +39,7 @@
 public class JsonInput implements Closeable {
 
   private final Reader source;
-  // FIXME: This flag is never set
-  private final boolean readPerformed = false;
+  private boolean readPerformed = false;
   private JsonTypeCoercer coercer;
   private PropertySetting setter;
   private final Input input;
@@ -49,6 +48,7 @@ public class JsonInput implements Closeable {
   private final Deque<Container> stack = new ArrayDeque<>();
 
   JsonInput(Reader source, JsonTypeCoercer coercer, PropertySetting setter) {
+
     this.source = Require.nonNull("Source", source);
     this.coercer = Require.nonNull("Coercer", coercer);
     this.input = new Input(source);
@@ -402,6 +402,10 @@ public void skipValue() {
     }
   }
 
+  private void markReadPerformed() {
+    readPerformed = true;
+  }
+
   /**
    * Read the next element from the JSON input stream as the specified type.
    *
@@ -413,6 +417,7 @@ public void skipValue() {
    * @throws UncheckedIOException if an I/O exception is encountered
    */
   public <T> T read(Type type) {
+    markReadPerformed();
     skipWhitespace(input);
 
     // Guard against reading an empty stream
