8242532: convert tests to use Text Blocks

Reviewed-by: hannesw

test/langtools/jdk/javadoc/doclet/AccessAsciiArt/AccessAsciiArt.java

@@ -49,10 +49,15 @@ public void test() {
 
         checkOutput("p1/subpkg/SSC.html", true,
                 // Test the top line of the class tree
-                "<div class=\"inheritance\"><a href=\"../C.html\" title=\"class in p1\">p1.C</a>",
+                """
+                    <div class="inheritance"><a href="../C.html" title="class in p1">p1.C</a>""",
                 // Test the second line of the class tree
-                "<div class=\"inheritance\"><a href=\"../SC.html\" title=\"class in p1\">p1.SC</a>",
+                """
+                    <div class="inheritance"><a href="../SC.html" title="class in p1">p1.SC</a>""",
                 // Test the third line of the class tree
-                "<div class=\"inheritance\">p1.subpkg.SSC</div>\n</div>\n</div>");
+                """
+                    <div class="inheritance">p1.subpkg.SSC</div>
+                    </div>
+                    </div>""");
     }
 }

test/langtools/jdk/javadoc/doclet/AccessH1/AccessH1.java

@@ -57,6 +57,7 @@ public void test() {
 
         // Test the doc title in the overview page
         checkOutput("index.html", true,
-                "<h1 class=\"title\">Document Title</h1>");
+                """
+                    <h1 class="title">Document Title</h1>""");
     }
 }

test/langtools/jdk/javadoc/doclet/AccessSkipNav/AccessSkipNav.java

@@ -50,16 +50,20 @@ public void test() {
         // Testing only for the presence of the <a href> and <a id>
         checkOutput("p1/C1.html", true,
                 // Top navbar <a href>
-                "<a href=\"#skip.navbar.top\" title=\"Skip navigation links\">Skip navigation links</a>",
+                """
+                    <a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a>""",
                 // Top navbar <span id>
-                "<span class=\"skip-nav\" id=\"skip.navbar.top\">\n"
-                + "<!--   -->\n"
-                + "</span>",
+                """
+                    <span class="skip-nav" id="skip.navbar.top">
+                    <!--   -->
+                    </span>""",
                 // Bottom navbar <a href>
-                "<a href=\"#skip.navbar.bottom\" title=\"Skip navigation links\">Skip navigation links</a>",
+                """
+                    <a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a>""",
                 // Bottom navbar <span id>
-                "<span class=\"skip-nav\" id=\"skip.navbar.bottom\">\n"
-                + "<!--   -->\n"
-                + "</span>");
+                """
+                    <span class="skip-nav" id="skip.navbar.bottom">
+                    <!--   -->
+                    </span>""");
     }
 }

test/langtools/jdk/javadoc/doclet/AccessSummary/AccessSummary.java

@@ -55,14 +55,17 @@ public void testAccessSummary() {
 
     void checkSummary(boolean found) {
         checkOutput("index.html", found,
-                 "summary=\"Package Summary table, listing packages, and an explanation\"");
+                 """
+                     summary="Package Summary table, listing packages, and an explanation\"""");
 
         // Test that the summary attribute appears or not
         checkOutput("p1/C1.html", found,
-                 "summary=\"Constructor Summary table, listing constructors, and an explanation\"");
+                 """
+                     summary="Constructor Summary table, listing constructors, and an explanation\"""");
 
         // Test that the summary attribute appears or not
         checkOutput("constant-values.html", found,
-                 "summary=\"Constant Field Values table, listing constant fields, and values\"");
+                 """
+                     summary="Constant Field Values table, listing constant fields, and values\"""");
     }
 }

test/langtools/jdk/javadoc/doclet/AuthorDD/AuthorDD.java

@@ -59,7 +59,8 @@ public void test() {
                 "<dt>Since:</dt>\n"
                 + "<dd>JDK 1.0</dd>",
                 // Test multiple @author tags:
-                "<dt>Author:</dt>\n"
-                + "<dd>Alice, Bob, Eve</dd>");
+                """
+                    <dt>Author:</dt>
+                    <dd>Alice, Bob, Eve</dd>""");
     }
 }

test/langtools/jdk/javadoc/doclet/DocRootSlash/DocRootSlash.java

