simplify test class

Signed-off-by: Peter Mitri <[email protected]>

src/solver/expressions/include/antares/solver/expressions/NodeRegistry.h

@@ -9,14 +9,13 @@ class NodeRegistry
 {
 public:
     NodeRegistry() = default;
-    NodeRegistry(Antares::Solver::Nodes::Node* node,
-                 Antares::Solver::Registry<Antares::Solver::Nodes::Node> registry);
+    NodeRegistry(Nodes::Node* node, Registry<Nodes::Node> registry);
 
     // Shallow copy
     NodeRegistry(NodeRegistry&&) = default;
     NodeRegistry& operator=(NodeRegistry&&) = default;
 
-    Antares::Solver::Nodes::Node* node;
-    Antares::Solver::Registry<Antares::Solver::Nodes::Node> registry;
+    Nodes::Node* node;
+    Registry<Nodes::Node> registry;
 };
 } // namespace Antares::Solver

src/tests/src/solver/optim-model-filler/test_componentFiller.cpp

@@ -36,15 +36,6 @@ using namespace Antares::Optimization;
 using namespace Antares::Solver::Nodes;
 using namespace std;
 
-static Expression generateExpression(Node* node)
-{
-    // TODO : this seems too complicated; try to make building Expressions easier
-    Antares::Solver::Registry<Node> registry;
-    Antares::Solver::NodeRegistry node_registry(node, move(registry));
-    Expression expression("expression", move(node_registry));
-    return move(expression);
-}
-
 struct VariableData
 {
     string id;
@@ -118,6 +109,12 @@ void LinearProblemBuildingFixture::createModel(string modelId,
                                                vector<VariableData> variablesData,
                                                vector<ConstraintData> constraintsData)
 {
+    auto generateExpression = [this](Node* node)
+    {
+        Antares::Solver::NodeRegistry node_registry(node, move(nodes));
+        Expression expression("expression", move(node_registry));
+        return move(expression);
+    };
     vector<Parameter> parameters;
     for (auto parameter_id: parameterIds)
     {