new approach to GenericDriver

Author: konserw

features/step_definitions/RpnCalculatorSteps.cpp

@@ -1,4 +1,3 @@
-#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,7 +231,6 @@ 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/autodetect.hpp

@@ -0,0 +1,14 @@
+#if defined(GTEST_INCLUDE_GTEST_GTEST_H_)
+    #include "internal/drivers/GTestDriver.hpp"
+#elif defined(BOOST_TEST_CASE)
+    #include "internal/drivers/BoostDriver.hpp"
+#elif defined(CPPSPEC_H_)
+    #include "internal/drivers/CppSpecDriver.hpp"
+#else
+    #error No test framework found: Please #include testing framework before cucumber-cpp or #include defs.hpp for Generic Driver
+#endif
+
+#include "internal/step/StepManager.hpp"
+#include "internal/hook/HookRegistrar.hpp"
+#include "internal/ContextManager.hpp"
+#include "internal/Macros.hpp"

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

@@ -5,9 +5,5 @@
 #elif defined(CPPSPEC_H_)
     #include "CppSpecDriver.hpp"
 #else // No test framework
-    #ifdef CUKE_ENABLE_GENERICDRIVER
-        #include "GenericDriver.hpp"
-    #else
-        #error Please #inlude testing framework before cucumber-cpp or #define CUKE_ENABLE_GENERICDRIVER explicitly 
-    #endif
+    #include "GenericDriver.hpp"
 #endif

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

@@ -6,12 +6,12 @@
 namespace cucumber {
 namespace internal {
 
-class FakeStep : public BasicStep {
+class GenericStep : public BasicStep {
 protected:
     virtual const InvokeResult invokeStepBody();
 };
 
-#define STEP_INHERITANCE(step_name) virtual ::cucumber::internal::FakeStep
+#define STEP_INHERITANCE(step_name) virtual ::cucumber::internal::GenericStep
 
 }
 }

src/drivers/GenericDriver.cpp

@@ -3,7 +3,7 @@
 namespace cucumber {
 namespace internal {
 
-const InvokeResult FakeStep::invokeStepBody() {
+const InvokeResult GenericStep::invokeStepBody() {
     // No try/catch block to throw the original exceptions to the testing framework
     body();
     return InvokeResult::success();