diff --git a/tests/test_transforms.py b/tests/test_transforms.py index 225f1b9d..ec731667 100644 --- a/tests/test_transforms.py +++ b/tests/test_transforms.py @@ -104,12 +104,13 @@ class TestEventWindow(TestCase): window.update(message) # Assert that we've added the correct number of events. - assert len(window.added) == num + self.assertTrue(len(window.added), num) # Assert that we removed only events that fall outside (or # on the boundary of) the delta. for dropped in window.removed: - assert message.dt - dropped.dt >= timedelta(minutes=5) + self.assertTrue( + message.dt - dropped.dt >= timedelta(minutes=5)) def test_market_aware_window_normal_week(self): window = NoopEventWindow( @@ -129,9 +130,9 @@ class TestEventWindow(TestCase): # to drop events until the weekend ends. The last window is # briefly longer because it doesn't complete a full day. The # window then shrinks once the day completes - assert lengths == [1, 2, 3, 3, 3, 4, 5, 5, 5, 3, 4, 3] - assert window.added == events - assert window.removed == events[:-3] + self.assertEquals(lengths, [1, 2, 3, 3, 3, 4, 5, 5, 5, 3, 4, 3]) + self.assertEquals(window.added, events) + self.assertEquals(window.removed, events[:-3]) def test_market_aware_window_holiday(self): window = NoopEventWindow( @@ -148,9 +149,9 @@ class TestEventWindow(TestCase): # Record the length of the window after each event. lengths.append(len(window.ticks)) - assert lengths == [1, 2, 3, 3, 2] - assert window.added == events - assert window.removed == events[:-2] + self.assertEquals(lengths, [1, 2, 3, 3, 2]) + self.assertEquals(window.added, events) + self.assertEquals(window.removed, events[:-2]) def tearDown(self): setup_logger(self) @@ -195,7 +196,7 @@ class TestFinanceTransforms(TestCase): ] # Output should match the expected. - assert tnfm_vals == expected + self.assertEquals(tnfm_vals, expected) def test_returns(self): # Daily returns. @@ -208,7 +209,7 @@ class TestFinanceTransforms(TestCase): # previous close. expected = [0.0, 0.0, 0.1, 0.0] - assert tnfm_vals == expected + self.assertEquals(tnfm_vals, expected) # Two-day returns. An extra kink here is that the # factory will automatically skip a weekend for the @@ -236,7 +237,7 @@ class TestFinanceTransforms(TestCase): (13.0 - 13.0) / 13.0 ] - assert tnfm_vals == expected + self.assertEquals(tnfm_vals, expected) def test_moving_average(self): @@ -271,8 +272,8 @@ class TestFinanceTransforms(TestCase): ((100.0 + 300.0) / 2.0) ] - assert tnfm_prices == expected_prices - assert tnfm_volumes == expected_volumes + self.assertEquals(tnfm_prices, expected_prices) + self.assertEquals(tnfm_volumes, expected_volumes) def test_moving_stddev(self): trade_history = factory.create_trade_history( @@ -305,9 +306,9 @@ class TestFinanceTransforms(TestCase): for v1, v2 in zip(vals, expected): if v1 is None: - assert v2 is None + self.assertIsNone(v2) continue - assert round(v1, 5) == round(v2, 5) + self.assertEquals(round(v1, 5), round(v2, 5)) ############################################################