adelorenzo
/
stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed more occuranes of function

This commit is contained in:
Jonathan Raviotta 2019-09-06 18:59:42 -04:00 committed by Matthias
parent a5510d14e9
commit adbc0159ae
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/test_plotting.py
View File

@ -13,7 +13,7 @@ from freqtrade.data import history
from freqtrade.data.btanalysis import create_cum_profit, load_backtest_data from freqtrade.data.btanalysis import create_cum_profit, load_backtest_data
from freqtrade.plot.plot_utils import start_plot_dataframe, start_plot_profit from freqtrade.plot.plot_utils import start_plot_dataframe, start_plot_profit
from freqtrade.plot.plotting import (add_indicators, add_profit, from freqtrade.plot.plotting import (add_indicators, add_profit,
analyse_and_plot_pairs, load_and_plot_trades,
generate_candlestick_graph, generate_candlestick_graph,
generate_plot_filename, generate_plot_filename,
generate_profit_graph, init_plotscript, generate_profit_graph, init_plotscript,
@ -94,7 +94,7 @@ def test_add_indicators(default_conf, testdatadir, caplog):
def test_plot_trades(testdatadir, caplog): def test_plot_trades(testdatadir, caplog):
fig1 = generage_empty_figure() fig1 = generate_empty_figure()
# nothing happens when no trades are available # nothing happens when no trades are available
fig = plot_trades(fig1, None) fig = plot_trades(fig1, None)
assert fig == fig1 assert fig == fig1
@ -230,7 +230,7 @@ def test_add_profit(testdatadir):
df = history.load_pair_history(pair="POWR/BTC", ticker_interval='5m', df = history.load_pair_history(pair="POWR/BTC", ticker_interval='5m',
datadir=testdatadir, timerange=timerange) datadir=testdatadir, timerange=timerange)
fig = generage_empty_figure() fig = generate_empty_figure()
cum_profits = create_cum_profit(df.set_index('date'), cum_profits = create_cum_profit(df.set_index('date'),
bt_data[bt_data["pair"] == 'POWR/BTC'], bt_data[bt_data["pair"] == 'POWR/BTC'],
@ -279,7 +279,7 @@ def test_generate_profit_graph(testdatadir):
def test_start_plot_dataframe(mocker): def test_start_plot_dataframe(mocker):
aup = mocker.patch("freqtrade.plot.plotting.analyse_and_plot_pairs", MagicMock()) aup = mocker.patch("freqtrade.plot.plotting.load_and_plot_trades", MagicMock())
args = [ args = [
"--config", "config.json.example", "--config", "config.json.example",
"plot-dataframe", "plot-dataframe",
@ -293,7 +293,7 @@ def test_start_plot_dataframe(mocker):
assert called_config['pairs'] == ["ETH/BTC"] assert called_config['pairs'] == ["ETH/BTC"]
def test_analyse_and_plot_pairs(default_conf, mocker, caplog, testdatadir): def test_load_and_plot_trades(default_conf, mocker, caplog, testdatadir):
default_conf['trade_source'] = 'file' default_conf['trade_source'] = 'file'
default_conf["datadir"] = testdatadir default_conf["datadir"] = testdatadir
default_conf['exportfilename'] = str(testdatadir / "backtest-result_test.json") default_conf['exportfilename'] = str(testdatadir / "backtest-result_test.json")
@ -308,7 +308,7 @@ def test_analyse_and_plot_pairs(default_conf, mocker, caplog, testdatadir):
generate_candlestick_graph=candle_mock, generate_candlestick_graph=candle_mock,
store_plot_file=store_mock store_plot_file=store_mock
) )
analyse_and_plot_pairs(default_conf) load_and_plot_trades(default_conf)
# Both mocks should be called once per pair # Both mocks should be called once per pair
assert candle_mock.call_count == 2 assert candle_mock.call_count == 2