FHSS unit tests: Updated channel function tests

Author: Jarkko Paso

test/nanostack/unittest/service_libs/channel_functions/channelfunctest.cpp

@@ -29,26 +29,6 @@ TEST_GROUP(channel_functions)
     }
 };
 
-TEST(channel_functions, test_tr51_get_rand)
-{
-    CHECK(test_tr51_get_rand());
-}
-
-TEST(channel_functions, test_tr51_calculate_channel_table)
-{
-    CHECK(test_tr51_calculate_channel_table());
-}
-
-TEST(channel_functions, test_tr51_compute_cfd)
-{
-    CHECK(test_tr51_compute_cfd());
-}
-
-TEST(channel_functions, test_tr51_calculate_hopping_sequence)
-{
-    CHECK(test_tr51_calculate_hopping_sequence());
-}
-
 TEST(channel_functions, test_dh1cf_get_uc_channel_index)
 {
     CHECK(test_dh1cf_get_uc_channel_index());
@@ -59,12 +39,12 @@ TEST(channel_functions, test_dh1cf_get_bc_channel_index)
     CHECK(test_dh1cf_get_bc_channel_index());
 }
 
-TEST(channel_functions, test_tr51_calc_nearest_prime_number)
+TEST(channel_functions, test_tr51_get_uc_channel_index)
 {
-    CHECK(test_tr51_calc_nearest_prime_number());
+    CHECK(test_tr51_get_uc_channel_index());
 }
 
-TEST(channel_functions, test_tr51_get_uc_channel_index)
+TEST(channel_functions, test_tr51_get_bc_channel_index)
 {
-    CHECK(test_tr51_get_uc_channel_index());
+    CHECK(test_tr51_get_bc_channel_index());
 }

test/nanostack/unittest/service_libs/channel_functions/test_channel_functions.c

@@ -18,24 +18,6 @@
 #include "Service_Libs/fhss/channel_functions.h"
 #include "test_channel_functions.h"
 