@@ -56,7 +56,8 @@ public void test() {
         javadoc("-d", "out",
                 "-Xdoclint:none",
                 "-overview", (srcdir + "/overview.html"),
-                "-header", "<A HREF=\"{@docroot}/element-list\">{&#064;docroot}</A> <A HREF=\"{@docRoot}/help-doc.html\">{&#064;docRoot}</A>",
+                "-header", """
+                    <A HREF="{@docroot}/element-list">{&#064;docroot}</A> <A HREF="{@docRoot}/help-doc.html">{&#064;docRoot}</A>""",
                 "-sourcepath", srcdir,
                 "p1", "p2");
 

test/langtools/jdk/javadoc/doclet/JavascriptWinTitle/JavascriptWinTitle.java

@@ -54,10 +54,12 @@ public void test() {
         checkExit(Exit.OK);
         checkOutput("index.html", true,
                 "<script type=\"text/javascript\">",
-                "<body class=\"package-index-page\">");
+                """
+                    <body class="package-index-page">""");
 
         // Test that "onload" is not present in BODY tag:
-        checkOutput("p1/package-summary.html", true, "<body class=\"package-declaration-page\">");
+        checkOutput("p1/package-summary.html", true, """
+            <body class="package-declaration-page">""");
 
         checkOutput("p1/C.html", true, "<title>C (Window Title)</title>");
     }

test/langtools/jdk/javadoc/doclet/MetaTag/MetaTag.java

@@ -77,17 +77,24 @@ public void testNoTimestamp() {
 
     void checkMeta(String metaNameDate, boolean found) {
         checkOutput("p1/C1.html", found,
-                "<meta name=\"keywords\" content=\"p1.C1 class\">",
-                "<meta name=\"keywords\" content=\"field1\">",
-                "<meta name=\"keywords\" content=\"field2\">",
-                "<meta name=\"keywords\" content=\"method1()\">",
-                "<meta name=\"keywords\" content=\"method2()\">");
+                """
+                    <meta name="keywords" content="p1.C1 class">""",
+                """
+                    <meta name="keywords" content="field1">""",
+                """
+                    <meta name="keywords" content="field2">""",
+                """
+                    <meta name="keywords" content="method1()">""",
+                """
+                    <meta name="keywords" content="method2()">""");
 
         checkOutput("p1/package-summary.html", found,
-                "<meta name=\"keywords\" content=\"p1 package\">");
+                """
+                    <meta name="keywords" content="p1 package">""");
 
         checkOutput("index.html", found,
-                "<meta name=\"keywords\" content=\"Overview, Sample Packages\">");
+                """
+                    <meta name="keywords" content="Overview, Sample Packages">""");
 
         // NOTE: Hopefully, this regression test is not run at midnight.  If the output
         // was generated yesterday and this test is run today, this check could fail ...

test/langtools/jdk/javadoc/doclet/constantValues/TestConstantValuesDriver.java

