cmake Paths corrected

Antti Kauppila · Antti Kauppila · commit a54c271814eb · 2018-09-27T11:30:52.000+03:00
diff --git a/UNITTESTS/features/lorawan/loramac/unittest.cmake b/UNITTESTS/features/lorawan/loramac/unittest.cmake
@@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes}
 
 # Test & stub files
 set(unittest-test-sources
-  ../features/lorawan/loramac/Test_LoRaMac.cpp
+  features/lorawan/loramac/Test_LoRaMac.cpp
   stubs/LoRaPHY_stub.cpp
   stubs/LoRaWANStack_stub.cpp
   stubs/mbed_assert_stub.c
diff --git a/UNITTESTS/features/lorawan/loramacchannelplan/unittest.cmake b/UNITTESTS/features/lorawan/loramacchannelplan/unittest.cmake
@@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes}
 
 # Test & stub files
 set(unittest-test-sources
-  ../features/lorawan/loramacchannelplan/Test_LoRaMacChannelPlan.cpp
+  features/lorawan/loramacchannelplan/Test_LoRaMacChannelPlan.cpp
   stubs/LoRaPHY_stub.cpp
 )
 
diff --git a/UNITTESTS/features/lorawan/loramaccommand/unittest.cmake b/UNITTESTS/features/lorawan/loramaccommand/unittest.cmake
@@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes}
 
 # Test & stub files
 set(unittest-test-sources
-  ../features/lorawan/loramaccommand/Test_LoRaMacCommand.cpp
+  features/lorawan/loramaccommand/Test_LoRaMacCommand.cpp
   stubs/mbed_assert_stub.c
   stubs/LoRaPHY_stub.cpp
 )
diff --git a/UNITTESTS/features/lorawan/loramaccrypto/unittest.cmake b/UNITTESTS/features/lorawan/loramaccrypto/unittest.cmake
@@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes}
 
 # Test & stub files
 set(unittest-test-sources
-  ../features/lorawan/loramaccrypto/Test_LoRaMacCrypto.cpp
+  features/lorawan/loramaccrypto/Test_LoRaMacCrypto.cpp
   stubs/cipher_stub.c
   stubs/aes_stub.c
   stubs/cmac_stub.c
diff --git a/UNITTESTS/features/lorawan/loraphy/Test_LoRaPHY.cpp b/UNITTESTS/features/lorawan/loraphy/Test_LoRaPHY.cpp
@@ -536,6 +536,7 @@ TEST_F(Test_LoRaPHY, set_next_channel)
     uint8_t ch;
     lorawan_time_t t1;
     lorawan_time_t t2;
+    p.aggregate_timeoff = 10000;
     EXPECT_TRUE(LORAWAN_STATUS_DUTYCYCLE_RESTRICTED == object->set_next_channel(&p, &ch, &t1, &t2));
 
     uint16_t list[16];
diff --git a/UNITTESTS/features/lorawan/loraphy/unittest.cmake b/UNITTESTS/features/lorawan/loraphy/unittest.cmake
@@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes}
 
 # Test & stub files
 set(unittest-test-sources
-  ../features/lorawan/loraphy/Test_LoRaPHY.cpp
+  features/lorawan/loraphy/Test_LoRaPHY.cpp
   stubs/LoRaWANTimer_stub.cpp
   stubs/mbed_assert_stub.c
 )
