diff --git a/unit_tests/operator/Test_MetaOperator.cpp b/unit_tests/operator/Test_MetaOperator.cpp index c090427914390369452ce3259f47830f01ab1754..aac66429adffc3e5a034325234eff0a010067294 100644 --- a/unit_tests/operator/Test_MetaOperator.cpp +++ b/unit_tests/operator/Test_MetaOperator.cpp @@ -14,6 +14,7 @@ #include "aidge/operator/MetaOperator.hpp" #include "aidge/operator/MetaOperatorDefs.hpp" #include "aidge/graph/GraphView.hpp" +#include "aidge/graph/Testing.hpp" #include <cstddef> using namespace Aidge; @@ -26,8 +27,8 @@ TEST_CASE("[core/operators] MetaOperator", "[Operator]") { REQUIRE(microGraph->getNodes().size() == 2); REQUIRE(microGraph->inputNodes().size() == 2); // 2 because Conv has inputs outside the meta-op (Producers for weight and bias) - // Order not garanteed by the GraphView - //REQUIRE((*microGraph->inputNodes().begin())->getOperator()->type() == "Pad"); + REQUIRE(nodePtrTo(microGraph->getOrderedInputs()) == std::vector<std::pair<std::string, IOIndex_t>>({{"Pad", 0}, {"Conv", 1}, {"Conv", 2}})); + REQUIRE(nodePtrTo(microGraph->getOrderedOutputs()) == std::vector<std::pair<std::string, IOIndex_t>>({{"Conv", 0}})); REQUIRE(microGraph->outputNodes().size() == 1); REQUIRE((*microGraph->outputNodes().begin())->getOperator()->type() == "Conv"); REQUIRE(op->nbInputs() == 3); @@ -42,8 +43,7 @@ TEST_CASE("[core/operators] MetaOperator", "[Operator]") { REQUIRE(op->getOperator()->outputDimsForwarded()); REQUIRE(op->getOperator()->getOutput(0)->dims() == std::vector<size_t>({2,3,5,5})); REQUIRE(op->getOperator()->getInput(0) == myInput); - // Order not garanteed by the GraphView - //REQUIRE((*microGraph->inputNodes().begin())->getOperator()->getInput(0) == myInput); + REQUIRE(microGraph->getOrderedInputs()[0].first->getOperator()->getInput(0) == myInput); REQUIRE(op->getOperator()->getOutput(0) == (*microGraph->outputNodes().begin())->getOperator()->getOutput(0)); //op->getOperator()->updateConsummerProducer(); // require implementation