HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1369:8a5759a257ef

Some test refac and prepared synchronized graph test...

jeandet -

r1369:8a5759a257ef

parent child

Context file:

r1369:8a5759a257ef

gui/tests/CMakeLists.txt +1 -1

              subdirs(GUITestUtils)
              declare_test(simple_graph simple_graph simple_graph/main.cpp "sciqlopgui;TestUtils;GUITestUtils;Qt5::Test")
-             declare_test(two_sync_graph two_sync_graph two_sync_graph/main.cpp "sciqlopgui;TestUtils;GUITestUtils;Qt5::Test")
+             declare_test(multiple_sync_graph multiple_sync_graph multiple_sync_graph/main.cpp "sciqlopgui;TestUtils;GUITestUtils;Qt5::Test")

gui/tests/GUITestUtils/GUITestUtils.h +14 -11

              #define SELECT_ITEM(widget, itemIndex, item)\
                  auto item = getItem(widget, itemIndex);\
-             {\
-                 auto itemCenterPos = widget->visualItemRect(item).center();\
-                 QTest::mouseClick(widget->viewport(), Qt::LeftButton, Qt::NoModifier, itemCenterPos);\
-                 QVERIFY(widget->selectedItems().size() > 0);\
-                 QVERIFY(widget->selectedItems().contains(item));\
+                 {\
+                   auto itemCenterPos = widget->visualItemRect(item).center();\
+                   QTest::mouseClick(widget->viewport(), Qt::LeftButton, Qt::NoModifier, itemCenterPos);\
+                   QVERIFY(widget->selectedItems().size() > 0);\
+                   QVERIFY(widget->selectedItems().contains(item));\
                  }
                  mouseMove(sourceWidget,itemCenterPos,Qt::LeftButton);
              }
-             #define PREPARE_GUI_TEST(main_widget)\
-                 main_widget.setGeometry(QRect(QPoint(QApplication::desktop()->geometry().center() - QPoint(250, 250)),\
-                 QSize(500, 500)));\
-                 main_widget.show();\
-                 qApp->setActiveWindow(&main_widget);\
-                 QVERIFY(QTest::qWaitForWindowActive(&main_widget))
+             template<typename T>
+             bool prepare_gui_test(T* w)
+             {
+                 w->setGeometry(QRect(QPoint(QApplication::desktop()->geometry().center() - QPoint(250, 250)),
+                 QSize(500, 500)));
+                 w->show();
+                 qApp->setActiveWindow(w);
+                 return QTest::qWaitForWindowActive(w);
+             }
              #define GET_CHILD_WIDGET_FOR_GUI_TESTS(parent, child, childType, childName)\
                  childType* child = parent.findChild<childType*>(childName); \

gui/tests/multiple_sync_graph/main.cpp ~~gui/tests/two_sync_graph/main.cpp~~ renamed +41 -24

              #include <Common/cpp_utils.h>
              #include <Visualization/VisualizationZoneWidget.h>
+             #include <Visualization/VisualizationGraphWidget.h>
              #include <TestProviders.h>
              #include <GUITestUtils.h>
              ALIAS_TEMPLATE_FUNCTION(isReady, static_cast<SqpApplication *>(qApp)->variableController().isReady)
