X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=bluechips%2Ftests%2Fmodel%2Ftest_currency.py;h=4b8bdb419474f1a3cdbc7a319f76fcbd97a7fc09;hb=a59d19c0581702321ebb6f89ab20f158cdc9d7bc;hp=5b4eba90fdb15640b289a331f9516b2af12399ad;hpb=50013672226794b8d7421c0c2c391f3db5ac0e85;p=bluechips.git

diff --git a/bluechips/tests/model/test_currency.py b/bluechips/tests/model/test_currency.py
index 5b4eba9..4b8bdb4 100644
--- a/bluechips/tests/model/test_currency.py
+++ b/bluechips/tests/model/test_currency.py
@@ -1,65 +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_initInt(self):
-        """
-        Make sure the constructor for Currency works
-        """
-        self.assert_(Currency(1) is Currency(1), 
-                     "Currency objects not interned")
-    def test_initString(self):
-        """
-        Make sure the constructor for Currency works with strings
-        """
-        self.assertEqual(Currency("0.01"), Currency(1))
-        self.assert_(Currency("0.01") is Currency(1),
-                     "string and int constructors return different values")
-    
-    def test_string(self):
-        """
-        Test converting a Currency to a string
-        """
-        self.assertEqual(str(Currency(1)), "$0.01")
-        self.assertEqual(str(Currency(100)), "$1.00")
-        self.assertEqual(str(Currency(101)), "$1.01")
-        self.assertEqual(str(Currency(-1)), "-$0.01")
-        self.assertEqual(str(Currency(-100)), "-$1.00")
-        self.assertEqual(str(Currency(-101)), "-$1.01")
-    
-    def test_additionMath(self):
-        """
-        Confirm that addition works over currency types and ints
-        """
-        self.assertEqual(Currency(2) + 2, Currency(4))
-        self.assertEqual(2 + Currency(2), Currency(4))
-        self.assertEqual(Currency(2) + Currency(2), Currency(4))
-    
-    def test_additionType(self):
-        """
-        Adding Currencies or a Currency and an int should yield a
-        Currency
-        """
-        self.assertEqual(type(Currency(2) + 2), Currency)
-        self.assertEqual(type(2 + Currency(2)), Currency)
-        self.assertEqual(type(Currency(2) + Currency(2)), Currency)
-        
-    def test_multMath(self):
-        """
-        This test tests the same 3 things as ``test_addition``, but
-        for multiplication
-        """
-        self.assertEqual(Currency(100) * Decimal("0.25"), Currency(25))
-        self.assertEqual(Decimal("0.25") * Currency(100), Currency(25))
-        self.assertEqual(Currency(10) * Currency(10), Currency(100))
-    
-    def test_multType(self):
-        """
-        The result of multiplying a Currency with something else
-        should be a currency
-        """
-        self.assertEqual(type(Currency(100) * Decimal("0.25")), Currency)
-        self.assertEqual(type(Decimal("0.25") * Currency(100)), Currency)
-        self.assertEqual(type(Currency(100) * Currency(100)), 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