Generic driver

.gitignore

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

examples/Calc/features/step_definitions/BoostCalculatorSteps.cpp

@@ -1,5 +1,5 @@
 #include <boost/test/unit_test.hpp>
-#include <cucumber-cpp/defs.hpp>
+#include <cucumber-cpp/autodetect.hpp>
 
 #include <Calculator.h>
 

examples/Calc/features/step_definitions/CppSpecCalculatorSteps.cpp

@@ -1,5 +1,5 @@
 #include <CppSpec/CppSpec.h>
-#include <cucumber-cpp/defs.hpp>
+#include <cucumber-cpp/autodetect.hpp>
 
 #include <Calculator.h>
 

examples/Calc/features/step_definitions/GTestCalculatorSteps.cpp

@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <cucumber-cpp/defs.hpp>
+#include <cucumber-cpp/autodetect.hpp>
 
 #include <Calculator.h>
 

examples/CalcQt/features/step_definitions/BoostCalculatorQtSteps.cpp

@@ -1,6 +1,6 @@
 #include <cstdlib>
 #include <boost/test/unit_test.hpp>
-#include <cucumber-cpp/defs.hpp>
+#include <cucumber-cpp/autodetect.hpp>
 #include <QApplication>
 #include <QTest>
 

examples/CalcQt/features/step_definitions/GTestCalculatorQtSteps.cpp

@@ -1,6 +1,6 @@
 #include <cstdlib>
 #include <gtest/gtest.h>
-#include <cucumber-cpp/defs.hpp>
+#include <cucumber-cpp/autodetect.hpp>
 #include <QApplication>
 #include <QTest>
 

examples/FeatureShowcase/features/step_definitions/TableSteps.cpp

@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <cucumber-cpp/defs.hpp>
+#include <cucumber-cpp/autodetect.hpp>
 
 #include <string>
 #include <map>

examples/FeatureShowcase/features/step_definitions/TagSteps.cpp

@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <cucumber-cpp/defs.hpp>
+#include <cucumber-cpp/autodetect.hpp>
 
 #include <iostream>
 

features/step_definitions/RpnCalculatorSteps.cpp

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

features/step_definitions/cucumber_cpp_mappings.rb

@@ -231,7 +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
-#include <cucumber-cpp/defs.hpp>
+#include <cucumber-cpp/generic.hpp>
 #include "#{helper_functions}"
 
 using cucumber::ScenarioScope;

include/cucumber-cpp/autodetect.hpp

@@ -0,0 +1,4 @@
+#include "internal/defs.hpp"
+#ifndef STEP_INHERITANCE
+    #error No test framework found: please include a testing framework before autodetect.hpp or include generic.hpp
+#endif

include/cucumber-cpp/defs.hpp

@@ -1,6 +1,5 @@
-#include "internal/step/StepManager.hpp"
-#include "internal/hook/HookRegistrar.hpp"
-#include "internal/ContextManager.hpp"
-
-#include "internal/Macros.hpp"
-#include "internal/drivers/DriverSelector.hpp"
+#warning Use of defs.hpp is deprecated, please use either autodetect.hpp or generic.hpp
+#include "internal/defs.hpp"
+#ifndef STEP_INHERITANCE
+    #include "internal/drivers/GenericDriver.hpp"
+#endif

include/cucumber-cpp/generic.hpp

@@ -0,0 +1,6 @@
+#include "internal/defs.hpp"
+#ifdef STEP_INHERITANCE
+    #error Test framework found: please include autodetect.hpp or remove the test framework includes
+#else
+    #include "internal/drivers/GenericDriver.hpp"
+#endif

include/cucumber-cpp/internal/defs.hpp

@@ -0,0 +1,5 @@
+#include "step/StepManager.hpp"
+#include "hook/HookRegistrar.hpp"
+#include "ContextManager.hpp"
+#include "Macros.hpp"
+#include "drivers/DriverSelector.hpp"

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

@@ -1,9 +1,7 @@
 #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"
