Add SSL integration tests and support for SSL connections in ActiveMQ

.gitattributes

@@ -0,0 +1,10 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Shell scripts must always use LF (Unix) line endings
+*.sh text eol=lf
+
+# Windows batch files must use CRLF
+*.bat text eol=crlf
+*.cmd text eol=crlf
+*.ps1 text eol=crlf

.github/workflows/ci.yml

@@ -204,7 +204,7 @@ jobs:
       run: chmod +x output/build/${{ matrix.config.preset }}/bin/*
 
     - name: Run benchmarks
-      run: ctest --preset ${{ matrix.config.preset }} -L benchmark --output-on-failure --timeout 600
+      run: ctest --preset ${{ matrix.config.preset }} -L ^benchmark$ --output-on-failure --timeout 600
 
     - name: Upload test results
       if: failure()
@@ -227,12 +227,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Use release build for integration tests (one config to avoid excessive combinations)
+        # Use no-SSL release build for non-SSL integration tests
         config:
-          - { preset: x64-linux-release-test, build_type: Release }
+          - { preset: x64-linux-release-no-ssl-test, build_type: Release }
         # Test with multiple ActiveMQ versions
         activemq:
-          - { name: "AMQ-5.15", image: "rmohr/activemq:5.15.9" }
           - { name: "AMQ-5.18", image: "apache/activemq-classic:5.18.7" }
           - { name: "AMQ-6.2", image: "apache/activemq-classic:6.2.0" }
 
@@ -282,8 +281,11 @@ jobs:
     - name: Show broker status
       run: docker compose ps
 
-    - name: Run integration tests (${{ matrix.activemq.name }})
-      run: ctest --preset ${{ matrix.config.preset }} -L integration --output-on-failure --timeout 900
+    - name: Run OpenWire integration tests (${{ matrix.activemq.name }})
+      run: ctest --preset ${{ matrix.config.preset }} -L ^integration-openwire$ --output-on-failure --timeout 900
+
+    - name: Run STOMP integration tests (${{ matrix.activemq.name }})
+      run: ctest --preset ${{ matrix.config.preset }} -L ^integration-stomp$ --output-on-failure --timeout 900
 
     - name: Show broker logs on failure
       if: failure()
@@ -304,10 +306,103 @@ jobs:
           output/build/${{ matrix.config.preset }}/Testing/Temporary/
           output/build/${{ matrix.config.preset }}/**/*.log
 
