Remove ArduinoFake_t - use fakeit::Mock directly.

Author: adbancroft

src/ArduinoFake.h

@@ -32,7 +32,7 @@
     new mock##FakeProxy(ArduinoFakeInstance(mock))
 
 #define _ArduinoFakeGetMock(mock) \
-    getArduinoFakeContext()->_##mock.Fake
+    getArduinoFakeContext()->_##mock
 
 #define _ArduinoFakeGetFunction() _ArduinoFakeGetMock(Function)
 #define _ArduinoFakeGetSerial() _ArduinoFakeGetMock(Serial)
@@ -46,28 +46,9 @@
 
 #define ArduinoFake(mock) _ArduinoFakeGet##mock()
 
-template <class FakeT>
-struct ArduinoFake_t
-{
-    fakeit::Mock<FakeT> Fake;
-
-    void Reset(void)
-    {
-        Fake.Reset();
-    }
-
-    FakeT* getFake(void)
-    {
-        return &Fake.get();
-    }
-};
-
-template <class FakeT, class ProxyT, typename BaseT = ArduinoFake_t<FakeT>>
+template <class FakeT, class ProxyT, typename BaseT = fakeit::Mock<FakeT>>
 struct ProxiedArduinoFake_t : public BaseT
-{
-    // Pull in base class getFake()
-    using BaseT::getFake;
-    
+{  
     template <class ArduinoT>
     FakeT* getFake(ArduinoT *instance)
     {
@@ -111,16 +92,13 @@ struct OverrideableProxiedArduinoFake_t : public BaseT
         , _overrides(overrides)
     {
     }
-
-    // Pull in base class getFake()
-    using BaseT::getFake;
-    
+   
     template <class ArduinoT>
     FakeT* getFake(ArduinoT *instance)
     {
-        ArduinoFake_t<FakeT> *pOverride = static_cast<ArduinoFake_t<FakeT> *>(_overrides.getOverride(instance));
+        fakeit::Mock<FakeT> *pOverride = static_cast<fakeit::Mock<FakeT> *>(_overrides.getOverride(instance));
         if (pOverride!=nullptr) {
-            return pOverride->getFake();
+            return &pOverride->get();
         }
         return BaseT::getFake(instance);
     }
@@ -130,7 +108,7 @@ class ArduinoFakeContext
 {
 public:
     FakeOverride_t _fakeOverrides;
-    ArduinoFake_t<FunctionFake> _Function;
+    fakeit::Mock<FunctionFake> _Function;
     OverrideableProxiedArduinoFake_t<SerialFake, SerialFakeProxy> _Serial;
     OverrideableProxiedArduinoFake_t<WireFake, WireFakeProxy> _Wire;
     OverrideableProxiedArduinoFake_t<StreamFake, StreamFakeProxy> _Stream;
@@ -142,7 +120,7 @@ class ArduinoFakeContext
 #define _ArduinoFakeInstanceGetter1(mock) \
     mock##Fake* mock() \
     { \
-        return this->_##mock.getFake(); \
+        return &this->_##mock.get(); \
     }
 
     _ArduinoFakeInstanceGetter1(Print)

test/main.cpp

@@ -16,7 +16,6 @@ using namespace fakeit;
 #include "test_client.h"
 #include "test_arduino_string.h"
 #include "test_include.h"
-#include "test_ArduinoFake_t.h"
 #include "test_ProxiedArduinoFake_t.h"
 #include "test_OverrideableProxiedArduinoFake_t.h"
 
@@ -48,7 +47,6 @@ int main(int argc, char **argv)
     RUN_TEST_GROUP(EEPROMTest);
     RUN_TEST_GROUP(ClientTest);
     RUN_TEST_GROUP(IncludeTest);
-    RUN_TEST_GROUP(ArduinoFakeTTest);
     RUN_TEST_GROUP(ProxiedArduinoFakeTTest);
     RUN_TEST_GROUP(OverrideableProxiedArduinoFakeTTest);
 

test/test_ArduinoFake_t.h

@@ -30,9 +30,9 @@ namespace OverrideableProxiedArduinoFakeTTest
         TEST_ASSERT_EQUAL_PTR(proxy.getFake(), subject.getFake<IArduino>(&proxy));
 
         // Should return the alternate, since it's now overriden
-        ArduinoFake_t<IDummy> alternateFake;
+        fakeit::Mock<IDummy> alternateFake;
         overrides.setOverride(&proxy, &alternateFake);
-        TEST_ASSERT_EQUAL_PTR(alternateFake.getFake(), subject.getFake<IArduino>(&proxy));
+        TEST_ASSERT_EQUAL_PTR(&alternateFake.get(), subject.getFake<IArduino>(&proxy));
     }
 
     void run_tests(void)