-#else // No test framework
-#include "FakeDriver.hpp"
+    #include "CppSpecDriver.hpp"
 #endif

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

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

src/CMakeLists.txt

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

src/drivers/GenericDriver.cpp

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

tests/CMakeLists.txt

@@ -47,3 +47,4 @@ if(Boost_UNIT_TEST_FRAMEWORK_FOUND)
     cuke_add_driver_test(integration/drivers/BoostDriverTest ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 endif()
 
+cuke_add_driver_test(integration/drivers/GenericDriverTest)

tests/integration/StepRegistrationTest.cpp

@@ -2,13 +2,13 @@
 
 #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;
 
 #define MANUAL_STEP_MATCHER "manual step"
 
-class ManualStep : public FakeStep {
+class ManualStep : public GenericStep {
 public:
     void body() {};
 //private:

tests/integration/drivers/BoostDriverTest.cpp

@@ -1,8 +1,6 @@
 #include <boost/version.hpp>
-
 #include <boost/test/unit_test.hpp>
-
-#include <cucumber-cpp/defs.hpp>
+#include <cucumber-cpp/autodetect.hpp>
 
 #include "../../utils/DriverTestRunner.hpp"
 

tests/integration/drivers/CppSpecDriverTest.cpp

@@ -1,5 +1,5 @@
 #include <CppSpec/CppSpec.h>
-#include <cucumber-cpp/defs.hpp>
+#include <cucumber-cpp/autodetect.hpp>
 
 #include "../../utils/DriverTestRunner.hpp"
 

tests/integration/drivers/GTestDriverTest.cpp

@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <cucumber-cpp/defs.hpp>
+#include <cucumber-cpp/autodetect.hpp>
 
 #include "../../utils/DriverTestRunner.hpp"
 

tests/integration/drivers/GenericDriverTest.cpp

@@ -0,0 +1,29 @@
+#include <cucumber-cpp/generic.hpp>
+
+#include "../../utils/DriverTestRunner.hpp"
+
+using namespace cucumber;
+
+THEN(SUCCEED_MATCHER) {
+    ScenarioScope<SomeContext> ctx;
+    // Do not throw for successes
+}
+
+THEN(FAIL_MATCHER) {
+    ScenarioScope<SomeContext> ctx;
+    throw std::runtime_error("Failure description");
+}
+
+THEN(PENDING_MATCHER_1) {
+    pending();
+}
+
+THEN(PENDING_MATCHER_2) {
+    pending(PENDING_DESCRIPTION);
+}
+
+using namespace cucumber::internal;
+
+int main(int argc, char **argv) {
+    return DriverTest().run();
+}

tests/unit/BasicStepTest.cpp

@@ -1,18 +1,18 @@
 #include <gtest/gtest.h>
 
-#include <cucumber-cpp/internal/drivers/FakeDriver.hpp>
+#include <cucumber-cpp/internal/drivers/GenericDriver.hpp>
 
 using namespace cucumber::internal;
 
 #define PENDING_STEP_DESCRIPTION "A description"
 
-class PendingStep : public FakeStep {
+class PendingStep : public GenericStep {
     void body() {
         pending();
     }
 };
 
-class PendingStepWithDescription : public FakeStep {
+class PendingStepWithDescription : public GenericStep {
     void body() {
         pending(PENDING_STEP_DESCRIPTION);
     }

tests/unit/CukeCommandsTest.cpp

@@ -15,7 +15,7 @@ class CukeCommandsTest : public CukeCommandsFixture {
     }
 };
 
-class CheckAllParameters : public FakeStep {
+class CheckAllParameters : public GenericStep {
 protected:
     static const int arg_0_int;
     static const double arg_1_double;

tests/utils/CukeCommandsFixture.hpp

@@ -2,15 +2,15 @@
 #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>
 
 using namespace cucumber::internal;
 using boost::shared_ptr;
 
-class EmptyStep : public FakeStep {
+class EmptyStep : public GenericStep {
     void body() {}
 };