diff --git a/UNITTESTS/features/lorawan/loraphyas923/unittest.cmake b/UNITTESTS/features/lorawan/loraphyas923/unittest.cmake
@@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes}
 
 # Test & stub files
 set(unittest-test-sources
-  ../features/lorawan/loraphyas923/Test_LoRaPHYAS923.cpp
+  features/lorawan/loraphyas923/Test_LoRaPHYAS923.cpp
   stubs/LoRaPHY_stub.cpp
   stubs/LoRaWANTimer_stub.cpp
   stubs/mbed_assert_stub.c
diff --git a/UNITTESTS/features/lorawan/loraphyau915/unittest.cmake b/UNITTESTS/features/lorawan/loraphyau915/unittest.cmake
@@ -20,7 +20,7 @@ set(TEST_SUITE_NAME "lorawan_LoRaPHYAU915")
 
 # Source files
 set(unittest-sources
-  ../features/lorawan/lorastack/phy/LoRaPHYAU915.cpp
+ ../features/lorawan/lorastack/phy/LoRaPHYAU915.cpp
 )
 
 # Add test specific include paths
@@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes}
 
 # Test & stub files
 set(unittest-test-sources
-  ../features/lorawan/loraphyau915/Test_LoRaPHYAU915.cpp
+  features/lorawan/loraphyau915/Test_LoRaPHYAU915.cpp
   stubs/LoRaPHY_stub.cpp
   stubs/LoRaWANTimer_stub.cpp
   stubs/mbed_assert_stub.c
diff --git a/UNITTESTS/features/lorawan/loraphycn470/unittest.cmake b/UNITTESTS/features/lorawan/loraphycn470/unittest.cmake
@@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes}
 
 # Test & stub files
 set(unittest-test-sources
-  ../features/lorawan/loraphycn470/Test_LoRaPHYCN470.cpp
+  features/lorawan/loraphycn470/Test_LoRaPHYCN470.cpp
   stubs/LoRaPHY_stub.cpp
   stubs/LoRaWANTimer_stub.cpp
   stubs/mbed_assert_stub.c
diff --git a/UNITTESTS/features/lorawan/loraphycn779/unittest.cmake b/UNITTESTS/features/lorawan/loraphycn779/unittest.cmake
@@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes}
 
 # Test & stub files
 set(unittest-test-sources
-  ../features/lorawan/loraphycn779/Test_LoRaPHYCN779.cpp
+  features/lorawan/loraphycn779/Test_LoRaPHYCN779.cpp
   stubs/LoRaPHY_stub.cpp
   stubs/mbed_assert_stub.c
 
diff --git a/UNITTESTS/features/lorawan/loraphyeu433/unittest.cmake b/UNITTESTS/features/lorawan/loraphyeu433/unittest.cmake
@@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes}
 
 # Test & stub files
 set(unittest-test-sources
-  ../features/lorawan/loraphyeu433/Test_LoRaPHYEU433.cpp
+  features/lorawan/loraphyeu433/Test_LoRaPHYEU433.cpp
   stubs/LoRaPHY_stub.cpp
   stubs/mbed_assert_stub.c
 
diff --git a/UNITTESTS/features/lorawan/loraphyeu868/unittest.cmake b/UNITTESTS/features/lorawan/loraphyeu868/unittest.cmake
@@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes}
 
 # Test & stub files
 set(unittest-test-sources
-  ../features/lorawan/loraphyeu868/Test_LoRaPHYEU868.cpp
+  features/lorawan/loraphyeu868/Test_LoRaPHYEU868.cpp
   stubs/LoRaPHY_stub.cpp
   stubs/mbed_assert_stub.c
 
diff --git a/UNITTESTS/features/lorawan/loraphyin865/unittest.cmake b/UNITTESTS/features/lorawan/loraphyin865/unittest.cmake
@@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes}
 
 # Test & stub files
 set(unittest-test-sources
-  ../features/lorawan/loraphyin865/Test_LoRaPHYIN865.cpp
+  features/lorawan/loraphyin865/Test_LoRaPHYIN865.cpp
   stubs/LoRaPHY_stub.cpp
   stubs/mbed_assert_stub.c
 
diff --git a/UNITTESTS/features/lorawan/loraphykr920/unittest.cmake b/UNITTESTS/features/lorawan/loraphykr920/unittest.cmake
@@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes}
 
 # Test & stub files
 set(unittest-test-sources
-  ../features/lorawan/loraphykr920/Test_LoRaPHYKR920.cpp
+  features/lorawan/loraphykr920/Test_LoRaPHYKR920.cpp
   stubs/LoRaPHY_stub.cpp
   stubs/LoRaWANTimer_stub.cpp
   stubs/mbed_assert_stub.c
diff --git a/UNITTESTS/features/lorawan/loraphyus915/unittest.cmake b/UNITTESTS/features/lorawan/loraphyus915/unittest.cmake
@@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes}
 
 # Test & stub files
 set(unittest-test-sources
-  ../features/lorawan/loraphyus915/Test_LoRaPHYUS915.cpp
+  features/lorawan/loraphyus915/Test_LoRaPHYUS915.cpp
   stubs/LoRaPHY_stub.cpp
   stubs/LoRaWANTimer_stub.cpp
   stubs/mbed_assert_stub.c
diff --git a/UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake b/UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake
@@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes}
 
 # Test & stub files
 set(unittest-test-sources
-  ../features/lorawan/lorawaninterface/Test_LoRaWANInterface.cpp
+  features/lorawan/lorawaninterface/Test_LoRaWANInterface.cpp
   stubs/LoRaPHY_stub.cpp
   stubs/LoRaWANStack_stub.cpp
   stubs/LoRaMac_stub.cpp
diff --git a/UNITTESTS/features/lorawan/lorawanstack/Test_LoRaWANStack.cpp b/UNITTESTS/features/lorawan/lorawanstack/Test_LoRaWANStack.cpp
@@ -419,6 +419,7 @@ TEST_F(Test_LoRaWANStack, handle_rx)
 
     loramac_mcps_indication_t ind;
     LoRaMac_stub::mcps_ind_ptr = &ind;
+    ind.status = LORAMAC_EVENT_INFO_STATUS_OK;
 
     loramac_mlme_confirm_t mlme;
     LoRaMac_stub::mlme_conf_ptr = &mlme;
@@ -442,6 +443,7 @@ TEST_F(Test_LoRaWANStack, handle_rx)
     ind.buffer = ind_buf;
     ind.buffer_size = 150;
     ind.type = MCPS_UNCONFIRMED;
+    ind.is_data_recvd = true;
     radio._ev->rx_done(NULL, 0, 0, 0);
 
     //data == NULL || LENGTH == 0 (2 cases)
diff --git a/UNITTESTS/features/lorawan/lorawanstack/unittest.cmake b/UNITTESTS/features/lorawan/lorawanstack/unittest.cmake
@@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes}
 
 # Test & stub files
 set(unittest-test-sources
-  ../features/lorawan/lorawanstack/Test_LoRaWANStack.cpp
+  features/lorawan/lorawanstack/Test_LoRaWANStack.cpp
   stubs/LoRaPHY_stub.cpp
   stubs/LoRaMac_stub.cpp
   stubs/mbed_assert_stub.c
diff --git a/UNITTESTS/features/lorawan/lorawantimer/unittest.cmake b/UNITTESTS/features/lorawan/lorawantimer/unittest.cmake
@@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes}
 
 # Test & stub files
 set(unittest-test-sources
-  ../features/lorawan/lorawantimer/Test_LoRaWANTimer.cpp
+  features/lorawan/lorawantimer/Test_LoRaWANTimer.cpp
   stubs/EventQueue_stub.cpp
   stubs/mbed_assert_stub.c
   stubs/equeue_stub.c
diff --git a/features/lorawan/LoRaWANStack.cpp b/features/lorawan/LoRaWANStack.cpp
@@ -1064,8 +1064,8 @@ lorawan_status_t LoRaWANStack::state_controller(device_states_t new_state)
             break;
         default:
             //Because this is internal function only coding error causes this
+            tr_error("Unknown state: %d:", new_state);
             MBED_ASSERT(false);
-            break;
     }
 
     return status;
