Update Jsoup to 1.14.3 (#2448)

* Update Jsoup to 1.14.3

* Fix Jsoup API breaking changes after the update

* Fix new Qodana inspections

* Replace IllegalStateException with more appropriate NoSuchElementException

5 files changed, 39 insertions, 18 deletions

diff --git a/plugins/base/src/test/kotlin/linking/EnumValuesLinkingTest.kt b/plugins/base/src/test/kotlin/linking/EnumValuesLinkingTest.kt
index 29e705fd..f95d9860 100644
--- a/plugins/base/src/test/kotlin/linking/EnumValuesLinkingTest.kt
+++ b/plugins/base/src/test/kotlin/linking/EnumValuesLinkingTest.kt
@@ -13,7 +13,7 @@ import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Test
 import java.nio.file.Paths
 import utils.TestOutputWriterPlugin
-import java.lang.AssertionError
+import kotlin.AssertionError
 
 class EnumValuesLinkingTest : BaseAbstractTest() {
 
@@ -106,12 +106,32 @@ class EnumValuesLinkingTest : BaseAbstractTest() {
                     assertNotNull(content.dfs { it is ContentDRILink && it.address.classNames == "JavaEnum.ON_DECEIT" })
                 }
 
-                // single method will throw an exception if there is no single element (0 or 2+)
-                Jsoup.parse(writerPlugin.writer.contents["root/linking.source/-java-linker/index.html"]).select("a[href=\"../-kotlin-enum/-o-n_-c-r-e-a-t-e/index.html\"]").single()
-                Jsoup.parse(writerPlugin.writer.contents["root/linking.source/-java-linker/index.html"]).select("a[href=\"../-java-enum/-o-n_-d-e-c-e-i-t/index.html\"]").single()
-                Jsoup.parse(writerPlugin.writer.contents["root/linking.source/-kotlin-linker/index.html"]).select("a[href=\"../-kotlin-enum/-o-n_-c-r-e-a-t-e/index.html\"]").single()
-                Jsoup.parse(writerPlugin.writer.contents["root/linking.source/-kotlin-linker/index.html"]).select("a[href=\"../-java-enum/-o-n_-d-e-c-e-i-t/index.html\"]").single()
+                Jsoup
+                    .parse(writerPlugin.writer.contents.getValue("root/linking.source/-java-linker/index.html"))
+                    .select("a[href=\"../-kotlin-enum/-o-n_-c-r-e-a-t-e/index.html\"]")
+                    .assertOnlyOneElement()
+
+                Jsoup
+                    .parse(writerPlugin.writer.contents.getValue("root/linking.source/-java-linker/index.html"))
+                    .select("a[href=\"../-java-enum/-o-n_-d-e-c-e-i-t/index.html\"]")
+                    .assertOnlyOneElement()
+
+                Jsoup
+                    .parse(writerPlugin.writer.contents.getValue("root/linking.source/-kotlin-linker/index.html"))
+                    .select("a[href=\"../-kotlin-enum/-o-n_-c-r-e-a-t-e/index.html\"]")
+                    .assertOnlyOneElement()
+
+                Jsoup
+                    .parse(writerPlugin.writer.contents.getValue("root/linking.source/-kotlin-linker/index.html"))
+                    .select("a[href=\"../-java-enum/-o-n_-d-e-c-e-i-t/index.html\"]")
+                    .assertOnlyOneElement()
             }
         }
     }
+
+    private fun <T> List<T>.assertOnlyOneElement() {
+        if (isEmpty() || size > 1) {
+            throw AssertionError("Single element expected in list: $this")
+        }
+    }
 }
diff --git a/plugins/base/src/test/kotlin/renderers/html/TextStylesTest.kt b/plugins/base/src/test/kotlin/renderers/html/TextStylesTest.kt
index d65a4f6e..fd2f7860 100644
--- a/plugins/base/src/test/kotlin/renderers/html/TextStylesTest.kt
+++ b/plugins/base/src/test/kotlin/renderers/html/TextStylesTest.kt
@@ -45,7 +45,8 @@ class TextStylesTest : HtmlRenderingOnlyTestBase() {
         }
         HtmlRenderer(context).render(page)
         renderedContent.match(Span("keyword"))
-        assertEquals(renderedContent.children().last().attr("class"), "token keyword")
+        val lastChild = renderedContent.children().last() ?: throw IllegalStateException("No element found")
+        assertEquals(lastChild.attr("class"), "token keyword")
     }
 
     @Test
