GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1228:6bf9a231f6d8

Adds validators to the fuzzing test...

Alexandre Leroux -

r1228:6bf9a231f6d8

parent child

Context file:

r1228:6bf9a231f6d8

Collapse all files

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

             const QString METADATA_POOL_PROPERTY = QStringLiteral("metadataPool");
             const QString PROVIDER_PROPERTY = QStringLiteral("provider");
             const QString OPERATION_DELAY_PROPERTY = QStringLiteral("operationDelay");
+            const QString VALIDATORS_PROPERTY = QStringLiteral("validators");

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

             /// Time left for an operation to execute
             extern const QString OPERATION_DELAY_PROPERTY;
+            /// Validators used to validate an operation
+            extern const QString VALIDATORS_PROPERTY;
             // /////// //
             // Structs //

plugins/amda/tests/FuzzingValidators.h +7 0

             #ifndef SCIQLOP_FUZZINGVALIDATORS_H
             #define SCIQLOP_FUZZINGVALIDATORS_H
+            #include <memory>
+            #include <set>
             #include <QLoggingCategory>
+            #include <QMetaType>
             Q_DECLARE_LOGGING_CATEGORY(LOG_FuzzingValidators)
                 static std::unique_ptr<IFuzzingValidator> create(FuzzingValidatorType type);
             };
+            using ValidatorsTypes = std::vector<FuzzingValidatorType>;
+            Q_DECLARE_METATYPE(ValidatorsTypes)
             #endif // SCIQLOP_FUZZINGVALIDATORS_H

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

             #include "FuzzingDefs.h"
             #include "FuzzingOperations.h"
             #include "FuzzingUtils.h"
+            #include "FuzzingValidators.h"
             #include "AmdaProvider.h"
             using WeightedOperationsPool = std::map<std::shared_ptr<IFuzzingOperation>, Weight>;
             using VariablesPool = std::map<VariableId, VariableState>;
+            using Validators = std::vector<std::shared_ptr<IFuzzingValidator> >;
             // ///////// //
             // Constants //
             /// Delay between each operation (in ms)
             const auto OPERATION_DELAY_DEFAULT_VALUE = 3000;
+            /// Validators for the tests (executed in the order in which they're defined)
+            const auto VALIDATORS_DEFAULT_VALUE = QVariant::fromValue(
+                ValidatorsTypes{{FuzzingValidatorType::RANGE, FuzzingValidatorType::DATA}});
             // /////// //
             // Methods //
             // /////// //
                 return result;
             }
+            Validators createValidators(const ValidatorsTypes &types)
+            {
+                Validators result{};
+                std::transform(types.cbegin(), types.cend(), std::inserter(result, result.end()),
+                               [](const auto &type) { return FuzzingValidatorFactory::create(type); });
+                return result;
+            }
             /**
              * Class to run random tests
              */
                     return result;
                 }
+                Validators validators() const
+                {
+                    static auto result
+                        = createValidators(m_Properties.value(VALIDATORS_PROPERTY, VALIDATORS_DEFAULT_VALUE)
+                                               .value<ValidatorsTypes>());
+                    return result;
+                }
                 VariableController &m_VariableController;
                 Properties m_Properties;
                 VariablesPool m_VariablesPool;
                     "*.info=false\n"
                     "*.debug=false\n"
                     "FuzzingOperations.info=true\n"
+                    "FuzzingValidators.info=true\n"
                     "TestAmdaFuzzing.info=true\n");
                 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