Add unit tests for IOutstationApplication::OnConfirmProcess.

dnp3 · Oct 16, 2020 · 6034a89 · 6034a89
1 parent eae6671
commit 6034a89
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 0 deletions.
diff --git a/cpp/tests/dnp3mocks/include/dnp3mocks/MockOutstationApplication.h b/cpp/tests/dnp3mocks/include/dnp3mocks/MockOutstationApplication.h
@@ -25,6 +25,14 @@
 #include <deque>
 #include <tuple>
 
+struct ConfirmResult
+{
+    bool is_unsolicited;
+    uint32_t num_class1;
+    uint32_t num_class2;
+    uint32_t num_class3;
+};
+
 class MockOutstationApplication : public opendnp3::IOutstationApplication
 {
 public:
@@ -119,6 +127,16 @@ class MockOutstationApplication : public opendnp3::IOutstationApplication
         return warmRestartTimeDelay;
     }
 
+    void OnConfirmProcessed(bool is_unsolicited, uint32_t num_class1, uint32_t num_class2, uint32_t num_class3) final
+    {
+        ConfirmResult confirm{};
+        confirm.is_unsolicited = is_unsolicited;
+        confirm.num_class1 = num_class1;
+        confirm.num_class2 = num_class2;
+        confirm.num_class3 = num_class3;
+        this->confirms.push_back(confirm);
+    }
+
     void SetTime(opendnp3::DNPTime time)
     {
         this->currentTime = time;
@@ -143,6 +161,7 @@ class MockOutstationApplication : public opendnp3::IOutstationApplication
     std::deque<opendnp3::UTCTimestamp> timestamps;
     std::deque<std::tuple<opendnp3::AssignClassType, opendnp3::PointClass, uint16_t, uint16_t>> classAssignments;
     std::deque<opendnp3::Indexed<opendnp3::TimeAndInterval>> timeAndIntervals;
+    std::deque<ConfirmResult> confirms;
 };
 
 #endif
diff --git a/cpp/tests/unit/TestOutstationEventResponses.cpp b/cpp/tests/unit/TestOutstationEventResponses.cpp
@@ -137,6 +137,13 @@ TEST_CASE(SUITE("EventBufferOverflowAndClear"))
     t.OnTxReady();
     t.SendToOutstation(hex::SolicitedConfirm(1));
 
+    // Check that the confirm is reported to the IOutstationApplication
+    REQUIRE(t.application->confirms.size() == 1);
+    REQUIRE(t.application->confirms[0].is_unsolicited == false);
+    REQUIRE(t.application->confirms[0].num_class1 == 1);
+    REQUIRE(t.application->confirms[0].num_class2 == 0);
+    REQUIRE(t.application->confirms[0].num_class3 == 0);
+
     t.SendToOutstation("C0 01");
     REQUIRE("C0 81 82 00" == t.lower->PopWriteAsHex());
 }

diff --git a/cpp/tests/unit/TestOutstationUnsolicitedResponses.cpp b/cpp/tests/unit/TestOutstationUnsolicitedResponses.cpp
@@ -277,6 +277,13 @@ TEST_CASE(SUITE("UnsolData"))
     t.OnTxReady();
     t.SendToOutstation(hex::UnsolConfirm(0));
 
+    // Check that the confirm is reported to the IOutstationApplication
+    REQUIRE(t.application->confirms.size() == 1);
+    REQUIRE(t.application->confirms[0].is_unsolicited == true);
+    REQUIRE(t.application->confirms[0].num_class1 == 0);
+    REQUIRE(t.application->confirms[0].num_class2 == 0);
+    REQUIRE(t.application->confirms[0].num_class3 == 0);
+
     // do a transaction before the layer comes online to prove that the null transaction
     // is occuring before unsol data is sent
     t.Transaction([](IUpdateHandler& db) { db.Update(Binary(false, Flags(0x01)), 2); });
@@ -287,6 +294,13 @@ TEST_CASE(SUITE("UnsolData"))
     t.OnTxReady();
     t.SendToOutstation(hex::UnsolConfirm(1));
     REQUIRE(t.lower->PopWriteAsHex().empty());
+
+    // Check that the confirm is reported to the IOutstationApplication
+    REQUIRE(t.application->confirms.size() == 2);
+    REQUIRE(t.application->confirms[1].is_unsolicited == true);
+    REQUIRE(t.application->confirms[1].num_class1 == 0);
+    REQUIRE(t.application->confirms[1].num_class2 == 0);
+    REQUIRE(t.application->confirms[1].num_class3 == 0);
 }
 
 TEST_CASE(SUITE("UnsolEventBufferOverflow"))
@@ -316,6 +330,13 @@ TEST_CASE(SUITE("UnsolEventBufferOverflow"))
     t.OnTxReady();
     t.SendToOutstation(hex::UnsolConfirm(1));
 
+    // Check that the confirm is reported to the IOutstationApplication
+    REQUIRE(t.application->confirms.size() == 2);
+    REQUIRE(t.application->confirms[1].is_unsolicited == true);
+    REQUIRE(t.application->confirms[1].num_class1 == 0);
+    REQUIRE(t.application->confirms[1].num_class2 == 0);
+    REQUIRE(t.application->confirms[1].num_class3 == 0);
+
     REQUIRE(t.lower->PopWriteAsHex().empty());
 }
 
@@ -345,12 +366,26 @@ TEST_CASE(SUITE("UnsolMultiFragments"))
     t.OnTxReady();
     t.SendToOutstation(hex::UnsolConfirm(1));
 
+    // Check that the confirm is reported to the IOutstationApplication
+    REQUIRE(t.application->confirms.size() == 2);
+    REQUIRE(t.application->confirms[1].is_unsolicited == true);
+    REQUIRE(t.application->confirms[1].num_class1 == 1);
+    REQUIRE(t.application->confirms[1].num_class2 == 0);
+    REQUIRE(t.application->confirms[1].num_class3 == 0);
+
     // should immediately try to send another unsol packet
     REQUIRE(t.lower->PopWriteAsHex() == "F2 82 80 00 20 01 28 01 00 03 00 01 0D 00 00 00");
     t.OnTxReady();
     t.SendToOutstation(hex::UnsolConfirm(2));
 
     REQUIRE(t.lower->PopWriteAsHex().empty());
+
+    // Check that the confirm is reported to the IOutstationApplication
+    REQUIRE(t.application->confirms.size() == 3);
+    REQUIRE(t.application->confirms[2].is_unsolicited == true);
+    REQUIRE(t.application->confirms[2].num_class1 == 0);
+    REQUIRE(t.application->confirms[2].num_class2 == 0);
+    REQUIRE(t.application->confirms[2].num_class3 == 0);
 }
 
 void WriteDuringUnsol(bool beforeTx)