ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Unittests fixed

feature-lorawan-1-1
Antti Kauppila 2020-01-09 13:55:49 +02:00
parent 694790f5fe
commit 7fb6efa9cd
19 changed files with 86 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
UNITTESTS/features/lorawan/loramac/unittest.cmake
View File

@ -53,6 +53,8 @@ set(unittest-test-flags
-DMBED_CONF_LORA_TX_MAX_SIZE=255
-DMBED_CONF_LORA_DEVICE_ADDRESS=0x00000000
-DMBED_CONF_LORA_VERSION=0
-DMBED_CONF_LORA_CLASS_B_MULTICAST_ADDRESS_MAX_COUNT=1
-DMBED_CONF_LORA_PING_SLOT_PERIODICITY=7
)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMBED_CONF_LORA_NWKSKEY=\"{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\"")
@ -61,7 +63,3 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMBED_CONF_LORA_NWKSKEY=\"{0x00, 0x00,
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMBED_CONF_LORA_APPSKEY=\"{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\"")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMBED_CONF_LORA_APPSKEY=\"{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\"")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMBED_CONF_LORA_CLASS_B_MULTICAST_ADDRESS_MAX_COUNT=1 -DMBED_CONF_LORA_PING_SLOT_PERIODICITY=7")
set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -DMBED_CONF_LORA_CLASS_B_MULTICAST_ADDRESS_MAX_COUNT=1 -DMBED_CONF_LORA_PING_SLOT_PERIODICITY=7")

3
UNITTESTS/features/lorawan/loramaccrypto/unittest.cmake
View File

@ -42,4 +42,5 @@ set(unittest-test-sources
set(unittest-test-flags
-DMBED_CONF_LORA_TX_MAX_SIZE=255
)
-DMBED_CONF_LORA_VERSION=0
)

1
UNITTESTS/features/lorawan/loraphy/unittest.cmake
View File

@ -47,5 +47,6 @@ set(unittest-test-flags
-DMBED_CONF_LORA_REJOIN_DEFAULT_MAX_TIME=3600
-DMBED_CONF_LORA_REJOIN_DEFAULT_MAX_COUNT=10
-DMBED_CONF_LORA_BEACON_PREAMBLE_LENGTH=7
-DMBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5
)

9
UNITTESTS/features/lorawan/loraphyas923/unittest.cmake
View File

@ -44,3 +44,12 @@ set(unittest-test-flags
-DMBED_CONF_LORA_UPLINK_PREAMBLE_LENGTH=8
)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMBED_CONF_LORA_NWKSENCKEY=\"{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\"")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMBED_CONF_LORA_NWKSENCKEY=\"{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\"")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMBED_CONF_LORA_SNWKSINTKEY=\"{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\"")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMBED_CONF_LORA_SNWKSINTKEY=\"{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\"")

1
UNITTESTS/features/lorawan/lorawanstack/unittest.cmake
View File

@ -49,6 +49,7 @@ set(unittest-test-flags
-DMBED_CONF_LORA_OVER_THE_AIR_ACTIVATION=true
-DMBED_CONF_LORA_AUTOMATIC_UPLINK_MESSAGE=true
-DMBED_CONF_LORA_TX_MAX_SIZE=255
-DMBED_CONF_LORA_VERSION=0
)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMBED_CONF_LORA_REJOIN_TYPE1_SEND_PERIOD=3600")

4
UNITTESTS/features/netsocket/DTLSSocket/unittest.cmake
View File

@ -37,6 +37,10 @@ set(unittest-test-sources
stubs/SocketStats_Stub.cpp
)
set(unittest-test-flags
-DMBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
)
set(MBEDTLS_USER_CONFIG_FILE_PATH "\"../UNITTESTS/features/netsocket/DTLSSocket/dtls_test_config.h\"")
set_source_files_properties(features/netsocket/DTLSSocket/test_DTLSSocket.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
set_source_files_properties(../features/netsocket/DTLSSocket.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})

4
UNITTESTS/features/netsocket/DTLSSocketWrapper/unittest.cmake
View File

