Restructure events directory & move tests

.astyleignore

@@ -19,6 +19,7 @@
 ^features/unsupported/
 ^hal/storage_abstraction
 ^platform/cxxsupport
+^events/tests/UNITTESTS
 ^rtos/source/TARGET_CORTEX/rtx4
 ^rtos/source/TARGET_CORTEX/rtx5
 ^targets

.travis.yml

@@ -100,7 +100,8 @@ matrix:
         - |
           ! git grep '^#include\s["'"']mbed.h['"'"]$' -- '*.c' '*.h' '*.cpp' '*.hpp' \
               ':!*platform_mbed.h' ':!*TESTS/*' ':!TEST_APPS/' ':!UNITTESTS/' \
-              ':!*tests/*' ':!*targets/*' ':!*TARGET_*' ':!*unsupported/*'
+              ':!*tests/*' ':!*targets/*' ':!*TARGET_*' ':!*unsupported/*' \
+              ':!*events/tests/*'
 
 
     ### Docs Tests ###
@@ -253,9 +254,9 @@ matrix:
             features/frameworks/utest features/frameworks/unity components BUILD
         - python tools/make.py -t GCC_ARM -m NUCLEO_F103RB --source=. --build=BUILD/NUCLEO_F103RB/GCC_ARM -j0
         # Run local equeue tests
-        - make -C ${EVENTS}/source test
+        - make -C ${EVENTS}/test/unit test
         # Run profiling tests
-        - make -C ${EVENTS}/source prof | tee prof
+        - make -C ${EVENTS}/test/unit prof | tee prof
       after_success:
         # Update status, comparing with master if possible.
         - |

TESTS/usb_device/basic/USBEndpointTester.cpp

@@ -20,7 +20,7 @@
 #include "stdint.h"
 #include "stdlib.h"
 #include "USBEndpointTester.h"
-#include "mbed_shared_queues.h"
+#include "events/mbed_shared_queues.h"
 #include "EndpointResolver.h"
 
 #define DEFAULT_CONFIGURATION       (1)

TESTS/usb_device/basic/USBEndpointTester.h

@@ -21,7 +21,7 @@
 /* These headers are included for child class. */
 #include "USBDescriptor.h"
 #include "USBDevice_Types.h"
-#include "EventQueue.h"
+#include "events/EventQueue.h"
 #include "EventFlags.h"
 #include "platform/NonCopyable.h"
 

TESTS/usb_device/basic/USBTester.cpp

@@ -19,7 +19,7 @@
 
 #include "stdint.h"
 #include "USBTester.h"
-#include "mbed_shared_queues.h"
+#include "events/mbed_shared_queues.h"
 #include "EndpointResolver.h"
 
 #define DEFAULT_CONFIGURATION (1)

TESTS/usb_device/basic/USBTester.h

@@ -21,7 +21,7 @@
 /* These headers are included for child class. */
 #include "USBDescriptor.h"
 #include "USBDevice_Types.h"
-#include "EventQueue.h"
+#include "events/EventQueue.h"
 #include "EventFlags.h"
 #include "platform/NonCopyable.h"
 

UNITTESTS/CMakeLists.txt

@@ -103,8 +103,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUNITTEST")
 # Set include dirs.
 set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/target_h"
-  "${PROJECT_SOURCE_DIR}/target_h/events"
-  "${PROJECT_SOURCE_DIR}/target_h/events/equeue"
+  "${PROJECT_SOURCE_DIR}/../events/tests/UNITTESTS/target_h"
+  "${PROJECT_SOURCE_DIR}/../events/tests/UNITTESTS/target_h/equeue"
   "${PROJECT_SOURCE_DIR}/target_h/platform"
   "${PROJECT_SOURCE_DIR}/target_h/platform/cxxsupport"
   "${PROJECT_SOURCE_DIR}/target_h/drivers"
@@ -122,9 +122,9 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/../storage/kvstore/kv_config/include"
   "${PROJECT_SOURCE_DIR}/../drivers"
   "${PROJECT_SOURCE_DIR}/../hal"
-  "${PROJECT_SOURCE_DIR}/../events"
+  "${PROJECT_SOURCE_DIR}/../events/include"
+  "${PROJECT_SOURCE_DIR}/../events/include/events/internal"
   "${PROJECT_SOURCE_DIR}/../events/source"
