ParkerBritt/Enzo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(test): add network manager singleton reset

Browse Source
This commit is contained in:
Parker Britt
2025-07-10 14:21:56 +01:00
parent 2d0c8fcfba
commit 5fb89f0589
4 changed files with 44 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -79,4 +79,5 @@ add_executable(${TestExec}
src/Engine/Operator/GeometryOpDef.cpp src/Engine/Operator/GeometryOpDef.cpp
) )
target_link_libraries(${TestExec} PRIVATE Catch2::Catch2WithMain Eigen3::Eigen Qt6::Core ) target_link_libraries(${TestExec} PRIVATE Catch2::Catch2WithMain Eigen3::Eigen Qt6::Core )
target_compile_definitions(${TestExec} PRIVATE UNIT_TEST)
target_include_directories(${TestExec} PUBLIC src) target_include_directories(${TestExec} PUBLIC src)

12
src/Engine/Network/NetworkManager.cpp
View File

@@ -100,6 +100,18 @@ std::optional<enzo::nt::OpId> enzo::nt::NetworkManager::getDisplayOp()
return displayOp_; return displayOp_;
} }
#ifdef UNIT_TEST
void enzo::nt::NetworkManager::_reset()
{
delete instancePtr_;
instancePtr_ = nullptr;
gopStore_.clear();
maxOpId_=0;
displayOp_.reset();
}
#endif
enzo::nt::NetworkManager* enzo::nt::NetworkManager::instancePtr_ = nullptr; enzo::nt::NetworkManager* enzo::nt::NetworkManager::instancePtr_ = nullptr;
std::unordered_map<enzo::nt::OpId, std::unique_ptr<enzo::nt::GeometryOperator>> enzo::nt::NetworkManager::gopStore_; std::unordered_map<enzo::nt::OpId, std::unique_ptr<enzo::nt::GeometryOperator>> enzo::nt::NetworkManager::gopStore_;

15
src/Engine/Network/NetworkManager.h
View File

@@ -17,24 +17,31 @@ public:
static NetworkManager* getInstance(); static NetworkManager* getInstance();
// functions
static OpId addOperator(); static OpId addOperator();
void setDisplayOp(OpId opId);
static std::optional<OpId> getDisplayOp(); static std::optional<OpId> getDisplayOp();
static bool isValidOp(nt::OpId opId); static bool isValidOp(nt::OpId opId);
static GeometryOperator& getGeoOperator(nt::OpId opId); static GeometryOperator& getGeoOperator(nt::OpId opId);
void setDisplayOp(OpId opId);
#ifdef UNIT_TEST
static void _reset();
#endif
private: private:
static NetworkManager* instancePtr_; static NetworkManager* instancePtr_;
NetworkManager() {}; NetworkManager() {};
static std::unordered_map<enzo::nt::OpId, std::unique_ptr<enzo::nt::GeometryOperator>> gopStore_; // functions
static void cookOp(enzo::nt::OpId opId); static void cookOp(enzo::nt::OpId opId);
static std::vector<enzo::nt::OpId> getDependencyGraph(enzo::nt::OpId opId); static std::vector<enzo::nt::OpId> getDependencyGraph(enzo::nt::OpId opId);
// variables
// store for geometry operators
static std::unordered_map<enzo::nt::OpId, std::unique_ptr<enzo::nt::GeometryOperator>> gopStore_;
// the highest operator id currently stored // the highest operator id currently stored
inline static enzo::nt::OpId maxOpId_=0; inline static enzo::nt::OpId maxOpId_=0;
// operator selected for displaying in the viewport
inline static std::optional<OpId> displayOp_=std::nullopt; inline static std::optional<OpId> displayOp_=std::nullopt;
signals: signals:
void updateDisplay(enzo::geo::Geometry& geometry); void updateDisplay(enzo::geo::Geometry& geometry);

28
tests/NetworkTests.cpp
View File

@@ -3,22 +3,22 @@
#include "Engine/Network/NetworkManager.h" #include "Engine/Network/NetworkManager.h"
#include "Engine/Operator/GeometryOperator.h" #include "Engine/Operator/GeometryOperator.h"
#include "Engine/Types.h" #include "Engine/Types.h"
#include <iostream>
TEST_CASE("network") TEST_CASE("network")
{ {
using namespace enzo; using namespace enzo;
nt::NetworkManager* nm = nt::NetworkManager::getInstance(); nt::NetworkManager::_reset();
nt::OpId newOpId = nm->addOperator(); nt::OpId newOpId = nt::NetworkManager::addOperator();
nt::OpId newOpId2 = nm->addOperator(); nt::OpId newOpId2 = nt::NetworkManager::addOperator();
REQUIRE(nm->isValidOp(newOpId)); REQUIRE(nt::NetworkManager::isValidOp(newOpId));
if(nm->isValidOp(newOpId)) if(nt::NetworkManager::isValidOp(newOpId))
{ {
auto newConnection = std::make_shared<nt::GeometryConnection>(newOpId, 1, newOpId2, 3); auto newConnection = std::make_shared<nt::GeometryConnection>(newOpId, 1, newOpId2, 3);
auto& inputOp = nm->getGeoOperator(newOpId); auto& inputOp = nt::NetworkManager::getGeoOperator(newOpId);
auto& outputOp = nm->getGeoOperator(newOpId2); auto& outputOp = nt::NetworkManager::getGeoOperator(newOpId2);
// set output on the upper operator // set output on the upper operator
outputOp.addOutputConnection(newConnection); outputOp.addOutputConnection(newConnection);
@@ -29,3 +29,15 @@ TEST_CASE("network")
} }
} }
TEST_CASE("reset")
{
using namespace enzo;
nt::OpId newOpId = nt::NetworkManager::addOperator();
nt::NetworkManager::_reset();
nt::OpId newOpId2 = nt::NetworkManager::addOperator();
REQUIRE_FALSE(nt::NetworkManager::isValidOp(newOpId));
REQUIRE(nt::NetworkManager::isValidOp(newOpId2));
}