Reorganized examples directory

Author: paoloambrosio

HISTORY.md

@@ -2,6 +2,7 @@
 
 ### New Features
 
+* Added CalcQt example ([#58](https://github.com/cucumber/cucumber-cpp/pull/58) Gianni Ambrosio)
 * Replaced USING_CONTEXT with ScenarioScope<T> ([27256e9](https://github.com/cucumber/cucumber-cpp/commit/27256e932c75e9d4d57d4839042317e6a04cfe46) Paolo Ambrosio)
 * Changed include name from core.hpp to defs.hpp ([5bbac06](https://github.com/cucumber/cucumber-cpp/commit/5bbac062e19dcf9de2761f4ded115aa7212c14d7) Paolo Ambrosio)
 * Project rename from CukeBins to Cucumber-Cpp ([efecfd0](https://github.com/cucumber/cucumber-cpp/commit/efecfd0813efa1b6d406c2fd0cd03d8a84bed3ff) Paolo Ambrosio)

examples/Calc/CMakeLists.txt

@@ -1,23 +1,23 @@
 project(Calc)
 
-include_directories(${CUKE_INCLUDE_DIRS} Calc)
+include_directories(${CUKE_INCLUDE_DIRS} src)
 
-add_library(Calc Calc/Calculator)
+add_library(Calc src/Calculator)
 
 if(GTEST_FOUND)
     include_directories(${GTEST_INCLUDE_DIRS})
-    add_executable(GTestCalculatorSteps CalcFeatures/GTestCalculatorSteps)
+    add_executable(GTestCalculatorSteps features/step_definitions/GTestCalculatorSteps)
     target_link_libraries(GTestCalculatorSteps Calc ${GTEST_LIBRARIES} ${CUKE_LIBRARIES})
 endif()
 
 if(CPPSPEC_FOUND)
     include_directories(${CPPSPEC_INCLUDE_DIRS})
-    add_executable(CppSpecCalculatorSteps CalcFeatures/CppSpecCalculatorSteps)
+    add_executable(CppSpecCalculatorSteps features/step_definitions/CppSpecCalculatorSteps)
     target_link_libraries(CppSpecCalculatorSteps Calc ${CPPSPEC_LIBRARY} ${CUKE_LIBRARIES})
 endif()
 
 if(Boost_UNIT_TEST_FRAMEWORK_FOUND)
     include_directories(${Boost_INCLUDE_DIRS})
-    add_executable(BoostCalculatorSteps CalcFeatures/BoostCalculatorSteps)
+    add_executable(BoostCalculatorSteps features/step_definitions/BoostCalculatorSteps)
     target_link_libraries(BoostCalculatorSteps Calc ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${CUKE_LIBRARIES})
 endif()

examples/Calc/CalcFeatures/features/addition.feature renamed to examples/Calc/features/addition.feature

@@ -4,18 +4,18 @@ find_package(Qt4 COMPONENTS QtCore QtGui QtTest)
 
 if(QT4_FOUND)
     include(${QT_USE_FILE})
-    set(CALCQT_HEADERS CalcQt/CalculatorWidget.h)
+    set(CALCQT_HEADERS src/CalculatorWidget.h)
     qt4_wrap_cpp(CALCQT_HEADERS_MOC ${CALCQT_HEADERS})
-    include_directories(${CUKE_INCLUDE_DIRS} CalcQt)
-    add_library(CalcQt CalcQt/CalculatorWidget ${CALCQT_HEADERS_MOC})
-    
+    include_directories(${CUKE_INCLUDE_DIRS} src)
+    add_library(CalcQt src/CalculatorWidget ${CALCQT_HEADERS_MOC})
+
     if(Boost_UNIT_TEST_FRAMEWORK_FOUND)
         include_directories(${Boost_INCLUDE_DIRS})
-        add_executable(BoostCalculatorQtSteps CalcQtFeatures/BoostCalculatorQtSteps)
+        add_executable(BoostCalculatorQtSteps features/step_definitions/BoostCalculatorQtSteps)
         target_link_libraries(BoostCalculatorQtSteps CalcQt ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${CUKE_LIBRARIES} ${QT_LIBRARIES})
     endif()
-    
-    set(CALCQT_SOURCES CalcQt/CalcQt.cpp CalcQt/CalculatorWidget.cpp)
+
+    set(CALCQT_SOURCES src/CalcQt.cpp src/CalculatorWidget.cpp)
     add_executable(calcqt ${CALCQT_SOURCES} ${CALCQT_HEADERS_MOC})
     target_link_libraries(calcqt ${QT_LIBRARIES})
-endif()
+endif()

examples/Calc/CalcFeatures/features/division.feature renamed to examples/Calc/features/division.feature

@@ -0,0 +1,4 @@
+This sample shows how to test a QT GUI. The environment variable
+CALCQT_STEP_DELAY allows to introduce delays in the step execution for
+demo purposes (i.e. CALCQT_STEP_DELAY=100 ./BoostCalculatorQtSteps)
+

examples/Calc/CalcFeatures/BoostCalculatorSteps.cpp renamed to examples/Calc/features/step_definitions/BoostCalculatorSteps.cpp

@@ -5,10 +5,18 @@ include_directories(${CUKE_INCLUDE_DIRS})
 if(GTEST_FOUND)
     include_directories(${GTEST_INCLUDE_DIRS})
 
-    add_executable(TagSteps tag/TagSteps)
-    target_link_libraries(TagSteps ${GTEST_LIBRARIES} ${CUKE_LIBRARIES})
+    function(add_cucumber_executable)
+        add_executable(FeatureShowcaseSteps ${ARGV})
+        target_link_libraries(FeatureShowcaseSteps ${GTEST_LIBRARIES} ${CUKE_LIBRARIES})
+        foreach(_arg ${ARGN})
+            get_filename_component(OBJECT_PREFIX ${_arg} NAME_WE)
+            set_source_files_properties(${_arg} PROPERTIES COMPILE_FLAGS "-DCUKE_OBJECT_PREFIX=${OBJECT_PREFIX}")
+        endforeach(_arg)
+    endfunction()
 
-    add_executable(TableSteps table/TableSteps)
-    target_link_libraries(TableSteps ${GTEST_LIBRARIES} ${CUKE_LIBRARIES})
+    add_cucumber_executable(
+        features/step_definitions/TagSteps
+        features/step_definitions/TableSteps
+    )
 endif()
 

examples/Calc/CalcFeatures/CppSpecCalculatorSteps.cpp renamed to examples/Calc/features/step_definitions/CppSpecCalculatorSteps.cpp

@@ -0,0 +1,2 @@
+This sample shows a few advanced features: tags and table arguments.
+