GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1248:7541b71e5b78

Wait for the end of an acquisition to validate an operation (3)...

Alexandre Leroux -

r1248:7541b71e5b78

parent child

Context file:

r1248:7541b71e5b78

Collapse all files

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

             #include "FuzzingDefs.h"
+            const QString ACQUISITION_TIMEOUT_PROPERTY = QStringLiteral("acquisitionTimeout");
             const QString NB_MAX_OPERATIONS_PROPERTY = QStringLiteral("component");
             const QString NB_MAX_SYNC_GROUPS_PROPERTY = QStringLiteral("nbSyncGroups");
             const QString NB_MAX_VARIABLES_PROPERTY = QStringLiteral("nbMaxVariables");

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

             // Constants //
             // ///////// //
+            /// Timeout set for data acquisition for an operation (in ms)
+            extern const QString ACQUISITION_TIMEOUT_PROPERTY;
             /// Max number of operations to generate
             extern const QString NB_MAX_OPERATIONS_PROPERTY;

plugins/amda/tests/TestAmdaFuzzing.cpp +17 -9

             // ///////// //
             // Defaults values used when the associated properties have not been set for the test
+            const auto ACQUISITION_TIMEOUT_DEFAULT_VALUE = 30000;
             const auto NB_MAX_OPERATIONS_DEFAULT_VALUE = 100;
             const auto NB_MAX_SYNC_GROUPS_DEFAULT_VALUE = 1;
             const auto NB_MAX_VARIABLES_DEFAULT_VALUE = 1;
                         nextValidationCounter = RandomGenerator::instance().generateInt(
                             validationFrequencies().first, validationFrequencies().second);
                         qCInfo(LOG_TestAmdaFuzzing()).noquote()
-                            << "Next validation in " << nextValidationCounter << "operations...";
+                            << "Next validation in " << nextValidationCounter << "operation(s)...";
                     };
                     updateValidationCounter();
                             auto variableId = variableOperation.first;
                             auto fuzzingOperation = variableOperation.second;
+                            auto waitAcquisition = nextValidationCounter == 0;
                             fuzzingOperation->execute(variableId, m_FuzzingState, m_VariableController,
                                                       m_Properties);
-                            // Delays the next operation with a randomly generated time
+                            if (waitAcquisition) {
-                            auto delay = RandomGenerator::instance().generateInt(operationDelays().first,
+                                qCDebug(LOG_TestAmdaFuzzing()) << "Waiting for acquisition to finish...";
-                                                                                 operationDelays().second);
+                                SignalWaiter{m_VariableController, SIGNAL(acquisitionFinished())}.wait(
-                            qCDebug(LOG_TestAmdaFuzzing())
+                                    acquisitionTimeout());
-                                << "Waiting " << delay << "ms before the next operation...";
-                            QTest::qWait(delay);
-                            // Validates variables
+                                // Validates variables
-                            if (nextValidationCounter == 0) {
                                 validate(m_FuzzingState.m_VariablesPool, validators());
                                 updateValidationCounter();
                             }
+                            else {
+                                // Delays the next operation with a randomly generated time
+                                auto delay = RandomGenerator::instance().generateInt(operationDelays().first,
+                                                                                     operationDelays().second);
+                                qCDebug(LOG_TestAmdaFuzzing())
+                                    << "Waiting " << delay << "ms before the next operation...";
+                                QTest::qWait(delay);
+                            }
                         }
                         else {
                             qCInfo(LOG_TestAmdaFuzzing()).noquote()

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