X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/1dd4c748cdeb86cac49be8ff47eb4637e7145dbe..8e80bb9cec2c90dd61f810fb1525932a434288eb:/tests/test_admin_conf.cpp?ds=sidebyside diff --git a/tests/test_admin_conf.cpp b/tests/test_admin_conf.cpp index 7a54c480..ef98db19 100644 --- a/tests/test_admin_conf.cpp +++ b/tests/test_admin_conf.cpp @@ -6,12 +6,12 @@ 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 }; }; @@ -26,7 +26,7 @@ namespace tut { set_test_name("Check default constructor"); - PRIV zero; + STG::Priv zero; ensure("zero.userStat == 0", zero.userStat == 0); ensure("zero.userConf == 0", zero.userConf == 0); @@ -35,21 +35,23 @@ 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); + ensure("zero.toInt() == 0", zero.toInt() == 0); } template<> 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 + STG::Priv priv1(ONES | (i << 0x12)); // All 1 ensure_equals("priv1.userStat == 1", priv1.userStat, 1); ensure_equals("priv1.userConf == 1", priv1.userConf, 1); @@ -58,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(ONES)); + ensure_equals("priv1.toInt() == 0x00015555", priv1.toInt(), static_cast(ONES)); - PRIV priv2(TWOS | (i << 0x0E)); // All 2 + STG::Priv priv2(TWOS | (i << 0x12)); // All 2 ensure_equals("priv2.userStat == 2", priv2.userStat, 2); ensure_equals("priv2.userConf == 2", priv2.userConf, 2); @@ -70,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(TWOS)); + ensure_equals("priv2.toInt() = 0x0002AAAA", priv2.toInt(), static_cast(TWOS)); - PRIV priv3(THREES | (i << 0x0E)); // All 3 + STG::Priv priv3(THREES | (i << 0x12)); // All 3 ensure_equals("priv3.userStat == 3", priv3.userStat, 3); ensure_equals("priv3.userConf == 3", priv3.userConf, 3); @@ -82,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(THREES)); + ensure_equals("priv3.toInt() = 0x0003FFFF", priv3.toInt(), static_cast(THREES)); - PRIV pm1(MIX1 | (i << 0x0E)); // 0123012 + STG::Priv pm1(MIX1 | (i << 0x12)); // 012301230 ensure_equals("pm1.userStat == 0", pm1.userStat, 0); ensure_equals("pm1.userConf == 1", pm1.userConf, 1); @@ -94,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(MIX1)); + ensure_equals("pm1.toInt() = 0xE4E4", pm1.toInt(), static_cast(MIX1)); - PRIV pm2(MIX2 | (i << 0x0E)); // 0123012 + STG::Priv pm2(MIX2 | (i << 0x12)); // 210321032 ensure_equals("pm2.userStat == 2", pm2.userStat, 2); ensure_equals("pm2.userConf == 1", pm2.userConf, 1); @@ -106,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(MIX2)); + ensure_equals("pm2.toInt() = 0x0002C6C6", pm2.toInt(), static_cast(MIX2)); - PRIV pm3(MIX3 | (i << 0x0E)); // 3210321 + STG::Priv pm3(MIX3 | (i << 0x12)); // 321032103 ensure_equals("pm3.userStat == 3", pm3.userStat, 3); ensure_equals("pm3.userConf == 2", pm3.userConf, 2); @@ -118,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(MIX3)); + ensure_equals("pm3.toInt() = 0x00031B1B", pm3.toInt(), static_cast(MIX3)); } @@ -129,14 +143,14 @@ 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 + STG::Priv priv1(ONES | (i << 0x12)); // All 1 + ensure_equals("priv1.userStat == 1", priv1.userStat, 1); ensure_equals("priv1.userConf == 1", priv1.userConf, 1); @@ -145,11 +159,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(ONES)); + ensure_equals("priv1.toInt() == 0x00015555", priv1.toInt(), static_cast(ONES)); - PRIV priv2; - priv2.FromInt(TWOS | (i << 0x0E)); // All 2 + STG::Priv priv2(TWOS | (i << 0x12)); // All 2 ensure_equals("priv2.userStat == 2", priv2.userStat, 2); ensure_equals("priv2.userConf == 2", priv2.userConf, 2); @@ -158,11 +173,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(TWOS)); + ensure_equals("priv2.toInt() = 0x0002AAAA", priv2.toInt(), static_cast(TWOS)); - PRIV priv3; - priv3.FromInt(THREES | (i << 0x0E)); // All 3 + STG::Priv priv3(THREES | (i << 0x12)); // All 3 ensure_equals("priv3.userStat == 3", priv3.userStat, 3); ensure_equals("priv3.userConf == 3", priv3.userConf, 3); @@ -171,11 +187,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(THREES)); + ensure_equals("priv3.toInt() = 0x0003FFFF", priv3.toInt(), static_cast(THREES)); - PRIV pm1; - pm1.FromInt(MIX1 | (i << 0x0E)); // 0123012 + STG::Priv pm1(MIX1 | (i << 0x12)); // 012301230 ensure_equals("pm1.userStat == 0", pm1.userStat, 0); ensure_equals("pm1.userConf == 1", pm1.userConf, 1); @@ -184,11 +201,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(MIX1)); + ensure_equals("pm1.toInt() = 0xE4E4", pm1.toInt(), static_cast(MIX1)); - PRIV pm2; - pm2.FromInt(MIX2 | (i << 0x0E)); // 0123012 + STG::Priv pm2(MIX2 | (i << 0x12)); // 210321032 ensure_equals("pm2.userStat == 2", pm2.userStat, 2); ensure_equals("pm2.userConf == 1", pm2.userConf, 1); @@ -197,11 +215,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(MIX2)); + ensure_equals("pm2.toInt() = 0x0002C6C6", pm2.toInt(), static_cast(MIX2)); - PRIV pm3; - pm3.FromInt(MIX3 | (i << 0x0E)); // 3210321 + STG::Priv pm3(MIX3 | (i << 0x12)); // 321032103 ensure_equals("pm3.userStat == 3", pm3.userStat, 3); ensure_equals("pm3.userConf == 2", pm3.userConf, 2); @@ -210,8 +229,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(MIX3)); + ensure_equals("pm3.toInt() = 0x00031B1B", pm3.toInt(), static_cast(MIX3)); }