Skip to content

Commit 0a8ce90

Browse files
committed
fixed tests again!
1 parent a4841e0 commit 0a8ce90

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

tests/circuitTests.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#include "circuitTests.h"
2+
#include "util/uuid.h"
23

34
void CircuitTest::SetUp() {
4-
circuit_id_t circuitId = circuitManager.createNewCircuit();
5+
circuit_id_t circuitId = circuitManager.createNewCircuit(generate_uuid_v4(), "Circuit");
56
circuit = circuitManager.getCircuit(circuitId);
67
i = 0;
78
}

tests/circuitTests.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,15 @@
55
#include "backend/circuit/circuitManager.h"
66

77
class CircuitTest: public ::testing::Test {
8+
public:
9+
CircuitTest() : circuitManager(&dataUpdateEventManager) {}
10+
811
protected:
912
void SetUp() override;
1013
void TearDown() override;
14+
DataUpdateEventManager dataUpdateEventManager;
1115
CircuitManager circuitManager;
12-
SharedCircuit circuit;
16+
SharedCircuit circuit = nullptr;
1317
int i;
1418
};
1519

tests/evaluatorTests.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#include "evaluatorTests.h"
2+
#include "util/uuid.h"
23

34
// Note that logic simulator is tested separately
45
void EvaluatorTest::SetUp() {
5-
circuit_id_t circuitId = circuitManager.createNewCircuit();
6+
circuit_id_t circuitId = circuitManager.createNewCircuit(generate_uuid_v4(), "Circuit");
67
circuit = circuitManager.getCircuit(circuitId);
78
evaluator = std::make_shared<Evaluator>(1, circuit);
89
i = 0;

tests/evaluatorTests.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,13 @@
66
#include "backend/evaluator/evaluator.h"
77

88
class EvaluatorTest : public ::testing::Test {
9+
public:
10+
EvaluatorTest() : circuitManager(&dataUpdateEventManager) {}
11+
912
protected:
1013
void SetUp() override;
1114
void TearDown() override;
15+
DataUpdateEventManager dataUpdateEventManager;
1216
CircuitManager circuitManager;
1317
SharedCircuit circuit;
1418
SharedEvaluator evaluator;

0 commit comments

Comments
 (0)