Skip to content
Snippets Groups Projects
Commit f9e6dc7e authored by angloth's avatar angloth
Browse files

Fix old tests to fit with new port and signal interface

parent 4e31ca55
No related branches found
No related tags found
1 merge request!9Resolve #1 "Port Interface", #8 "Port Coupling"
......@@ -10,9 +10,9 @@ def operation():
def create_operation(_type, dest_oper, index, **kwargs):
oper = _type(**kwargs)
oper_signal = Signal()
oper._output_ports[0].connect(oper_signal)
oper._output_ports[0].connect_signal(oper_signal)
dest_oper._input_ports[index].connect(oper_signal)
dest_oper._input_ports[index].connect_signal(oper_signal)
return oper
@pytest.fixture
......@@ -34,11 +34,11 @@ def large_operation_tree():
create_operation(Constant, add_oper_2, 1, value=5)
add_oper_3 = Addition()
add_oper_signal = Signal(add_oper, add_oper_3)
add_oper._output_ports[0].connect(add_oper_signal)
add_oper_3._input_ports[0].connect(add_oper_signal)
add_oper_signal = Signal(add_oper.output(0), add_oper_3.output(0))
add_oper._output_ports[0].connect_signal(add_oper_signal)
add_oper_3._input_ports[0].connect_signal(add_oper_signal)
add_oper_2_signal = Signal(add_oper_2, add_oper_3)
add_oper_2._output_ports[0].connect(add_oper_2_signal)
add_oper_3._input_ports[1].connect(add_oper_2_signal)
add_oper_2_signal = Signal(add_oper_2.output(0), add_oper_3.output(0))
add_oper_2._output_ports[0].connect_signal(add_oper_2_signal)
add_oper_3._input_ports[1].connect_signal(add_oper_2_signal)
return const_oper
......@@ -6,11 +6,12 @@ import pytest
def test_explicit_signal_creation():
in_port = InputPort(0, None)
out_port = OutputPort(1, None)
s = Signal(in_port, out_port)
s = Signal(out_port, in_port)
assert in_port.signals == [s]
assert out_port.signals == [s]
assert s.source == out_port
assert s.source is out_port
assert s.destination is in_port
def test_implicit_signal_creation():
in_port = InputPort(0, None)
......
......@@ -24,6 +24,7 @@ def test_traverse_type(large_operation_tree):
def test_traverse_loop(operation_tree):
add_oper_signal = Signal()
operation_tree._output_ports[0].connect(add_oper_signal)
operation_tree._input_ports[0].connect(add_oper_signal)
operation_tree._output_ports[0].connect_signal(add_oper_signal)
operation_tree._input_ports[0].disconnect_signal()
operation_tree._input_ports[0].connect_signal(add_oper_signal)
assert len(list(operation_tree.traverse())) == 2
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment