...

tests/adc_netmsg_test.cpp

@@ -84,91 +84,21 @@ TEST_CASE("[ADC NET MESSAGE]")
     std::cout << "EPT: [" << ept.endpoint() << "]\n";
 
 
-    std::string bs = "  SET   EXP  1.24    0.23652 9.765432  ";
+    std::cout << "\n\n";
+    std::string bs;
+
+    AdcDeviceProtoMessage dpm(bs);
+
+    std::cout << std::boolalpha << "IS VALID: " << dpm.isValid() << "\n";
+
+    dpm.ack();
     std::cout << "BS: {" << bs << "}\n";
+    std::cout << "BS SZ: " << bs.size() << "\n";
 
-    AdcDeviceNetMessage md(bs);
+    dpm.set("FILTER", "V", 1.1, std::make_tuple("1.1", 33.77));
+    std::cout << "BS: {" << bs << "}\n";
+    std::cout << "BS SZ: " << bs.size() << "\n";
 
-    std::cout << "KEY = {" << md.key() << "}\n";
-    std::cout << "VALUE = {" << md.value() << "}\n";
-    for (auto& pp : md.params(2, 2)) {
-        std::cout << "PAR: {" << pp << "}\n";
-    }
-
-    auto st = md.joinParams(0, 3);
-    std::cout << "JOIN: {" << st << "}\n";
-
-    // md.setKeyValue(11, std::make_tuple("1.1", 33.77));
-    md.setKeyValue(std::string_view("SET"), std::make_tuple("1.1", 33.77), "OPER", 1.0, 33.44);
-    std::cout << "BS: " << bs << "\n";
-
-    md.setKeyParams(std::string_view("SET_ATTR"), std::make_tuple("1.1", 33.77), 77.33, "DEDE");
-    std::cout << "BS: " << bs << "\n";
+    std::cout << std::boolalpha << "IS SET: " << dpm.isSET() << "\n";
+    std::cout << std::boolalpha << "IS VALID: " << dpm.isValid() << "\n";
 }
-
-/*
-TEST_CASE("[ADC NET MESSAGE]")
-{
-    AdcKeyParamNetMessage<DD> msg;
-
-    std::string_view bytes{"SET=POS 1 2 3 4 5"};
-
-    std::cout << "INPUT BYTES: [" << bytes << "]\n";
-
-    msg.setFromBytes(bytes.begin(), bytes.end());
-
-    std::string key, pars, bb;
-    msg.key(key);
-    std::cout << "KEY: [" << key << "]\n";
-
-    msg.paramsBytes(pars);
-    std::cout << "PARS BYTES: [" << pars << "]\n";
-    pars.clear();
-    msg.paramsBytes(pars, 2, 3);
-    std::cout << "PARS BYTES: [" << pars << "]\n";
-
-    std::list<std::string> ls;
-    msg.params(ls, 0, 3);
-    for (auto& el : ls) {
-        std::cout << "PAR: [" << el << "]\n";
-    }
-
-    msg.bytes(bb);
-    std::cout << "MESSAGE: [" << bb << "]\n";
-
-    REQUIRE_EQ(bb, bytes);
-
-    // msg.setKeyParam("GET", "IMAGE", std::string_view("CROP"), 4, 7, std::make_pair(10, 20));
-    msg.setKeyParam("GET", "IMAGE", std::string_view("CROP"), 4, 7);
-    bb.clear();
-    msg.bytes(bb);
-
-    std::cout << "MSG: [" << bb << "]\n";
-    key.clear();
-    msg.key(key);
-    std::cout << "KEY: [" << key << "]\n";
-    ls.clear();
-    msg.params(ls, 1, 3);
-    for (auto& el : ls) {
-        std::cout << "PAR: [" << el << "]\n";
-    }
-
-
-    ls = {"AAA", "BBB", "CCC"};
-    std::string sr{"RES: "};
-    std::vector<std::string_view> vsv;
-
-
-    auto N = utils::AdcReturnRangeElementsView(ls, std::string_view("<>"), vsv);
-
-    std::cout << "\n\nN = " << N << "\n";
-    for (auto& el : vsv) {
-        std::cout << el << "\n";
-    }
-
-    N = utils::AdcJoinRange(ls, std::string_view("*"), sr);
-    std::cout << "\n\nN = " << N << "\n";
-    std::cout << sr << "\n";
-}
-
-*/