@@ -52,32 +52,37 @@ public void test() {
                 "TEST2PASSES",
                 "TEST3PASSES",
                 "TEST4PASSES",
-                "<code>\"&lt;Hello World&gt;\"</code>",
-                "<code id=\"TestConstantValues.BYTE_MAX_VALUE\">public&nbsp;static&nbsp;final&nbsp;byte</code></td>\n" +
-                    "<th class=\"col-second\" scope=\"row\"><code><a href=\"TestConstantValues.html#BYTE_MAX_VALUE\">" +
-                    "BYTE_MAX_VALUE</a></code></th>\n" +
-                    "<td class=\"col-last\"><code>127</code></td>",
-                "<code id=\"TestConstantValues.BYTE_MIN_VALUE\">public&nbsp;static&nbsp;final&nbsp;byte</code></td>\n" +
-                    "<th class=\"col-second\" scope=\"row\"><code><a href=\"TestConstantValues.html#BYTE_MIN_VALUE\">" +
-                    "BYTE_MIN_VALUE</a></code></th>\n" +
-                    "<td class=\"col-last\"><code>-127</code></td>",
-                "<code id=\"TestConstantValues.CHAR_MAX_VALUE\">public&nbsp;static&nbsp;final&nbsp;char</code></td>\n" +
-                    "<th class=\"col-second\" scope=\"row\"><code><a href=\"TestConstantValues.html#CHAR_MAX_VALUE\">" +
-                    "CHAR_MAX_VALUE</a></code></th>\n" +
-                    "<td class=\"col-last\"><code>65535</code></td>",
-                "<code id=\"TestConstantValues.DOUBLE_MAX_VALUE\">public&nbsp;static&nbsp;final&nbsp;double</code></td>",
-                    "<th class=\"col-second\" scope=\"row\"><code><a href=\"TestConstantValues.html#DOUBLE_MAX_VALUE\">" +
-                    "DOUBLE_MAX_VALUE</a></code></th>\n" +
-                    "<td class=\"col-last\"><code>1.7976931348623157E308</code></td>",
-                "<code id=\"TestConstantValues.DOUBLE_MIN_VALUE\">public&nbsp;static&nbsp;final&nbsp;double</code></td>\n" +
-                    "<th class=\"col-second\" scope=\"row\"><code><a href=\"TestConstantValues.html#DOUBLE_MIN_VALUE\">" +
-                    "DOUBLE_MIN_VALUE</a></code></th>",
-                "<code id=\"TestConstantValues.GOODBYE\">public&nbsp;static&nbsp;final&nbsp;boolean</code></td>\n" +
-                    "<th class=\"col-second\" scope=\"row\"><code><a href=\"TestConstantValues.html#GOODBYE\">" +
-                    "GOODBYE</a></code></th>",
-                "<code id=\"TestConstantValues.HELLO\">public&nbsp;static&nbsp;final&nbsp;boolean</code></td>\n" +
-                    "<th class=\"col-second\" scope=\"row\"><code><a href=\"TestConstantValues.html#HELLO\">HELLO</a></code></th>\n" +
-                    "<td class=\"col-last\"><code>true</code></td>"
+                """
+                    <code>"&lt;Hello World&gt;"</code>""",
+                """
+                    <code id="TestConstantValues.BYTE_MAX_VALUE">public&nbsp;static&nbsp;final&nbsp;byte</code></td>
+                    <th class="col-second" scope="row"><code><a href="TestConstantValues.html#BYTE_MAX_VALUE">BYTE_MAX_VALUE</a></code></th>
+                    <td class="col-last"><code>127</code></td>""",
+                """
+                    <code id="TestConstantValues.BYTE_MIN_VALUE">public&nbsp;static&nbsp;final&nbsp;byte</code></td>
+                    <th class="col-second" scope="row"><code><a href="TestConstantValues.html#BYTE_MIN_VALUE">BYTE_MIN_VALUE</a></code></th>
+                    <td class="col-last"><code>-127</code></td>""",
+                """
+                    <code id="TestConstantValues.CHAR_MAX_VALUE">public&nbsp;static&nbsp;final&nbsp;char</code></td>
+                    <th class="col-second" scope="row"><code><a href="TestConstantValues.html#CHAR_MAX_VALUE">CHAR_MAX_VALUE</a></code></th>
+                    <td class="col-last"><code>65535</code></td>""",
+                """
+                    <code id="TestConstantValues.DOUBLE_MAX_VALUE">public&nbsp;static&nbsp;final&nbsp;double</code></td>""",
+                    """
+                        <th class="col-second" scope="row"><code><a href="TestConstantValues.html#DOUBLE\
+                        _MAX_VALUE">DOUBLE_MAX_VALUE</a></code></th>
+                        <td class="col-last"><code>1.7976931348623157E308</code></td>""",
+                """
+                    <code id="TestConstantValues.DOUBLE_MIN_VALUE">public&nbsp;static&nbsp;final&nbsp;double</code></td>
+                    <th class="col-second" scope="row"><code><a href="TestConstantValues.html#DOUBLE\
+                    _MIN_VALUE">DOUBLE_MIN_VALUE</a></code></th>""",
+                """
+                    <code id="TestConstantValues.GOODBYE">public&nbsp;static&nbsp;final&nbsp;boolean</code></td>
+                    <th class="col-second" scope="row"><code><a href="TestConstantValues.html#GOODBYE">GOODBYE</a></code></th>""",
+                """
+                    <code id="TestConstantValues.HELLO">public&nbsp;static&nbsp;final&nbsp;boolean</code></td>
+                    <th class="col-second" scope="row"><code><a href="TestConstantValues.html#HELLO">HELLO</a></code></th>
+                    <td class="col-last"><code>true</code></td>"""
         );
     }
 }