-  "${PROJECT_SOURCE_DIR}/../events/internal"
   "${PROJECT_SOURCE_DIR}/../rtos/include"
   "${PROJECT_SOURCE_DIR}/../features/frameworks"
   "${PROJECT_SOURCE_DIR}/../features/frameworks/mbed-trace"

UNITTESTS/events/equeue/unittest.cmake

@@ -1,27 +0,0 @@
-
-####################
-# UNIT TESTS
-####################
-
-list(REMOVE_ITEM unittest-includes ${PROJECT_SOURCE_DIR}/target_h/events ${PROJECT_SOURCE_DIR}/target_h/events/equeue)
-
-set(unittest-includes ${unittest-includes}
-  ../events/source
-  ../events
-  ../events/internal
-)
-
-set(unittest-sources
-  ../events/source/equeue.c
-)
-
-set(unittest-test-sources
-  events/equeue/test_equeue.cpp
-  stubs/EqueuePosix_stub.c
-)
-
-set(unittest-test-flags
-  -pthread
-  -DEQUEUE_PLATFORM_POSIX
-)
-

UNITTESTS/stubs/equeue_stub.c

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "equeue.h"
+#include "events/equeue.h"
 #include <stdlib.h>
 
 #include "equeue_stub.h"

connectivity/cellular/source/framework/device/CellularDevice.cpp

@@ -20,7 +20,7 @@
 #include "CellularUtil.h"
 #include "CellularLog.h"
 #include "events/EventQueue.h"