-  # Linux system tests - run separately with multiple ActiveMQ versions
+  # Linux SSL integration tests - run with SSL-enabled broker (Linux only)
+  linux-ssl-integration-test:
+    name: Linux SSL Integration Test
+    runs-on: ubuntu-latest
+    needs: linux-build-test
+
+    env:
+      VCPKG_BINARY_SOURCES: "clear;files,${{ github.workspace }}/.cache/vcpkg/archives,read"
+
+    strategy:
+      fail-fast: false
+      matrix:
+        # Only test with SSL-enabled presets (release build)
+        config:
+          - { preset: x64-linux-release-test, build_type: Release }
+        # Test with ActiveMQ versions that support SSL
+        activemq:
+          - { name: "AMQ-5.18", image: "apache/activemq-classic:5.18.7" }
+          - { name: "AMQ-6.2", image: "apache/activemq-classic:6.2.0" }
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v6
+
+    - name: Install system dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y ninja-build
+
+    - name: Set VCPKG_ROOT environment variable
+      run: echo "VCPKG_ROOT=$VCPKG_INSTALLATION_ROOT" >> $GITHUB_ENV
+
+    - name: Create vcpkg binary cache directory
+      run: mkdir -p "${{ github.workspace }}/.cache/vcpkg/archives"
+
+    - name: Cache vcpkg binary packages
+      uses: actions/cache@v5
+      with:
+        path: ${{ github.workspace }}/.cache/vcpkg/archives
+        key: vcpkg-binary-${{ runner.os }}-${{ hashFiles('vcpkg.json') }}
+        restore-keys: |
+          vcpkg-binary-${{ runner.os }}-
+
+    - name: Configure CMake (for CTest)
+      run: cmake --preset ${{ matrix.config.preset }}
+
+    - name: Download build artifacts
+      uses: actions/download-artifact@v7
+      with:
+        name: linux-build-${{ matrix.config.preset }}
+        path: output/build/${{ matrix.config.preset }}/
+
+    - name: Make test executables runnable
+      run: chmod +x output/build/${{ matrix.config.preset }}/bin/*
+
+    - name: Start SSL broker (${{ matrix.activemq.name }})
+      run: |
+        echo "Starting SSL-enabled ActiveMQ using image: ${{ matrix.activemq.image }}"
+        ACTIVEMQ_IMAGE=${{ matrix.activemq.image }} docker compose --profile ssl up -d
+        echo "Waiting for SSL broker to be ready..."
+        timeout 60 bash -c 'until docker compose --profile ssl ps | grep -q "healthy"; do sleep 2; done' || true
+        sleep 10
+
+    - name: Show broker status
+      run: docker compose --profile ssl ps
+
+    - name: Show broker logs (startup)
+      run: docker compose --profile ssl logs --tail 50
+
+    - name: Run OpenWire SSL integration tests (${{ matrix.activemq.name }})
+      run: ctest --preset ${{ matrix.config.preset }} -L integration-openwire-ssl --output-on-failure --timeout 900
+      env:
+        SSL_CERT_FILE: ${{ github.workspace }}/docker/ssl/certs/ca.pem
+
+    - name: Show broker logs on failure
+      if: failure()
+      run: |
+        echo "=== ActiveMQ SSL broker logs ==="
+        docker compose --profile ssl logs --tail 200 || true
+
+    - name: Stop SSL broker
+      if: always()
+      run: docker compose --profile ssl down
+
+    - name: Upload test results
+      if: failure()
+      uses: actions/upload-artifact@v6
+      with:
+        name: test-results-ssl-integration-${{ matrix.activemq.name }}
+        path: |
+          output/build/${{ matrix.config.preset }}/Testing/Temporary/
+          output/build/${{ matrix.config.preset }}/**/*.log
+
+  # Linux integration benchmark tests - run separately with multiple ActiveMQ versions
   # Tests failover, multi-connection, and high-volume scenarios
-  linux-system-test:
-    name: Linux System Test
+  linux-integration-benchmark-test:
+    name: Linux Integration Benchmark Test
     runs-on: ubuntu-latest
     needs: linux-build-test
 
@@ -317,12 +412,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Use release build for system tests (one config to avoid excessive combinations)
+        # Use release build for integration benchmark tests (one config to avoid excessive combinations)
         config:
           - { preset: x64-linux-release-test, build_type: Release }
         # Test with multiple ActiveMQ versions
         activemq:
-          - { name: "AMQ-5.15", image: "rmohr/activemq:5.15.9" }
           - { name: "AMQ-5.18", image: "apache/activemq-classic:5.18.7" }
           - { name: "AMQ-6.2", image: "apache/activemq-classic:6.2.0" }
 
@@ -371,8 +465,8 @@ jobs:
     - name: Show broker status
       run: docker compose --profile failover ps
 
-    - name: Run system tests (${{ matrix.activemq.name }})
-      run: ctest --preset ${{ matrix.config.preset }} -L system --output-on-failure --timeout 1800
+    - name: Run integration benchmark tests (${{ matrix.activemq.name }})
+      run: ctest --preset ${{ matrix.config.preset }} -L integration-benchmark --output-on-failure --timeout 1800
 
     - name: Show broker logs on failure
       if: failure()
@@ -392,7 +486,7 @@ jobs:
       if: failure()
       uses: actions/upload-artifact@v6
       with:
-        name: test-results-system-${{ matrix.activemq.name }}
+        name: test-results-integration-benchmark-${{ matrix.activemq.name }}
         path: |
           output/build/${{ matrix.config.preset }}/Testing/Temporary/
           output/build/${{ matrix.config.preset }}/**/*.log
@@ -657,7 +751,7 @@ jobs:
         path: output/build/${{ matrix.config.preset }}/
 
     - name: Run benchmarks
-      run: ctest --preset ${{ matrix.config.preset }} -C ${{ matrix.config.build_type }} -L benchmark --output-on-failure --timeout 600
+      run: ctest --preset ${{ matrix.config.preset }} -C ${{ matrix.config.build_type }} -L ^benchmark$ --output-on-failure --timeout 600
 
     - name: Upload test results
       if: failure()

