Ticket 37. In the if() construction for the changePolicyTimeout

[stg.git] / tests / test_admin_conf.cpp

diff --git a/tests/test_admin_conf.cpp b/tests/test_admin_conf.cpp
index 51913d5c0839e269599be6239ae4105c530f44e1..dad51b18b245a2867ec4d1ab4fb82af658783503 100644 (file)
--- a/tests/test_admin_conf.cpp
+++ b/tests/test_admin_conf.cpp
@@ -1,19 +1,17 @@
-#include <iostream>
+#include "tut/tut.hpp"
 
-#include <tut/tut.hpp>
-
-#include "admin_conf.h"
+#include "stg/admin_conf.h"
 
 namespace tut
 {
     struct priv_data {
         enum {
-            MIX2 = 0x06C6, // 2103210
-            ONES = 0x1555,
-            MIX3 = 0x1B1B, // 3210321
-            TWOS = 0x2AAA,
-            MIX1 = 0x24E4, // 0123012
-            THREES = 0x3FFF
+            MIX2 = 0x0002C6C6, // 210321032
+            ONES = 0x00015555,
+            MIX3 = 0x00031B1B, // 321032103
+            TWOS = 0x0002AAAA,
+            MIX1 = 0x0000E4E4, // 012301230
+            THREES = 0x0003FFFF
         };
     };
 
@@ -37,6 +35,8 @@ namespace tut
         ensure("zero.userAddDel == 0", zero.userAddDel == 0);
         ensure("zero.adminChg == 0", zero.adminChg == 0);
         ensure("zero.tariffChg == 0", zero.tariffChg == 0);
+        ensure("zero.serviceChg == 0", zero.serviceChg == 0);
+        ensure("zero.corpChg == 0", zero.corpChg == 0);
 
         ensure("zero.ToInt() == 0", zero.ToInt() == 0);
     }