-#include "mbed_shared_queues.h"
+#include "events/mbed_shared_queues.h"
 
 namespace mbed {
 

connectivity/drivers/emac/TARGET_ARM_FM/COMPONENT_LAN91C111/fvp_emac.cpp

@@ -24,7 +24,7 @@
 #include "mbed_interface.h"
 #include "mbed_assert.h"
 #include "netsocket/nsapi_types.h"
-#include "mbed_shared_queues.h"
+#include "events/mbed_shared_queues.h"
 
 using namespace std::chrono;
 

connectivity/drivers/emac/TARGET_ARM_SSG/COMPONENT_SMSC9220/smsc9220_emac.cpp

@@ -23,7 +23,7 @@
 #include "mbed_wait_api.h"
 #include "mbed_assert.h"
 #include "netsocket/nsapi_types.h"
-#include "mbed_shared_queues.h"
+#include "events/mbed_shared_queues.h"
 
 #include "smsc9220_emac.h"
 #include "smsc9220_eth_drv.h"

connectivity/drivers/emac/TARGET_Cypress/COMPONENT_SCL/interface/scl_emac.cpp

@@ -24,7 +24,7 @@
 #include "scl_emac.h"
 #include "lwip/etharp.h"
 #include "lwip/ethip6.h"
-#include "mbed_shared_queues.h"
+#include "events/mbed_shared_queues.h"
 #include "scl_buffer_api.h"
 #include "cy_result.h"
 #include "cy_pdl.h"

connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/whd_emac.cpp

@@ -24,7 +24,7 @@
 #include "whd_emac.h"
 #include "lwip/etharp.h"
 #include "lwip/ethip6.h"
-#include "mbed_shared_queues.h"
+#include "events/mbed_shared_queues.h"
 #include "whd_wlioctl.h"
 #include "whd_buffer_api.h"
 #include "cybsp_wifi.h"

connectivity/drivers/emac/TARGET_Freescale_EMAC/kinetis_emac.cpp

@@ -40,7 +40,7 @@
 #include "mbed_interface.h"
 #include "mbed_assert.h"
 #include "netsocket/nsapi_types.h"
-#include "mbed_shared_queues.h"
+#include "events/mbed_shared_queues.h"
 
 #include "fsl_phy.h"
 

connectivity/drivers/emac/TARGET_GD_EMAC/gd32xx_emac.cpp

@@ -22,7 +22,7 @@
 
 #include "mbed_interface.h"
 #include "mbed_assert.h"
-#include "mbed_shared_queues.h"
+#include "events/mbed_shared_queues.h"
 #include "netsocket/nsapi_types.h"
 
 #include "gd32xx_emac.h"

connectivity/drivers/emac/TARGET_NUVOTON_EMAC/numaker_emac.cpp

@@ -28,7 +28,7 @@
 #include "mbed_interface.h"
 #include "mbed_assert.h"
 #include "netsocket/nsapi_types.h"
-#include "mbed_shared_queues.h"
+#include "events/mbed_shared_queues.h"
 
 //#define NU_TRACE
 

connectivity/drivers/emac/TARGET_NXP_EMAC/TARGET_IMX/imx_emac.cpp

@@ -40,7 +40,7 @@
 #include "mbed_interface.h"
 #include "mbed_assert.h"
 #include "netsocket/nsapi_types.h"
-#include "mbed_shared_queues.h"
+#include "events/mbed_shared_queues.h"
 
 #include "fsl_phy.h"
 

connectivity/drivers/emac/TARGET_NXP_EMAC/TARGET_MCU_LPC546XX/lpc546xx_emac.cpp

@@ -24,7 +24,7 @@
 #include "mbed_interface.h"
 #include "mbed_assert.h"
 #include "netsocket/nsapi_types.h"
-#include "mbed_shared_queues.h"
+#include "events/mbed_shared_queues.h"
 
 #include "fsl_phy.h"
 

connectivity/drivers/emac/TARGET_RDA_EMAC/rda5981x_emac.cpp

@@ -18,7 +18,7 @@
 #include "cmsis_os.h"
 #include "mbed_interface.h"
 #include "mbed_assert.h"
-#include "mbed_shared_queues.h"
+#include "events/mbed_shared_queues.h"
 #include "netsocket/nsapi_types.h"
 #include "lwip/arch.h"
 #include "lwip/pbuf.h"

connectivity/drivers/emac/TARGET_RZ_A1_EMAC/rza1_emac.cpp

@@ -16,7 +16,7 @@
 #include "cmsis_os.h"
 #include "rtos/ThisThread.h"
 #include "netsocket/nsapi_types.h"
-#include "mbed_shared_queues.h"
+#include "events/mbed_shared_queues.h"
 #include "rza1_eth.h"
 #include "rza1_eth_ext.h"
 #include "rza1_emac.h"

connectivity/drivers/emac/TARGET_STM/stm32xx_emac.cpp

@@ -24,7 +24,7 @@
 #include "mbed.h"
 #include "mbed_interface.h"
 #include "mbed_assert.h"
-#include "mbed_shared_queues.h"
+#include "events/mbed_shared_queues.h"
 #include "netsocket/nsapi_types.h"
 
 #include "stm32xx_emac_config.h"

connectivity/libraries/ppp/source/ppp_service.cpp

@@ -22,10 +22,10 @@
 #include "netsocket/nsapi_types.h"
 
 #if PPP_MBED_EVENT_QUEUE
-#include "mbed_shared_queues.h"
+#include "events/mbed_shared_queues.h"
 #else
 #include "Thread.h"
-#include "EventQueue.h"
+#include "events/EventQueue.h"
 #endif
 
 #include "mbed_poll.h"

connectivity/libraries/ppp/source/ppp_service_if.cpp

@@ -20,7 +20,7 @@
 #include "mbed_interface.h"
 #include "mbed_trace.h"
 #include "netsocket/nsapi_types.h"
-#include "mbed_shared_queues.h"
+#include "events/mbed_shared_queues.h"
 #include "mbed_poll.h"
 #include "ip4string.h"
 #include "ip6string.h"

connectivity/netsocket/source/NetworkStack.cpp

@@ -19,7 +19,7 @@
 #include "stddef.h"
 #include <new>
 #include "events/EventQueue.h"
-#include "mbed_shared_queues.h"
+#include "events/mbed_shared_queues.h"
 #include "platform/mbed_error.h"
 
 // Default NetworkStack operations

connectivity/netsocket/source/nsapi_dns.cpp

@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdint.h>
-#include "mbed_shared_queues.h"
+#include "events/mbed_shared_queues.h"
 #include "events/EventQueue.h"
 #include "netsocket/OnboardNetworkStack.h"
 #include "rtos/Kernel.h"

connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/moduletest.cpp

@@ -22,7 +22,7 @@
 #include "netsocket/SocketAddress.h"
 #include "EMAC_mock.h"
 #include "OnboardNetworkStack_mock.h"
-#include "EventQueue.h"
+#include "events/EventQueue.h"
 #include <future>
 #include <thread>
 #include <chrono>

drivers/USBCDC_ECM.h

@@ -24,7 +24,7 @@
 #include "ByteBuffer.h"
 #include "Mutex.h"
 #include "EventFlags.h"
-#include "EventQueue.h"
+#include "events/EventQueue.h"
 #include "Thread.h"
 #include "Callback.h"
 

events/source/.mbedignore

@@ -1 +0,0 @@
-tests/*

events/tests/.mbedignore

@@ -0,0 +1,2 @@
+UNITTESTS/*
+unit/

events/tests/TESTS/events/equeue/main.cpp

@@ -23,7 +23,7 @@
 #include "unity/unity.h"
 #include "greentea-client/test_env.h"
 
-#include "equeue.h"
+#include "events/equeue.h"
 #include "mbed.h"
 
 using namespace utest::v1;

events/tests/UNITTESTS/equeue/test_equeue.cpp

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "gtest/gtest.h"
-#include "equeue.h"
+#include "events/equeue.h"
 #include "mbed.h"
 #include <unistd.h>
 #include <pthread.h>

events/tests/UNITTESTS/equeue/unittest.cmake

@@ -0,0 +1,27 @@
+
+####################
+# UNIT TESTS
+####################
+
+list(REMOVE_ITEM unittest-includes ${PROJECT_SOURCE_DIR}/../events/tests/UNITTESTS/target_h ${PROJECT_SOURCE_DIR}/../events/test/UNITTESTS/target_h/equeue)
+
+set(unittest-includes ${unittest-includes}
+  ../events/source
+  ../events/include/events
+  ../events/include/events/internal
+)
+
+set(unittest-sources
+  ../events/source/equeue.c
+)
+
+set(unittest-test-sources
+  ../events/tests/UNITTESTS/equeue/test_equeue.cpp
+  ../events/tests/UNITTESTS/stubs/EqueuePosix_stub.c
+)
+
+set(unittest-test-flags
+  -pthread
+  -DEQUEUE_PLATFORM_POSIX
+)
+

events/tests/unit/Makefile

@@ -27,13 +27,13 @@ LFLAGS += -pthread
 
 all: $(TARGET)
 
-test: tests/tests.o $(OBJ)
-	$(CC) $(CFLAGS) $^ $(LFLAGS) -o tests/tests
-	tests/tests
+test: tests.o $(OBJ)
+	$(CC) $(CFLAGS) $^ $(LFLAGS) -o tests
+	tests
 
-prof: tests/prof.o $(OBJ)
-	$(CC) $(CFLAGS) $^ $(LFLAGS) -o tests/prof
-	tests/prof
+prof: prof.o $(OBJ)
+	$(CC) $(CFLAGS) $^ $(LFLAGS) -o prof
+	prof
 
 asm: $(ASM)
 
@@ -53,8 +53,8 @@ size: $(OBJ)
 
 clean:
 	rm -f $(TARGET)
-	rm -f tests/tests tests/tests.o tests/tests.d
-	rm -f tests/prof tests/prof.o tests/prof.d
+	rm -f tests tests.o tests.d
+	rm -f prof prof.o prof.d
 	rm -f $(OBJ)
 	rm -f $(DEP)
 	rm -f $(ASM)

features/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_fhss_timer.cpp

@@ -24,9 +24,9 @@
 #include "platform/SingletonPtr.h"
 #include "platform/arm_hal_interrupt.h"
 #include "platform/mbed_power_mgmt.h"
-#include "equeue.h"
+#include "events/equeue.h"
 #include "events/EventQueue.h"
-#include "mbed_shared_queues.h"
+#include "events/mbed_shared_queues.h"
 #include "Timeout.h"
 
 #define TRACE_GROUP "fhdr"

features/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_event_loop_mbed.cpp

@@ -27,7 +27,7 @@
 #include "eventOS_scheduler.h"
 
 #include "mbed_error.h"
-#include "mbed_shared_queues.h"
+#include "events/mbed_shared_queues.h"
 #include "events/Event.h"
 #include "ns_event_loop_mutex.h"
 #include "ns_event_loop.h"