summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorTatu Lund <tatu@vaadin.com>2021-08-24 13:53:34 +0300
committerGitHub <noreply@github.com>2021-08-24 13:53:34 +0300
commitc019c5d5ae61513aecb8b0f5a051e7b24b82db1d (patch)
tree709d5c385b166cf8e5128ac2558c186fa911aaf4 /server
parentf4e16a189ae654e19db0c64667a0751e62f4b4e5 (diff)
downloadvaadin-framework-c019c5d5ae61513aecb8b0f5a051e7b24b82db1d.tar.gz
vaadin-framework-c019c5d5ae61513aecb8b0f5a051e7b24b82db1d.zip
Update to Jsoup 1.14.2 (#12381)
Diffstat (limited to 'server')
-rw-r--r--server/src/main/java/com/vaadin/ui/declarative/Design.java2
-rw-r--r--server/src/test/java/com/vaadin/tests/design/DeclarativeTestBaseBase.java18
-rw-r--r--server/src/test/java/com/vaadin/tests/design/LocaleTest.java4
-rw-r--r--server/src/test/java/com/vaadin/tests/server/component/ReadEmptyDesignTest.java2
4 files changed, 20 insertions, 6 deletions
diff --git a/server/src/main/java/com/vaadin/ui/declarative/Design.java b/server/src/main/java/com/vaadin/ui/declarative/Design.java
index 2e1e767f74..daed874a98 100644
--- a/server/src/main/java/com/vaadin/ui/declarative/Design.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/Design.java
@@ -534,7 +534,7 @@ public class Design implements Serializable {
private static Document createHtml(DesignContext designContext) {
// Create the html tree skeleton.
Document doc = new Document("");
- DocumentType docType = new DocumentType("html", "", "", "");
+ DocumentType docType = new DocumentType("html", "", "");
doc.appendChild(docType);
Element html = doc.createElement("html");
doc.appendChild(html);
diff --git a/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBaseBase.java b/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBaseBase.java
index 04c04ed76a..927e6b291c 100644
--- a/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBaseBase.java
+++ b/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBaseBase.java
@@ -6,6 +6,7 @@ import static org.junit.Assert.assertNull;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@@ -16,7 +17,6 @@ import java.util.logging.Logger;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Attribute;
-import org.jsoup.nodes.BooleanAttribute;
import org.jsoup.nodes.Element;
import org.jsoup.nodes.Node;
import org.jsoup.nodes.TextNode;
@@ -29,6 +29,13 @@ import com.vaadin.ui.declarative.DesignContext;
import com.vaadin.ui.declarative.ShouldWriteDataDelegate;
public abstract class DeclarativeTestBaseBase<T extends Component> {
+ private static final String[] booleanAttributes = { "allowfullscreen",
+ "async", "autofocus", "checked", "compact", "declare", "default",
+ "defer", "disabled", "formnovalidate", "hidden", "inert", "ismap",
+ "itemscope", "multiple", "muted", "nohref", "noresize", "noshade",
+ "novalidate", "nowrap", "open", "readonly", "required", "reversed",
+ "seamless", "selected", "sortable", "truespeed", "typemustmatch" };
+
private static final class AlwaysWriteDelegate
implements ShouldWriteDataDelegate {
private static final long serialVersionUID = -6345914431997793599L;
@@ -249,7 +256,7 @@ public abstract class DeclarativeTestBaseBase<T extends Component> {
List<String> names = new ArrayList<>();
for (Attribute a : producedElem.attributes().asList()) {
names.add(a.getKey());
- if (a instanceof BooleanAttribute) {
+ if (isBooleanAttribute(a.getKey())) {
booleanAttributes.add(a.getKey());
}
}
@@ -276,6 +283,13 @@ public abstract class DeclarativeTestBaseBase<T extends Component> {
return sb.toString();
}
+ /**
+ * Checks if this attribute name is defined as a boolean attribute in HTML5
+ */
+ protected static boolean isBooleanAttribute(final String key) {
+ return Arrays.binarySearch(booleanAttributes, key) >= 0;
+ }
+
protected String stripOptionTags(String design) {
return design.replaceAll("[ \n]*<option(.*)</option>[ \n]*", "");
diff --git a/server/src/test/java/com/vaadin/tests/design/LocaleTest.java b/server/src/test/java/com/vaadin/tests/design/LocaleTest.java
index ab04cbc727..98eeb342bf 100644
--- a/server/src/test/java/com/vaadin/tests/design/LocaleTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/LocaleTest.java
@@ -97,7 +97,7 @@ public class LocaleTest {
private Document componentToDoc(DesignContext dc) {
// Create the html tree skeleton.
Document doc = new Document("");
- DocumentType docType = new DocumentType("html", "", "", "");
+ DocumentType docType = new DocumentType("html", "", "");
doc.appendChild(docType);
Element html = doc.createElement("html");
doc.appendChild(html);
@@ -124,7 +124,7 @@ public class LocaleTest {
public void testParsing() {
// create an html document
Document doc = new Document("");
- DocumentType docType = new DocumentType("html", "", "", "");
+ DocumentType docType = new DocumentType("html", "", "");
doc.appendChild(docType);
Element html = doc.createElement("html");
doc.appendChild(html);
diff --git a/server/src/test/java/com/vaadin/tests/server/component/ReadEmptyDesignTest.java b/server/src/test/java/com/vaadin/tests/server/component/ReadEmptyDesignTest.java
index 2757fd6c3d..58ba3131ef 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/ReadEmptyDesignTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/ReadEmptyDesignTest.java
@@ -59,7 +59,7 @@ public class ReadEmptyDesignTest {
private Document createDesign() {
Document doc = new Document("");
- DocumentType docType = new DocumentType("html", "", "", "");
+ DocumentType docType = new DocumentType("html", "", "");
doc.appendChild(docType);
Element html = doc.createElement("html");
doc.appendChild(html);