Removed MockExpectedCallComposite.

Author: jgonzalezdr

include/CppUTestExt/MockCheckedExpectedCall.h

@@ -140,52 +140,6 @@ class MockCheckedExpectedCall : public MockExpectedCall
     unsigned int expectedCalls_;
 };
 
-#if 0
-struct MockExpectedCallCompositeNode;
-class MockExpectedCallComposite : public MockExpectedCall
-{
-public:
-    MockExpectedCallComposite();
-    virtual ~MockExpectedCallComposite();
-
-    virtual MockExpectedCall& withName(const SimpleString& name) _override;
-    virtual MockExpectedCall& withCallOrder(unsigned int callOrder) _override;
-    virtual MockExpectedCall& withBoolParameter(const SimpleString& name, bool value) _override;
-    virtual MockExpectedCall& withIntParameter(const SimpleString& name, int value) _override;
-    virtual MockExpectedCall& withUnsignedIntParameter(const SimpleString& name, unsigned int value) _override;
-    virtual MockExpectedCall& withLongIntParameter(const SimpleString& name, long int value) _override;
-    virtual MockExpectedCall& withUnsignedLongIntParameter(const SimpleString& name, unsigned long int value) _override;
-    virtual MockExpectedCall& withDoubleParameter(const SimpleString& name, double value) _override;
-    virtual MockExpectedCall& withStringParameter(const SimpleString& name, const char* value) _override;
-    virtual MockExpectedCall& withConstPointerParameter(const SimpleString& name, const void* value) _override;
-    virtual MockExpectedCall& withPointerParameter(const SimpleString& name, void* value) _override;
-    virtual MockExpectedCall& withFunctionPointerParameter(const SimpleString& name, void (*value)()) _override;
-    virtual MockExpectedCall& withMemoryBufferParameter(const SimpleString& name, const unsigned char* value, size_t size) _override;
-    virtual MockExpectedCall& withParameterOfType(const SimpleString& typeName, const SimpleString& name, const void* value) _override;
-    virtual MockExpectedCall& withOutputParameterReturning(const SimpleString& name, const void* value, size_t size) _override;
-    virtual MockExpectedCall& withOutputParameterOfTypeReturning(const SimpleString& typeName, const SimpleString& name, const void* value) _override;
-    virtual MockExpectedCall& ignoreOtherParameters() _override;
-
-    virtual MockExpectedCall& andReturnValue(bool value) _override;
-    virtual MockExpectedCall& andReturnValue(int value) _override;
-    virtual MockExpectedCall& andReturnValue(unsigned int value) _override;
-    virtual MockExpectedCall& andReturnValue(long int value) _override;
-    virtual MockExpectedCall& andReturnValue(unsigned long int value) _override;
-    virtual MockExpectedCall& andReturnValue(double value) _override;
-    virtual MockExpectedCall& andReturnValue(const char* value) _override;
-    virtual MockExpectedCall& andReturnValue(void* value) _override;
-    virtual MockExpectedCall& andReturnValue(const void* value) _override;
-    virtual MockExpectedCall& andReturnValue(void (*value)()) _override;
-
-    virtual MockExpectedCall& onObject(void* objectPtr) _override;
-
-    virtual void add(MockExpectedCall& call);
-    virtual void clear();
-private:
-    MockExpectedCallCompositeNode* head_;
-};
-#endif
-
 class MockIgnoredExpectedCall: public MockExpectedCall
 {
 public:

src/CppUTestExt/MockExpectedCall.cpp

@@ -533,235 +533,6 @@ unsigned int MockCheckedExpectedCall::getActualCallsFulfilled() const
     return actualCalls_;
 }
 
