more test coverage

[bluechips.git] / bluechips / tests / model / test_currency.py

diff --git a/bluechips/tests/model/test_currency.py b/bluechips/tests/model/test_currency.py
index 44c78ac789b528727e5d45540ff98d375121e7b1..4b8bdb419474f1a3cdbc7a319f76fcbd97a7fc09 100644 (file)
--- a/bluechips/tests/model/test_currency.py
+++ b/bluechips/tests/model/test_currency.py
@@ -1,29 +1,19 @@
 from unittest import TestCase
-from bluechips.tests import *
-from bluechips.model.types import Currency
-from decimal import Decimal
+from bluechips.model import types
 
 class TestCurrency(TestCase):
-    def test_addition(self):
-        """
-        Each of these tests tests 3 things:
-        
-        1) That the math works
-        2) That the result is converted to a Currency type
-        3) That multiple Currency instances with the same value are
-           the same object
-        """
-        assert Currency(2) + 2 is Currency(4), "Currency + int is Currency"
-        assert 2 + Currency(2) is Currency(4), "int + Currency is Currency"
-        assert Currency(2) + Currency(2) == Currency(4), \
-            "Currency + Currency is Currency"
-    
-    def test_multiplication(self):
-        """
-        This test tests the same 3 things as ``test_addition``, but
-        for multiplication
-        """
-        assert Currency(100) * Decimal(0.25) is Currency(25), \
-            "Currency * Decimal is Currency"
-        assert Decimal(0.25) * Currency(100) is Currency(25), \
-            "Decimal * Currency is Currency"
+    def setUp(self):
+        self.c = types.Currency('12.34')
+
+    def test_currency_float(self):
+        assert float(self.c) == 1234.
+
+    def test_currency_int(self):
+        val = int(self.c)
+        assert val == 1234
+        assert type(val) == int
+
+    def test_currency_long(self):
+        val = long(self.c)
+        assert val == 1234
+        assert type(val) == long