Merge pull request #12080 from AnttiKauppila/ut_cleanup

0xc0170 · web-flow · commit 8fd8ea2fed33 · 2019-12-11T13:00:12.000+01:00
Unittest cleanup made
diff --git a/UNITTESTS/features/cellular/framework/AT/at_cellularcontext/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/at_cellularcontext/unittest.cmake
@@ -50,4 +50,5 @@ set(unittest-test-flags
   -DDEVICE_INTERRUPTIN=1
   -DMBED_CONF_CELLULAR_USE_SMS=1
   -DMBED_CONF_NSAPI_DEFAULT_CELLULAR_APN=NULL
+  -DMBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
 )
diff --git a/UNITTESTS/features/cellular/framework/AT/at_cellularinformation/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/at_cellularinformation/unittest.cmake
@@ -40,4 +40,5 @@ set(unittest-test-sources
 set(unittest-test-flags
   -DDEVICE_SERIAL=1
   -DDEVICE_INTERRUPTIN=1
+  -DMBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
 )
diff --git a/UNITTESTS/features/cellular/framework/AT/at_cellularnetwork/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/at_cellularnetwork/unittest.cmake
@@ -42,4 +42,5 @@ set(unittest-test-sources
 set(unittest-test-flags
   -DDEVICE_SERIAL=1
   -DDEVICE_INTERRUPTIN=1
+  -DMBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
 )
diff --git a/UNITTESTS/features/cellular/framework/AT/at_cellularsms/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/at_cellularsms/unittest.cmake
@@ -44,4 +44,5 @@ set(unittest-test-flags
   -DMBED_CONF_CELLULAR_USE_SMS=1
   -DDEVICE_SERIAL=1
   -DDEVICE_INTERRUPTIN=1
+  -DMBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
 )
diff --git a/UNITTESTS/features/cellular/framework/AT/at_cellularstack/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/at_cellularstack/unittest.cmake
@@ -49,5 +49,6 @@ set(unittest-test-sources
 set(unittest-test-flags
   -DDEVICE_SERIAL=1
   -DDEVICE_INTERRUPTIN=1
+  -DMBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
 )
 
diff --git a/UNITTESTS/features/cellular/framework/AT/athandler/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/athandler/unittest.cmake
@@ -45,4 +45,5 @@ set(unittest-test-flags
   -DOS_STACK_SIZE=2048
   -DDEVICE_SERIAL=1
   -DDEVICE_INTERRUPTIN=1
+  -DMBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
 )
diff --git a/UNITTESTS/features/cellular/framework/device/cellulardevice/unittest.cmake b/UNITTESTS/features/cellular/framework/device/cellulardevice/unittest.cmake
@@ -49,6 +49,3 @@ set(unittest-test-flags
   -DDEVICE_INTERRUPTIN=1
 )
 
-# defines
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMDMRTS=PTC0 -DMDMCTS=PTC1 -DMDMTXD=NC -DMDMRXD=NC -DMBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200 -DCELLULAR_DEVICE=myCellularDevice -DDEVICE_SERIAL_FC=1")
diff --git a/UNITTESTS/features/netsocket/cellular/CellularNonIPSocket/unittest.cmake b/UNITTESTS/features/netsocket/cellular/CellularNonIPSocket/unittest.cmake
@@ -26,4 +26,5 @@ set(unittest-test-sources
 set(unittest-test-flags
   -DDEVICE_SERIAL=1
   -DDEVICE_INTERRUPTIN=1
+  -DMBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
 )
diff --git a/UNITTESTS/stubs/UARTSerial_stub.cpp b/UNITTESTS/stubs/UARTSerial_stub.cpp
@@ -130,9 +130,11 @@ int UARTSerial::enable_output(bool enabled)
     return 0;
 }
 
+#if DEVICE_SERIAL_FC
 void UARTSerial::set_flow_control(mbed::SerialBase::Flow, PinName, PinName)
 {
 
 }
+#endif
 
 }

Original file line number	Diff line number	Diff line change
`@@ -50,4 +50,5 @@ set(unittest-test-flags`
`50`	`50`	`-DDEVICE_INTERRUPTIN=1`
`51`	`51`	`-DMBED_CONF_CELLULAR_USE_SMS=1`
`52`	`52`	`-DMBED_CONF_NSAPI_DEFAULT_CELLULAR_APN=NULL`
	`53`	`+ -DMBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200`
`53`	`54`	`)`
Original file line number	Diff line number	Diff line change
`@@ -40,4 +40,5 @@ set(unittest-test-sources`
`40`	`40`	`set(unittest-test-flags`
`41`	`41`	`-DDEVICE_SERIAL=1`
`42`	`42`	`-DDEVICE_INTERRUPTIN=1`
	`43`	`+ -DMBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200`
`43`	`44`	`)`
Original file line number	Diff line number	Diff line change
`@@ -42,4 +42,5 @@ set(unittest-test-sources`
`42`	`42`	`set(unittest-test-flags`
`43`	`43`	`-DDEVICE_SERIAL=1`
`44`	`44`	`-DDEVICE_INTERRUPTIN=1`
	`45`	`+ -DMBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200`
`45`	`46`	`)`
Original file line number	Diff line number	Diff line change
`@@ -44,4 +44,5 @@ set(unittest-test-flags`
`44`	`44`	`-DMBED_CONF_CELLULAR_USE_SMS=1`
`45`	`45`	`-DDEVICE_SERIAL=1`
`46`	`46`	`-DDEVICE_INTERRUPTIN=1`
	`47`	`+ -DMBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200`
`47`	`48`	`)`
Original file line number	Diff line number	Diff line change
`@@ -49,5 +49,6 @@ set(unittest-test-sources`
`49`	`49`	`set(unittest-test-flags`
`50`	`50`	`-DDEVICE_SERIAL=1`
`51`	`51`	`-DDEVICE_INTERRUPTIN=1`
	`52`	`+ -DMBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200`
`52`	`53`	`)`
`53`	`54`
Original file line number	Diff line number	Diff line change
`@@ -45,4 +45,5 @@ set(unittest-test-flags`
`45`	`45`	`-DOS_STACK_SIZE=2048`
`46`	`46`	`-DDEVICE_SERIAL=1`
`47`	`47`	`-DDEVICE_INTERRUPTIN=1`
	`48`	`+ -DMBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200`
`48`	`49`	`)`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,3 @@ set(unittest-test-flags`
`49`	`49`	`-DDEVICE_INTERRUPTIN=1`
`50`	`50`	`)`
`51`	`51`
`52`		`-# defines`
`53`		`-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ")`
`54`		`-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMDMRTS=PTC0 -DMDMCTS=PTC1 -DMDMTXD=NC -DMDMRXD=NC -DMBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200 -DCELLULAR_DEVICE=myCellularDevice -DDEVICE_SERIAL_FC=1")`
Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,5 @@ set(unittest-test-sources`
`26`	`26`	`set(unittest-test-flags`
`27`	`27`	`-DDEVICE_SERIAL=1`
`28`	`28`	`-DDEVICE_INTERRUPTIN=1`
	`29`	`+ -DMBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200`
`29`	`30`	`)`
Original file line number	Diff line number	Diff line change
`@@ -130,9 +130,11 @@ int UARTSerial::enable_output(bool enabled)`
`130`	`130`	`return 0;`
`131`	`131`	`}`
`132`	`132`
	`133`	`+#if DEVICE_SERIAL_FC`
`133`	`134`	`void UARTSerial::set_flow_control(mbed::SerialBase::Flow, PinName, PinName)`
`134`	`135`	`{`
`135`	`136`
`136`	`137`	`}`
	`138`	`+#endif`
`137`	`139`
`138`	`140`	`}`