-#if 0
-struct MockExpectedCallCompositeNode
-{
-    MockExpectedCallCompositeNode(MockExpectedCall& functionCall, MockExpectedCallCompositeNode* next) : next_(next), call_(functionCall){}
-
-    MockExpectedCallCompositeNode* next_;
-    MockExpectedCall& call_;
-};
-
-MockExpectedCallComposite::MockExpectedCallComposite() : head_(NULL)
-{
-}
-
-MockExpectedCallComposite::~MockExpectedCallComposite()
-{
-
-}
-
-void MockExpectedCallComposite::add(MockExpectedCall& call)
-{
-    head_ = new MockExpectedCallCompositeNode(call, head_);
-}
-
-void MockExpectedCallComposite::clear()
-{
-    while (head_) {
-        MockExpectedCallCompositeNode* next = head_->next_;
-        delete head_;
-        head_ = next;
-    }
-}
-
-MockExpectedCall& MockExpectedCallComposite::withName(const SimpleString& name)
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.withName(name);
-    return *this;
-}
-
-MockExpectedCall& MockExpectedCallComposite::withCallOrder(unsigned int)
-{
-    FAIL("withCallOrder not supported for CompositeCalls");
-    return *this; // LCOV_EXCL_LINE
-}
-
-MockExpectedCall& MockExpectedCallComposite::withBoolParameter(const SimpleString& name, bool value)
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.withParameter(name, value);
-    return *this;
-}
-
-MockExpectedCall& MockExpectedCallComposite::withUnsignedIntParameter(const SimpleString& name, unsigned int value)
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.withParameter(name, value);
-    return *this;
-}
-
-MockExpectedCall& MockExpectedCallComposite::withIntParameter(const SimpleString& name, int value)
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.withParameter(name, value);
-    return *this;
-}
-
-MockExpectedCall& MockExpectedCallComposite::withLongIntParameter(const SimpleString& name, long int value)
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.withParameter(name, value);
-    return *this;
-}
-
-MockExpectedCall& MockExpectedCallComposite::withUnsignedLongIntParameter(const SimpleString& name, unsigned long int value)
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.withParameter(name, value);
-    return *this;
-}
-
-MockExpectedCall& MockExpectedCallComposite::withDoubleParameter(const SimpleString& name, double value)
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.withParameter(name, value);
-    return *this;
-
-}
-
-MockExpectedCall& MockExpectedCallComposite::withStringParameter(const SimpleString& name, const char* value)
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.withParameter(name, value);
-    return *this;
-}
-
-MockExpectedCall& MockExpectedCallComposite::withPointerParameter(const SimpleString& name, void* value)
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.withParameter(name, value);
-    return *this;
-}
-
-MockExpectedCall& MockExpectedCallComposite::withConstPointerParameter(const SimpleString& name, const void* value)
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.withParameter(name, value);
-    return *this;
-}
-
-MockExpectedCall& MockExpectedCallComposite::withFunctionPointerParameter(const SimpleString& name, void (*value)())
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.withParameter(name, value);
-    return *this;
-}
-
-MockExpectedCall& MockExpectedCallComposite::withMemoryBufferParameter(const SimpleString& name, const unsigned char* value, size_t size)
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.withParameter(name, value, size);
-    return *this;
-}
-
-MockExpectedCall& MockExpectedCallComposite::withParameterOfType(const SimpleString& typeName, const SimpleString& name, const void* value)
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.withParameterOfType(typeName, name, value);
-    return *this;
-}
-
-MockExpectedCall& MockExpectedCallComposite::withOutputParameterReturning(const SimpleString& name, const void* value, size_t size)
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.withOutputParameterReturning(name, value, size);
-    return *this;
-}
-
-MockExpectedCall& MockExpectedCallComposite::withOutputParameterOfTypeReturning(const SimpleString& typeName, const SimpleString& name, const void* value)
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.withOutputParameterOfTypeReturning(typeName, name, value);
-    return *this;
-}
-
-MockExpectedCall& MockExpectedCallComposite::ignoreOtherParameters()
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.ignoreOtherParameters();
-    return *this;
-}
-
-MockExpectedCall& MockExpectedCallComposite::andReturnValue(bool value)
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.andReturnValue(value);
-    return *this;
-}
-
-MockExpectedCall& MockExpectedCallComposite::andReturnValue(unsigned int value)
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.andReturnValue(value);
-    return *this;
-}
-
-MockExpectedCall& MockExpectedCallComposite::andReturnValue(int value)
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.andReturnValue(value);
-    return *this;
-}
-
-MockExpectedCall& MockExpectedCallComposite::andReturnValue(long int value)
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.andReturnValue(value);
-    return *this;
-}
-
-MockExpectedCall& MockExpectedCallComposite::andReturnValue(unsigned long int value)
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.andReturnValue(value);
-    return *this;
-}
-
-MockExpectedCall& MockExpectedCallComposite::andReturnValue(double value)
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.andReturnValue(value);
-    return *this;
-}
-
-MockExpectedCall& MockExpectedCallComposite::andReturnValue(const char* value)
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.andReturnValue(value);
-    return *this;
-}
-
-MockExpectedCall& MockExpectedCallComposite::andReturnValue(void* value)
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.andReturnValue(value);
-    return *this;
-}
-
-MockExpectedCall& MockExpectedCallComposite::andReturnValue(const void* value)
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.andReturnValue(value);
-    return *this;
-}
-
-MockExpectedCall& MockExpectedCallComposite::andReturnValue(void (*value)())
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.andReturnValue(value);
-    return *this;
-}
-
-MockExpectedCall& MockExpectedCallComposite::onObject(void* object)
-{
-    for (MockExpectedCallCompositeNode* node = head_; node != NULL; node = node->next_)
-        node->call_.onObject(object);
-    return *this;
-}
-#endif
-
 MockExpectedCall& MockIgnoredExpectedCall::instance()
 {
     static MockIgnoredExpectedCall call;