Qt5 support for CalcQt example

.travis.yml

@@ -30,10 +30,10 @@ addons:
 
 script: ./travis.sh 
 
-notifications:
-  email:
-    - cukes-devs@googlegroups.com
+#notifications:
+#  email:
+#    - cukes-devs@googlegroups.com
 
-branches:
-  only:
-    - master
+#branches:
+#  only:
+#    - master

README.md

@@ -25,7 +25,7 @@ It relies on a few libraries:
   Optional for the CppSpec driver.
 * [GMock](http://code.google.com/p/googlemock/) 1.6 or later.
   Optional for the internal test suite. By default downloaded and built by CMake.
-* [Qt 4](http://qt-project.org/). Optional for the CalcQt example.
+* [Qt 4 or 5](http://qt-project.org/). Optional for the CalcQt example.
 
 This header-only library is included in the source code:
 

examples/CalcQt/CMakeLists.txt

@@ -1,21 +1,49 @@
 project(CalcQt)
 
-find_package(Qt4 COMPONENTS QtCore QtGui QtTest)
+set(CALCQT_HEADERS src/CalculatorWidget.h)
+set(CALCQT_SOURCES src/CalcQt.cpp src/CalculatorWidget.cpp)
+set(LIBCALCQT_BUILD OFF)
+include_directories(${CUKE_INCLUDE_DIRS} src)
 
-if(QT4_FOUND)
-    include(${QT_USE_FILE})
-    set(CALCQT_HEADERS src/CalculatorWidget.h)
-    qt4_wrap_cpp(CALCQT_HEADERS_MOC ${CALCQT_HEADERS})
-    include_directories(${CUKE_INCLUDE_DIRS} src)
-    add_library(CalcQt src/CalculatorWidget ${CALCQT_HEADERS_MOC})
+find_package(Qt5Core QUIET)
+find_package(Qt5Widgets QUIET)
+find_package(Qt5Test QUIET)
 
+if(${Qt5Core_FOUND} AND ${Qt5Widgets_FOUND} AND ${Qt5Test_FOUND})
+    set(CMAKE_INCLUDE_CURRENT_DIR ON)
+    set(CMAKE_AUTOMOC ON)
+    set(QT_LIBRARIES Qt5::Core Qt5::Widgets Qt5::Test)
+
+    add_library(libcalcqt src/CalculatorWidget.cpp ${CALCQT_HEADERS})
+    target_link_libraries(libcalcqt ${QT_LIBRARIES})
+
+    add_executable(calcqt ${CALCQT_SOURCES})
+    target_link_libraries(calcqt libcalcqt ${QT_LIBRARIES})
+
+    set(LIBCALCQT_BUILD ON)
+else()
+    find_package(Qt4 COMPONENTS QtCore QtGui QtTest)
+    if(QT4_FOUND)
+        include(${QT_USE_FILE})
+        qt4_wrap_cpp(CALCQT_HEADERS_MOC ${CALCQT_HEADERS})
+        add_library(libcalcqt src/CalculatorWidget ${CALCQT_HEADERS_MOC})
+
+        add_executable(calcqt ${CALCQT_SOURCES} ${CALCQT_HEADERS_MOC})
+        target_link_libraries(calcqt ${QT_LIBRARIES})
+
+        set(LIBCALCQT_BUILD ON)
+    endif()
+endif()
+
+if(LIBCALCQT_BUILD)
     if(Boost_UNIT_TEST_FRAMEWORK_FOUND)
         include_directories(${Boost_INCLUDE_DIRS})
         add_executable(BoostCalculatorQtSteps features/step_definitions/BoostCalculatorQtSteps)
-        target_link_libraries(BoostCalculatorQtSteps CalcQt ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${CUKE_LIBRARIES} ${QT_LIBRARIES})
+        target_link_libraries(BoostCalculatorQtSteps libcalcqt ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${CUKE_LIBRARIES} ${QT_LIBRARIES})
+    endif()
+    if(GTEST_FOUND)
+        include_directories(${GTEST_INCLUDE_DIRS})
+        add_executable(GTestCalculatorQtSteps features/step_definitions/GTestCalculatorQtSteps)
+        target_link_libraries(GTestCalculatorQtSteps libcalcqt ${CUKE_LIBRARIES} ${CUKE_GTEST_LIBRARIES} ${QT_LIBRARIES})
     endif()
-
-    set(CALCQT_SOURCES src/CalcQt.cpp src/CalculatorWidget.cpp)
-    add_executable(calcqt ${CALCQT_SOURCES} ${CALCQT_HEADERS_MOC})
-    target_link_libraries(calcqt ${QT_LIBRARIES})
 endif()

examples/CalcQt/features/step_definitions/BoostCalculatorQtSteps.cpp

@@ -1,13 +1,10 @@
-
 #include <cstdlib>
-
 #include <boost/test/unit_test.hpp>
 #include <cucumber-cpp/defs.hpp>
-
 #include <QApplication>
 #include <QTest>
 
-#include <CalculatorWidget.h>
+#include "CalculatorWidget.h"
 
 static int argc = 0;
 static QApplication app(argc, 0);
@@ -23,13 +20,17 @@ int millisecondsToWait() {
 }
 
 std::istream& operator>> (std::istream& in, QString& val) { std::string s; in >> s; val = s.c_str(); return in; }
-std::ostream& operator<< (std::ostream& out, const QString& val) { out << val.toAscii().data(); return out; }
+std::ostream& operator<< (std::ostream& out, const QString& val) { out << val.toLatin1().data(); return out; }
 
 GIVEN("^I just turned on the calculator$") {
     cucumber::ScenarioScope<CalculatorWidget> calculator;
     calculator->move(0, 0);
     calculator->show();
+#if QT_VERSION >= 0x050000
+    QTest::qWaitForWindowExposed(calculator.get());
+#else
     QTest::qWaitForWindowShown(calculator.get());
+#endif
     QTest::qWait(millisecondsToWait());
 }
 

examples/CalcQt/features/step_definitions/GTestCalculatorQtSteps.cpp

@@ -0,0 +1,74 @@
+#include <cstdlib>
+#include <gtest/gtest.h>
+#include <cucumber-cpp/defs.hpp>
+#include <QApplication>
+#include <QTest>
+
+#include "CalculatorWidget.h"
+
+static int argc = 0;
+static QApplication app(argc, 0);
+static int milliseconds = -1;
+
+int millisecondsToWait() {
+    if (milliseconds < 0)
+    {
+        char* envVariable = getenv("CALCQT_STEP_DELAY");
+        milliseconds = (0 != envVariable) ? atoi(envVariable) : 0;
+    }
+    return milliseconds;
+}
+
+std::istream& operator>> (std::istream& in, QString& val) { std::string s; in >> s; val = s.c_str(); return in; }
+std::ostream& operator<< (std::ostream& out, const QString& val) { out << val.toLatin1().data(); return out; }
+
+GIVEN("^I just turned on the calculator$") {
+    cucumber::ScenarioScope<CalculatorWidget> calculator;
+    calculator->move(0, 0);
+    calculator->show();
+#if QT_VERSION >= 0x050000
+    QTest::qWaitForWindowExposed(calculator.get());
+#else
+    QTest::qWaitForWindowShown(calculator.get());
+#endif
+    QTest::qWait(millisecondsToWait());
+}
+
+WHEN("^I press (\\d+)$") {
+    REGEX_PARAM(unsigned int, n);
+    cucumber::ScenarioScope<CalculatorWidget> calculator;
+    QTest::keyClick(calculator.get(), Qt::Key_0 + n, Qt::NoModifier, millisecondsToWait());
+}
+
+WHEN("^I press add") {
+    cucumber::ScenarioScope<CalculatorWidget> calculator;
+    QTest::keyClick(calculator.get(), Qt::Key_Plus, Qt::NoModifier, millisecondsToWait());
+}
+
+WHEN("^I press calculate") {
+    cucumber::ScenarioScope<CalculatorWidget> calculator;
+    QTest::keyClick(calculator.get(), Qt::Key_Return, Qt::NoModifier, millisecondsToWait());
+}
+
+WHEN("^I press clear") {
+    cucumber::ScenarioScope<CalculatorWidget> calculator;
+    QTest::keyClick(calculator.get(), Qt::Key_Escape, Qt::NoModifier, millisecondsToWait());
+}
+
+WHEN("^I press subtract") {
+    cucumber::ScenarioScope<CalculatorWidget> calculator;
+    QTest::keyClick(calculator.get(), Qt::Key_Minus, Qt::NoModifier, millisecondsToWait());
+}
+
+THEN("^the display should be empty$") {
+    cucumber::ScenarioScope<CalculatorWidget> calculator;
+    EXPECT_EQ(calculator->display().size(), 0);
+    QTest::qWait(millisecondsToWait());
+}
+
+THEN("^the display should show (.*)$") {
+    REGEX_PARAM(QString, expected);
+    cucumber::ScenarioScope<CalculatorWidget> calculator;
+    EXPECT_EQ(expected, calculator->display());
+    QTest::qWait(millisecondsToWait());
+}

examples/CalcQt/src/CalculatorWidget.cpp

@@ -1,14 +1,13 @@
 #include "CalculatorWidget.h"
 
-#include <stdio.h>
 #include <QGridLayout>
 #include <QKeyEvent>
 #include <QLabel>
 #include <QPushButton>
 #include <QSignalMapper>
 
 CalculatorWidget::CalculatorWidget(QWidget *parent, Qt::WindowFlags flags) : QWidget(parent, flags) {
-    QGridLayout *layout = new QGridLayout;
+    QGridLayout *layout = new QGridLayout(this);
     layout->setSizeConstraint(QLayout::SetFixedSize);
     setLayout(layout);
 
@@ -69,7 +68,7 @@ int CalculatorWidget::calculate(const QString& expression) {
         }
         pos += regexp.matchedLength();
         if (pos < expression.length()) {
-            operation = expression.at(pos).toAscii();
+            operation = expression.at(pos).toLatin1();
         }
     }
     return result;
@@ -103,6 +102,7 @@ void CalculatorWidget::keyPressEvent(QKeyEvent *event) {
 }
 
 void CalculatorWidget::keyReleaseEvent(QKeyEvent *event) {
+    Q_UNUSED(event)
     if (0 != keyclickedButton) {
         keyclickedButton->setDown(false);
         keyclickedButton = 0;

examples/CalcQt/src/CalculatorWidget.h

@@ -1,7 +1,8 @@
 class QLabel;
 class QPushButton;
-#include <QString>
 class QSignalMapper;
+
+#include <QString>
 #include <QWidget>
 
 class CalculatorWidget : public QWidget {