[qpid-broker-j] branch main updated: QPID-8617: [Broker-J] Jetty server dependencies update (#220)

[vavrtom]

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

vavrtom pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git


The following commit(s) were added to refs/heads/main by this push:
     new 753b1b44d5 QPID-8617: [Broker-J] Jetty server dependencies update 
(#220)
753b1b44d5 is described below

commit 753b1b44d5023b11ad30af0189305a7be3551cc3
Author: Daniil Kirilyuk <daniel.kiril...@gmail.com>
AuthorDate: Thu Aug 24 07:53:58 2023 +0200

    QPID-8617: [Broker-J] Jetty server dependencies update (#220)
    
    Fixes system tests failure in CompressedMessageContentTest and 
ExportImportMessagesTest under profiles java-bdb.1-0 and java-bdb.0-9
---
 .../http/endtoend/message/CompressedMessageContentTest.java   | 11 ++++++++++-
 .../tests/http/endtoend/message/ExportImportMessagesTest.java | 10 +++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git 
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/CompressedMessageContentTest.java
 
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/CompressedMessageContentTest.java
index ad916ff0a9..f14cc6505d 100644
--- 
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/CompressedMessageContentTest.java
+++ 
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/CompressedMessageContentTest.java
@@ -45,6 +45,7 @@ import javax.jms.TextMessage;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -63,8 +64,16 @@ public class CompressedMessageContentTest extends 
HttpTestBase
     public void setUp() throws Exception
     {
         assumeTrue(is(not(equalTo(Protocol.AMQP_1_0))).matches(getProtocol()));
-        getHelper().setTls(true);
         getBrokerAdmin().createQueue(TEST_QUEUE);
+        getHelper().createKeyStoreAndSetItOnPort(getFullTestName());
+    }
+
+    @AfterEach
+    public void afterEach() throws Exception
+    {
+        assumeTrue(is(not(equalTo(Protocol.AMQP_1_0))).matches(getProtocol()));
+        getHelper().setAcceptEncoding("Identity");
+        getHelper().removeKeyStoreFromPort(getFullTestName());
     }
 
     @Test
diff --git 
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/ExportImportMessagesTest.java
 
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/ExportImportMessagesTest.java
index 9ff71994b6..81064184f9 100644
--- 
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/ExportImportMessagesTest.java
+++ 
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/ExportImportMessagesTest.java
@@ -37,6 +37,7 @@ import javax.jms.TextMessage;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -54,7 +55,14 @@ public class ExportImportMessagesTest extends HttpTestBase
     @BeforeEach
     public void setUp() throws Exception
     {
-        getHelper().setTls(true);
+        getHelper().createKeyStoreAndSetItOnPort(getFullTestName());
+    }
+
+    @AfterEach
+    public void afterEach() throws Exception
+    {
+        getHelper().setAcceptEncoding("Identity");
+        getHelper().removeKeyStoreFromPort(getFullTestName());
     }
 
     @Test


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org