@ -36,6 +36,10 @@ set(unittest-test-sources
stubs/SocketStats_Stub.cpp
)
set(unittest-test-flags
-DMBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
)
set(MBEDTLS_USER_CONFIG_FILE_PATH "\"../UNITTESTS/features/netsocket/DTLSSocketWrapper/dtls_test_config.h\"")
set_source_files_properties(features/netsocket/DTLSSocketWrapper/test_DTLSSocketWrapper.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
set_source_files_properties(../features/netsocket/DTLSSocketWrapper.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})

4
UNITTESTS/features/netsocket/EthernetInterface/unittest.cmake
View File

@ -36,3 +36,7 @@ set(unittest-test-sources
stubs/SocketStats_Stub.cpp
stubs/mbed_error.c
)
set(unittest-test-flags
-DMBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
)

8
UNITTESTS/features/netsocket/InternetSocket/unittest.cmake
View File

@ -3,8 +3,6 @@
# UNIT TESTS
####################
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10")
set(unittest-sources
../features/netsocket/SocketAddress.cpp
../features/netsocket/NetworkStack.cpp
@ -13,7 +11,7 @@ set(unittest-sources
../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
)
set(unittest-test-sources
@ -32,3 +30,7 @@ set(unittest-test-sources
stubs/ip4tos_stub.c
stubs/SocketStats_Stub.cpp
)
set(unittest-test-flags
-DMBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
)

4
UNITTESTS/features/netsocket/NetworkInterface/unittest.cmake
View File

@ -30,3 +30,7 @@ set(unittest-test-sources
stubs/SocketStats_Stub.cpp
stubs/mbed_error.c
)
set(unittest-test-flags
-DMBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
)

7
UNITTESTS/features/netsocket/NetworkStack/unittest.cmake
View File

@ -15,7 +15,7 @@ set(unittest-sources
../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
)
# Test files
@ -31,3 +31,8 @@ set(unittest-test-sources
features/netsocket/NetworkStack/test_NetworkStack.cpp
stubs/SocketStats_Stub.cpp
)
set(unittest-test-flags
-DMBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
)

4
UNITTESTS/features/netsocket/PPPInterface/unittest.cmake
View File

@ -39,3 +39,7 @@ set(unittest-test-sources
stubs/SocketStats_Stub.cpp
stubs/mbed_error.c
)
set(unittest-test-flags
-DMBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
)

6
UNITTESTS/features/netsocket/TCPServer/unittest.cmake
View File

@ -16,7 +16,7 @@ set(unittest-sources
../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
)
set(unittest-test-sources
@ -33,3 +33,7 @@ set(unittest-test-sources
features/netsocket/TCPServer/test_TCPServer.cpp
stubs/SocketStats_Stub.cpp
)
set(unittest-test-flags
-DMBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
)

6
UNITTESTS/features/netsocket/TCPSocket/unittest.cmake
View File

@ -12,7 +12,7 @@ set(unittest-sources
../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
)
set(unittest-test-sources
@ -31,3 +31,7 @@ set(unittest-test-sources
stubs/ip4tos_stub.c
stubs/SocketStats_Stub.cpp
)
set(unittest-test-flags
-DMBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
)

6
UNITTESTS/features/netsocket/TLSSocket/unittest.cmake
View File

@ -14,7 +14,7 @@ set(unittest-sources
../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
)
set(unittest-test-sources
@ -34,6 +34,10 @@ set(unittest-test-sources
stubs/SocketStats_Stub.cpp
)
set(unittest-test-flags
-DMBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
)
set(MBEDTLS_USER_CONFIG_FILE_PATH "\"../UNITTESTS/features/netsocket/TLSSocket/tls_test_config.h\"")
set_source_files_properties(features/netsocket/TLSSocket/test_TLSSocket.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
set_source_files_properties(../features/netsocket/TLSSocket.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})

6
UNITTESTS/features/netsocket/TLSSocketWrapper/unittest.cmake
View File

@ -13,7 +13,7 @@ set(unittest-sources
../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
)
set(unittest-test-sources
@ -31,6 +31,10 @@ set(unittest-test-sources
stubs/SocketStats_Stub.cpp
)
set(unittest-test-flags
-DMBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
)
set(MBEDTLS_USER_CONFIG_FILE_PATH "\"../UNITTESTS/features/netsocket/TLSSocketWrapper/tls_test_config.h\"")
set_source_files_properties(features/netsocket/TLSSocketWrapper/test_TLSSocketWrapper.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
set_source_files_properties(../features/netsocket/TLSSocketWrapper.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})

6
UNITTESTS/features/netsocket/UDPSocket/unittest.cmake
View File

@ -13,7 +13,7 @@ set(unittest-sources
../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
)
set(unittest-test-sources
@ -32,3 +32,7 @@ set(unittest-test-sources
stubs/ip4tos_stub.c
stubs/SocketStats_Stub.cpp
)
set(unittest-test-flags
-DMBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
)

9
UNITTESTS/moduletests/features/netsocket/IfaceDnsSocket/unittest.cmake
View File

@ -43,5 +43,10 @@ set(unittest-test-sources
stubs/EventFlags_stub.cpp
)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDEVICE_EMAC -DMBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE=ETHERNET -DMBED_CONF_NSAPI_DNS_RESPONSE_WAIT_TIME=10000 -DMBED_CONF_NSAPI_DNS_RETRIES=1 -DMBED_CONF_NSAPI_DNS_TOTAL_ATTEMPTS=10 -DMBED_CONF_NSAPI_DNS_CACHE_SIZE=5")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDEVICE_EMAC -DMBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE=ETHERNET -DMBED_CONF_NSAPI_DNS_RESPONSE_WAIT_TIME=10000 -DMBED_CONF_NSAPI_DNS_RETRIES=1 -DMBED_CONF_NSAPI_DNS_TOTAL_ATTEMPTS=10 -DMBED_CONF_NSAPI_DNS_CACHE_SIZE=5")
set(unittest-test-flags
-DMBED_CONF_NSAPI_DNS_ADDRESSES_LIMIT=10
-DMBED_CONF_NSAPI_DNS_TOTAL_ATTEMPTS=5
)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDEVICE_EMAC -DMBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE=ETHERNET -DMBED_CONF_NSAPI_DNS_RESPONSE_WAIT_TIME=10000 -DMBED_CONF_NSAPI_DNS_RETRIES=1 -DMBED_CONF_NSAPI_DNS_CACHE_SIZE=5")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDEVICE_EMAC -DMBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE=ETHERNET -DMBED_CONF_NSAPI_DNS_RESPONSE_WAIT_TIME=10000 -DMBED_CONF_NSAPI_DNS_RETRIES=1 -DMBED_CONF_NSAPI_DNS_CACHE_SIZE=5")

16
features/lorawan/lorastack/mac/LoRaMac.cpp
View File

@ -1893,17 +1893,17 @@ lorawan_status_t LoRaMac::prepare_join(const lorawan_connect_t *params, bool is_
lorawan_status_t ret;
if (MBED_CONF_LORA_VERSION < LORAWAN_VERSION_1_1) {
ret = _lora_crypto.set_keys(NULL, NULL, nwk_skey,
app_skey,
nwk_skey,
nwk_skey);
ret = _lora_crypto.set_keys(NULL, NULL, const_cast<uint8_t *>(nwk_skey),
const_cast<uint8_t *>(app_skey),
const_cast<uint8_t *>(nwk_skey),
const_cast<uint8_t *>(nwk_skey));
_params.server_type = LW1_0_2;
} else {
ret = _lora_crypto.set_keys(NULL, NULL, nwk_skey,
app_skey,
snwk_sintkey,
nwk_senckey);
ret = _lora_crypto.set_keys(NULL, NULL, const_cast<uint8_t *>(nwk_skey),
const_cast<uint8_t *>(app_skey),
const_cast<uint8_t *>(snwk_sintkey),
const_cast<uint8_t *>(nwk_senckey));
_params.server_type = LW1_1;
}
if (ret != LORAWAN_STATUS_OK) {