From 0b6b11a0807cea788ddc98731606116f1ba74c89 Mon Sep 17 00:00:00 2001 From: Richard Frank Date: Thu, 24 Sep 2015 17:16:43 -0400 Subject: [PATCH] MAINT: Removed some unnecessary instance attributes --- tests/test_algorithm.py | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/tests/test_algorithm.py b/tests/test_algorithm.py index 5bf90b88..2a479867 100644 --- a/tests/test_algorithm.py +++ b/tests/test_algorithm.py @@ -1683,15 +1683,15 @@ class TestClosePosAlgo(TestCase): 'asset_type': 'equity', 'end_date': self.days[3]}} self.env.write_data(equities_data=metadata) - self.algo = TestAlgorithm(sid=1, amount=1, order_count=1, - instant_fill=True, commission=PerShare(0), - env=self.env) - self.data = DataPanelSource(self.panel) + algo = TestAlgorithm(sid=1, amount=1, order_count=1, + instant_fill=True, commission=PerShare(0), + env=self.env) + data = DataPanelSource(self.panel) # Check results expected_positions = [1, 1, 0] expected_pnl = [0, 1, 2] - results = self.run_algo() + results = algo.run(data) self.check_algo_pnl(results, expected_pnl) self.check_algo_positions(results, expected_positions) @@ -1700,15 +1700,15 @@ class TestClosePosAlgo(TestCase): 'asset_type': 'future', }} self.env.write_data(futures_data=metadata) - self.algo = TestAlgorithm(sid=1, amount=1, order_count=1, - instant_fill=True, commission=PerShare(0), - env=self.env) - self.data = DataPanelSource(self.panel) + algo = TestAlgorithm(sid=1, amount=1, order_count=1, + instant_fill=True, commission=PerShare(0), + env=self.env) + data = DataPanelSource(self.panel) # Check results expected_positions = [1, 1, 0] expected_pnl = [0, 1, 2] - results = self.run_algo() + results = algo.run(data) self.check_algo_pnl(results, expected_pnl) self.check_algo_positions(results, expected_positions) @@ -1717,13 +1717,13 @@ class TestClosePosAlgo(TestCase): 'asset_type': 'future', 'auto_close_date': self.days[3]}} self.env.write_data(futures_data=metadata) - self.algo = TestAlgorithm(sid=1, amount=1, order_count=1, - instant_fill=True, commission=PerShare(0), - env=self.env) - self.data = DataPanelSource(self.no_close_panel) + algo = TestAlgorithm(sid=1, amount=1, order_count=1, + instant_fill=True, commission=PerShare(0), + env=self.env) + data = DataPanelSource(self.no_close_panel) # Check results - results = self.run_algo() + results = algo.run(data) expected_pnl = [0, 1, 2] self.check_algo_pnl(results, expected_pnl) @@ -1731,10 +1731,6 @@ class TestClosePosAlgo(TestCase): expected_positions = [1, 1, 0] self.check_algo_positions(results, expected_positions) - def run_algo(self): - results = self.algo.run(self.data) - return results - def check_algo_pnl(self, results, expected_pnl): for i, pnl in enumerate(results.pnl): self.assertEqual(pnl, expected_pnl[i])