commit 17e7a4efbebd3eb04d47f356d5a6d68043287422
author Oliver Lietz <olli@apache.org> Thu Sep 08 15:14:53 2022 +0200
committer Oliver Lietz <olli@apache.org> Thu Sep 08 15:14:53 2022 +0200
tree f76c0113d657cc0285992d6c62873ca6293d5cf8
parent a6c663afa495ac2662b8ebf3c12cea941079be8f

SLING-11570 Adjust integration tests to not fail due to incompatible change in Jetty's status message handling

test document title instead of response status message

src/test/java/org/apache/sling/commons/crypto/it/tests/CryptoTestSupport.java

diff --git a/src/test/java/org/apache/sling/commons/crypto/it/tests/CryptoTestSupport.java b/src/test/java/org/apache/sling/commons/crypto/it/tests/CryptoTestSupport.java
index cdfc3f5..a6c5a3a 100644
--- a/src/test/java/org/apache/sling/commons/crypto/it/tests/CryptoTestSupport.java
+++ b/src/test/java/org/apache/sling/commons/crypto/it/tests/CryptoTestSupport.java
@@ -18,7 +18,6 @@
  */
 package org.apache.sling.commons.crypto.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptions;
 import org.apache.sling.testing.paxexam.TestSupport;
 import org.ops4j.pax.exam.options.ModifiableCompositeOption;
 
@@ -28,7 +27,6 @@
 public abstract class CryptoTestSupport extends TestSupport {
 
     public ModifiableCompositeOption baseConfiguration() {
-        SlingOptions.versionResolver.setVersion("org.apache.felix", "org.apache.felix.http.jetty", "4.0.14"); // 4.0.16 is incompatible due to change in Jetty 9.4.21
         return composite(
             super.baseConfiguration(),
             // Sling Commons Crypto

src/test/java/org/apache/sling/commons/crypto/it/tests/EncryptWebConsolePluginIT.java

diff --git a/src/test/java/org/apache/sling/commons/crypto/it/tests/EncryptWebConsolePluginIT.java b/src/test/java/org/apache/sling/commons/crypto/it/tests/EncryptWebConsolePluginIT.java
index 9737192..2220712 100644
--- a/src/test/java/org/apache/sling/commons/crypto/it/tests/EncryptWebConsolePluginIT.java
+++ b/src/test/java/org/apache/sling/commons/crypto/it/tests/EncryptWebConsolePluginIT.java
@@ -46,6 +46,7 @@
 
 import static org.apache.sling.testing.paxexam.SlingOptions.webconsole;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.endsWith;
 import static org.hamcrest.Matchers.is;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.options;
@@ -145,7 +146,9 @@
             .ignoreHttpErrors(true)
             .execute();
         assertThat(response.statusCode(), is(400));
-        assertThat(response.statusMessage(), is("Parameter message is missing"));
+
+        final Document document = response.parse();
+        assertThat(document.title(), endsWith("Parameter message is missing"));
     }
 
     @Test
@@ -158,7 +161,9 @@
             .ignoreHttpErrors(true)
             .execute();
         assertThat(response.statusCode(), is(400));
-        assertThat(response.statusMessage(), is("Parameter service-id is missing"));
+
+        final Document document = response.parse();
+        assertThat(document.title(), endsWith("Parameter service-id is missing"));
     }
 
     @Test
@@ -173,7 +178,9 @@
             .ignoreHttpErrors(true)
             .execute();
         assertThat(response.statusCode(), is(404));
-        assertThat(response.statusMessage(), is("Crypto service with service id invalid not found"));
+
+        final Document document = response.parse();
+        assertThat(document.title(), endsWith("Crypto service with service id invalid not found"));
     }
 
 }