GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1328:6015d1ab6800

Fixes on fuzzing tests

Alexandre Leroux -

r1328:6015d1ab6800

parent child

Context file:

r1328:6015d1ab6800

Collapse all files

plugins/amda/tests/FuzzingDefs.cpp +18 -9

                     return;
                 }
-                // Registers variable into sync group: if it's the first variable, sets the variable range as
+                // Registers variable into sync group
-                // the sync group range
                 auto &syncGroup = m_SyncGroupsPool.at(syncGroupId);
+                auto &variableState = m_VariablesPool.at(variableId);
                 syncGroup.m_Variables.insert(variableId);
                 if (syncGroup.m_Variables.size() == 1) {
-                    auto &variableState = m_VariablesPool.at(variableId);
+                    // If it's the first variable, sets the variable range as the sync group range
                     syncGroup.m_Range = variableState.m_Range;
                 }
+                else {
+                    // If a variable is added to an existing group, sets its range to the group's range
+                    variableState.m_Range = syncGroup.m_Range;
+                }
             }
             void FuzzingState::desynchronizeVariable(VariableId variableId, SyncGroupId syncGroupId)
                 auto syncGroupId = this->syncGroupId(variableId);
                 // Retrieves the variables to update:
-                // - if the variable is synchronized to others, updates all synchronized variables
+                // - if the variable is synchronized to others, updates the range of the group and of all
+                // synchronized variables
                 // - otherwise, updates only the variable
-                auto variablesToUpdate = syncGroupId.isNull() ? std::set<VariableId>{variableId}
+                if (syncGroupId.isNull()) {
-                                                              : m_SyncGroupsPool.at(syncGroupId).m_Variables;
-                // Sets new range
-                for (const auto &variableId : variablesToUpdate) {
                     m_VariablesPool.at(variableId).m_Range = newRange;
                 }
+                else {
+                    auto &syncGroup = m_SyncGroupsPool.at(syncGroupId);
+                    syncGroup.m_Range = newRange;
+                    for (const auto &variableId : syncGroup.m_Variables) {
+                        m_VariablesPool.at(variableId).m_Range = newRange;
+                    }
+                }
             }

plugins/amda/tests/FuzzingOperations.cpp +4 -1

                     // Updates state
                     fuzzingState.synchronizeVariable(variableId, syncGroupId);
+                    variableController.onRequestDataLoading({variableState.m_Variable}, variableState.m_Range,
+                                                            false);
                 }
             };
                     qCInfo(LOG_FuzzingOperations()).noquote() << "Removing" << variableState.m_Variable->name()
                                                               << "from synchronization group" << syncGroupId
                                                               << "...";
-                    variableController.onAddSynchronized(variableState.m_Variable, syncGroupId);
+                    variableController.desynchronize(variableState.m_Variable, syncGroupId);
                     // Updates state
                     fuzzingState.desynchronizeVariable(variableId, syncGroupId);

plugins/amda/tests/FuzzingValidators.cpp +1 -1

                     auto dataHoleIt = std::adjacent_find(
                         dataIts.first, dataIts.second, [](const auto &it1, const auto &it2) {
                             /// @todo: validate resolution
-                            return std::abs(it1.x() - it2.x()) > 2 * (LOCALHOST_SERVER_RESOLUTION - 1);
+                            return std::abs(it1.x() - it2.x()) > 2 * LOCALHOST_SERVER_RESOLUTION;
                         });
                     if (dataHoleIt != dataIts.second) {

plugins/amda/tests/TestAmdaFuzzing.cpp +4 0

             int main(int argc, char *argv[])
             {
+                // Increases the test function timeout (which is 5 minutes by default) to 12 hours
+                // https://stackoverflow.com/questions/42655932/setting-timeout-to-qt-test
+                qputenv("QTEST_FUNCTION_TIMEOUT", QByteArray::number(12*60*60*1000));
                 QLoggingCategory::setFilterRules(
                     "*.warning=false\n"
                     "*.info=false\n"

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