Template Singleton make_ functions

Author: zfields

src/NoteTxn.hpp

@@ -7,12 +7,6 @@
 class NoteTxn
 {
 public:
-    /**************************************************************************/
-    /*!
-        @brief  Type used to abstract specific hardware implementation types.
-    */
-    /**************************************************************************/
-    typedef void * param_t;
 
     virtual ~NoteTxn(void) {}
 
@@ -44,8 +38,9 @@ class NoteTxn
                the platform specific transaction implementation.
 */
 /******************************************************************************/
+template <typename T>
 NoteTxn * make_note_txn (
-    NoteTxn::param_t txn_parameters
+    T & txn_parameters
 );
 
 #endif // NOTE_TXN_HPP

src/NoteTxn_Arduino.cpp

@@ -7,21 +7,45 @@
   #include "mock/mock-parameters.hpp"
 #endif
 
+template <>
 NoteTxn *
-make_note_txn (
-    NoteTxn::param_t txn_parameters_
-)
-{
+make_note_txn <std::nullptr_t> (
+    const std::nullptr_t & txn_pins_
+) {
+    // Invalid configuration indicates deletion
+    if (note_txn) {
+        delete note_txn;
+        note_txn = nullptr;
+    }
+    return note_txn;
+}
+
+template <>
+NoteTxn *
+make_note_txn <uint8_t [2]> (
+    uint8_t (&txn_pins_)[2]
+) {
+    return make_note_txn(const_cast<const uint8_t (&)[2]>(txn_pins_));
+}
+
+template <>
+NoteTxn *
+make_note_txn <const uint8_t [2]> (
+    const uint8_t (&txn_pins_)[2]
+) {
+    // Singleton
     static NoteTxn * note_txn = nullptr;
-    if (!txn_parameters_) {
+
+    if (txn_pins_[0] == txn_pins_[1]) {
+        // Invalid configuration indicates deletion
         if (note_txn) {
             delete note_txn;
             note_txn = nullptr;
         }
     } else if (!note_txn) {
-        const uint8_t * txn_pins = reinterpret_cast<uint8_t *>(txn_parameters_);
-        note_txn = new NoteTxn_Arduino(txn_pins[0], txn_pins[1]);
+        note_txn = new NoteTxn_Arduino(txn_pins_[0], txn_pins_[1]);
     }
+
     return note_txn;
 }
 

src/NoteTxn_Arduino.hpp

@@ -15,4 +15,8 @@ class NoteTxn_Arduino final : public NoteTxn
     uint8_t _rtx_pin;
 };
 
+template <> NoteTxn * make_note_txn <std::nullptr_t> (const std::nullptr_t & txn_pins_);
+template <> NoteTxn * make_note_txn <uint8_t [2]> (uint8_t (&txn_pins_)[2]);
+template <> NoteTxn * make_note_txn <const uint8_t [2]> (const uint8_t (&txn_pins_)[2]);
+
 #endif // NOTE_TXN_ARDUINO_HPP

src/Notecard.h

@@ -96,7 +96,8 @@ class Notecard
         setDebugOutputStream(nullptr);
     }
     inline void clearTransactionPins(void) {
-        setTransactionPins(nullptr);
+        uint8_t txn_pins[2] = {0};
+        setTransactionPins(make_note_txn(txn_pins));
     }
     bool debugSyncStatus (int pollFrequencyMs, int maxLevel);
     void deleteResponse(J *rsp) const;

test/NoteTxn_Arduino.test.cpp

@@ -16,7 +16,7 @@ int test_make_note_txn_instantiates_notetxn_object()
   uint8_t txn_pins[2] = {19, 79};
 
   // Action
-  notetxn = make_note_txn(reinterpret_cast<NoteTxn::param_t>(txn_pins));
+  notetxn = make_note_txn(txn_pins);
 
   // Assert
   if (nullptr != notetxn)
@@ -32,7 +32,8 @@ int test_make_note_txn_instantiates_notetxn_object()
   }
 
   // Clean-up
-  make_note_txn(nullptr);
+  uint8_t invalid_pins[2] = {0};
+  make_note_txn(invalid_pins);
 
   return result;
 }
@@ -43,11 +44,11 @@ int test_make_note_txn_enforces_singleton_by_returning_same_notetxn_object_for_a
 
   // Arrange
   uint8_t txn_pins_1[2] = {19, 79};
-  NoteTxn * const notetxn_1 = make_note_txn(reinterpret_cast<NoteTxn::param_t>(txn_pins_1));
+  NoteTxn * const notetxn_1 = make_note_txn(txn_pins_1);
 
   // Action
   uint8_t txn_pins_2[2] = {9, 17};
-  NoteTxn * const notetxn_2 = make_note_txn(reinterpret_cast<NoteTxn::param_t>(txn_pins_2));
+  NoteTxn * const notetxn_2 = make_note_txn(txn_pins_2);
 
   // Assert
   if (notetxn_1 == notetxn_2)
@@ -63,23 +64,25 @@ int test_make_note_txn_enforces_singleton_by_returning_same_notetxn_object_for_a
   }
 
   // Clean-up
-  make_note_txn(nullptr);
+  uint8_t invalid_pins[2] = {0};
+  make_note_txn(invalid_pins);
 
   return result;
 }
 
-//int test_make_note_txn_returns_nullptr_when_nullptr_is_passed_as_parameter()
-int test_make_note_txn_deletes_singleton_when_nullptr_is_passed_as_parameter()
+//int test_make_note_txn_returns_nullptr_when_same_pins_are_passed_as_parameter()
+int test_make_note_txn_deletes_singleton_when_same_pins_are_passed_as_parameter()
 {
   int result;
 
   // Arrange
   uint8_t txn_pins[2] = {19, 79};
-  NoteTxn * notetxn = make_note_txn(reinterpret_cast<NoteTxn::param_t>(txn_pins));
+  NoteTxn * notetxn = make_note_txn(txn_pins);
   assert(notetxn);
 
   // Action
-  notetxn = make_note_txn(nullptr);
+  uint8_t invalid_pins[2] = {0};
+  notetxn = make_note_txn(invalid_pins);
 
   // Assert
   if (nullptr == notetxn)
@@ -605,7 +608,7 @@ int main(void)
   TestFunction tests[] = {
       {test_make_note_txn_instantiates_notetxn_object, "test_make_note_txn_instantiates_notetxn_object"},
       {test_make_note_txn_enforces_singleton_by_returning_same_notetxn_object_for_all_calls, "test_make_note_txn_enforces_singleton_by_returning_same_notetxn_object_for_all_calls"},
-      {test_make_note_txn_deletes_singleton_when_nullptr_is_passed_as_parameter, "test_make_note_txn_deletes_singleton_when_nullptr_is_passed_as_parameter"},
+      {test_make_note_txn_deletes_singleton_when_same_pins_are_passed_as_parameter, "test_make_note_txn_deletes_singleton_when_same_pins_are_passed_as_parameter"},
       {test_notetxn_arduino_constructor_floats_ctx_pin, "test_notetxn_arduino_constructor_floats_ctx_pin"},
       {test_notetxn_arduino_constructor_floats_rtx_pin, "test_notetxn_arduino_constructor_floats_rtx_pin"},
       {test_notetxn_arduino_start_initially_configures_ctx_pin_as_input_pullup, "test_notetxn_arduino_start_initially_configures_ctx_pin_as_input_pullup"},