Diff: MaximTinyTester.h

Revision:

12:55db0f4a417d

Parent:

10:b11ab5d7ac58

Child:

14:10219b869ac3

--- a/MaximTinyTester.h	Sun Mar 29 15:57:49 2020 -0700
+++ b/MaximTinyTester.h	Mon Apr 13 02:53:26 2020 +0000
@@ -116,57 +116,80 @@
     bool Expect(const char *nameOfTest, int actual_result, int expect_result);
     bool Expect(const char *nameOfTest, double actual_result, double expect_result);
 
-    bool FunctionCall_Expect(const char *nameOfFunctionUnderTest, 
+    bool FunctionCall_u_f_Expect(const char *nameOfFunctionUnderTest, 
         Callback<uint16_t(double)> functionUnderTest,
         double arg_1_voltageV,
         uint16_t expect_result);
 
-    bool FunctionCall_Expect(const char *nameOfFunctionUnderTest, 
+    bool FunctionCall_f_d_Expect(const char *nameOfFunctionUnderTest, 
         Callback<double(int)> functionUnderTest,
         int arg_1_u16,
         double expect_result);
 
-    bool FunctionCall_Expect(const char *nameOfFunctionUnderTest, 
+    bool FunctionCall_f_d_d_Expect(const char *nameOfFunctionUnderTest, 
+        Callback<double(int, int)> functionUnderTest,
+        int arg_1_int,
+        int arg_2_int,
+        double expect_result);
+
+    bool FunctionCall_f_lu_Expect(const char *nameOfFunctionUnderTest, 
         Callback<double(uint32_t)> functionUnderTest,
         uint32_t arg_1_u32,
         double expect_result);
 
-    bool FunctionCall_Expect(const char *nameOfFunctionUnderTest, 
+    bool FunctionCall_f_f_Expect(const char *nameOfFunctionUnderTest, 
         Callback<double(double)> functionUnderTest,
         double arg_1_d,
         double expect_result);
 
-    bool FunctionCall_Expect(const char *nameOfFunctionUnderTest, 
+    bool FunctionCall_su_Expect(const char *nameOfFunctionUnderTest, 
         Callback<uint8_t()> functionUnderTest,
         uint8_t expect_result);
 
-    bool FunctionCall_Expect(const char *nameOfFunctionUnderTest, 
+    bool FunctionCall_su_su_Expect(const char *nameOfFunctionUnderTest, 
+        Callback<uint8_t(uint8_t)> functionUnderTest,
+        uint8_t arg_1,
+        uint8_t expect_result);
+
+    bool FunctionCall_su_d_Expect(const char *nameOfFunctionUnderTest, 
         Callback<uint8_t(int)> functionUnderTest,
         int arg_1,
         uint8_t expect_result);
 
-    bool FunctionCall_Expect(const char *nameOfFunctionUnderTest, 
+    bool FunctionCall_su_su_su_Expect(const char *nameOfFunctionUnderTest, 
+        Callback<uint8_t(uint8_t, uint8_t)> functionUnderTest,
+        uint8_t arg_1,
+        uint8_t arg_2,
+        uint8_t expect_result);
+
+    bool FunctionCall_su_d_d_Expect(const char *nameOfFunctionUnderTest, 
         Callback<uint8_t(int, int)> functionUnderTest,
         int arg_1,
         int arg_2,
         uint8_t expect_result);
 
+    bool FunctionCall_su_d_lu_Expect(const char *nameOfFunctionUnderTest, 
+        Callback<uint8_t(int, uint32_t)> functionUnderTest,
+        int arg_1,
+        uint32_t arg_2,
+        uint8_t expect_result);
 
-    bool FunctionCall_i_pi_Expect(const char *nameOfFunctionUnderTest, 
+
+    bool FunctionCall_su_d_plu_Expect(const char *nameOfFunctionUnderTest, 
         Callback<uint8_t(int, uint32_t*)> functionUnderTest,
         int arg_1,
         uint32_t* arg_2,
         uint8_t expect_result,
         uint32_t expect_buffer);
 
-    bool FunctionCall_Expect(const char *nameOfFunctionUnderTest, 
+    bool FunctionCall_su_su_su_su_Expect(const char *nameOfFunctionUnderTest, 
         Callback<uint8_t(uint8_t, uint8_t, uint8_t)> functionUnderTest,
         uint8_t arg_1,
         uint8_t arg_2,
         uint8_t arg_3,
         uint8_t expect_result);
 
-    bool FunctionCall_Expect(const char *nameOfFunctionUnderTest, 
+    bool FunctionCall_su_su_su_su_su_Expect(const char *nameOfFunctionUnderTest, 
         Callback<uint8_t(uint8_t, uint8_t, uint8_t, uint8_t)> functionUnderTest,
         uint8_t arg_1,
         uint8_t arg_2,
@@ -174,7 +197,7 @@
         uint8_t arg_4,
         uint8_t expect_result);
 
-    bool FunctionCall_Expect(const char *nameOfFunctionUnderTest, 
+    bool FunctionCall_su_su_su_su_su_su_Expect(const char *nameOfFunctionUnderTest, 
         Callback<uint8_t(uint8_t, uint8_t, uint8_t, uint8_t, uint8_t)> functionUnderTest,
         uint8_t arg_1,
         uint8_t arg_2,
@@ -184,7 +207,7 @@
         uint8_t expect_result);
 
 // TODO1 #167 support callback<uint8_t(uint8_t, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t)>
-//    bool FunctionCall_Expect(const char *nameOfFunctionUnderTest, 
+//    bool FunctionCall_su_su_su_su_su_su_su_Expect(const char *nameOfFunctionUnderTest, 
 //        Callback<uint8_t(uint8_t, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t)> functionUnderTest,
 //        uint8_t arg_1,
 //        uint8_t arg_2,