Skip to content

P
paho.mqtt.c
Commit 6ed10b9d authored by Ian Craggs's avatar Ian Craggs
Browse files
Options

Merge branch 'cmake-tests-breakdown' of https://github.com/orpiske/paho.mqtt.c into fixes

parents 3c3ffbed cdc70102
Show whitespace changes
Inline Side-by-side
Showing with 188 additions and 24 deletions
test/CMakeLists.txt
View file @ 6ed10b9d
......@@ -16,8 +16,33 @@ TARGET_LINK_LIBRARIES(
)
ADD_TEST(
NAME test1
COMMAND "test1" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
NAME test1-1-single-thread-client
COMMAND "test1" "--test_no" "1" "--connection" ${MQTT_TEST_BROKER}
)
ADD_TEST(
NAME test1-2-multithread-callbacks
COMMAND "test1" "--test_no" "2" "--connection" ${MQTT_TEST_BROKER}
)
ADD_TEST(
NAME test1-3-connack-return-codes
COMMAND "test1" "--test_no" "3" "--connection" ${MQTT_TEST_BROKER}
)
ADD_TEST(
NAME test1-4-client-persistence
COMMAND "test1" "--test_no" "4" "--connection" ${MQTT_TEST_BROKER}
)
ADD_TEST(
NAME test1-5-disconnect-with-quiesce
COMMAND "test1" "--test_no" "5" "--connection" ${MQTT_TEST_BROKER}
)
ADD_TEST(
NAME test1-6-connlost-will-message
COMMAND "test1" "--test_no" "6" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
)
ADD_EXECUTABLE(
......@@ -31,7 +56,7 @@ TARGET_LINK_LIBRARIES(
)
ADD_TEST(
NAME test2
NAME test2-1-multiple-threads-single-client
COMMAND test2 "--connection" ${MQTT_TEST_BROKER}
)
......@@ -46,12 +71,56 @@ IF (PAHO_WITH_SSL)
paho-mqtt3cs
)
ADD_TEST(
NAME test3
COMMAND test3 "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" "${CERTDIR}/client.pem" "--server_key" "${CERTDIR}/test-root-ca.crt"
)
ADD_TEST(
NAME test3-1-ssl-conn-to-non-SSL-broker
COMMAND test3 "--test_no" "1" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" "${CERTDIR}/client.pem" "--server_key" "${CERTDIR}/test-root-ca.crt"
)
ADD_TEST(
NAME test3-2as-mutual-ssl-auth-single-thread
COMMAND test3 "--test_no" "2" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" "${CERTDIR}/client.pem" "--server_key" "${CERTDIR}/test-root-ca.crt"
)
ADD_TEST(
NAME test3-2am-mutual-ssl-auth-multi-thread
COMMAND test3 "--test_no" "3" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" "${CERTDIR}/client.pem" "--server_key" "${CERTDIR}/test-root-ca.crt"
)
ADD_TEST(
NAME test3-2b-mutual-ssl-broker-missing-client-cert
COMMAND test3 "--test_no" "4" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" "${CERTDIR}/client.pem" "--server_key" "${CERTDIR}/test-root-ca.crt"
)
ADD_TEST(
NAME test3-2c-mutual-ssl-client-missing-broker-cert
COMMAND test3 "--test_no" "5" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" "${CERTDIR}/client.pem" "--server_key" "${CERTDIR}/test-root-ca.crt"
)
ADD_TEST(
NAME test3-3as-broker-auth-server-cert-in-client-store-single-thread
COMMAND test3 "--test_no" "6" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" "${CERTDIR}/client.pem" "--server_key" "${CERTDIR}/test-root-ca.crt"
)
ADD_TEST(
NAME test3-3am-broker-auth-server-cert-in-client-store-multi-thread
COMMAND test3 "--test_no" "7" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" "${CERTDIR}/client.pem" "--server_key" "${CERTDIR}/test-root-ca.crt"
)
ADD_TEST(
NAME test3-3b-broker-auth-client-missing-broker-cert
COMMAND test3 "--test_no" "8" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" "${CERTDIR}/client.pem" "--server_key" "${CERTDIR}/test-root-ca.crt"
)
ADD_TEST(
NAME test3-4s-broker-auth-accept-invalid-certificate-single-thread
COMMAND test3 "--test_no" "9" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" "${CERTDIR}/client.pem" "--server_key" "${CERTDIR}/test-root-ca.crt"
)
ADD_TEST(
NAME test3-4m-broker-auth-accept-invalid-certificate-multi-thread
COMMAND test3 "--test_no" "10" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" "${CERTDIR}/client.pem" "--server_key" "${CERTDIR}/test-root-ca.crt"
)
SET_TESTS_PROPERTIES(test3 PROPERTIES TIMEOUT 540)
ENDIF()
ADD_EXECUTABLE(
......@@ -65,8 +134,43 @@ TARGET_LINK_LIBRARIES(
)
ADD_TEST(
NAME test4
COMMAND test4 "--connection" ${MQTT_TEST_BROKER}
NAME test4-1-basic-connect-subscribe-receive
COMMAND test4 "--test_no" "1" "--connection" ${MQTT_TEST_BROKER}
)
ADD_TEST(
NAME test4-2-connect-timeout
COMMAND test4 "--test_no" "2" "--connection" ${MQTT_TEST_BROKER}
)
ADD_TEST(
NAME test4-3-multiple-client-objs-simultaneous-working
COMMAND test4 "--test_no" "3" "--connection" ${MQTT_TEST_BROKER}
)
ADD_TEST(
NAME test4-4-send-receive-big-messages
COMMAND test4 "--test_no" "4" "--connection" ${MQTT_TEST_BROKER}
)
ADD_TEST(
NAME test4-5-connack-return-codes
COMMAND test4 "--test_no" "5" "--connection" ${MQTT_TEST_BROKER}
)
ADD_TEST(
NAME test4-6-ha-connections
COMMAND test4 "--test_no" "6" "--connection" ${MQTT_TEST_BROKER}
)
ADD_TEST(
NAME test4-7-pending-tokens
COMMAND test4 "--test_no" "7" "--connection" ${MQTT_TEST_BROKER}
)
ADD_TEST(
NAME test4-8-incomplete-commands-requests
COMMAND test4 "--test_no" "8" "--connection" ${MQTT_TEST_BROKER}
)
IF (PAHO_WITH_SSL)
......@@ -80,14 +184,44 @@ IF (PAHO_WITH_SSL)
paho-mqtt3as
)
ADD_TEST(
NAME test5
COMMAND test5 "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" "${CERTDIR}/client.pem" "--server_key" "${CERTDIR}/test-root-ca.crt"
)
ADD_TEST(
NAME test5-1-ssl-connection-to-no-SSL-server
COMMAND test5 "--test_no" "1" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" "${CERTDIR}/client.pem" "--server_key" "${CERTDIR}/test-root-ca.crt"
)
ADD_TEST(
NAME test5-2a-multual-ssl-auth-certificates-in-place
COMMAND test5 "--test_no" "2" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" "${CERTDIR}/client.pem" "--server_key" "${CERTDIR}/test-root-ca.crt"
)
ADD_TEST(
NAME test5-2b-multual-ssl-auth-broker-missing-client-cert
COMMAND test5 "--test_no" "3" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" "${CERTDIR}/client.pem" "--server_key" "${CERTDIR}/test-root-ca.crt"
)
ADD_TEST(
NAME test5-2c-multual-ssl-auth-client-missing-broker-cert
COMMAND test5 "--test_no" "4" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" "${CERTDIR}/client.pem" "--server_key" "${CERTDIR}/test-root-ca.crt"
)
ADD_TEST(
NAME test5-3a-server-auth-server-cert-in-client-store
COMMAND test5 "--test_no" "5" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" "${CERTDIR}/client.pem" "--server_key" "${CERTDIR}/test-root-ca.crt"
)
ADD_TEST(
NAME test5-3b-server-auth-client-missing-broker-cert
COMMAND test5 "--test_no" "6" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" "${CERTDIR}/client.pem" "--server_key" "${CERTDIR}/test-root-ca.crt"
)
ADD_TEST(
NAME test5-4-accept-invalid-certificates
COMMAND test5 "--test_no" "7" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" "${CERTDIR}/client.pem" "--server_key" "${CERTDIR}/test-root-ca.crt"
)
SET_TESTS_PROPERTIES(test5 PROPERTIES TIMEOUT 540)
ENDIF()
ADD_EXECUTABLE(
test6
test6.c
......@@ -99,7 +233,7 @@ TARGET_LINK_LIBRARIES(
)
ADD_TEST(
NAME test6
NAME test6-restart-recovery
COMMAND test6 "--connection" ${MQTT_TEST_BROKER}
)
......@@ -114,8 +248,23 @@ TARGET_LINK_LIBRARIES(
)
ADD_TEST(
NAME test8
COMMAND test8 "--connection" ${MQTT_TEST_BROKER}
NAME test8-1-basic-connect-subscribe-receive
COMMAND test8 "--test_no" "1" "--connection" ${MQTT_TEST_BROKER}
)
ADD_TEST(
NAME test8-2-connect-timeout
COMMAND test8 "--test_no" "2" "--connection" ${MQTT_TEST_BROKER}
)
ADD_TEST(
NAME test8-3-multiple-client-objects-simultaneous-working
COMMAND test8 "--test_no" "3" "--connection" ${MQTT_TEST_BROKER}
)
ADD_TEST(
NAME test8-4-send-receive-big-messages
COMMAND test8 "--test_no" "4" "--connection" ${MQTT_TEST_BROKER}
)
ADD_EXECUTABLE(
......@@ -129,12 +278,27 @@ TARGET_LINK_LIBRARIES(
)
ADD_TEST(
NAME test9
COMMAND test9 "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
NAME test9-1-offline-buffering-send-disconnected
COMMAND test9 "--test_no" "1" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
)
# Times out after 9 minutes
SET_TESTS_PROPERTIES(
test1 test2 test4 test6 test8 test9
PROPERTIES TIMEOUT 540)
ADD_TEST(
NAME test9-2-offline-buffering-send-disconnected-serverURIs
COMMAND test9 "--test_no" "2" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
)
ADD_TEST(
NAME test9-3-offline-buffering-auto-reconnect
COMMAND test9 "--test_no" "3" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
)
ADD_TEST(
NAME test9-4-offline-buffering-auto-reconnect-serverURIs
COMMAND test9 "--test_no" "4" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
)
ADD_TEST(
NAME test9-5-offline-buffering-max-buffered
COMMAND test9 "--test_no" "5" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment