Added fixes from the general integration tests (#2357)

* Added fixes from James

* Fixed tests

* More test fixes

* Added fixes

* Fixed tests
This commit is contained in:
Colin Delahunty
2022-08-18 17:03:46 -04:00
committed by GitHub
parent 52f4d673f8
commit 6b95d7d3ac
15 changed files with 35 additions and 35 deletions

View File

@@ -571,7 +571,7 @@ class DiscoveryController(BaseController):
coinpaprika_view.display_search_results(
top=ns_parser.limit,
sortby=ns_parser.sortby,
descend=ns_parser.descend,
ascend=not ns_parser.descend,
export=ns_parser.export,
query=" ".join(ns_parser.query),
category=ns_parser.category,

View File

@@ -237,7 +237,7 @@ class PredictionTechniquesController(CryptoBaseController):
trend=ns_parser.trend,
seasonal=ns_parser.seasonal,
seasonal_periods=ns_parser.seasonal_periods,
s_end_date=ns_parser.s_end_date,
end_date=ns_parser.s_end_date,
export=ns_parser.export,
time_res=self.resolution,
)

View File

@@ -279,7 +279,7 @@ class PredictionTechniquesController(BaseController):
trend=ns_parser.trend,
seasonal=ns_parser.seasonal,
seasonal_periods=ns_parser.seasonal_periods,
s_end_date=ns_parser.s_end_date,
end_date=ns_parser.s_end_date,
export=ns_parser.export,
)

View File

@@ -233,7 +233,7 @@ class PredictionTechniquesController(BaseController):
trend=ns_parser.trend,
seasonal=ns_parser.seasonal,
seasonal_periods=ns_parser.seasonal_periods,
s_end_date=ns_parser.s_end_date,
end_date=ns_parser.s_end_date,
export=ns_parser.export,
time_res=self.resolution,
)

View File

@@ -343,7 +343,7 @@ class PredictionTechniquesController(BaseController):
trend=ns_parser.trend,
seasonal=ns_parser.seasonal,
seasonal_periods=ns_parser.seasonal_periods,
s_end_date=ns_parser.s_end_date,
end_date=ns_parser.s_end_date,
export=ns_parser.export,
)

View File

@@ -251,7 +251,7 @@ class PredictionTechniquesController(BaseController):
trend=ns_parser.trend,
seasonal=ns_parser.seasonal,
seasonal_periods=ns_parser.seasonal_periods,
s_end_date=ns_parser.s_end_date,
end_date=ns_parser.s_end_date,
export=ns_parser.export,
)

View File

@@ -172,7 +172,7 @@ class TechnicalAnalysisController(StockBaseController):
ma_type="EMA",
symbol=self.ticker,
series=self.data["Close"],
length=ns_parser.n_length,
window=ns_parser.n_length,
offset=ns_parser.n_offset,
export=ns_parser.export,
)
@@ -225,7 +225,7 @@ class TechnicalAnalysisController(StockBaseController):
ma_type="SMA",
symbol=self.ticker,
series=self.data["Close"],
length=ns_parser.n_length,
window=ns_parser.n_length,
offset=ns_parser.n_offset,
export=ns_parser.export,
)
@@ -279,7 +279,7 @@ class TechnicalAnalysisController(StockBaseController):
ma_type="ZLMA",
symbol=self.ticker,
series=self.data["Close"],
length=ns_parser.n_length,
window=ns_parser.n_length,
offset=ns_parser.n_offset,
export=ns_parser.export,
)
@@ -760,7 +760,7 @@ class TechnicalAnalysisController(StockBaseController):
volatility_view.display_bbands(
symbol=self.ticker,
data=self.data,
length=ns_parser.n_length,
window=ns_parser.n_length,
n_std=ns_parser.n_std,
mamode=ns_parser.s_mamode,
export=ns_parser.export,

View File

@@ -319,8 +319,8 @@ class FundController(BaseController):
self.fund_symbol,
self.country,
) = investpy_model.get_fund_historical(
fund=parsed_fund,
name=ns_parser.name,
name=parsed_fund,
by_name=ns_parser.name,
country=self.country,
start_date=ns_parser.start,
end_date=ns_parser.end,
@@ -356,7 +356,7 @@ Potential errors
)
return self.queue
investpy_view.display_historical(
self.data, fund=self.fund_name, export=ns_parser.export
self.data, name=self.fund_name, export=ns_parser.export
)
return self.queue

View File

@@ -631,7 +631,7 @@ class DiscoveryController(BaseController):
if ns_parser:
ark_view.ark_orders_view(
limit=ns_parser.limit,
sort_col=ns_parser.sort_col,
sortby=ns_parser.sort_col,
ascending=ns_parser.ascend,
buys_only=ns_parser.buys_only,
sells_only=ns_parser.sells_only,

View File

@@ -252,7 +252,7 @@ class PredictionTechniquesController(BaseController):
trend=ns_parser.trend,
seasonal=ns_parser.seasonal,
seasonal_periods=ns_parser.seasonal_periods,
s_end_date=ns_parser.s_end_date,
end_date=ns_parser.s_end_date,
export=ns_parser.export,
)

