BUG: Fix GH-521 trade_on_close=True

Fix 4aee89a BUG: Fix "stop-loss executed at a higher than market price"

Fixes #521
Fixes #1218

Author: kernc

Diff for: backtesting/backtesting.py

@@ -558,7 +558,9 @@ def is_contingent(self):
         [contingent]: https://www.investopedia.com/terms/c/contingentorder.asp
         [OCO]: https://www.investopedia.com/terms/o/oco.asp
         """
-        return bool(self.__parent_trade)
+        return bool((parent := self.__parent_trade) and
+                    (self is parent._sl_order or
+                     self is parent._tp_order))
 
 
 class Trade:
@@ -916,7 +918,10 @@ def _process_orders(self):
 
             # Determine entry/exit bar index
             is_market_order = not order.limit and not stop_price
-            time_index = (self._i - 1) if is_market_order and self._trade_on_close else self._i
+            time_index = (
+                (self._i - 1)
+                if is_market_order and self._trade_on_close and not order.is_contingent else
+                self._i)
 
             # If order is a SL/TP order, it should close an existing trade it was contingent upon
             if order.parent_trade:

Diff for: backtesting/test/_test.py

@@ -450,15 +450,16 @@ def next(self):
 
 
 class TestStrategy(TestCase):
-    def _Backtest(self, strategy_coroutine, **kwargs):
+    @staticmethod
+    def _Backtest(strategy_coroutine, data=SHORT_DATA, **kwargs):
         class S(Strategy):
             def init(self):
                 self.step = strategy_coroutine(self)
 
             def next(self):
                 try_(self.step.__next__, None, StopIteration)
 
-        return Backtest(SHORT_DATA, S, **kwargs)
+        return Backtest(data, S, **kwargs)
 
     def test_position(self):
         def coroutine(self):
@@ -1032,12 +1033,8 @@ def next(self):
                 if self.data.Close[-1] == 100:
                     self.buy(size=1, sl=90)
 
-        df = pd.DataFrame({
-            'Open': [100, 100, 100, 50, 50],
-            'High': [100, 100, 100, 50, 50],
-            'Low': [100, 100, 100, 50, 50],
-            'Close': [100, 100, 100, 50, 50],
-        })
+        arr = np.r_[100, 100, 100, 50, 50]
+        df = pd.DataFrame({'Open': arr, 'High': arr, 'Low': arr, 'Close': arr})
         with self.assertWarnsRegex(UserWarning, 'index is not datetime'):
             bt = Backtest(df, S, cash=100, trade_on_close=True)
         self.assertEqual(bt.run()._trades['ExitPrice'][0], 50)
@@ -1059,3 +1056,44 @@ def next(self):
                         order.cancel()
 
         Backtest(SHORT_DATA, S).run()
+
+    def test_trade_on_close_closes_trades_on_close(self):
+        def coro(strat):
+            yield strat.buy(size=1, sl=90) and strat.buy(size=1, sl=80)
+            assert len(strat.trades) == 2
+            yield strat.trades[0].close()
+            yield
+
+        arr = np.r_[100, 101, 102, 50, 51]
+        df = pd.DataFrame({
+            'Open': arr - 10,
+            'Close': arr, 'High': arr, 'Low': arr})
+        with self.assertWarnsRegex(UserWarning, 'index is not datetime'):
+            trades = TestStrategy._Backtest(coro, df, cash=250, trade_on_close=True).run()._trades
+            # trades = Backtest(df, S, cash=250, trade_on_close=True).run()._trades
+            self.assertEqual(trades['EntryBar'][0], 1)
+            self.assertEqual(trades['ExitBar'][0], 2)
+            self.assertEqual(trades['EntryPrice'][0], 101)
+            self.assertEqual(trades['ExitPrice'][0], 102)
+            self.assertEqual(trades['EntryBar'][1], 1)
+            self.assertEqual(trades['ExitBar'][1], 3)
+            self.assertEqual(trades['EntryPrice'][1], 101)
+            self.assertEqual(trades['ExitPrice'][1], 40)
+
+        with self.assertWarnsRegex(UserWarning, 'index is not datetime'):
+            trades = TestStrategy._Backtest(coro, df, cash=250, trade_on_close=False).run()._trades
+            # trades = Backtest(df, S, cash=250, trade_on_close=False).run()._trades
+            self.assertEqual(trades['EntryBar'][0], 2)
+            self.assertEqual(trades['ExitBar'][0], 3)
+            self.assertEqual(trades['EntryPrice'][0], 92)
+            self.assertEqual(trades['ExitPrice'][0], 40)
+            self.assertEqual(trades['EntryBar'][1], 2)
+            self.assertEqual(trades['ExitBar'][1], 3)
+            self.assertEqual(trades['EntryPrice'][1], 92)
+            self.assertEqual(trades['ExitPrice'][1], 40)
+
+    def test_trades_dates_match_prices(self):
+        bt = Backtest(EURUSD, SmaCross, trade_on_close=True)
+        trades = bt.run()._trades
+        self.assertEqual(EURUSD.Close[trades['ExitTime']].tolist(),
+                         trades['ExitPrice'].tolist())