diff --git a/features/lorawan/lorastack/mac/LoRaMacCommand.cpp b/features/lorawan/lorastack/mac/LoRaMacCommand.cpp
@@ -33,7 +33,6 @@ SPDX-License-Identifier: BSD-3-Clause
  */
 static const uint8_t max_eirp_table[] = { 8, 10, 12, 13, 14, 16, 18, 20, 21, 24, 26, 27, 29, 30, 33, 36 };
 
-
 LoRaMacCommand::LoRaMacCommand()
 {
     sticky_mac_cmd = false;
@@ -93,7 +92,9 @@ void LoRaMacCommand::parse_mac_commands_to_repeat()
             case MOTE_MAC_LINK_CHECK_REQ: { // 0 byte payload
                 break;
             }
-            default: {}//Cannot happen
+            default: {
+                MBED_ASSERT(false);
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ set(unittest-includes ${unittest-includes}`
`31`	`31`
`32`	`32`	`# Test & stub files`
`33`	`33`	`set(unittest-test-sources`
`34`		`- ../features/lorawan/loramacchannelplan/Test_LoRaMacChannelPlan.cpp`
	`34`	`+ features/lorawan/loramacchannelplan/Test_LoRaMacChannelPlan.cpp`
`35`	`35`	`stubs/LoRaPHY_stub.cpp`
`36`	`36`	`)`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -1064,8 +1064,8 @@ lorawan_status_t LoRaWANStack::state_controller(device_states_t new_state)`
`1064`	`1064`	`break;`
`1065`	`1065`	`default:`
`1066`	`1066`	`//Because this is internal function only coding error causes this`
	`1067`	`+ tr_error("Unknown state: %d:", new_state);`
`1067`	`1068`	`MBED_ASSERT(false);`
`1068`		`- break;`
`1069`	`1069`	`}`
`1070`	`1070`
`1071`	`1071`	`return status;`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ SPDX-License-Identifier: BSD-3-Clause`
`33`	`33`	`*/`
`34`	`34`	`static const uint8_t max_eirp_table[] = { 8, 10, 12, 13, 14, 16, 18, 20, 21, 24, 26, 27, 29, 30, 33, 36 };`
`35`	`35`
`36`		`-`
`37`	`36`	`LoRaMacCommand::LoRaMacCommand()`
`38`	`37`	`{`
`39`	`38`	`sticky_mac_cmd = false;`
`@@ -93,7 +92,9 @@ void LoRaMacCommand::parse_mac_commands_to_repeat()`
`93`	`92`	`case MOTE_MAC_LINK_CHECK_REQ: { // 0 byte payload`
`94`	`93`	`break;`
`95`	`94`	`}`
`96`		`- default: {}//Cannot happen`
	`95`	`+ default: {`
	`96`	`+ MBED_ASSERT(false);`
	`97`	`+ }`
`97`	`98`	`}`
`98`	`99`	`}`
`99`	`100`