View File

@@ -60,7 +60,7 @@ d_signals = {
@log_start_end(log=logger)
def get_screener_data(
preset_loaded: str, data_type: str, limit: int = 10, ascending: bool = False
preset_loaded: str, data_type: str, limit: int = 10, ascend: bool = False
):
"""Screener Overview
@@ -72,7 +72,7 @@ def get_screener_data(
Data type between: overview, valuation, financial, ownership, performance, technical
limit : int
Limit of stocks filtered with presets to print
ascending : bool
: bool
Ascended order of stocks filtered to print
Returns
@@ -101,9 +101,9 @@ def get_screener_data(
try:
if limit > 0:
df_screen = screen.screener_view(limit=limit, ascend=ascending)
df_screen = screen.screener_view(limit=limit, ascend=ascend)
else:
df_screen = screen.screener_view(ascend=ascending)
df_screen = screen.screener_view(ascend=ascend)
except IndexError:
console.print("[red]Invalid data provided by the website[/red]\n")
return pd.DataFrame()
@@ -147,18 +147,18 @@ def get_screener_data(
df_screen = screen.screener_view(
order=d_general["Order"],
limit=limit,
ascend=ascending,
ascend=ascend,
)
else:
df_screen = screen.screener_view(
order=d_general["Order"], ascend=ascending
order=d_general["Order"], ascend=ascend
)
else:
if limit > 0:
df_screen = screen.screener_view(limit=limit, ascend=ascending)
df_screen = screen.screener_view(limit=limit, ascend=ascend)
else:
df_screen = screen.screener_view(ascend=ascending)
df_screen = screen.screener_view(ascend=ascend)
return df_screen

View File

@@ -128,7 +128,7 @@ def screener(
loaded_preset: str,
data_type: str = "overview",
limit: int = 10,
ascending: bool = False,
ascend: bool = False,
sortby: str = "",
export: str = "",
) -> List[str]:
@@ -142,7 +142,7 @@ def screener(
Data type string between: overview, valuation, financial, ownership, performance, technical
limit : int
Limit of stocks to display
ascending : bool
ascend : bool
Order of table to ascend or descend
sortby: str
Column to sort table by
@@ -159,7 +159,7 @@ def screener(
preset_loaded=loaded_preset,
data_type=data_type,
limit=10,
ascending=ascending,
ascend=ascend,
)
if isinstance(df_screen, pd.DataFrame):
@@ -172,7 +172,7 @@ def screener(
if sortby in d_cols_to_sort[data_type]:
df_screen = df_screen.sort_values(
by=[sortby],
ascending=ascending,
ascending=ascend,
na_position="last",
)
else:
@@ -188,7 +188,7 @@ def screener(
)
df_screen = df_screen.sort_values(
by=[similar_cmd[0]],
ascending=ascending,
ascending=ascend,
na_position="last",
)
else:

View File

@@ -206,7 +206,7 @@ def test_call_func_expect_queue(expected_queue, queue, func):
["--limit=5", "--sortby=date", "--fund=ARKK", "--export=csv"],
{
"limit": 5,
"sort_col": ["date"],
"sortby": ["date"],
"ascending": False,
"buys_only": False,
"sells_only": False,

View File

@@ -25,7 +25,7 @@ def test_get_screener_data(data_type, recorder):
preset_loaded="top_gainers",
data_type=data_type,
limit=2,
ascending=True,
ascend=True,
)
recorder.capture(result_df)
@@ -44,7 +44,7 @@ def test_get_screener_data_no_preset_loaded(mocker, recorder):
preset_loaded="oversold",
data_type="overview",
limit=2,
ascending=True,
ascend=True,
)
recorder.capture(result_df)
@@ -56,7 +56,7 @@ def test_get_screener_data_no_limit(recorder):
preset_loaded="oversold",
data_type="overview",
limit=-1,
ascending=True,
ascend=True,
)
recorder.capture(result_df)

View File

@@ -40,7 +40,7 @@ def test_screener(mocker, toggle):
loaded_preset="top_gainers",
data_type="overview",
limit=2,
ascending=True,
ascend=True,
sortby="Ticker",
export="",
)
@@ -65,7 +65,7 @@ def test_screener_no_data(data, mocker):
loaded_preset="top_gainers",
data_type="overview",
limit=2,
ascending=True,
ascend=True,
sortby="",
export="",
)
@@ -104,7 +104,7 @@ def test_screener_sort_matches(sort, mocker):
loaded_preset="top_gainers",
data_type="overview",
limit=2,
ascending=True,
ascend=True,
sortby=sort,
export="",
)