.gitignore

@@ -30,5 +30,8 @@ configure
 output/
 .cache/
 
+# Generated SSL certificates for integration testing
+docker/ssl/certs/
+
 
 

.vscode/settings.json

@@ -141,5 +141,6 @@
         "test": {
             "enabled": true
         }
-    }
+    },
+    "cmake.ctest.testSuiteDelimiter": "/"
 }

CMakeLists.txt

@@ -174,18 +174,7 @@ option(AMQCPP_USE_SSL "Enable OpenSSL support (required when ON)" OFF)
 
 if(AMQCPP_USE_SSL)
 	find_package(OpenSSL REQUIRED)
-	message(STATUS "AMQCPP: SSL support enabled; OpenSSL will be required.")
-
-	# If OpenSSL was found, define HAVE_OPENSSL for the code so sources
-	# can use `#ifdef HAVE_OPENSSL` to enable OpenSSL-dependent features.
-	if(OpenSSL_FOUND)
-		message(STATUS "AMQCPP: Found OpenSSL ${OPENSSL_VERSION}")
-		add_compile_definitions(HAVE_OPENSSL)
-		set(AMQCPP_HAVE_OPENSSL ON CACHE INTERNAL "OpenSSL available")
-	else()
-		message(STATUS "AMQCPP: OpenSSL not found; HAVE_OPENSSL will not be defined")
-		set(AMQCPP_HAVE_OPENSSL OFF CACHE INTERNAL "OpenSSL available")
-	endif()
+	message(STATUS "AMQCPP: SSL support enabled; found OpenSSL ${OPENSSL_VERSION}")
 else()
 	find_package(OpenSSL QUIET)
 	message(STATUS "AMQCPP: SSL support disabled; OpenSSL will be optional.")
@@ -213,7 +202,7 @@ if(AMQCPP_BUILD_TESTS)
 	add_subdirectory(activemq-cpp/src/test)
 	add_subdirectory(activemq-cpp/src/test-benchmarks)
 	add_subdirectory(activemq-cpp/src/test-integration)
-	add_subdirectory(activemq-cpp/src/test-system)
+	add_subdirectory(activemq-cpp/src/test-integration-benchmarks)
 
 	# =========================================================================
 	# Integration & System Test Workflow Targets
@@ -232,21 +221,21 @@ if(AMQCPP_BUILD_TESTS)
 		COMMENT "Full integration test workflow (start broker, test, stop broker)..."
 	)
 
-	# System tests: start all brokers (failover profile), run tests, stop brokers
-	add_custom_target(system-full
+	# Integration benchmark tests: start all brokers (failover profile), run tests, stop brokers
+	add_custom_target(integration-benchmark-full
 		COMMAND docker compose --profile failover up -d
 		COMMAND ${CMAKE_COMMAND} -E sleep 15
-		COMMAND ${CMAKE_COMMAND} -E echo "Running system tests..."
-		COMMAND $<TARGET_FILE:neoactivemq-system-test>
+		COMMAND ${CMAKE_COMMAND} -E echo "Running integration benchmark tests..."
+		COMMAND $<TARGET_FILE:neoactivemq-integration-benchmark-test>
 		COMMAND docker compose --profile failover down
 		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-		DEPENDS neoactivemq-system-test
-		COMMENT "Full system test workflow (start all brokers, test, stop brokers)..."
+		DEPENDS neoactivemq-integration-benchmark-test
+		COMMENT "Full integration benchmark test workflow (start all brokers, test, stop brokers)..."
 	)
 
 	message(STATUS "Test workflow targets:")
-	message(STATUS "  cmake --build --preset <preset> --target integration-full  # Integration tests (auto Docker)")
-	message(STATUS "  cmake --build --preset <preset> --target system-full       # System tests (auto Docker)")
+	message(STATUS "  cmake --build --preset <preset> --target integration-full            # Integration tests (auto Docker)")
+	message(STATUS "  cmake --build --preset <preset> --target integration-benchmark-full  # Integration benchmark tests (auto Docker)")
 endif()
 
 # Installation rules