HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1190:767abfa514f1

Some fixes...

Alexandre Leroux -

r1190:767abfa514f1

parent child

Context file:

r1190:767abfa514f1

Collapse all files

core/include/Data/SqpRange.h +2 -2

                 static SqpRange fromDateTime(const QDate &startDate, const QTime &startTime,
                                              const QDate &endDate, const QTime &endTime)
                 {
-                    return {DateUtils::secondsSinceEpoch(QDateTime{startDate, startTime}),
+                    return {DateUtils::secondsSinceEpoch(QDateTime{startDate, startTime, Qt::UTC}),
-                            DateUtils::secondsSinceEpoch(QDateTime{endDate, endTime})};
+                            DateUtils::secondsSinceEpoch(QDateTime{endDate, endTime, Qt::UTC})};
                 }
                 /// Start time (UTC)

plugins/amda/tests/FuzzingDefs.cpp +1 0

             const QString NB_MAX_OPERATIONS_PROPERTY = QStringLiteral("component");
             const QString NB_MAX_VARIABLES_PROPERTY = QStringLiteral("nbMaxVariables");
             const QString AVAILABLE_OPERATIONS_PROPERTY = QStringLiteral("availableOperations");
+            const QString INITIAL_RANGE_PROPERTY = QStringLiteral("initialRange");
             const QString MAX_RANGE_PROPERTY = QStringLiteral("maxRange");
             const QString METADATA_POOL_PROPERTY = QStringLiteral("metadataPool");
             const QString PROVIDER_PROPERTY = QStringLiteral("provider");

plugins/amda/tests/FuzzingDefs.h +4 0

             /// Set of operations available for the test
             extern const QString AVAILABLE_OPERATIONS_PROPERTY;
+            /// Range with which the timecontroller is initialized
+            extern const QString INITIAL_RANGE_PROPERTY;
             /// Max range that an operation can reach
             extern const QString MAX_RANGE_PROPERTY;

plugins/amda/tests/FuzzingOperations.cpp +5 -2

                         = properties.value(PROVIDER_PROPERTY).value<std::shared_ptr<IDataProvider> >();
                     auto variableName = QString{"Var_%1"}.arg(QUuid::createUuid().toString());
-                    qCInfo(LOG_FuzzingOperations())
+                    qCInfo(LOG_FuzzingOperations()).noquote()
                         << "Creating variable" << variableName << "(metadata:" << variableMetadata << ")";
                     auto newVariable
                         = variableController.createVariable(variableName, variableMetadata, variableProvider);
+                    // Updates variable's state
+                    variableState.m_Range = properties.value(INITIAL_RANGE_PROPERTY).value<SqpRange>();
                     std::swap(variableState.m_Variable, newVariable);
                 }
             };
                     // Moves variable to its new range
                     auto newVariableRange = SqpRange{m_RangeStartMoveFun(variableRange.m_TStart, delta),
                                                      m_RangeEndMoveFun(variableRange.m_TEnd, delta)};
-                    qCInfo(LOG_FuzzingOperations())
+                    qCInfo(LOG_FuzzingOperations()).noquote()
                         << "Performing" << m_Label << "on" << variable->name() << "(from" << variableRange
                         << "to" << newVariableRange << ")...";
                     variableController.onRequestDataLoading({variable}, newVariableRange, false);

plugins/amda/tests/TestAmdaFuzzing.cpp +6 -5

                 void execute()
                 {
-                    qCInfo(LOG_TestAmdaFuzzing()) << "Running" << nbMaxOperations() << "operations on"
+                    qCInfo(LOG_TestAmdaFuzzing()).noquote() << "Running" << nbMaxOperations() << "operations on"
-                                                  << nbMaxVariables() << "variable(s)...";
+                                                            << nbMaxVariables() << "variable(s)...";
                     auto canExecute = true;
                     for (auto i = 0; i < nbMaxOperations() && canExecute; ++i) {
                         }
                         else {
-                            qCInfo(LOG_TestAmdaFuzzing())
+                            qCInfo(LOG_TestAmdaFuzzing()).noquote()
                                 << "No more operations are available, the execution of the test will stop...";
                         }
                     }
-                    qCInfo(LOG_TestAmdaFuzzing()) << "Execution of the test completed.";
+                    qCInfo(LOG_TestAmdaFuzzing()).noquote() << "Execution of the test completed.";
                 }
             private:
                 // Sets initial range on time controller
                 SqpRange initialRange{initialRangeStart, initialRangeEnd};
-                qCInfo(LOG_TestAmdaFuzzing()) << "Setting initial range to" << initialRange << "...";
+                qCInfo(LOG_TestAmdaFuzzing()).noquote() << "Setting initial range to" << initialRange << "...";
                 timeController.onTimeToUpdate(initialRange);
+                properties.insert(INITIAL_RANGE_PROPERTY, QVariant::fromValue(initialRange));
                 FuzzingTest test{variableController, properties};
                 test.execute();

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