Replace FakeDriver with GenericDriver, warn when using it

Author: konserw

.gitignore

@@ -11,5 +11,5 @@ Gemfile.lock
 # Build artifacts
 build/
 
-#vim swap files
+# vim swap files
 *.swp

features/step_definitions/RpnCalculatorSteps.cpp

@@ -1,3 +1,4 @@
+#define CUKE_ENABLE_GENERICDRIVER
 #include <cucumber-cpp/defs.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/math/constants/constants.hpp>

features/step_definitions/cucumber_cpp_mappings.rb

@@ -231,6 +231,7 @@ def append_step_definition(step_name, code) # todo params parameter?
   def append_support_code(code)
     helper_functions = get_absolute_path('../support/HelperFunctions.hpp');
     @support_code ||= <<-EOF
+#define CUKE_ENABLE_GENERICDRIVER
 #include <cucumber-cpp/defs.hpp>
 #include "#{helper_functions}"
 

include/cucumber-cpp/internal/drivers/DriverSelector.hpp

@@ -1,9 +1,13 @@
 #if defined(GTEST_INCLUDE_GTEST_GTEST_H_)
-#include "GTestDriver.hpp"
+    #include "GTestDriver.hpp"
 #elif defined(BOOST_TEST_CASE)
-#include "BoostDriver.hpp"
+    #include "BoostDriver.hpp"
 #elif defined(CPPSPEC_H_)
-#include "CppSpecDriver.hpp"
+    #include "CppSpecDriver.hpp"
 #else // No test framework
-#include "FakeDriver.hpp"
+    #ifdef CUKE_ENABLE_GENERICDRIVER
+        #include "GenericDriver.hpp"
+    #else
+        #error Please #inlude testing framework before cucumber-cpp or #define CUKE_ENABLE_GENERICDRIVER explicitly 
+    #endif
 #endif

include/cucumber-cpp/internal/drivers/FakeDriver.hpp

@@ -0,0 +1,19 @@
+#ifndef CUKE_GENERICDRIVER_HPP_
+#define CUKE_GENERICDRIVER_HPP_
+
+#include "../step/StepManager.hpp"
+
+namespace cucumber {
+namespace internal {
+
+class FakeStep : public BasicStep {
+protected:
+    virtual const InvokeResult invokeStepBody();
+};
+
+#define STEP_INHERITANCE(step_name) virtual ::cucumber::internal::FakeStep
+
+}
+}
+
+#endif /* CUKE_GENERICDRIVER_HPP_ */

include/cucumber-cpp/internal/drivers/GenericDriver.hpp

@@ -1,4 +1,5 @@
 set(CUKE_SOURCES
+    drivers/GenericDriver.cpp
     ContextManager.cpp
     CukeCommands.cpp
     CukeEngine.cpp

src/CMakeLists.txt

@@ -0,0 +1,13 @@
+#include "cucumber-cpp/internal/drivers/GenericDriver.hpp"
+
+namespace cucumber {
+namespace internal {
+
+const InvokeResult FakeStep::invokeStepBody() {
+    // No try/catch block to throw the original exceptions to the testing framework
+    body();
+    return InvokeResult::success();
+}
+
+}
+}

src/drivers/GenericDriver.cpp

@@ -2,7 +2,7 @@
 
 #include <cucumber-cpp/internal/step/StepManager.hpp>
 #include <cucumber-cpp/internal/step/StepMacros.hpp>
-#include <cucumber-cpp/internal/drivers/FakeDriver.hpp>
+#include <cucumber-cpp/internal/drivers/GenericDriver.hpp>
 
 using namespace cucumber::internal;
 

tests/integration/StepRegistrationTest.cpp

@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include <cucumber-cpp/internal/drivers/FakeDriver.hpp>
+#include <cucumber-cpp/internal/drivers/GenericDriver.hpp>
 
 using namespace cucumber::internal;
 

tests/unit/BasicStepTest.cpp

@@ -2,7 +2,7 @@
 #define CUKE_CUKECOMMANDSFIXTURE_HPP_
 
 #include <cucumber-cpp/internal/CukeCommands.hpp>
-#include <cucumber-cpp/internal/drivers/FakeDriver.hpp>
+#include <cucumber-cpp/internal/drivers/GenericDriver.hpp>
 #include "StepManagerTestDouble.hpp"
 
 #include <boost/shared_ptr.hpp>