[sling-org-apache-sling-servlets-resolver] branch master updated: SLING-11896 switch back to default Jenkins settings (#35)

[joerghoh]

This is an automated email from the ASF dual-hosted git repository.

joerghoh pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git


The following commit(s) were added to refs/heads/master by this push:
     new cffd5af  SLING-11896 switch back to default Jenkins settings (#35)
cffd5af is described below

commit cffd5af4eb9552cd570974fd4fb674f333febbe6
Author: Jörg Hoh <joerg...@users.noreply.github.com>
AuthorDate: Fri Jun 16 09:51:21 2023 +0200

    SLING-11896 switch back to default Jenkins settings (#35)
    
    replace hardcoded Unix lineseparator
---
 .sling-module.json                                     |  5 -----
 .../internal/console/WebConsolePluginTest.java         | 18 +++++++++---------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/.sling-module.json b/.sling-module.json
deleted file mode 100644
index cff6ade..0000000
--- a/.sling-module.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "jenkins" : {
-    "operatingSystems": ["linux"]
-  }
-}
diff --git 
a/src/test/java/org/apache/sling/servlets/resolver/internal/console/WebConsolePluginTest.java
 
b/src/test/java/org/apache/sling/servlets/resolver/internal/console/WebConsolePluginTest.java
index f70aeea..cc77fda 100644
--- 
a/src/test/java/org/apache/sling/servlets/resolver/internal/console/WebConsolePluginTest.java
+++ 
b/src/test/java/org/apache/sling/servlets/resolver/internal/console/WebConsolePluginTest.java
@@ -224,7 +224,7 @@ public class WebConsolePluginTest {
 
         String htmlString = stringWriter.toString();
 
-        final String expectedInputHTML = "<tr class='content'>\n" +
+        final String expectedInputHTML = ("<tr class='content'>\n" +
                 "<td class='content'>URL</td>\n" +
                 "<td class='content' colspan='2'><input type='text' name='url' 
value='/test.1.json' class='input' " +
                 "size='50'>\n" +
@@ -237,10 +237,10 @@ public class WebConsolePluginTest {
                 "<option value='POST'>POST</option>\n" +
                 "</select>\n" +
                 "&nbsp;&nbsp;<input type='submit' value='Resolve' 
class='submit'>\n" +
-                "</td></tr>";
+                "</td></tr>").replace("\n", System.lineSeparator());
         assertThat(htmlString, CoreMatchers.containsString(expectedInputHTML));
 
-        final String expectedDecomposedURLHTML = "<tr class='content'>\n" +
+        final String expectedDecomposedURLHTML = ("<tr class='content'>\n" +
                 "<td class='content'>Decomposed URL</td>\n" +
                 "<td class='content' colspan='2'><dl>\n" +
                 "<dt>Path</dt>\n" +
@@ -256,14 +256,14 @@ public class WebConsolePluginTest {
                 "</dd><dt>Suffix</dt>\n" +
                 "<dd>\n" +
                 "null</dd></dl>\n" +
-                "</td></tr>";
+                "</td></tr>").replace("\n", System.lineSeparator());
         assertThat(htmlString, 
CoreMatchers.containsString(expectedDecomposedURLHTML));
 
-        final String expectedCandidatesHTML = "<tr class='content'>\n" +
+        final String expectedCandidatesHTML = ("<tr class='content'>\n" +
                 "<td class='content'>Candidates</td>\n" +
                 "<td class='content' colspan='2'>Candidate servlets and 
scripts in order of preference for method " +
                 "GET:<br/>\n" +
-                "<ol class='servlets'>\n";
+                "<ol class='servlets'>\n").replace("\n", 
System.lineSeparator());
         assertThat(htmlString, 
CoreMatchers.containsString(expectedCandidatesHTML));
     }
 
@@ -286,7 +286,7 @@ public class WebConsolePluginTest {
         webConsolePlugin.service(request, response);
 
         String htmlString = stringWriter.toString();
-        assertEquals("<form method='get'><table class='content' 
cellpadding='0' cellspacing='0' width='100%'>\n" +
+        assertEquals(("<form method='get'><table class='content' 
cellpadding='0' cellspacing='0' width='100%'>\n" +
                 "<tr class='content'>\n" +
                 "<th colspan='3' class='content container'>Servlet Resolver 
Test</th>\n" +
                 "</tr>\n" +
@@ -308,7 +308,7 @@ public class WebConsolePluginTest {
                 "&nbsp;&nbsp;<input type='submit' value='Resolve' 
class='submit'>\n" +
                 "</td></tr>\n" +
                 "</table>\n" +
-                "</form>", htmlString);
+                "</form>").replace("\n", System.lineSeparator()), htmlString);
     }
 
     @Test
@@ -331,7 +331,7 @@ public class WebConsolePluginTest {
         webConsolePlugin.service(request, response);
 
         String htmlString = stringWriter.toString();
-        final String expectedDeniedElement = "<ol class='servlets'>\n" +
+        final String expectedDeniedElement = "<ol class='servlets'>" + 
System.lineSeparator() +
                 "<li><del>";
         assertThat(htmlString, 
CoreMatchers.containsString(expectedDeniedElement));
     }