From 2f00cb1b752a90fbfc9d0a4bbb03e6a07b82c44a Mon Sep 17 00:00:00 2001
From: tpoole <tom@tp-mbp.local>
Date: Mon, 28 Nov 2016 20:11:03 +0000
Subject: [PATCH] Tidied up ListenerList tests

---
 .../containers/juce_ListenerList.cpp          | 24 ++++---------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/modules/juce_core/containers/juce_ListenerList.cpp b/modules/juce_core/containers/juce_ListenerList.cpp
index 01ea6dc171..455bd72eff 100644
--- a/modules/juce_core/containers/juce_ListenerList.cpp
+++ b/modules/juce_core/containers/juce_ListenerList.cpp
@@ -75,23 +75,15 @@ class ListenerListTests : public UnitTest
 public:
     ListenerListTests() : UnitTest ("ListenerList") {}
 
-    template <typename T>
-    void callHelper (std::vector<int>& expectedCounterValues, T v)
+    template <typename... Args>
+    void callHelper (std::vector<int>& expectedCounterValues)
     {
-        counter = 0;
-        listeners.call (&ListenerBase::f, v);
-        expect (counter == expectedCounterValues[1]);
-
         counter = 0;
         listeners.call (&ListenerBase::f);
         expect (counter == expectedCounterValues[0]);
 
         ListenerList<ListenerBase>::DummyBailOutChecker boc;
 
-        counter = 0;
-        listeners.callChecked (boc, &ListenerBase::f, v);
-        expect (counter == expectedCounterValues[1]);
-
         counter = 0;
         listeners.callChecked (boc, &ListenerBase::f);
         expect (counter == expectedCounterValues[0]);
@@ -114,24 +106,16 @@ public:
         callHelper (expectedCounterValues, args...);
     }
 
-    template <typename T>
+    template <typename... Args>
     void callExcludingHelper (ListenerBase& listenerToExclude,
-                              std::vector<int>& expectedCounterValues, T v)
+                              std::vector<int>& expectedCounterValues)
     {
-        counter = 0;
-        listeners.callExcluding (listenerToExclude, &ListenerBase::f, v);
-        expect (counter == expectedCounterValues[1]);
-
         counter = 0;
         listeners.callExcluding (listenerToExclude, &ListenerBase::f);
         expect (counter == expectedCounterValues[0]);
 
         ListenerList<ListenerBase>::DummyBailOutChecker boc;
 
-        counter = 0;
-        listeners.callCheckedExcluding (listenerToExclude, boc, &ListenerBase::f, v);
-        expect (counter == expectedCounterValues[1]);
-
         counter = 0;
         listeners.callCheckedExcluding (listenerToExclude, boc, &ListenerBase::f);
         expect (counter == expectedCounterValues[0]);