Skip to content

Commit b1a5e1b

Browse files
rajkan01rajkan01
committed
Move Unittests closure to library
1 parent 354bfaa commit b1a5e1b

36 files changed

+152
-159
lines changed

‎UNITTESTS/features/netsocket/DTLSSocket/unittest.cmake‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎connectivity/netsocket/tests/UNITTESTS/.mbedignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*

UNITTESTS/features/netsocket/CellularNonIPSocket/test_CellularNonIPSocket.cpp renamed to connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/test_CellularNonIPSocket.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717

1818
#include "gtest/gtest.h"
19-
#include "CellularNonIPSocket.h"
19+
#include "netsocket/CellularNonIPSocket.h"
2020
#include "myCellularContext.h"
2121

2222
using namespace mbed;

UNITTESTS/features/netsocket/CellularNonIPSocket/unittest.cmake renamed to connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/unittest.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
# Add test specific include paths
77
set(unittest-includes ${unittest-includes}
8-
../features/netsocket/cellular
8+
../features/cellular
99
)
1010

1111
set(unittest-sources
12-
../features/netsocket/CellularNonIPSocket.cpp
12+
../connectivity/netsocket/source/CellularNonIPSocket.cpp
1313
)
1414

1515
set(unittest-test-sources
16-
features/netsocket/CellularNonIPSocket/test_CellularNonIPSocket.cpp
16+
${CMAKE_CURRENT_LIST_DIR}/test_CellularNonIPSocket.cpp
1717
stubs/NetworkInterface_stub.cpp
1818
stubs/NetworkInterfaceDefaults_stub.cpp
1919
stubs/NetworkStack_stub.cpp

UNITTESTS/features/netsocket/DTLSSocket/dtls_test_config.h renamed to connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/dtls_test_config.h

File renamed without changes.

UNITTESTS/features/netsocket/DTLSSocket/test_DTLSSocket.cpp renamed to connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/test_DTLSSocket.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717

1818
#include "gtest/gtest.h"
19-
#include "features/netsocket/DTLSSocket.h"
19+
#include "netsocket/DTLSSocket.h"
2020
#include "NetworkStack_stub.h"
2121

2222
#include "mbed_error.h"

UNITTESTS/features/netsocket/TLSSocket/unittest.cmake renamed to connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/unittest.cmake

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@
44
####################
55

66
set(unittest-sources
7-
../features/netsocket/SocketAddress.cpp
8-
../features/netsocket/NetworkStack.cpp
9-
../features/netsocket/InternetSocket.cpp
10-
../features/netsocket/TCPSocket.cpp
11-
../features/netsocket/TLSSocket.cpp
12-
../features/netsocket/TLSSocketWrapper.cpp
7+
../connectivity/netsocket/source/SocketAddress.cpp
8+
../connectivity/netsocket/source/NetworkStack.cpp
9+
../connectivity/netsocket/source/InternetSocket.cpp
10+
../connectivity/netsocket/source/InternetDatagramSocket.cpp
11+
../connectivity/netsocket/source/UDPSocket.cpp
12+
../connectivity/netsocket/source/DTLSSocket.cpp
13+
../connectivity/netsocket/source/DTLSSocketWrapper.cpp
14+
../connectivity/netsocket/source/TLSSocketWrapper.cpp
1315
../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
1416
../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
1517
../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
@@ -18,7 +20,7 @@ set(unittest-sources
1820
)
1921

2022
set(unittest-test-sources
21-
features/netsocket/TLSSocket/test_TLSSocket.cpp
23+
${CMAKE_CURRENT_LIST_DIR}/test_DTLSSocket.cpp
2224
stubs/Mutex_stub.cpp
2325
stubs/mbed_assert_stub.cpp
2426
stubs/mbed_atomic_stub.c
@@ -31,11 +33,11 @@ set(unittest-test-sources
3133
stubs/EventFlags_stub.cpp
3234
stubs/stoip4_stub.c
3335
stubs/ip4tos_stub.c
36+
stubs/Kernel_stub.cpp
3437
stubs/SocketStats_Stub.cpp
3538
)
3639

37-
set(MBEDTLS_USER_CONFIG_FILE_PATH "\"../UNITTESTS/features/netsocket/TLSSocket/tls_test_config.h\"")
38-
set_source_files_properties(features/netsocket/TLSSocket/test_TLSSocket.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
39-
set_source_files_properties(../features/netsocket/TLSSocket.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
40-
set_source_files_properties(../features/netsocket/TLSSocketWrapper.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
41-
40+
set(MBEDTLS_USER_CONFIG_FILE_PATH "\"${CMAKE_CURRENT_LIST_DIR}/dtls_test_config.h\"")
41+
set_source_files_properties(${CMAKE_CURRENT_LIST_DIR}/test_DTLSSocket.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
42+
set_source_files_properties(../connectivity/netsocket/source/DTLSSocket.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
43+
set_source_files_properties(../connectivity/netsocket/source/DTLSSocketWrapper.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})

UNITTESTS/features/netsocket/DTLSSocketWrapper/dtls_test_config.h renamed to connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/dtls_test_config.h

File renamed without changes.

UNITTESTS/features/netsocket/DTLSSocketWrapper/test_DTLSSocketWrapper.cpp renamed to connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/test_DTLSSocketWrapper.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717

1818
#include "gtest/gtest.h"
19-
#include "features/netsocket/UDPSocket.h"
20-
#include "features/netsocket/DTLSSocketWrapper.h"
19+
#include "netsocket/UDPSocket.h"
20+
#include "netsocket/DTLSSocketWrapper.h"
2121
#include "NetworkStack_stub.h"
2222
#include "features/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.h"
2323
#include <cstring> //memset
@@ -407,4 +407,3 @@ TEST_F(TestDTLSSocketWrapper, accept_unsupported)
407407
EXPECT_EQ(wrapper->accept(&error), static_cast<UDPSocket *>(NULL));
408408
EXPECT_EQ(error, NSAPI_ERROR_UNSUPPORTED);
409409
}
410-

UNITTESTS/features/netsocket/DTLSSocketWrapper/unittest.cmake renamed to connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/unittest.cmake

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
####################
55

66
set(unittest-sources
7-
../features/netsocket/SocketAddress.cpp
8-
../features/netsocket/NetworkStack.cpp
9-
../features/netsocket/InternetSocket.cpp
10-
../features/netsocket/InternetDatagramSocket.cpp
11-
../features/netsocket/UDPSocket.cpp
12-
../features/netsocket/DTLSSocketWrapper.cpp
13-
../features/netsocket/TLSSocketWrapper.cpp
7+
../connectivity/netsocket/source/SocketAddress.cpp
8+
../connectivity/netsocket/source/NetworkStack.cpp
9+
../connectivity/netsocket/source/InternetSocket.cpp
10+
../connectivity/netsocket/source/InternetDatagramSocket.cpp
11+
../connectivity/netsocket/source/UDPSocket.cpp
12+
../connectivity/netsocket/source/DTLSSocketWrapper.cpp
13+
../connectivity/netsocket/source/TLSSocketWrapper.cpp
1414
../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
1515
../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
1616
../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
@@ -19,7 +19,7 @@ set(unittest-sources
1919
)
2020

2121
set(unittest-test-sources
22-
features/netsocket/DTLSSocketWrapper/test_DTLSSocketWrapper.cpp
22+
${CMAKE_CURRENT_LIST_DIR}/test_DTLSSocketWrapper.cpp
2323
stubs/Mutex_stub.cpp
2424
stubs/mbed_assert_stub.cpp
2525
stubs/mbed_atomic_stub.c
@@ -36,7 +36,6 @@ set(unittest-test-sources
3636
stubs/SocketStats_Stub.cpp
3737
)
3838

39-
set(MBEDTLS_USER_CONFIG_FILE_PATH "\"../UNITTESTS/features/netsocket/DTLSSocketWrapper/dtls_test_config.h\"")
40-
set_source_files_properties(features/netsocket/DTLSSocketWrapper/test_DTLSSocketWrapper.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
41-
set_source_files_properties(../features/netsocket/DTLSSocketWrapper.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
42-
39+
set(MBEDTLS_USER_CONFIG_FILE_PATH "\"${CMAKE_CURRENT_LIST_DIR}/dtls_test_config.h\"")
40+
set_source_files_properties(${CMAKE_CURRENT_LIST_DIR}/test_DTLSSocketWrapper.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})
41+
set_source_files_properties(../connectivity/netsocket/source/DTLSSocketWrapper.cpp PROPERTIES COMPILE_DEFINITIONS MBEDTLS_USER_CONFIG_FILE=${MBEDTLS_USER_CONFIG_FILE_PATH})

0 commit comments

Comments
 (0)