HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1361:d94394edced5

simple graph unit test: simple scroll implemented...

jeandet -

r1361:d94394edced5

parent child

Context file:

r1361:d94394edced5

core +1 -1

		@@ -1,1 +1,1
1		Subproject commit e3779b99a071447cf8b6781a8ae6b414d6106b82
	1	Subproject commit cc47cd67a7b3418c7c0b065e7cb178abb63b0036

gui/tests/GUITestUtils/GUITestUtils.h +9 -9

              #include <qcustomplot.h>
-             QPoint center(QWidget* widget)
+             template <typename T>
+             QPoint center(T* widget)
              {
                  return QPoint{widget->width()/2,widget->height()/2};
              }
              HAS_METHOD(viewport)
+             template <typename T>
+             using is_QWidgetOrDerived = std::is_base_of<QWidget,T>;
+             template <typename T> using viewport_type = decltype(std::declval<T>().viewport());
              HAS_METHOD(topLevelItem)
              template<typename T>
              {
                  QCursor::setPos(widget->mapToGlobal(pos));
                  QMouseEvent event(QEvent::MouseMove, pos, Qt::NoButton, mouseModifier, Qt::NoModifier);
-                 if constexpr(has_viewport<T>)
+                 if constexpr(has_viewport<T> && is_QWidgetOrDerived<viewport_type<T>>::value )
                  {
                      qApp->sendEvent(widget->viewport(), &event);
                  }
              template <typename T>
              void setMouseTracking(T* widget)
              {
-                 if constexpr(has_viewport<T>)
+                 if constexpr(has_viewport<T> && is_QWidgetOrDerived<viewport_type<T>>::value)
                  {
                      widget->viewport()->setMouseTracking(true);
                  }
                  }
              }
-             template <>
-             void setMouseTracking<QCustomPlot>(QCustomPlot* widget)
+             {
-                 widget->setMouseTracking(true);
+             }
              template <typename T, typename T2>
              auto getItem(T* widget, T2 itemIndex)
              {

gui/tests/simple_graph/main.cpp +41 -22

              #include <SqpApplication.h>
              #include <Variable/VariableController2.h>
+             #include <Common/cpp_utils.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 \
+                     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);\
+                     GET_CHILD_WIDGET_FOR_GUI_TESTS(w, plot, QCustomPlot, "widget");\
+                     auto cent = center(plot);\
              class A_SimpleGraph : public QObject {
                  Q_OBJECT
              public:
-                 A_SimpleGraph(QObject* parent=Q_NULLPTR)
-                     :QObject(parent)
+                 {
+                 }
+                 explicit A_SimpleGraph(QObject *parent = Q_NULLPTR) : QObject(parent) {}
              private slots:
-                 void scrolls_with_mouse_wheel()
+                 void scrolls_with_mouse()
                  {
-                     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(!static_cast<SqpApplication*>(qApp)->variableController().isReady(var))QCoreApplication::processEvents();
-                     w.addVariable(var, range);
-                     GET_CHILD_WIDGET_FOR_GUI_TESTS(w,plot,QCustomPlot,"widget");
-                     auto cent = center(static_cast<QWidget*>(plot));
-                     for(auto i=0;i<10;i++)
+                     {
-                         QTest::mousePress(plot, Qt::LeftButton, Qt::NoModifier, cent, 10);
-                         QTest::mouseMove(plot, {cent.x()+100,cent.y()},10);
+                     A_SIMPLE_GRAPH_FIXTURE
+                     for (auto i = 0; i < 10; i++) {
+                         QTest::mousePress(plot, Qt::LeftButton, Qt::NoModifier, cent, 5);
+                         mouseMove(plot, {cent.x() + 200, cent.y()}, Qt::LeftButton);
                          QTest::mouseRelease(plot,Qt::LeftButton);
+                         while (!isReady(var))
+                             QCoreApplication::processEvents();
+                         /*
+                          * Just for visual inspection while running tests
+                          */
+                         plot->rescaleAxes();
+                         plot->replot();
+                         QCoreApplication::processEvents();
                      }
-                     while(!static_cast<SqpApplication*>(qApp)->variableController().isReady(var))QCoreApplication::processEvents();
+                     while (!isReady(var))
+                         QCoreApplication::processEvents();
+                     auto r = var->range();
+                     QVERIFY(r.m_TEnd < range.m_TEnd);
+                     // this fails :(
+                     QVERIFY(SciQLop::numeric::almost_equal<double>(r.delta(),range.delta(),1));
                  }
              };
              QT_BEGIN_NAMESPACE
              QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS
-             QT_END_NAMESPACE \
+             QT_END_NAMESPACE
              int main(int argc, char *argv[])
              {
                  SqpApplication app{argc, argv};

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