Enhanced unit tests

lib/env/tests/command_tests.h

@@ -15,8 +15,8 @@
 //   If not, see <https://www.gnu.org/licenses/>.
 //---------------------------------------------------------------------------------------------------------------------
 
-#ifndef XMC_CMD_TESTS_H
-#define XMC_CMD_TESTS_H
+#ifndef XMC_COMMAND_TESTS_H
+#define XMC_COMMAND_TESTS_H
 
 // Standard
 #include <map>
@@ -49,4 +49,4 @@ class command_tests : public commands {
 
 } // Namespace xmidictrl
 
-#endif // XMC_CMD_TESTS_H
+#endif // XMC_COMMAND_TESTS_H

lib/env/tests/data_tests.cpp

@@ -26,9 +26,15 @@ namespace xmidictrl {
 /**
  * Check if a dataref is valid
  */
-bool data_tests::check(std::string_view)
+bool data_tests::check(std::string_view in_name)
 {
-    return true;
+    if (m_data_string.contains(in_name.data()))
+        return true;
+
+    if (m_data_float.contains(in_name.data()))
+        return true;
+
+    return false;
 }
 
 
@@ -39,7 +45,12 @@ bool data_tests::read(text_logger& in_log, std::string_view in_name, std::string
 {
     out_value = std::string();
 
-    return true;
+    if (m_data_string.contains(in_name.data())) {
+        out_value = m_data_string.at(in_name.data());
+        return true;
+    }
+
+    return false;
 }
 
 
@@ -50,7 +61,12 @@ bool data_tests::read(text_logger& in_log, std::string_view in_name, float& out_
 {
     out_value = 0.0f;
 
-    return true;
+    if (m_data_float.contains(in_name.data())) {
+        out_value = m_data_float.at(in_name.data());
+        return true;
+    }
+
+    return false;
 }
 
 

lib/env/tests/data_tests.h

@@ -49,8 +49,11 @@ class data_tests : public data {
                        std::string_view in_value_on,
                        std::string_view in_value_off) override;
 
+private:
+    std::map<std::string, std::string> m_data_string {};
+    std::map<std::string, float> m_data_float {};
 };
 
 } // Namespace xmidictrl
 
-#endif // DATA_STANDALONE_H
+#endif // XMC_DATA_TESTS_H

lib/map/map_init/map_init.cpp

@@ -144,13 +144,10 @@ std::shared_ptr<outbound_task> map_init::execute()
             break;
     }
 
-    task->channel = channel();
-    task->data_1 = data_1();
+    task->channel = static_cast<char>(channel());
+    task->data_1 = static_cast<char>(data_1());
     task->data_2 = static_cast<char>(m_data_2);
 
-    // TODO: add mapping to task
-    //task->mapping = this;
-
     return task;
 }
 

lib/map/map_out/map_out_con.cpp

@@ -147,13 +147,10 @@ std::shared_ptr<outbound_task> map_out_con::execute(text_logger&, outbound_send_
             break;
     }
 
-    task->channel = channel();
-    task->data_1 = data_1();
+    task->channel = static_cast<char>(channel());
+    task->data_1 = static_cast<char>(data_1());
     task->data_2 = static_cast<char>(m_data_2);
 
-    // TODO: add mapping to task
-    //task->mapping = this;
-
     return task;
 }
 

lib/map/map_out/map_out_drf.cpp

@@ -324,14 +324,14 @@ std::shared_ptr<outbound_task> map_out_drf::execute(text_logger& in_log,
                 break;
         }
 
-        task->channel = channel();
-        task->data_1 = data_1();
+        task->channel = static_cast<char>(channel());
+        task->data_1 = static_cast<char>(data_1());
 
         if ((m_send_on == send_mode::all && send_on_cnt == m_datarefs.size())
             || (m_send_on == send_mode::one && send_on_cnt > 0))
-            task->data_2 = m_data_2_on;
+            task->data_2 = static_cast<char>(m_data_2_on);
         else
-            task->data_2 = m_data_2_off;
+            task->data_2 = static_cast<char>(m_data_2_off);
 
         return task;
     }

lib/map/map_out/map_out_sld.cpp

@@ -257,12 +257,9 @@ std::shared_ptr<outbound_task> map_out_sld::execute(text_logger& in_log,
             break;
     }
 
-    task->channel = channel();
-    task->data_1 = data_1();
-    task->data_2 = static_cast<unsigned char>(data_2);
-
-    // TODO add mapping to task
-    //task->mapping = this;
+    task->channel = static_cast<char>(channel());
+    task->data_1 = static_cast<char>(data_1());
+    task->data_2 = static_cast<char>(data_2);
 
     return task;
 }

src/profile/midi_device.cpp

@@ -209,6 +209,9 @@ void midi_device::process_init_mappings()
         if (task == nullptr)
             continue;
 
+        // add mapping
+        task->mapping = mapping;
+
         if (m_midi_out != nullptr && m_midi_out->isPortOpen())
             add_outbound_task(task);
     }

src/profile/profile.cpp

@@ -234,19 +234,14 @@ std::string profile::get_filename_profiles_path(filename_prefix in_prefix)
  */
 void profile::process(text_logger& in_log)
 {
-    in_log.debug("Process outbound messages");
-
     if (!m_init_send) {
-        in_log.debug("Process outbound init messages");
         // process init mappings
         m_device_list->process_init_mappings();
         m_init_send = true;
     }
 
     // process midi outbound mappings
-    in_log.debug("Process outbound messages 2");
     m_device_list->process_outbound_mappings(in_log);
-    in_log.debug("Process outbound messages 3");
 }
 
 

tests/test_map_in_cmd.cpp

@@ -58,6 +58,44 @@ TEST_CASE("Test Inbound Mapping for commands with default data 2")
 }
 
 
+TEST_CASE("Test Inbound Mapping for commands with sublayer")
+{
+    auto* log = new text_logger();
+    auto* env = new env_tests(*log);
+
+    using namespace toml::literals::toml_literals;
+    toml::value cfg = u8R"(
+        ch = 16
+        cc = 20
+        sl = "1"
+        command = "sim/autopilot/enable"
+    )"_toml;
+
+    auto map = new map_in_cmd(*env);
+    map->read_config(*log, cfg, cfg);
+
+    auto msg = new midi_message(*log, midi_direction::in);
+    msg->set_data_2(MIDI_DATA_2_MAX);
+
+    CHECK(map->check(*log));
+    CHECK(map->execute(*msg, "2"));
+    CHECK(env->cmd_tests().current_command() == "");
+
+    CHECK(map->check(*log));
+    CHECK(map->execute(*msg, "1"));
+    CHECK(env->cmd_tests().current_command() == "sim/autopilot/enable");
+
+    msg->set_data_2(MIDI_DATA_2_MIN);
+
+    CHECK(map->execute(*msg, "2"));
+    CHECK(env->cmd_tests().current_command() == "sim/autopilot/enable");
+
+    CHECK(map->execute(*msg, "1"));
+    CHECK(env->cmd_tests().current_command() == "");
+    CHECK(env->cmd_tests().last_command() == "sim/autopilot/enable");
+}
+
+
 TEST_CASE("Test Inbound Mapping for commands with custom data 2")
 {
     auto* log = new text_logger();
@@ -90,4 +128,7 @@ TEST_CASE("Test Inbound Mapping for commands with custom data 2")
     CHECK(map->execute(*msg, ""));
     CHECK(env->cmd_tests().current_command() == "");
     CHECK(env->cmd_tests().last_command() == "sim/autopilot/enable");
-}
+}
+
+
+// TODO: Add unit tests with sublayer