diff --git a/plugins/base/src/test/kotlin/resourceLinks/ResourceLinksTest.kt b/plugins/base/src/test/kotlin/resourceLinks/ResourceLinksTest.kt
index fb9ec10e..8a8586ee 100644
--- a/plugins/base/src/test/kotlin/resourceLinks/ResourceLinksTest.kt
+++ b/plugins/base/src/test/kotlin/resourceLinks/ResourceLinksTest.kt
@@ -65,7 +65,7 @@ class ResourceLinksTest : BaseAbstractTest() {
         ) {
             renderingStage = { root, context ->
                 Jsoup
-                    .parse(writerPlugin.writer.contents["root/example.html"])
+                    .parse(writerPlugin.writer.contents.getValue("root/example.html"))
                     .head()
                     .select("link, script")
                     .let {
@@ -125,7 +125,7 @@ class ResourceLinksTest : BaseAbstractTest() {
                     }
                     if (isMultiModule) {
                         Jsoup
-                            .parse(writerPlugin.writer.contents["example.html"])
+                            .parse(writerPlugin.writer.contents.getValue("example.html"))
                             .head()
                             .select("link, script")
                             .let {
@@ -135,7 +135,7 @@ class ResourceLinksTest : BaseAbstractTest() {
                             }
                     } else {
                         Jsoup
-                            .parse(writerPlugin.writer.contents["root/example.html"])
+                            .parse(writerPlugin.writer.contents.getValue("root/example.html"))
                             .head()
                             .select("link, script")
                             .let {
@@ -184,7 +184,7 @@ class ResourceLinksTest : BaseAbstractTest() {
                     assertNull(writerPlugin.writer.contents["scripts/relativePath.js"])
                     assertNull(writerPlugin.writer.contents["styles/relativePath.js"])
                     Jsoup
-                        .parse(writerPlugin.writer.contents["root/example.html"])
+                        .parse(writerPlugin.writer.contents.getValue("root/example.html"))
                         .head()
                         .select("link, script")
                         .let {
diff --git a/plugins/base/src/test/kotlin/signatures/FunctionalTypeConstructorsSignatureTest.kt b/plugins/base/src/test/kotlin/signatures/FunctionalTypeConstructorsSignatureTest.kt
index e631117f..cd55a001 100644
--- a/plugins/base/src/test/kotlin/signatures/FunctionalTypeConstructorsSignatureTest.kt
+++ b/plugins/base/src/test/kotlin/signatures/FunctionalTypeConstructorsSignatureTest.kt
@@ -235,7 +235,7 @@ class FunctionalTypeConstructorsSignatureTest : BaseAbstractTest() {
             pluginOverrides = listOf(writerPlugin)
         ) {
             renderingStage = { _, _ ->
-                writerPlugin.writer.renderedContent("root/example/-java-class/index.html").signature().last().match(
+                writerPlugin.writer.renderedContent("root/example/-java-class/index.html").lastSignature().match(
                     "open val ", A("javaFunction"), ": (", A("Integer"), ") -> ", A("String"), Span(),
                         ignoreSpanWithTokenStyle = true
                 )
@@ -261,7 +261,7 @@ class FunctionalTypeConstructorsSignatureTest : BaseAbstractTest() {
             pluginOverrides = listOf(writerPlugin)
         ) {
             renderingStage = { _, _ ->
-                writerPlugin.writer.renderedContent("root/example/-java-class/index.html").signature().last().match(
+                writerPlugin.writer.renderedContent("root/example/-java-class/index.html").lastSignature().match(
                     "open val ", A("kotlinFunction"), ": (", A("Integer"), ") -> ", A("String"), Span(),
                         ignoreSpanWithTokenStyle = true
                 )
diff --git a/plugins/base/src/test/kotlin/signatures/SignatureTest.kt b/plugins/base/src/test/kotlin/signatures/SignatureTest.kt
index ddf1c892..6f4de32b 100644
--- a/plugins/base/src/test/kotlin/signatures/SignatureTest.kt
+++ b/plugins/base/src/test/kotlin/signatures/SignatureTest.kt
@@ -547,7 +547,7 @@ class SignatureTest : BaseAbstractTest() {
             pluginOverrides = listOf(writerPlugin)
         ) {
             renderingStage = { _, _ ->
-                writerPlugin.writer.renderedContent("root/example.html").signature().first().match(
+                writerPlugin.writer.renderedContent("root/example.html").firstSignature().match(
                     "typealias ", A("PlainTypealias"), " = ", A("Int"), Span(),
                         ignoreSpanWithTokenStyle = true
                 )
@@ -577,7 +577,7 @@ class SignatureTest : BaseAbstractTest() {
             pluginOverrides = listOf(writerPlugin)
         ) {
             renderingStage = { _, _ ->
-                writerPlugin.writer.renderedContent("root/example/index.html").signature().first().match(
+                writerPlugin.writer.renderedContent("root/example/index.html").firstSignature().match(
                     Div(
                         Div(
                             "@", A("SomeAnnotation")
@@ -607,7 +607,7 @@ class SignatureTest : BaseAbstractTest() {
             pluginOverrides = listOf(writerPlugin)
         ) {
             renderingStage = { _, _ ->
-                writerPlugin.writer.renderedContent("root/example.html").signature().first().match(
+                writerPlugin.writer.renderedContent("root/example.html").firstSignature().match(
                     "typealias ", A("PlainTypealias"), " = ", A("Comparable"),
                     "<", A("Int"), ">", Span(),
                         ignoreSpanWithTokenStyle = true
@@ -634,7 +634,7 @@ class SignatureTest : BaseAbstractTest() {
             pluginOverrides = listOf(writerPlugin)
         ) {
             renderingStage = { _, _ ->
-                writerPlugin.writer.renderedContent("root/example.html").signature().first().match(
+                writerPlugin.writer.renderedContent("root/example.html").firstSignature().match(
                     "typealias ", A("GenericTypealias"), "<", A("T"), "> = ", A("Comparable"),
                     "<", A("T"), ">", Span(),
                         ignoreSpanWithTokenStyle = true
@@ -663,7 +663,7 @@ class SignatureTest : BaseAbstractTest() {
             pluginOverrides = listOf(writerPlugin)
         ) {
             renderingStage = { _, _ ->
-                writerPlugin.writer.renderedContent("root/kotlinAsJavaPlugin/-a-b-c/some-fun.html").signature().first()
+                writerPlugin.writer.renderedContent("root/kotlinAsJavaPlugin/-a-b-c/some-fun.html").firstSignature()
                     .match(
                         "fun ", A("someFun"), "(", Parameters(
                             Parameter("xd: ", A("XD"), "<", A("Int"), ", ", A("String"), ">"),