Refactoring.

test/Mocks.h

@@ -0,0 +1,33 @@
+/*
+ * Scope Guard
+ * Copyright (C) 2017  offa
+ *
+ * This file is part of Scope Guard.
+ *
+ * Scope Guard is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Scope Guard is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Scope Guard.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <trompeloeil.hpp>
+
+namespace mock
+{
+    struct CallMock
+    {
+        MAKE_MOCK0(deleter, void());
+    };
+}
+
+

test/ScopeGuardTest.cpp

@@ -20,18 +20,10 @@
 
 #include "scope_guard.h"
 #include <catch.hpp>
-#include <trompeloeil.hpp>
+#include "Mocks.h"
 
 using namespace trompeloeil;
 
-namespace mock
-{
-    struct CallMock
-    {
-        MAKE_MOCK0(deleter, void());
-    };
-}
-
 namespace
 {
     mock::CallMock m;
@@ -40,11 +32,6 @@ namespace
     {
         m.deleter();
     }
-
-    void deleterThrow()
-    {
-        throw std::exception{};
-    }
 }
 
 
@@ -98,7 +85,7 @@ TEST_CASE("move transfers state if released", "[ScopeGuard]")
 TEST_CASE("no exception propagation from deleter", "[ScopeGuard]")
 {
     REQUIRE_NOTHROW([] {
-        auto guard = sr::scope_guard(deleterThrow);
+        auto guard = sr::scope_guard([] { throw std::exception{}; });
         static_cast<void>(guard);
         }());
 }