diff --git a/tests/test_unit_tx.py b/tests/test_unit_tx.py index f0de4ce116832ede663caac299073e922376cc96..18c74f41bad469b7d519f31c9a37318135b46c77 100644 --- a/tests/test_unit_tx.py +++ b/tests/test_unit_tx.py @@ -1094,7 +1094,7 @@ def test_send_transaction( @pytest.mark.parametrize( - "key, issuers, tx_amounts, listinput_and_amount, outputAddresses, Comment, OutputbackChange, client_return", + "key, issuers, tx_amounts, listinput_and_amount, outputAddresses, Comment, OutputbackChange", [ # right tx : 1 amount for 1 receiver ( @@ -1133,7 +1133,6 @@ def test_send_transaction( ("DBM6F5ChMJzpmkUdL5zD9UXKExmZGfQ1AgPDQy4MxSBw",), "", None, - True, ), # right tx : 2 amounts for 2 receivers ( @@ -1176,7 +1175,6 @@ def test_send_transaction( ), "Test comment", None, - True, ), # Wrong tx : 3 amounts for 1 receiver ( @@ -1217,7 +1215,6 @@ def test_send_transaction( ("DBM6F5ChMJzpmkUdL5zD9UXKExmZGfQ1AgPDQy4MxSBw",), "", "DBM6F5ChMJzpmkUdL5zD9UXKExmZGfQ1AgPDQy4MxSBw", - False, ), ], ) @@ -1229,81 +1226,47 @@ def test_generate_and_send_transaction( outputAddresses, Comment, OutputbackChange, - client_return, monkeypatch, capsys, ): - - # create FakeReturn and patched_ClientInstance classes to patch ClientInstance() class - class FakeReturn: - def __init__(self): - self.status = client_return - - def __call__(self, *args, **kwargs): - return self - - def text(self): - return "Tests for Silkaj : Fake Return !" - - class patched_ClientInstance: - def __init__(self): - self.client = FakeReturn() - # mock functions tx.generate_transaction_document = Mock() + network_tools.send_document = Mock() # patched functions monkeypatch.setattr(blockchain_tools.HeadBlock, "get_head", patched_head_block) - monkeypatch.setattr(network_tools, "ClientInstance", patched_ClientInstance) - - # write the test function - def function_testing(): - tx.generate_and_send_transaction( - key, - issuers, - tx_amounts, - listinput_and_amount, - outputAddresses, - Comment, - OutputbackChange, - ) - if client_return != 200: - assert pytest.raises(SystemExit).type == SystemExit + # monkeypatch.setattr(network_tools, "ClientInstance", patched_ClientInstance) - display = capsys.readouterr().out - if listinput_and_amount[2]: - assert display.find("Generate Change Transaction") != -1 - else: - assert display.find("Generate Transaction:") != -1 - assert display.find(" - From: {0}".format(issuers)) != -1 - for tx_amount, outputAddress in zip(tx_amounts, outputAddresses): - assert display.find( - " - To: {0}\n - Amount: {1}".format( - outputAddress, tx_amount / 100 - ) - ) + tx.generate_and_send_transaction( + key, + issuers, + tx_amounts, + listinput_and_amount, + outputAddresses, + Comment, + OutputbackChange, + ) - tx.generate_transaction_document.assert_called_once_with( - issuers, - tx_amounts, - listinput_and_amount, - outputAddresses, - Comment, - OutputbackChange, + display = capsys.readouterr().out + if listinput_and_amount[2]: + assert display.find("Generate Change Transaction") != -1 + else: + assert display.find("Generate Transaction:") != -1 + assert display.find(" - From: {0}".format(issuers)) != -1 + for tx_amount, outputAddress in zip(tx_amounts, outputAddresses): + assert display.find( + " - To: {0}\n - Amount: {1}".format(outputAddress, tx_amount / 100) ) - if client_return == 200: - assert display.find("Transaction successfully sent.") != -1 - else: - assert display.find("Error while publishing transaction:") != -1 - - ### test function and catch SystemExit if needed ### - if client_return == 200: - function_testing() - else: - with pytest.raises(SystemExit) as pytest_exit: - function_testing() - assert pytest_exit.type == SystemExit + tx.generate_transaction_document.assert_called_once_with( + issuers, + tx_amounts, + listinput_and_amount, + outputAddresses, + Comment, + OutputbackChange, + ) + network_tools.send_document.assert_called_once() # test check_transaction_values()