-const int32_t test_channel_table[131] = {   57,78,25,22,97,90,86,102,
-                                            98,16,104,128,28,23,44,26,
-                                            1,74,117,6,53,89,105,94,
-                                            110,39,119,80,62,46,47,69,
-                                            68,21,49,58,5,92,17,54,
-                                            65,11,41,14,111,24,83,40,
-                                            76,106,19,118,123,51,38,126,
-                                            107,12,60,13,87,125,116,100,
-                                            88,103,72,96,36,99,114,112,
-                                            3,48,32,35,73,7,91,45,
-                                            64,20,55,77,27,75,0,59,
-                                            109,81,30,122,84,67,121,101,
-                                            127,37,85,18,124,66,31,79,
-                                            115,9,34,70,10,95,42,33,
-                                            93,43,50,108,63,2,15,61,
-                                            56,71,4,29,52,82,120,113,
-                                            8,-1,-1 };
-
 const int32_t test_HopSequenceTable[129] =  {   4,93,31,84,55,3,116,123,
                                                 41,68,105,28,25,71,33,66,
                                                 122,20,112,125,118,11,69,89,
@@ -71,102 +53,44 @@ const int32_t test_HopSequenceTable2[129] =  {   4, 42, 85, 0, 32, 116, 19, 17,
                                                 18, 59, 35, 100, 118, 54, 80, 26,
                                                 22 };
 
-const uint16_t prime_number_table[] = { 2, 3, 5, 7, 11, 13, 17, 19, 23, 29,
-                                        31, 37, 41, 43, 47, 53, 59, 61, 67, 71,
-                                        73, 79, 83, 89, 97, 101, 103, 107, 109, 113,
-                                        127, 131, 137, 139, 149, 151, 157, 163, 167, 173,
-                                        179, 181, 191, 193, 197, 199, 211, 223, 227, 229,
-                                        233, 239, 241, 251, 257, 263, 269, 271, 277, 281,
-                                        283, 293, 307, 311, 313, 317, 331, 337, 347, 349,
-                                        353, 359, 367, 373, 379, 383, 389, 397, 401, 409,
-                                        419, 421, 431, 433, 439, 443, 449, 457, 461, 463,
-                                        467, 479, 487, 491, 499, 503, 509, 521, 523, 541,
-                                        547, 557, 563, 569, 571, 577, 587, 593, 599, 601,
-                                        607, 613, 617, 619, 631, 641, 643, 647, 653, 659,
-                                        661, 673, 677, 683, 691, 701, 709, 719, 727, 733,
-                                        739, 743, 751, 757, 761, 769, 773, 787, 797, 809,
-                                        811, 821, 823, 827, 829, 839, 853, 857, 859, 863,
-                                        877, 881, 883, 887, 907, 911, 919, 929, 937, 941,
-                                        947, 953, 967, 971, 977, 983, 991, 997, 1009 };
+const int32_t test_HopSequenceTable3[129] =  {  124, 114, 65, 104, 33, 20, 118, 89,
+                                                4, 84, 116, 68, 25, 79, 48, 14,
+                                                23, 50, 27, 38, 110, 82, 101, 103,
+                                                58, 90, 34, 73, 83, 1, 2, 59,
+                                                12, 80, 8, 85, 36, 17, 98, 95,
+                                                45, 106, 6, 56, 30, 87, 47, 57,
+                                                66, 112, 11, 128, 93, 55, 123, 105,
+                                                29, 67, 100, 21, 22, 115, 32, 111,
+                                                44, 108, 75, 126, 39, 120, 127, 72,
+                                                5, 86, 70, 7, 40, 74, 15, 109,
+                                                60, 62, 18, 99, 54, 16, 42, 64,
+                                                19, 53, 71, 122, 125, 69, 78, 31,
+                                                3, 41, 28, 43, 77, 51, 94, 52,
+                                                121, 88, 49, 97, 9, 35, 24, 26,
+                                                63, 0, 107, 119, 113, 37, 96, 92,
+                                                102, 10, 91, 76, 117, 61, 81, 13,
+                                                46 };
 
-bool test_tr51_get_rand()
-{
-    tr51_seed_rand(1);
-    // Test first few random values
-    if (1103527590 != tr51_get_rand()) {
-        return false;
-    }
-    if (377401575 != tr51_get_rand()) {
-        return false;
-    }
-    if (662824084 != tr51_get_rand()) {
-        return false;
-    }
-    if (1147902781 != tr51_get_rand()) {
-        return false;
-    }
-    if (2035015474 != tr51_get_rand()) {
-        return false;
-    }
-    return true;
-}
-
-bool test_tr51_calculate_channel_table()
+bool test_tr51_get_uc_channel_index()
 {
-    int32_t chantable[131];
-    // Test generating channel table
-    tr51_calculate_channel_table(129, 131, chantable);
-    if (memcmp(chantable, test_channel_table, 131*4)) {
-        return false;
-    }
-
-    // Test that every channel exists once and only once.
-    int k=0;
-    for (int i=0; i<129; i++) {
-        for (int j=0; j<131; j++) {
-            if (chantable[j] == i) {
-                k++;
-            }
-        }
-        if (k != 1) {
+    int i;
+    uint16_t number_of_channels = 129;
+    int32_t channel;
+    int32_t test_table[number_of_channels];
+    uint8_t mac[8] = {0x00, 0x13, 0x50, 0x04, 0x00, 0x00, 0x05, 0xf8};
+    for (i=0; i<number_of_channels; i++) {
+        test_table[i] = channel = tr51_get_uc_channel_index(i, mac, number_of_channels, NULL, 0);
+// Not sure yet which one is correct since there might be bug in spec
+//        if (channel != test_HopSequenceTable[i]) {
+        if (channel != test_HopSequenceTable2[i]) {
             return false;
         }
-        k=0;
-    }
-    return true;
-}
-
-bool test_tr51_compute_cfd()
-{
-    uint8_t first_element;
-    uint8_t step_size;
-    uint8_t mac[8] = {0x00, 0x13, 0x50, 0x04, 0x00, 0x00, 0x05, 0xf8};
-    // Test generating first element and step size
-    tr51_compute_cfd(mac, &first_element, &step_size , 131);
-    if (122 != first_element) {
-        return false;
-    }
-    if (119 != step_size) {
-        return false;
-    }
-    return true;
-}
-
-bool test_tr51_calculate_hopping_sequence()
-{
-    int32_t chantable[131];
-    int32_t outtable[129];
-    tr51_calculate_channel_table(129, 131, chantable);
-    // Test generating hopping sequence table of specific peer
-    tr51_calculate_hopping_sequence(chantable, 131, 122, 119, outtable, NULL, 0);
-    if (memcmp(outtable, test_HopSequenceTable2, 129*4)) {
-        return false;
     }
     // Test that every channel exists once and only once.
     int k=0;
-    for (int i=0; i<129; i++) {
-        for (int j=0; j<129; j++) {
-            if (outtable[j] == i) {
+    for (int h=0; h<number_of_channels; h++) {
+        for (int j=0; j<number_of_channels; j++) {
+            if (test_table[j] == h) {
                 k++;
             }
         }
@@ -179,17 +103,15 @@ bool test_tr51_calculate_hopping_sequence()
     return true;
 }
 
-bool test_tr51_get_uc_channel_index()
+bool test_tr51_get_bc_channel_index()
 {
     uint16_t number_of_channels = 129;
     int32_t channel;
+    uint16_t bsi = 100;
     int32_t test_table[number_of_channels];
-    uint8_t mac[8] = {0x00, 0x13, 0x50, 0x04, 0x00, 0x00, 0x05, 0xf8};
     for (int i=0; i<number_of_channels; i++) {
-        test_table[i] = channel = tr51_get_uc_channel_index(i, mac, number_of_channels);
-// Not sure yet which one is correct since there might be bug in spec
-//        if (channel != test_HopSequenceTable[i]) {
-        if (channel != test_HopSequenceTable2[i]) {
+        test_table[i] = channel = tr51_get_bc_channel_index(i, bsi, number_of_channels, NULL, 0);
+        if (channel != test_HopSequenceTable3[i]) {
             return false;
         }
     }
@@ -258,21 +180,3 @@ bool test_dh1cf_get_bc_channel_index()
     }
     return true;
 }
-
-bool test_tr51_calc_nearest_prime_number()
-{
-    uint16_t prime_number;
-    int j;
-    for (int i=2; i<1000; i++) {
-        prime_number = tr51_calc_nearest_prime_number(i);
-        for (j=0; j<sizeof(prime_number_table); j++) {
-            if (prime_number == prime_number_table[j]) {
-                break;
-            }
-        }
-        if (j >= sizeof(prime_number_table)) {
-            return false;
-        }
-    }
-    return true;
-}

test/nanostack/unittest/service_libs/channel_functions/test_channel_functions.h

@@ -23,14 +23,10 @@ extern "C" {
 
 #include <stdbool.h>
 
-bool test_tr51_get_rand();
-bool test_tr51_calculate_channel_table();
-bool test_tr51_compute_cfd();
-bool test_tr51_calculate_hopping_sequence();
 bool test_dh1cf_get_uc_channel_index();
 bool test_dh1cf_get_bc_channel_index();
-bool test_tr51_calc_nearest_prime_number();
 bool test_tr51_get_uc_channel_index();
+bool test_tr51_get_bc_channel_index();
 
 #ifdef __cplusplus
 }