Move LoggingTest object to own header.

include/logger/logger.h

@@ -49,6 +49,8 @@ namespace logging {
       log(ll, info, message(interp, std::forward<Args>(args)...));
     }
     
+    void log(level ll, message const&);
+
     void flush();
     
   protected:
@@ -56,7 +58,6 @@ namespace logging {
     
   private:
     friend class manager;
-    void log(level ll, message const&);
     void log(level ll, location_info const & info, message const&);
 
   private:

logger.xcodeproj/project.pbxproj

@@ -109,6 +109,7 @@
 		CDC0E0472267EA30001EDAB7 /* logger_impl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = logger_impl.h; sourceTree = "<group>"; };
 		CDC0E04C2267F8A9001EDAB7 /* pattern_layout.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = pattern_layout.h; sourceTree = "<group>"; };
 		CDC0E0502269378E001EDAB7 /* message.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = message.cxx; sourceTree = "<group>"; };
+		CDC0E06022694966001EDAB7 /* logger_test_obj.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = logger_test_obj.h; sourceTree = "<group>"; };
 		CDEA62D4225A3B0B00A6FAE0 /* json_layout.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = json_layout.cxx; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -200,6 +201,7 @@
 				CD1CDE8F22542CC500E5B6B2 /* log_manager_test.cxx */,
 				CD1CDE9122543E7E00E5B6B2 /* test_properties.cxx */,
 				CD1CDE8E22540DEA00E5B6B2 /* mock_logger.h */,
+				CDC0E06022694966001EDAB7 /* logger_test_obj.h */,
 			);
 			path = test;
 			sourceTree = "<group>";

test/c_logger_test.cxx

@@ -5,7 +5,7 @@
 //  Created by Sam Jaffe on 4/2/19.
 //
 
-#include "mock_logger.h"
+#include "logger_test_obj.h"
 
 #include "logger/c_logger.h"
 

test/console_appender_test.cxx

@@ -12,6 +12,7 @@
 
 #include "logger/log_manager.h"
 #include "logger/properties.h"
+#include "logger_impl.h"
 #include "mock_logger.h"
 
 class ConsoleAppenderTest : public testing::Test {

test/file_appender_test.cxx

@@ -14,6 +14,7 @@
 #include "logger/exception.h"
 #include "logger/log_manager.h"
 #include "logger/properties.h"
+#include "logger_impl.h"
 #include "mock_logger.h"
 
 class FileAppenderTest : public testing::Test {

test/logger_test.cxx

@@ -5,7 +5,7 @@
 //  Created by Sam Jaffe on 3/31/19.
 //
 
-#include "mock_logger.h"
+#include "logger_test_obj.h"
 
 #include "logger/logger.h"
 

test/logger_test_obj.h

@@ -0,0 +1,36 @@
+//
+//  logger_test_obj.h
+//  logger
+//
+//  Created by Sam Jaffe on 4/18/19.
+//
+
+#pragma once
+
+#include <gmock/gmock.h>
+
+#include "logger_impl.h"
+#include "mock_logger.h"
+
+struct LoggerTest : public testing::Test {
+  void SetUp() override {
+    appender.reset(new MockAppender);
+    pimpl = std::make_shared<logging::logger_impl>();
+    auto layout = std::make_shared<StubLayout>();
+    auto log = std::make_shared<logging::log_appender>(appender, layout);
+    pimpl->impls.push_back(log);
+    
+    using testing::_;
+    using testing::AnyNumber;
+    
+    EXPECT_CALL(*appender, write(_, _)).Times(AnyNumber());
+    EXPECT_CALL(*appender, flush()).Times(AnyNumber());
+  }
+  void TearDown() override {
+    pimpl.reset();
+    appender.reset();
+  }
+  
+  std::shared_ptr<MockAppender> appender;
+  std::shared_ptr<logging::logger_impl> pimpl;
+};

test/mock_logger.h

@@ -14,7 +14,6 @@
 
 #include "logger/detail/appender.h"
 #include "logger/detail/layout.h"
-#include "logger_impl.h"
 #include "logger/logpacket.h"
 
 namespace logging {
@@ -72,27 +71,4 @@ MATCHER_P(MessageEq, value, "") {
   return arg.message.str() == value;
 }
 
-struct LoggerTest : public testing::Test {
-  void SetUp() override {
-    appender.reset(new MockAppender);
-    pimpl = std::make_shared<logging::logger_impl>();
-    auto layout = std::make_shared<StubLayout>();
-    auto log = std::make_shared<logging::log_appender>(appender, layout);
-    pimpl->impls.push_back(log);
-    
-    using testing::_;
-    using testing::AnyNumber;
-
-    EXPECT_CALL(*appender, write(_, _)).Times(AnyNumber());
-    EXPECT_CALL(*appender, flush()).Times(AnyNumber());
-  }
-  void TearDown() override {
-    pimpl.reset();
-    appender.reset();
-  }
-  
-  std::shared_ptr<MockAppender> appender;
-  std::shared_ptr<logging::logger_impl> pimpl;
-};
-
 #endif /* mock_logger_h */