-             #define A_SIMPLE_GRAPH_FIXTURE \
-                 VisualizationZoneWidget w;\
-                 PREPARE_GUI_TEST(w);\
-                 auto provider = std::make_shared<SimpleRange<10> >();\
-                 auto range = DateTimeRange::fromDateTime(QDate(2018, 8, 7), QTime(14, 00), QDate(2018, 8, 7),\
-                 QTime(16, 00));\
-                 auto var = static_cast<SqpApplication *>(qApp)->variableController().createVariable(\
-                 "V1", {{"", "scalar"}}, provider, range);\
-                 while (!isReady(var))\
-                 QCoreApplication::processEvents();\
-                 //w.addVariable(var, range);\
-                 auto cent = center(&w);
+             template <int GraphCount=2>
+             std::tuple< std::unique_ptr<VisualizationZoneWidget>,
+                         std::vector<std::shared_ptr<Variable>>,
+                         std::vector<VisualizationGraphWidget*> >
+             build_multi_graph_test()
+             {
+                 auto w = std::make_unique<VisualizationZoneWidget>();
+                 auto provider = std::make_shared<SimpleRange<10> >();
+                 auto range = DateTimeRange::fromDateTime(QDate(2018, 8, 7), QTime(14, 00), QDate(2018, 8, 7),QTime(16, 00));
+                 std::vector<std::shared_ptr<Variable>> variables;
+                 std::vector<VisualizationGraphWidget*> graphs;
+                 for(auto i=0;i<GraphCount;i++)
+                 {
+                     auto var = static_cast<SqpApplication *>(qApp)->variableController().createVariable(
+                                 QString("V%1").arg(i), {{"", "scalar"}}, provider, range);
+                     auto graph = new VisualizationGraphWidget();
+                     graph->addVariable(var, range);
+                     while (!isReady(var))
+                         QCoreApplication::processEvents();
+                     variables.push_back(var);
+                     graphs.push_back(graph);
+                     w->addGraph(graph);
+                 }
+                 auto cent = center(w.get());
+                 return {std::move(w), variables, graphs};
+             }
-             class A_SimpleGraph : public QObject {
+             class A_MultipleSyncGraphs : public QObject {
                  Q_OBJECT
              public:
-                 explicit A_SimpleGraph(QObject *parent = Q_NULLPTR) : QObject(parent) {}
+                 explicit A_MultipleSyncGraphs(QObject *parent = Q_NULLPTR) : QObject(parent) {}
              private slots:
                  void scrolls_left_with_mouse()
                  {
-                     A_SIMPLE_GRAPH_FIXTURE;
+                     auto [w, variables, graphs] = build_multi_graph_test<3>();
+                     QVERIFY(prepare_gui_test(w.get()));
-                     while (!isReady(var))
-                     QCoreApplication::processEvents();
-                     auto r = var->range();
                      /*
                       * Scrolling to the left implies going back in time
                       * Scroll only implies keeping the same delta T -> shit only transformation
                  void scrolls_right_with_mouse()
                  {
-                     A_SIMPLE_GRAPH_FIXTURE;
+                     auto [w, variables, graphs] = build_multi_graph_test<3>();
+                     QVERIFY(prepare_gui_test(w.get()));
+                     w->show();
+                     for(int i=0;i<10000;i++)
+                     {
+                         QThread::usleep(1000);
+                         qApp->processEvents();
+                     }
-                     while (!isReady(var))
-                         QCoreApplication::processEvents();
-                     auto r = var->range();
                      /*
                       * Scrolling to the right implies going forward in time
                       * Scroll only implies keeping the same delta T -> shit only transformation
                  }
              };
              QT_BEGIN_NAMESPACE
              QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS
              QT_END_NAMESPACE
                  app.setAttribute(Qt::AA_Use96Dpi, true);
                  QTEST_DISABLE_KEYPAD_NAVIGATION;
                  QTEST_ADD_GPU_BLACKLIST_SUPPORT;
-                 A_SimpleGraph tc;
+                 A_MultipleSyncGraphs tc;
                  QTEST_SET_MAIN_SOURCE_PATH;
                  return QTest::qExec(&tc, argc, argv);
              }

gui/tests/simple_graph/main.cpp +27 -21

              ALIAS_TEMPLATE_FUNCTION(isReady, static_cast<SqpApplication *>(qApp)->variableController().isReady)
-             #define A_SIMPLE_GRAPH_FIXTURE \
-                 VisualizationGraphWidget w;\
-                 PREPARE_GUI_TEST(w);\
-                 auto provider = std::make_shared<SimpleRange<10> >();\
-                 auto range = DateTimeRange::fromDateTime(QDate(2018, 8, 7), QTime(14, 00), QDate(2018, 8, 7),\
-                 QTime(16, 00));\
-                 auto var = static_cast<SqpApplication *>(qApp)->variableController().createVariable(\
-                 "V1", {{"", "scalar"}}, provider, range);\
-                 while (!isReady(var))\
-                 QCoreApplication::processEvents();\
-                 w.addVariable(var, range);\
-                 auto cent = center(&w);
+             std::tuple< std::unique_ptr<VisualizationGraphWidget>,
+                         std::shared_ptr<Variable>,
+                         DateTimeRange >
+             build_simple_graph_test()
+             {
+                 auto w = std::make_unique<VisualizationGraphWidget>();
+                 auto provider = std::make_shared<SimpleRange<10> >();
+                 auto range = DateTimeRange::fromDateTime(QDate(2018, 8, 7), QTime(14, 00), QDate(2018, 8, 7),QTime(16, 00));
+                 auto var = static_cast<SqpApplication *>(qApp)->variableController().createVariable("V1", {{"", "scalar"}}, provider, range);
+                 w->addVariable(var, range);
+                 while (!isReady(var))
+                 QCoreApplication::processEvents();
+                 auto cent = center(w.get());
+                 return {std::move(w), var, range};
+             }
              class A_SimpleGraph : public QObject {
              private slots:
                  void scrolls_left_with_mouse()
                  {
-                     A_SIMPLE_GRAPH_FIXTURE;
+                     auto [w, var, range] = build_simple_graph_test();
+                     QVERIFY(prepare_gui_test(w.get()));
+                     auto cent = center(w.get());
                      for (auto i = 0; i < 100; i++) {
-                         QTest::mousePress(&w, Qt::LeftButton, Qt::NoModifier, cent, 1);
-                         mouseMove(&w, {cent.x() + 200, cent.y()}, Qt::LeftButton);
-                         QTest::mouseRelease(&w, Qt::LeftButton);
+                         QTest::mousePress(w.get(), Qt::LeftButton, Qt::NoModifier, cent, 1);
+                         mouseMove(w.get(), {cent.x() + 200, cent.y()}, Qt::LeftButton);
+                         QTest::mouseRelease(w.get(), Qt::LeftButton);
                          while (!isReady(var))
                              QCoreApplication::processEvents();
                      }
                  void scrolls_right_with_mouse()
                  {
-                     A_SIMPLE_GRAPH_FIXTURE;
+                     auto [w, var, range] = build_simple_graph_test();
+                     QVERIFY(prepare_gui_test(w.get()));
+                     auto cent = center(w.get());
                      for (auto i = 0; i < 100; i++) {
-                         QTest::mousePress(&w, Qt::LeftButton, Qt::NoModifier, cent, 1);
-                         mouseMove(&w, {cent.x() - 200, cent.y()}, Qt::LeftButton);
-                         QTest::mouseRelease(&w, Qt::LeftButton);
+                         QTest::mousePress(w.get(), Qt::LeftButton, Qt::NoModifier, cent, 1);
+                         mouseMove(w.get(), {cent.x() - 200, cent.y()}, Qt::LeftButton);
+                         QTest::mouseRelease(w.get(), Qt::LeftButton);
                          while (!isReady(var))
                              QCoreApplication::processEvents();
                      }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages