rename Strategy into StrategyResolver

freqtrade/tests/strategy/test_strategy.py

@@ -2,49 +2,49 @@
 
 import logging
 
-from freqtrade.strategy.strategy import Strategy
+from freqtrade.strategy.resolver import StrategyResolver
 
 
 def test_sanitize_module_name():
-    assert Strategy._sanitize_module_name('default_strategy') == 'default_strategy'
-    assert Strategy._sanitize_module_name('default_strategy.py') == 'default_strategy'
-    assert Strategy._sanitize_module_name('../default_strategy.py') == 'default_strategy'
-    assert Strategy._sanitize_module_name('../default_strategy') == 'default_strategy'
-    assert Strategy._sanitize_module_name('.default_strategy') == '.default_strategy'
-    assert Strategy._sanitize_module_name('foo-bar') == 'foo-bar'
-    assert Strategy._sanitize_module_name('foo/bar') == 'bar'
+    assert StrategyResolver._sanitize_module_name('default_strategy') == 'default_strategy'
+    assert StrategyResolver._sanitize_module_name('default_strategy.py') == 'default_strategy'
+    assert StrategyResolver._sanitize_module_name('../default_strategy.py') == 'default_strategy'
+    assert StrategyResolver._sanitize_module_name('../default_strategy') == 'default_strategy'
+    assert StrategyResolver._sanitize_module_name('.default_strategy') == '.default_strategy'
+    assert StrategyResolver._sanitize_module_name('foo-bar') == 'foo-bar'
+    assert StrategyResolver._sanitize_module_name('foo/bar') == 'bar'
 
 
 def test_search_strategy():
-    assert Strategy._search_strategy('default_strategy') == '.'
-    assert Strategy._search_strategy('test_strategy') == 'user_data.strategies.'
-    assert Strategy._search_strategy('super_duper') is None
+    assert StrategyResolver._search_strategy('default_strategy') == '.'
+    assert StrategyResolver._search_strategy('test_strategy') == 'user_data.strategies.'
+    assert StrategyResolver._search_strategy('super_duper') is None
 
 
 def test_strategy_structure():
-    assert hasattr(Strategy, 'populate_indicators')
-    assert hasattr(Strategy, 'populate_buy_trend')
-    assert hasattr(Strategy, 'populate_sell_trend')
+    assert hasattr(StrategyResolver, 'populate_indicators')
+    assert hasattr(StrategyResolver, 'populate_buy_trend')
+    assert hasattr(StrategyResolver, 'populate_sell_trend')
 
 
 def test_load_strategy(result):
-    strategy = Strategy()
+    strategy = StrategyResolver()
     strategy.logger = logging.getLogger(__name__)
 
-    assert not hasattr(Strategy, 'custom_strategy')
+    assert not hasattr(StrategyResolver, 'custom_strategy')
     strategy._load_strategy('test_strategy')
 
-    assert not hasattr(Strategy, 'custom_strategy')
+    assert not hasattr(StrategyResolver, 'custom_strategy')
 
     assert hasattr(strategy.custom_strategy, 'populate_indicators')
     assert 'adx' in strategy.populate_indicators(result)
 
 
 def test_load_not_found_strategy(caplog):
-    strategy = Strategy()
+    strategy = StrategyResolver()
     strategy.logger = logging.getLogger(__name__)
 
-    assert not hasattr(Strategy, 'custom_strategy')
+    assert not hasattr(StrategyResolver, 'custom_strategy')
     strategy._load_strategy('NotFoundStrategy')
 
     error_msg = "Impossible to load Strategy 'user_data/strategies/{}.py'. This file does not " \
@@ -53,7 +53,7 @@ def test_load_not_found_strategy(caplog):
 
 
 def test_strategy(result):
-    strategy = Strategy({'strategy': 'default_strategy'})
+    strategy = StrategyResolver({'strategy': 'default_strategy'})
 
     assert hasattr(strategy.custom_strategy, 'minimal_roi')
     assert strategy.minimal_roi[0] == 0.04
@@ -81,11 +81,11 @@ def test_strategy_override_minimal_roi(caplog):
             "0": 0.5
         }
     }
-    strategy = Strategy(config)
+    strategy = StrategyResolver(config)
 
     assert hasattr(strategy.custom_strategy, 'minimal_roi')
     assert strategy.minimal_roi[0] == 0.5
-    assert ('freqtrade.strategy.strategy',
+    assert ('freqtrade.strategy.resolver',
             logging.INFO,
             'Override strategy \'minimal_roi\' with value in config file.'
             ) in caplog.record_tuples
@@ -97,11 +97,11 @@ def test_strategy_override_stoploss(caplog):
         'strategy': 'default_strategy',
         'stoploss': -0.5
     }
-    strategy = Strategy(config)
+    strategy = StrategyResolver(config)
 
     assert hasattr(strategy.custom_strategy, 'stoploss')
     assert strategy.stoploss == -0.5
-    assert ('freqtrade.strategy.strategy',
+    assert ('freqtrade.strategy.resolver',
             logging.INFO,
             'Override strategy \'stoploss\' with value in config file: -0.5.'
             ) in caplog.record_tuples
@@ -114,31 +114,31 @@ def test_strategy_override_ticker_interval(caplog):
         'strategy': 'default_strategy',
         'ticker_interval': 60
     }
-    strategy = Strategy(config)
+    strategy = StrategyResolver(config)
 
     assert hasattr(strategy.custom_strategy, 'ticker_interval')
     assert strategy.ticker_interval == 60
-    assert ('freqtrade.strategy.strategy',
+    assert ('freqtrade.strategy.resolver',
             logging.INFO,
             'Override strategy \'ticker_interval\' with value in config file: 60.'
             ) in caplog.record_tuples
 
 
 def test_strategy_fallback_default_strategy():
-    strategy = Strategy()
+    strategy = StrategyResolver()
     strategy.logger = logging.getLogger(__name__)
 
-    assert not hasattr(Strategy, 'custom_strategy')
+    assert not hasattr(StrategyResolver, 'custom_strategy')
     strategy._load_strategy('../../super_duper')
-    assert not hasattr(Strategy, 'custom_strategy')
+    assert not hasattr(StrategyResolver, 'custom_strategy')
 
 
 def test_strategy_singleton():
-    strategy1 = Strategy({'strategy': 'default_strategy'})
+    strategy1 = StrategyResolver({'strategy': 'default_strategy'})
 
     assert hasattr(strategy1.custom_strategy, 'minimal_roi')
     assert strategy1.minimal_roi[0] == 0.04
 
-    strategy2 = Strategy()
+    strategy2 = StrategyResolver()
     assert hasattr(strategy2.custom_strategy, 'minimal_roi')
     assert strategy2.minimal_roi[0] == 0.04