From 42fc637314439e8f9966e7e67e80b987451a0dc2 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Sun, 26 Sep 2021 22:31:43 +0200
Subject: [PATCH] resolved merge conflict

---
 .../unit/globalfunctions/testDleEncoder.cpp   | 64 -------------------
 1 file changed, 64 deletions(-)

diff --git a/tests/src/fsfw_tests/unit/globalfunctions/testDleEncoder.cpp b/tests/src/fsfw_tests/unit/globalfunctions/testDleEncoder.cpp
index 8cca6dfc..a82ac73a 100644
--- a/tests/src/fsfw_tests/unit/globalfunctions/testDleEncoder.cpp
+++ b/tests/src/fsfw_tests/unit/globalfunctions/testDleEncoder.cpp
@@ -4,69 +4,6 @@
 
 #include <array>
 
-<<<<<<< HEAD
-const std::array<uint8_t, 5> TEST_ARRAY_0 = { 0 };
-const std::array<uint8_t, 3> TEST_ARRAY_1 = { 0, DleEncoder::DLE_CHAR, 5};
-const std::array<uint8_t, 3> TEST_ARRAY_2 = { 0, DleEncoder::STX_CHAR, 5};
-const std::array<uint8_t, 3> TEST_ARRAY_3 = { 0, DleEncoder::CARRIAGE_RETURN, DleEncoder::ETX_CHAR};
-
-TEST_CASE("DleEncoder" , "[DleEncoder]") {
-
-    DleEncoder dleEncoder;
-    std::array<uint8_t, 32> buffer;
-    SECTION("Encoding") {
-        size_t encodedLen = 0;
-        ReturnValue_t result = dleEncoder.encode(TEST_ARRAY_0.data(), TEST_ARRAY_0.size(),
-                buffer.data(), buffer.size(), &encodedLen);
-        REQUIRE(result == retval::CATCH_OK);
-        std::vector<uint8_t> expected = {DleEncoder::STX_CHAR, 0, 0, 0, 0, 0,
-                DleEncoder::ETX_CHAR};
-        for(size_t idx = 0; idx < expected.size(); idx++) {
-            REQUIRE(buffer[idx] == expected[idx]);
-        }
-        REQUIRE(encodedLen == 7);
-
-        result = dleEncoder.encode(TEST_ARRAY_1.data(), TEST_ARRAY_1.size(),
-                buffer.data(), buffer.size(), &encodedLen);
-        REQUIRE(result == retval::CATCH_OK);
-        expected = std::vector<uint8_t>{DleEncoder::STX_CHAR, 0, DleEncoder::DLE_CHAR,
-                DleEncoder::DLE_CHAR, 5, DleEncoder::ETX_CHAR};
-        for(size_t idx = 0; idx < expected.size(); idx++) {
-            REQUIRE(buffer[idx] == expected[idx]);
-        }
-        REQUIRE(encodedLen == expected.size());
-
-        result = dleEncoder.encode(TEST_ARRAY_2.data(), TEST_ARRAY_2.size(),
-                buffer.data(), buffer.size(), &encodedLen);
-        REQUIRE(result == retval::CATCH_OK);
-        expected = std::vector<uint8_t>{DleEncoder::STX_CHAR, 0, DleEncoder::DLE_CHAR,
-               DleEncoder::STX_CHAR + 0x40, 5, DleEncoder::ETX_CHAR};
-        for(size_t idx = 0; idx < expected.size(); idx++) {
-            REQUIRE(buffer[idx] == expected[idx]);
-        }
-        REQUIRE(encodedLen == expected.size());
-
-        result = dleEncoder.encode(TEST_ARRAY_3.data(), TEST_ARRAY_3.size(),
-                buffer.data(), buffer.size(), &encodedLen);
-        REQUIRE(result == retval::CATCH_OK);
-        expected = std::vector<uint8_t>{DleEncoder::STX_CHAR, 0, DleEncoder::CARRIAGE_RETURN,
-            DleEncoder::DLE_CHAR, DleEncoder::ETX_CHAR + 0x40, DleEncoder::ETX_CHAR};
-        for(size_t idx = 0; idx < expected.size(); idx++) {
-            REQUIRE(buffer[idx] == expected[idx]);
-        }
-        REQUIRE(encodedLen == expected.size());
-
-        result = dleEncoder.encode(TEST_ARRAY_3.data(), TEST_ARRAY_3.size(),
-                buffer.data(), 0, &encodedLen);
-        REQUIRE(result == DleEncoder::STREAM_TOO_SHORT);
-        result = dleEncoder.encode(TEST_ARRAY_1.data(), TEST_ARRAY_1.size(),
-                buffer.data(), 4, &encodedLen);
-        REQUIRE(result == DleEncoder::STREAM_TOO_SHORT);
-    }
-
-    SECTION("Decoding") {
-
-=======
 const std::vector<uint8_t> TEST_ARRAY_0 = { 0, 0, 0, 0, 0 };
 const std::vector<uint8_t> TEST_ARRAY_1 = { 0, DleEncoder::DLE_CHAR, 5};
 const std::vector<uint8_t> TEST_ARRAY_2 = { 0, DleEncoder::STX_CHAR, 5};
@@ -281,6 +218,5 @@ TEST_CASE("DleEncoder" , "[DleEncoder]") {
         REQUIRE(result == static_cast<int>(DleEncoder::DECODING_ERROR));
 
         dleEncoder.setEscapeMode(true);
->>>>>>> eive/mueller/added-missing-devicehandlers
     }
 }