GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1302:6fce638804d1

add format

perrinel -

r1302:6fce638804d1

parent child

Context file:

r1302:6fce638804d1

plugins/amda/tests/FuzzingOperations.cpp +13 -13

             #include "FuzzingOperations.h"
             #include "FuzzingUtils.h"
             #include <Data/IDataProvider.h>
             #include <Variable/Variable.h>
             #include <Variable/VariableController.h>
             #include <QUuid>
             #include <functional>
             Q_LOGGING_CATEGORY(LOG_FuzzingOperations, "FuzzingOperations")
             namespace {
             struct CreateOperation : public IFuzzingOperation {
                 bool canExecute(VariableId variableId, const FuzzingState &fuzzingState) const override
                 {
                     // A variable can be created only if it doesn't exist yet
                     return fuzzingState.variableState(variableId).m_Variable == nullptr;
                 }
                 void execute(VariableId variableId, FuzzingState &fuzzingState,
                              VariableController &variableController,
                              const Properties &properties) const override
                 {
                     // Retrieves metadata pool from properties, and choose one of the metadata entries to
                     // associate it with the variable
                     auto metaDataPool = properties.value(METADATA_POOL_PROPERTY).value<MetadataPool>();
                     auto variableMetadata = RandomGenerator::instance().randomChoice(metaDataPool);
                     // Retrieves provider
                     auto variableProvider
                         = properties.value(PROVIDER_PROPERTY).value<std::shared_ptr<IDataProvider> >();
                     auto variableName = QString{"Var_%1"}.arg(QUuid::createUuid().toString());
-                    qCInfo(LOG_FuzzingOperations()).noquote()
+                    qCInfo(LOG_FuzzingOperations()).noquote() << "Creating variable" << variableName
-                        << "Creating variable" << variableName << "(metadata:" << variableMetadata << ")...";
+                                                              << "(metadata:" << variableMetadata << ")...";
                     auto newVariable
                         = variableController.createVariable(variableName, variableMetadata, variableProvider);
                     // Updates variable's state
                     auto &variableState = fuzzingState.variableState(variableId);
                     variableState.m_Range = properties.value(INITIAL_RANGE_PROPERTY).value<SqpRange>();
                     std::swap(variableState.m_Variable, newVariable);
                 }
             };
             struct DeleteOperation : public IFuzzingOperation {
                 bool canExecute(VariableId variableId, const FuzzingState &fuzzingState) const override
                 {
                     // A variable can be delete only if it exists
                     return fuzzingState.variableState(variableId).m_Variable != nullptr;
                 }
                 void execute(VariableId variableId, FuzzingState &fuzzingState,
                              VariableController &variableController, const Properties &) const override
                 {
                     auto &variableState = fuzzingState.variableState(variableId);
-                    qCInfo(LOG_FuzzingOperations()).noquote()
+                    qCInfo(LOG_FuzzingOperations()).noquote() << "Deleting variable"
-                        << "Deleting variable" << variableState.m_Variable->name() << "...";
+                                                              << variableState.m_Variable->name() << "...";
                     variableController.deleteVariable(variableState.m_Variable);
                     // Updates variable's state
                     variableState.m_Range = INVALID_RANGE;
                     variableState.m_Variable = nullptr;
                     // Desynchronizes the variable if it was in a sync group
                     auto syncGroupId = fuzzingState.syncGroupId(variableId);
                     fuzzingState.desynchronizeVariable(variableId, syncGroupId);
                 }
             };
             /**
              * Defines a move operation through a range.
              *
              * A move operation is determined by three functions:
              * - Two 'move' functions, used to indicate in which direction the beginning and the end of a range
              * are going during the operation. These functions will be:
              * -- {<- / <-} for pan left
              * -- {-> / ->} for pan right
              * -- {-> / <-} for zoom in
              * -- {<- / ->} for zoom out
              * - One 'max move' functions, used to compute the max delta at which the operation can move a
              * range, according to a max range. For exemple, for a range of {1, 5} and a max range of {0, 10},
              * max deltas will be:
              * -- {0, 4} for pan left
              * -- {6, 10} for pan right
              * -- {3, 3} for zoom in
              * -- {0, 6} for zoom out (same spacing left and right)
              */
             struct MoveOperation : public IFuzzingOperation {
                 using MoveFunction = std::function<double(double currentValue, double maxValue)>;
                 using MaxMoveFunction = std::function<double(const SqpRange &range, const SqpRange &maxRange)>;
                 explicit MoveOperation(MoveFunction rangeStartMoveFun, MoveFunction rangeEndMoveFun,
                                        MaxMoveFunction maxMoveFun,
                                        const QString &label = QStringLiteral("Move operation"))
                         : m_RangeStartMoveFun{std::move(rangeStartMoveFun)},
                           m_RangeEndMoveFun{std::move(rangeEndMoveFun)},
                           m_MaxMoveFun{std::move(maxMoveFun)},
                           m_Label{label}
                 {
                 }
                 bool canExecute(VariableId variableId, const FuzzingState &fuzzingState) const override
                 {
                     return fuzzingState.variableState(variableId).m_Variable != nullptr;
                 }
                 void execute(VariableId variableId, FuzzingState &fuzzingState,
                              VariableController &variableController,
                              const Properties &properties) const override
                 {
                     auto &variableState = fuzzingState.variableState(variableId);
                     auto variable = variableState.m_Variable;
                     // Gets the max range defined
                     auto maxRange = properties.value(MAX_RANGE_PROPERTY, QVariant::fromValue(INVALID_RANGE))
                                         .value<SqpRange>();
                     auto variableRange = variableState.m_Range;
                     if (maxRange == INVALID_RANGE || variableRange.m_TStart < maxRange.m_TStart
                         || variableRange.m_TEnd > maxRange.m_TEnd) {
                         qCWarning(LOG_FuzzingOperations()) << "Can't execute operation: invalid max range";
                         return;
                     }
                     // Computes the max delta at which the variable can move, up to the limits of the max range
                     auto deltaMax = m_MaxMoveFun(variableRange, maxRange);
                     // Generates random delta that will be used to move variable
                     auto delta = RandomGenerator::instance().generateDouble(0, deltaMax);
                     // Moves variable to its new range
                     auto isSynchronized = !fuzzingState.syncGroupId(variableId).isNull();
                     auto newVariableRange = SqpRange{m_RangeStartMoveFun(variableRange.m_TStart, delta),
                                                      m_RangeEndMoveFun(variableRange.m_TEnd, delta)};
-                    qCInfo(LOG_FuzzingOperations()).noquote()
+                    qCInfo(LOG_FuzzingOperations()).noquote() << "Performing" << m_Label << "on"
-                        << "Performing" << m_Label << "on" << variable->name() << "(from" << variableRange
+                                                              << variable->name() << "(from" << variableRange
-                        << "to" << newVariableRange << ")...";
+                                                              << "to" << newVariableRange << ")...";
                     variableController.onRequestDataLoading({variable}, newVariableRange, isSynchronized);
                     // Updates state
                     fuzzingState.updateRanges(variableId, newVariableRange);
                 }
                 MoveFunction m_RangeStartMoveFun;
                 MoveFunction m_RangeEndMoveFun;
                 MaxMoveFunction m_MaxMoveFun;
                 QString m_Label;
             };
             struct SynchronizeOperation : public IFuzzingOperation {
                 bool canExecute(VariableId variableId, const FuzzingState &fuzzingState) const override
                 {
                     auto variable = fuzzingState.variableState(variableId).m_Variable;
                     return variable != nullptr && !fuzzingState.m_SyncGroupsPool.empty()
                            && fuzzingState.syncGroupId(variableId).isNull();
                 }
                 void execute(VariableId variableId, FuzzingState &fuzzingState,
                              VariableController &variableController, const Properties &) const override
                 {
                     auto &variableState = fuzzingState.variableState(variableId);
                     // Chooses a random synchronization group and adds the variable into sync group
                     auto syncGroupId = RandomGenerator::instance().randomChoice(fuzzingState.syncGroupsIds());
-                    qCInfo(LOG_FuzzingOperations()).noquote()
+                    qCInfo(LOG_FuzzingOperations()).noquote() << "Adding" << variableState.m_Variable->name()
-                        << "Adding" << variableState.m_Variable->name() << "into synchronization group"
+                                                              << "into synchronization group" << syncGroupId
-                        << syncGroupId << "...";
+                                                              << "...";
                     variableController.onAddSynchronized(variableState.m_Variable, syncGroupId);
                     // Updates state
                     fuzzingState.synchronizeVariable(variableId, syncGroupId);
                 }
             };
             struct DesynchronizeOperation : public IFuzzingOperation {
                 bool canExecute(VariableId variableId, const FuzzingState &fuzzingState) const override
                 {
                     auto variable = fuzzingState.variableState(variableId).m_Variable;
                     return variable != nullptr && !fuzzingState.syncGroupId(variableId).isNull();
                 }
                 void execute(VariableId variableId, FuzzingState &fuzzingState,
                              VariableController &variableController, const Properties &) const override
                 {
                     auto &variableState = fuzzingState.variableState(variableId);
                     // Gets the sync group of the variable
                     auto syncGroupId = fuzzingState.syncGroupId(variableId);
-                    qCInfo(LOG_FuzzingOperations()).noquote()
+                    qCInfo(LOG_FuzzingOperations()).noquote() << "Removing" << variableState.m_Variable->name()
-                        << "Removing" << variableState.m_Variable->name() << "from synchronization group"
+                                                              << "from synchronization group" << syncGroupId
-                        << syncGroupId << "...";
+                                                              << "...";
                     variableController.onAddSynchronized(variableState.m_Variable, syncGroupId);
                     // Updates state
                     fuzzingState.desynchronizeVariable(variableId, syncGroupId);
                 }
             };
             struct UnknownOperation : public IFuzzingOperation {
                 bool canExecute(VariableId, const FuzzingState &) const override { return false; }
                 void execute(VariableId, FuzzingState &, VariableController &,
                              const Properties &) const override
                 {
                 }
             };
             } // namespace
             std::unique_ptr<IFuzzingOperation> FuzzingOperationFactory::create(FuzzingOperationType type)
             {
                 switch (type) {
                     case FuzzingOperationType::CREATE:
                         return std::make_unique<CreateOperation>();
                     case FuzzingOperationType::DELETE:
                         return std::make_unique<DeleteOperation>();
                     case FuzzingOperationType::PAN_LEFT:
                         return std::make_unique<MoveOperation>(
                             std::minus<double>(), std::minus<double>(),
                             [](const SqpRange &range, const SqpRange &maxRange) {
                                 return range.m_TStart - maxRange.m_TStart;
                             },
                             QStringLiteral("Pan left operation"));
                     case FuzzingOperationType::PAN_RIGHT:
                         return std::make_unique<MoveOperation>(
                             std::plus<double>(), std::plus<double>(),
                             [](const SqpRange &range, const SqpRange &maxRange) {
                                 return maxRange.m_TEnd - range.m_TEnd;
                             },
                             QStringLiteral("Pan right operation"));
                     case FuzzingOperationType::ZOOM_IN:
                         return std::make_unique<MoveOperation>(
                             std::plus<double>(), std::minus<double>(),
                             [](const SqpRange &range, const SqpRange &maxRange) {
                                 Q_UNUSED(maxRange)
                                 return range.m_TEnd - (range.m_TStart + range.m_TEnd) / 2.;
                             },
                             QStringLiteral("Zoom in operation"));
                     case FuzzingOperationType::ZOOM_OUT:
                         return std::make_unique<MoveOperation>(
                             std::minus<double>(), std::plus<double>(),
                             [](const SqpRange &range, const SqpRange &maxRange) {
                                 return std::min(range.m_TStart - maxRange.m_TStart,
                                                 maxRange.m_TEnd - range.m_TEnd);
                             },
                             QStringLiteral("Zoom out operation"));
                     case FuzzingOperationType::SYNCHRONIZE:
                         return std::make_unique<SynchronizeOperation>();
                     case FuzzingOperationType::DESYNCHRONIZE:
                         return std::make_unique<DesynchronizeOperation>();
                     default:
                         // Default case returns unknown operation
                         break;
                 }
                 return std::make_unique<UnknownOperation>();
             }

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

             #include "FuzzingValidators.h"
             #include "FuzzingDefs.h"
             #include <Data/DataSeries.h>
             #include <Variable/Variable.h>
             #include <QTest>
             #include <functional>
             Q_LOGGING_CATEGORY(LOG_FuzzingValidators, "FuzzingValidators")
             namespace {
             // ////////////// //
             // DATA VALIDATOR //
             // ////////////// //
             /// Singleton used to validate data of a variable
             class DataValidatorHelper {
             public:
                 /// @return the single instance of the helper
                 static DataValidatorHelper &instance();
                 virtual ~DataValidatorHelper() noexcept = default;
                 virtual void validate(const VariableState &variableState) const = 0;
             };
             /**
              * Default implementation of @sa DataValidatorHelper
              */
             class DefaultDataValidatorHelper : public DataValidatorHelper {
             public:
                 void validate(const VariableState &variableState) const override
                 {
                     Q_UNUSED(variableState);
                     qCWarning(LOG_FuzzingValidators()).noquote() << "Checking variable's data... WARN: no data "
                                                                     "verification is available for this server";
                 }
             };
             /// Data resolution in local server's files
             const auto LOCALHOST_SERVER_RESOLUTION = 4;
             /// Reference value used to generate the data on the local server (a value is the number of seconds
             /// between the data date and this reference date)
             const auto LOCALHOST_REFERENCE_VALUE
                 = DateUtils::secondsSinceEpoch(QDateTime{QDate{2000, 1, 1}, QTime{}, Qt::UTC});
             /**
              * Implementation of @sa DataValidatorHelper for the local AMDA server
              */
             class LocalhostServerDataValidatorHelper : public DataValidatorHelper {
             public:
                 void validate(const VariableState &variableState) const override
                 {
                     // Don't check data for null variable
                     if (!variableState.m_Variable || variableState.m_Range == INVALID_RANGE) {
                         return;
                     }
                     auto message = "Checking variable's data...";
                     auto toDateString = [](double value) { return DateUtils::dateTime(value).toString(); };
                     // Checks that data are defined
                     auto variableDataSeries = variableState.m_Variable->dataSeries();
                     if (variableDataSeries == nullptr && variableState.m_Range != INVALID_RANGE) {
                         qCInfo(LOG_FuzzingValidators()).noquote()
                             << message << "FAIL: the variable has no data while a range is defined";
                         QFAIL("");
                     }
                     auto dataIts = variableDataSeries->xAxisRange(variableState.m_Range.m_TStart,
                                                                   variableState.m_Range.m_TEnd);
                     // Checks that the data are well defined in the range:
                     // - there is at least one data
                     // - the data are consistent (no data holes)
                     if (std::distance(dataIts.first, dataIts.second) == 0) {
-                        qCInfo(LOG_FuzzingValidators()).noquote()
+                        qCInfo(LOG_FuzzingValidators()).noquote() << message
-                            << message << "FAIL: the variable has no data";
+                                                                  << "FAIL: the variable has no data";
                         QFAIL("");
                     }
                     auto firstXAxisData = dataIts.first->x();
                     auto lastXAxisData = (dataIts.second - 1)->x();
                     if (std::abs(firstXAxisData - variableState.m_Range.m_TStart) > LOCALHOST_SERVER_RESOLUTION
                         || std::abs(lastXAxisData - variableState.m_Range.m_TEnd)
                                > LOCALHOST_SERVER_RESOLUTION) {
                         qCInfo(LOG_FuzzingValidators()).noquote()
                             << message << "FAIL: the data in the defined range are inconsistent (data hole "
                                           "found at the beginning or the end)";
                         QFAIL("");
                     }
                     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);
                         });
                     if (dataHoleIt != dataIts.second) {
                         qCInfo(LOG_FuzzingValidators()).noquote()
                             << message << "FAIL: the data in the defined range are inconsistent (data hole "
                                           "found between times "
                             << toDateString(dataHoleIt->x()) << "and " << toDateString((dataHoleIt + 1)->x())
                             << ")";
                         QFAIL("");
                     }
                     // Checks values
                     auto dataIndex = 0;
                     for (auto dataIt = dataIts.first; dataIt != dataIts.second; ++dataIt, ++dataIndex) {
                         auto xAxisData = dataIt->x();
                         auto valuesData = dataIt->values();
                         for (auto valueIndex = 0, valueEnd = valuesData.size(); valueIndex < valueEnd;
                              ++valueIndex) {
                             auto value = valuesData.at(valueIndex);
                             auto expectedValue = xAxisData + valueIndex * LOCALHOST_SERVER_RESOLUTION
                                                  - LOCALHOST_REFERENCE_VALUE;
                             if (value != expectedValue) {
                                 qCInfo(LOG_FuzzingValidators()).noquote()
                                     << message << "FAIL: incorrect value data at time"
                                     << toDateString(xAxisData) << ", index" << valueIndex << "(found:" << value
                                     << ", expected:" << expectedValue << ")";
                                 QFAIL("");
                             }
                         }
                     }
                     // At this step validation is OK
                     qCInfo(LOG_FuzzingValidators()).noquote() << message << "OK";
                 }
             };
             /// Creates the @sa DataValidatorHelper according to the server passed in parameter
             std::unique_ptr<DataValidatorHelper> createDataValidatorInstance(const QString &server)
             {
                 if (server == QString{"localhost"}) {
                     return std::make_unique<LocalhostServerDataValidatorHelper>();
                 }
                 else {
                     return std::make_unique<DefaultDataValidatorHelper>();
                 }
             }
             DataValidatorHelper &DataValidatorHelper::instance()
             {
                 // Creates instance depending on the SCIQLOP_AMDA_SERVER value at compile time
                 static auto instance = createDataValidatorInstance(SCIQLOP_AMDA_SERVER);
                 return *instance;
             }
             // /////////////// //
             // RANGE VALIDATOR //
             // /////////////// //
             /**
              * Checks that a range of a variable matches the expected range passed as a parameter
              * @param variable the variable for which to check the range
              * @param expectedRange the expected range
              * @param getVariableRangeFun the function to retrieve the range from the variable
              * @remarks if the variable is null, checks that the expected range is the invalid range
              */
             void validateRange(std::shared_ptr<Variable> variable, const SqpRange &expectedRange,
                                std::function<SqpRange(const Variable &)> getVariableRangeFun)
             {
                 auto compare = [](const auto &range, const auto &expectedRange, const auto &message) {
                     if (range == expectedRange) {
                         qCInfo(LOG_FuzzingValidators()).noquote() << message << "OK";
                     }
                     else {
-                        qCInfo(LOG_FuzzingValidators()).noquote()
+                        qCInfo(LOG_FuzzingValidators()).noquote() << message << "FAIL (current range:" << range
-                            << message << "FAIL (current range:" << range
+                                                                  << ", expected range:" << expectedRange
-                            << ", expected range:" << expectedRange << ")";
+                                                                  << ")";
                         QFAIL("");
                     }
                 };
                 if (variable) {
                     compare(getVariableRangeFun(*variable), expectedRange, "Checking variable's range...");
                 }
                 else {
                     compare(INVALID_RANGE, expectedRange, "Checking that there is no range set...");
                 }
             }
             /**
              * Default implementation of @sa IFuzzingValidator. This validator takes as parameter of its
              * construction a function of validation which is called in the validate() method
              */
             class FuzzingValidator : public IFuzzingValidator {
             public:
                 /// Signature of a validation function
                 using ValidationFunction = std::function<void(const VariableState &variableState)>;
                 explicit FuzzingValidator(ValidationFunction fun) : m_Fun(std::move(fun)) {}
                 void validate(const VariableState &variableState) const override { m_Fun(variableState); }
             private:
                 ValidationFunction m_Fun;
             };
             } // namespace
             std::unique_ptr<IFuzzingValidator> FuzzingValidatorFactory::create(FuzzingValidatorType type)
             {
                 switch (type) {
                     case FuzzingValidatorType::DATA:
                         return std::make_unique<FuzzingValidator>([](const VariableState &variableState) {
                             DataValidatorHelper::instance().validate(variableState);
                         });
                     case FuzzingValidatorType::RANGE:
                         return std::make_unique<FuzzingValidator>([](const VariableState &variableState) {
                             auto getVariableRange = [](const Variable &variable) { return variable.range(); };
                             validateRange(variableState.m_Variable, variableState.m_Range, getVariableRange);
                         });
                     default:
                         // Default case returns invalid validator
                         break;
                 }
                 // Invalid validator
                 return std::make_unique<FuzzingValidator>(
                     [](const VariableState &) { QFAIL("Invalid validator"); });
             }

General Comments 3

perrinel

|

Auto status change to "Under Review"

perrinel

|

Status change > Approved

Write
Preview

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

	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