@@ -45,13 +45,13 @@ namespace tut
     template<>
     void testobject::test<2>()
     {
-        set_test_name("Check uint16_t conversions");
+        set_test_name("Check uint32_t conversions");
 
-        for (uint16_t i = 0; i < 4; ++i) {
+        for (uint8_t i = 0; i < 4; ++i) {
 
             // 'i' is extra trash in high bits
 
-            PRIV priv1(ONES | (i << 0x0E)); // All 1
+            PRIV priv1(ONES | (i << 0x12)); // All 1
 
             ensure_equals("priv1.userStat == 1", priv1.userStat, 1);
             ensure_equals("priv1.userConf == 1", priv1.userConf, 1);
@@ -60,10 +60,12 @@ namespace tut
             ensure_equals("priv1.userAddDel == 1", priv1.userAddDel, 1);
             ensure_equals("priv1.adminChg == 1", priv1.adminChg, 1);
             ensure_equals("priv1.tariffChg == 1", priv1.tariffChg, 1);
+            ensure_equals("priv1.serviceChg == 1", priv1.serviceChg, 1);
+            ensure_equals("priv1.corpChg == 1", priv1.corpChg, 1);
 
-            ensure_equals("priv1.ToInt() == 0x1555", priv1.ToInt(), static_cast<uint16_t>(ONES));
+            ensure_equals("priv1.ToInt() == 0x00015555", priv1.ToInt(), static_cast<uint32_t>(ONES));
 
-            PRIV priv2(TWOS | (i << 0x0E)); // All 2
+            PRIV priv2(TWOS | (i << 0x12)); // All 2
 
             ensure_equals("priv2.userStat == 2", priv2.userStat, 2);
             ensure_equals("priv2.userConf == 2", priv2.userConf, 2);
@@ -72,10 +74,12 @@ namespace tut
             ensure_equals("priv2.userAddDel == 2", priv2.userAddDel, 2);
             ensure_equals("priv2.adminChg == 2", priv2.adminChg, 2);
             ensure_equals("priv2.tariffChg == 2", priv2.tariffChg, 2);
+            ensure_equals("priv2.serviceChg == 2", priv2.serviceChg, 2);
+            ensure_equals("priv2.corpChg == 2", priv2.corpChg, 2);
 
-            ensure_equals("priv2.ToInt() = 0x2AAA", priv2.ToInt(), static_cast<uint16_t>(TWOS));
+            ensure_equals("priv2.ToInt() = 0x0002AAAA", priv2.ToInt(), static_cast<uint32_t>(TWOS));
 
-            PRIV priv3(THREES | (i << 0x0E)); // All 3
+            PRIV priv3(THREES | (i << 0x12)); // All 3
 
             ensure_equals("priv3.userStat == 3", priv3.userStat, 3);
             ensure_equals("priv3.userConf == 3", priv3.userConf, 3);
@@ -84,10 +88,12 @@ namespace tut
             ensure_equals("priv3.userAddDel == 3", priv3.userAddDel, 3);
             ensure_equals("priv3.adminChg == 3", priv3.adminChg, 3);
             ensure_equals("priv3.tariffChg == 3", priv3.tariffChg, 3);
+            ensure_equals("priv3.serviceChg == 3", priv3.serviceChg, 3);
+            ensure_equals("priv3.corpChg == 3", priv3.corpChg, 3);
 
-            ensure_equals("priv2.ToInt() = 0x3FFF", priv3.ToInt(), static_cast<uint16_t>(THREES));
+            ensure_equals("priv3.ToInt() = 0x0003FFFF", priv3.ToInt(), static_cast<uint32_t>(THREES));
 
-            PRIV pm1(MIX1 | (i << 0x0E)); // 0123012
+            PRIV pm1(MIX1 | (i << 0x12)); // 012301230
 
             ensure_equals("pm1.userStat == 0", pm1.userStat, 0);
             ensure_equals("pm1.userConf == 1", pm1.userConf, 1);
@@ -96,10 +102,12 @@ namespace tut
             ensure_equals("pm1.userAddDel == 0", pm1.userAddDel, 0);
             ensure_equals("pm1.adminChg == 1", pm1.adminChg, 1);
             ensure_equals("pm1.tariffChg == 2", pm1.tariffChg, 2);
+            ensure_equals("pm1.serviceChg == 3", pm1.serviceChg, 3);
+            ensure_equals("pm1.corpChg == 0", pm1.corpChg, 0);
 
-            ensure_equals("pm1.ToInt() = 0x24E4", pm1.ToInt(), static_cast<uint16_t>(MIX1));
+            ensure_equals("pm1.ToInt() = 0xE4E4", pm1.ToInt(), static_cast<uint32_t>(MIX1));
 
-            PRIV pm2(MIX2 | (i << 0x0E)); // 0123012
+            PRIV pm2(MIX2 | (i << 0x12)); // 210321032
 
             ensure_equals("pm2.userStat == 2", pm2.userStat, 2);
             ensure_equals("pm2.userConf == 1", pm2.userConf, 1);
@@ -108,10 +116,12 @@ namespace tut
             ensure_equals("pm2.userAddDel == 2", pm2.userAddDel, 2);
             ensure_equals("pm2.adminChg == 1", pm2.adminChg, 1);
             ensure_equals("pm2.tariffChg == 0", pm2.tariffChg, 0);
+            ensure_equals("pm2.serviceChg == 3", pm2.serviceChg, 3);
+            ensure_equals("pm2.corpChg == 2", pm2.corpChg, 2);
 
-            ensure_equals("pm2.ToInt() = 0x06C6", pm2.ToInt(), static_cast<uint16_t>(MIX2));
+            ensure_equals("pm2.ToInt() = 0x0002C6C6", pm2.ToInt(), static_cast<uint32_t>(MIX2));
 
-            PRIV pm3(MIX3 | (i << 0x0E)); // 3210321
+            PRIV pm3(MIX3 | (i << 0x12)); // 321032103
 
             ensure_equals("pm3.userStat == 3", pm3.userStat, 3);
             ensure_equals("pm3.userConf == 2", pm3.userConf, 2);
@@ -120,8 +130,10 @@ namespace tut
             ensure_equals("pm3.userAddDel == 3", pm3.userAddDel, 3);
             ensure_equals("pm3.adminChg == 2", pm3.adminChg, 2);
             ensure_equals("pm3.tariffChg == 1", pm3.tariffChg, 1);
+            ensure_equals("pm3.serviceChg == 0", pm3.serviceChg, 0);
+            ensure_equals("pm3.corpChg == 3", pm3.corpChg, 3);
 
-            ensure_equals("pm3.ToInt() = 0x1B1B", pm3.ToInt(), static_cast<uint16_t>(MIX3));
+            ensure_equals("pm3.ToInt() = 0x00031B1B", pm3.ToInt(), static_cast<uint32_t>(MIX3));
 
         }
 
@@ -131,14 +143,15 @@ namespace tut
     template<>
     void testobject::test<3>()
     {
-        set_test_name("Check explicit uint16_t conversions");
+        set_test_name("Check explicit uint32_t conversions");
 
-        for (uint16_t i = 0; i < 4; ++i) {
+        for (uint8_t i = 0; i < 4; ++i) {
 
             // 'i' is extra trash in high bits
 
             PRIV priv1;
-            priv1.FromInt(ONES | (i << 0x0E)); // All 1
+            priv1.FromInt(ONES | (i << 0x12)); // All 1
+
 
             ensure_equals("priv1.userStat == 1", priv1.userStat, 1);
             ensure_equals("priv1.userConf == 1", priv1.userConf, 1);
@@ -147,11 +160,13 @@ namespace tut
             ensure_equals("priv1.userAddDel == 1", priv1.userAddDel, 1);
             ensure_equals("priv1.adminChg == 1", priv1.adminChg, 1);
             ensure_equals("priv1.tariffChg == 1", priv1.tariffChg, 1);
+            ensure_equals("priv1.serviceChg == 1", priv1.serviceChg, 1);
+            ensure_equals("priv1.corpChg == 1", priv1.corpChg, 1);
 
-            ensure_equals("priv1.ToInt() == 0x1555", priv1.ToInt(), static_cast<uint16_t>(ONES));
+            ensure_equals("priv1.ToInt() == 0x00015555", priv1.ToInt(), static_cast<uint32_t>(ONES));
 
             PRIV priv2;
-            priv2.FromInt(TWOS | (i << 0x0E)); // All 2
+            priv2.FromInt(TWOS | (i << 0x12)); // All 2
 
             ensure_equals("priv2.userStat == 2", priv2.userStat, 2);
             ensure_equals("priv2.userConf == 2", priv2.userConf, 2);
@@ -160,11 +175,13 @@ namespace tut
             ensure_equals("priv2.userAddDel == 2", priv2.userAddDel, 2);
             ensure_equals("priv2.adminChg == 2", priv2.adminChg, 2);
             ensure_equals("priv2.tariffChg == 2", priv2.tariffChg, 2);
+            ensure_equals("priv2.serviceChg == 2", priv2.serviceChg, 2);
+            ensure_equals("priv2.corpChg == 2", priv2.corpChg, 2);
 
-            ensure_equals("priv2.ToInt() = 0x2AAA", priv2.ToInt(), static_cast<uint16_t>(TWOS));
+            ensure_equals("priv2.ToInt() = 0x0002AAAA", priv2.ToInt(), static_cast<uint32_t>(TWOS));
 
             PRIV priv3;
-            priv3.FromInt(THREES | (i << 0x0E)); // All 3
+            priv3.FromInt(THREES | (i << 0x12)); // All 3
 
             ensure_equals("priv3.userStat == 3", priv3.userStat, 3);
             ensure_equals("priv3.userConf == 3", priv3.userConf, 3);
@@ -173,11 +190,13 @@ namespace tut
             ensure_equals("priv3.userAddDel == 3", priv3.userAddDel, 3);
             ensure_equals("priv3.adminChg == 3", priv3.adminChg, 3);
             ensure_equals("priv3.tariffChg == 3", priv3.tariffChg, 3);
+            ensure_equals("priv3.serviceChg == 3", priv3.serviceChg, 3);
+            ensure_equals("priv3.corpChg == 3", priv3.corpChg, 3);
 
-            ensure_equals("priv2.ToInt() = 0x3FFF", priv3.ToInt(), static_cast<uint16_t>(THREES));
+            ensure_equals("priv3.ToInt() = 0x0003FFFF", priv3.ToInt(), static_cast<uint32_t>(THREES));
 
             PRIV pm1;
-            pm1.FromInt(MIX1 | (i << 0x0E)); // 0123012
+            pm1.FromInt(MIX1 | (i << 0x12)); // 012301230
 
             ensure_equals("pm1.userStat == 0", pm1.userStat, 0);
             ensure_equals("pm1.userConf == 1", pm1.userConf, 1);
@@ -186,11 +205,13 @@ namespace tut
             ensure_equals("pm1.userAddDel == 0", pm1.userAddDel, 0);
             ensure_equals("pm1.adminChg == 1", pm1.adminChg, 1);
             ensure_equals("pm1.tariffChg == 2", pm1.tariffChg, 2);
+            ensure_equals("pm1.serviceChg == 3", pm1.serviceChg, 3);
+            ensure_equals("pm1.corpChg == 0", pm1.corpChg, 0);
 
-            ensure_equals("pm1.ToInt() = 0x24E4", pm1.ToInt(), static_cast<uint16_t>(MIX1));
+            ensure_equals("pm1.ToInt() = 0xE4E4", pm1.ToInt(), static_cast<uint32_t>(MIX1));
 
             PRIV pm2;
-            pm2.FromInt(MIX2 | (i << 0x0E)); // 0123012
+            pm2.FromInt(MIX2 | (i << 0x12)); // 210321032
 
             ensure_equals("pm2.userStat == 2", pm2.userStat, 2);
             ensure_equals("pm2.userConf == 1", pm2.userConf, 1);
@@ -199,11 +220,13 @@ namespace tut
             ensure_equals("pm2.userAddDel == 2", pm2.userAddDel, 2);
             ensure_equals("pm2.adminChg == 1", pm2.adminChg, 1);
             ensure_equals("pm2.tariffChg == 0", pm2.tariffChg, 0);
+            ensure_equals("pm2.serviceChg == 3", pm2.serviceChg, 3);
+            ensure_equals("pm2.corpChg == 2", pm2.corpChg, 2);
 
-            ensure_equals("pm2.ToInt() = 0x06C6", pm2.ToInt(), static_cast<uint16_t>(MIX2));
+            ensure_equals("pm2.ToInt() = 0x0002C6C6", pm2.ToInt(), static_cast<uint32_t>(MIX2));
 
             PRIV pm3;
-            pm3.FromInt(MIX3 | (i << 0x0E)); // 3210321
+            pm3.FromInt(MIX3 | (i << 0x12)); // 321032103
 
             ensure_equals("pm3.userStat == 3", pm3.userStat, 3);
             ensure_equals("pm3.userConf == 2", pm3.userConf, 2);
@@ -212,8 +235,10 @@ namespace tut
             ensure_equals("pm3.userAddDel == 3", pm3.userAddDel, 3);
             ensure_equals("pm3.adminChg == 2", pm3.adminChg, 2);
             ensure_equals("pm3.tariffChg == 1", pm3.tariffChg, 1);
+            ensure_equals("pm3.serviceChg == 0", pm3.serviceChg, 0);
+            ensure_equals("pm3.corpChg == 3", pm3.corpChg, 3);
 
-            ensure_equals("pm3.ToInt() = 0x1B1B", pm3.ToInt(), static_cast<uint16_t>(MIX3));
+            ensure_equals("pm3.ToInt() = 0x00031B1B", pm3.ToInt(), static_cast<uint32_t>(MIX3));
 
         }