Exchanged old test files for the new testing code in was-v3.0.

18 files changed, 3591 insertions, 0 deletions

diff --git a/test/UnitTests.cc b/test/UnitTests.cc
new file mode 100644
index 00000000..7f5d1333
--- /dev/null
+++ b/test/UnitTests.cc
@@ -0,0 +1,115 @@
+#include <cppunit/CompilerOutputter.h>
+#include <cppunit/TestResult.h>
+#include <cppunit/TestResultCollector.h>
+#include <cppunit/TestRunner.h>
+#include <cppunit/TextTestProgressListener.h>
+#include <cppunit/BriefTestProgressListener.h>
+#include <cppunit/XmlOutputter.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+
+#include <stdexcept>
+#include <fstream>
+
+#include "UnitTests.h"
+
+
+// Create the CppUnit registry
+
+CPPUNIT_REGISTRY_ADD_TO_DEFAULT("Framework");
+
+CPPUNIT_REGISTRY_ADD_TO_DEFAULT("numerics");
+
+// Create a sample test, which acts both as a template, and a
+// verification that the basic framework is functioning.
+
+class UnitTests : public CPPUNIT_NS::TestCase
+{
+  CPPUNIT_TEST_SUITE( UnitTests );
+  CPPUNIT_TEST( testInitialization );
+  CPPUNIT_TEST_SUITE_END();
+
+public:
+  UnitTests() {}
+  virtual ~UnitTests() {}
+
+  virtual void setUp() {}
+  virtual void tearDown() {}
+
+  void testInitialization() {
+    assertEqual(std::string("Hello, world!"),
+		std::string("Hello, world!"));
+  }
+
+private:
+  UnitTests( const UnitTests &copy );
+  void operator =( const UnitTests &copy );
+};
+
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(UnitTests, "framework");
+
+
+// Create the various runners and commence running the tests!
+
+int main(int argc, char* argv[])
+{
+  int index = 1;
+
+  if (argc > index && std::string(argv[index]) == "--verify") {
+    ledger::verify_enabled = true;
+    index++;
+  }
+
+  // Retreive test path from command line first argument. Default to
+  // "" which resolves to the top level suite.
+  std::string testPath = ((argc > index) ? std::string(argv[index]) :
+			  std::string(""));
+
+  // Create the event manager and test controller
+  CPPUNIT_NS::TestResult controller;
+
+  // Add a listener that collects test results
+  CPPUNIT_NS::TestResultCollector result;
+  controller.addListener(&result);
+
+  // Add a listener that print dots as test run.
+#if 1
+  CPPUNIT_NS::TextTestProgressListener progress;
+#else
+  CPPUNIT_NS::BriefTestProgressListener progress;
+#endif
+  controller.addListener(&progress);
+
+  // Add the top suite to the test runner
+  CPPUNIT_NS::TestRunner runner;
+  runner.addTest(CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest());
+  try {
+    IF_VERIFY()
+      initialize_memory_tracing();
+
+    runner.run(controller, testPath);
+
+    IF_VERIFY()
+      shutdown_memory_tracing();
+
+    // Print test in a compiler compatible format.
+    CPPUNIT_NS::CompilerOutputter outputter(&result, CPPUNIT_NS::stdCOut());
+    outputter.write();
+
+#if 0
+    // Uncomment this for XML output
+    std::ofstream file("tests.xml");
+    CPPUNIT_NS::XmlOutputter xml(&result, file);
+    xml.setStyleSheet("report.xsl");
+    xml.write();
+    file.close();
+#endif
+  }
+  catch (std::invalid_argument &e) { // Test path not resolved
+    CPPUNIT_NS::stdCOut()  <<  "\n"
+			   <<  "ERROR: "  <<  e.what()
+			   << "\n";
+    return 0;
+  }
+
+  return result.wasSuccessful() ? 0 : 1;
+}
diff --git a/test/UnitTests.h b/test/UnitTests.h
new file mode 100644
index 00000000..e7027cf4
--- /dev/null
+++ b/test/UnitTests.h
@@ -0,0 +1,24 @@
+#ifndef _UNITTESTS_H
+#define _UNITTESTS_H
+
+#include "ledger.h"
+
+using namespace ledger;
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/Exception.h>
+#include <cppunit/Portability.h>
+
+#define assertDoublesEqual(x,y,z,w) CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(x,y,z,w)
+#define assertEqual(x,y)	    CPPUNIT_ASSERT_EQUAL(x,y)
+#define assertNotEqual(x,y)	    CPPUNIT_ASSERT((x) != (y))
+#define assertTrue(x)	            CPPUNIT_ASSERT(x)
+#define assertFalse(x)	            CPPUNIT_ASSERT(! (x))
+#define assertValid(x)	            CPPUNIT_ASSERT((x).valid())
+#define assertEqualMessage(x,y,z)   CPPUNIT_ASSERT_EQUAL_MESSAGE(x,y,z)
+#define assertMessage(x,y)	    CPPUNIT_ASSERT_MESSAGE(x,y)
+#define assertThrow(x,y)	    CPPUNIT_ASSERT_THROW(x,y)
+
+#define internalAmount(x) amount_t::exact(x)
+
+#endif /* _UNITTESTS_H */
diff --git a/test/__init__.py b/test/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test/__init__.py
diff --git a/test/numerics/t_amount.cc b/test/numerics/t_amount.cc
new file mode 100644
index 00000000..37e7ebae
--- /dev/null
+++ b/test/numerics/t_amount.cc
@@ -0,0 +1,1558 @@
+#include "t_amount.h"
+
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(AmountTestCase, "numerics");
+
+void AmountTestCase::setUp()
+{
+  ledger::set_session_context(&session);
+
+  // Cause the display precision for dollars to be initialized to 2.
+  amount_t x1("$1.00");
+  assertTrue(x1);
+
+  amount_t::stream_fullstrings = true; // make reports from UnitTests accurate
+}
+
+void AmountTestCase::tearDown()
+{
+  amount_t::stream_fullstrings = false;
+
+  ledger::set_session_context();
+}
+
+void AmountTestCase::testParser()
+{
+  amount_t x0;
+  amount_t x1;
+  amount_t x2;
+  amount_t x3;
+  amount_t x4(123.456);
+  amount_t x5(x4);
+  amount_t x6(x4);
+  amount_t x7(x4);
+  amount_t x8("$123.45");
+  amount_t x9(x8);
+  amount_t x10(x8);
+  amount_t x11(x8);
+  amount_t x12("$100");
+
+  assertEqual(amount_t::precision_t(2), x12.commodity().precision());
+
+  string buf("$100...");
+  std::istringstream input(buf);
+  amount_t x13;
+  x13.parse(input);
+  assertEqual(x12, x13);
+
+  amount_t x14;
+  assertThrow(x14.parse("DM"), amount_error);
+
+  amount_t x15("$1.000.000,00"); // parsing this switches us to European
+
+  amount_t x16("$2000");
+  assertEqual(string("$2.000,00"), x16.to_string());
+  x16.parse("$2000,00");
+  assertEqual(string("$2.000,00"), x16.to_string());
+
+  // Since European-ness is an additive quality, we must switch back
+  // to American-ness manually
+  x15.commodity().drop_flags(COMMODITY_STYLE_EUROPEAN);
+
+  amount_t x17("$1,000,000.00"); // parsing this switches back to American
+
+  amount_t x18("$2000");
+  assertEqual(string("$2,000.00"), x18.to_string());
+  x18.parse("$2,000");
+  assertEqual(string("$2,000.00"), x18.to_string());
+
+  assertEqual(x15, x17);
+
+  amount_t x19("EUR 1000");
+  amount_t x20("EUR 1000");
+
+  assertEqual(string("EUR 1000"), x19.to_string());
+  assertEqual(string("EUR 1000"), x20.to_string());
+
+  x1.parse("$100.0000", AMOUNT_PARSE_NO_MIGRATE);
+  assertEqual(amount_t::precision_t(2), x12.commodity().precision());
+  assertEqual(x1.commodity(), x12.commodity());
+  assertEqual(x1, x12);
+
+  x0.parse("$100.0000");
+  assertEqual(amount_t::precision_t(4), x12.commodity().precision());
+  assertEqual(x0.commodity(), x12.commodity());
+  assertEqual(x0, x12);
+
+  x2.parse("$100.00", AMOUNT_PARSE_NO_REDUCE);
+  assertEqual(x2, x12);
+  x3.parse("$100.00", AMOUNT_PARSE_NO_MIGRATE | AMOUNT_PARSE_NO_REDUCE);
+  assertEqual(x3, x12);
+
+  x4.parse("$100.00");
+  assertEqual(x4, x12);
+  x5.parse("$100.00", AMOUNT_PARSE_NO_MIGRATE);
+  assertEqual(x5, x12);
+  x6.parse("$100.00", AMOUNT_PARSE_NO_REDUCE);
+  assertEqual(x6, x12);
+  x7.parse("$100.00", AMOUNT_PARSE_NO_MIGRATE | AMOUNT_PARSE_NO_REDUCE);
+  assertEqual(x7, x12);
+
+  x8.parse("$100.00");
+  assertEqual(x8, x12);
+  x9.parse("$100.00", AMOUNT_PARSE_NO_MIGRATE);
+  assertEqual(x9, x12);
+  x10.parse("$100.00", AMOUNT_PARSE_NO_REDUCE);
+  assertEqual(x10, x12);
+  x11.parse("$100.00", AMOUNT_PARSE_NO_MIGRATE | AMOUNT_PARSE_NO_REDUCE);
+  assertEqual(x11, x12);
+
+  assertValid(x0);
+  assertValid(x1);
+  assertValid(x2);
+  assertValid(x3);
+  assertValid(x5);
+  assertValid(x6);
+  assertValid(x7);
+  assertValid(x8);
+  assertValid(x9);
+  assertValid(x10);
+  assertValid(x11);
+  assertValid(x12);
+}
+
+void AmountTestCase::testConstructors()
+{
+  amount_t x0;
+  amount_t x1(123456L);
+  amount_t x2(123456UL);
+  amount_t x3(123.456);
+  amount_t x5("123456");
+  amount_t x6("123.456");
+  amount_t x7(string("123456"));
+  amount_t x8(string("123.456"));
+  amount_t x9(x3);
+  amount_t x10(x6);
+  amount_t x11(x8);
+
+  assertThrow(amount_t(0L) == x0, amount_error);
+  assertThrow(amount_t() == x0, amount_error);
+  assertThrow(amount_t("0") == x0, amount_error);
+  assertThrow(amount_t("0.0") == x0, amount_error);
+  assertEqual(x2, x1);
+  assertEqual(x5, x1);
+  assertEqual(x7, x1);
+  assertEqual(x6, x3);
+  assertEqual(x8, x3);
+  assertEqual(x10, x3);
+  assertEqual(x10, x9);
+
+  assertValid(x0);
+  assertValid(x1);
+  assertValid(x2);
+  assertValid(x3);
+  assertValid(x5);
+  assertValid(x6);
+  assertValid(x7);
+  assertValid(x8);
+  assertValid(x9);
+  assertValid(x10);
+  assertValid(x11);
+}
+
+void AmountTestCase::testCommodityConstructors()
+{
+  amount_t x1("$123.45");
+  amount_t x2("-$123.45");
+  amount_t x3("$-123.45");
+  amount_t x4("DM 123.45");
+  amount_t x5("-DM 123.45");
+  amount_t x6("DM -123.45");
+  amount_t x7("123.45 euro");
+  amount_t x8("-123.45 euro");
+  amount_t x9("123.45€");
+  amount_t x10("-123.45€");
+
+  assertEqual(amount_t("$123.45"), x1);
+  assertEqual(amount_t("-$123.45"), x2);
+  assertEqual(amount_t("$-123.45"), x3);
+  assertEqual(amount_t("DM 123.45"), x4);
+  assertEqual(amount_t("-DM 123.45"), x5);
+  assertEqual(amount_t("DM -123.45"), x6);
+  assertEqual(amount_t("123.45 euro"), x7);
+  assertEqual(amount_t("-123.45 euro"), x8);
+  assertEqual(amount_t("123.45€"), x9);
+  assertEqual(amount_t("-123.45€"), x10);
+
+  assertEqual(string("$123.45"), x1.to_string());
+  assertEqual(string("$-123.45"), x2.to_string());
+  assertEqual(string("$-123.45"), x3.to_string());
+  assertEqual(string("DM 123.45"), x4.to_string());
+  assertEqual(string("DM -123.45"), x5.to_string());
+  assertEqual(string("DM -123.45"), x6.to_string());
+  assertEqual(string("123.45 euro"), x7.to_string());
+  assertEqual(string("-123.45 euro"), x8.to_string());
+  assertEqual(string("123.45€"), x9.to_string());
+  assertEqual(string("-123.45€"), x10.to_string());
+
+  assertValid(x1);
+  assertValid(x2);
+  assertValid(x3);
+  assertValid(x4);
+  assertValid(x5);
+  assertValid(x6);
+  assertValid(x7);
+  assertValid(x8);
+  assertValid(x9);
+  assertValid(x10);
+}
+
+void AmountTestCase::testAssignment()
+{
+  amount_t x0;
+  amount_t x1;
+  amount_t x2;
+  amount_t x3;
+  amount_t x5;
+  amount_t x6;
+  amount_t x7;
+  amount_t x8;
+  amount_t x9;
+  amount_t x10;
+
+  x1  = 123456L;
+  x2  = 123456UL;
+  x3  = 123.456;
+  x5  = "123456";
+  x6  = "123.456";
+  x7  = string("123456");
+  x8  = string("123.456");
+  x9  = x3;
+  x10 = amount_t(x6);
+
+  assertEqual(x2, x1);
+  assertEqual(x5, x1);
+  assertEqual(x7, x1);
+  assertEqual(x6, x3);
+  assertEqual(x8, x3);
+  assertEqual(x10, x3);
+  assertEqual(x10, x9);
+
+  assertFalse(x1.is_null());
+  x1 = x0;			// sets x1 back to uninitialized state
+  assertTrue(x0.is_null());
+  assertTrue(x1.is_null());
+
+  assertValid(x0);
+  assertValid(x1);
+  assertValid(x2);
+  assertValid(x3);
+  assertValid(x5);
+  assertValid(x6);
+  assertValid(x7);
+  assertValid(x8);
+  assertValid(x9);
+  assertValid(x10);
+}
+
+void AmountTestCase::testCommodityAssignment()
+{
+  amount_t x1;
+  amount_t x2;
+  amount_t x3;
+  amount_t x4;
+  amount_t x5;
+  amount_t x6;
+  amount_t x7;
+  amount_t x8;
+  amount_t x9;
+  amount_t x10;
+
+  x1  = "$123.45";
+  x2  = "-$123.45";
+  x3  = "$-123.45";
+  x4  = "DM 123.45";
+  x5  = "-DM 123.45";
+  x6  = "DM -123.45";
+  x7  = "123.45 euro";
+  x8  = "-123.45 euro";
+  x9  = "123.45€";
+  x10 = "-123.45€";
+
+  assertEqual(amount_t("$123.45"), x1);
+  assertEqual(amount_t("-$123.45"), x2);
+  assertEqual(amount_t("$-123.45"), x3);
+  assertEqual(amount_t("DM 123.45"), x4);
+  assertEqual(amount_t("-DM 123.45"), x5);
+  assertEqual(amount_t("DM -123.45"), x6);
+  assertEqual(amount_t("123.45 euro"), x7);
+  assertEqual(amount_t("-123.45 euro"), x8);
+  assertEqual(amount_t("123.45€"), x9);
+  assertEqual(amount_t("-123.45€"), x10);
+
+  assertEqual(string("$123.45"), x1.to_string());
+  assertEqual(string("$-123.45"), x2.to_string());
+  assertEqual(string("$-123.45"), x3.to_string());
+  assertEqual(string("DM 123.45"), x4.to_string());
+  assertEqual(string("DM -123.45"), x5.to_string());
+  assertEqual(string("DM -123.45"), x6.to_string());
+  assertEqual(string("123.45 euro"), x7.to_string());
+  assertEqual(string("-123.45 euro"), x8.to_string());
+  assertEqual(string("123.45€"), x9.to_string());
+  assertEqual(string("-123.45€"), x10.to_string());
+
+  assertValid(x1);
+  assertValid(x2);
+  assertValid(x3);
+  assertValid(x4);
+  assertValid(x5);
+  assertValid(x6);
+  assertValid(x7);
+  assertValid(x8);
+  assertValid(x9);
+  assertValid(x10);
+}
+
+void AmountTestCase::testEquality()
+{
+  amount_t x1(123456L);
+  amount_t x2(456789L);
+  amount_t x3(333333L);
+  amount_t x4(123456.0);
+  amount_t x5("123456.0");
+  amount_t x6(123456.0F);
+
+  assertTrue(x1 == 123456L);
+  assertTrue(x1 != x2);
+  assertTrue(x1 == (x2 - x3));
+  assertTrue(x1 == x4);
+  assertTrue(x4 == x5);
+  assertTrue(x4 == x6);
+
+  assertTrue(x1 == 123456L);
+  assertTrue(123456L == x1);
+  assertTrue(x1 == 123456UL);
+  assertTrue(123456UL == x1);
+  assertTrue(x1 == 123456.0);
+  assertTrue(123456.0 == x1);
+
+  assertValid(x1);
+  assertValid(x2);
+  assertValid(x3);
+  assertValid(x4);
+  assertValid(x5);
+  assertValid(x6);
+}
+
+void AmountTestCase::testCommodityEquality()
+{
+  amount_t x0;
+  amount_t x1;
+  amount_t x2;
+  amount_t x3;
+  amount_t x4;
+  amount_t x5;
+  amount_t x6;
+  amount_t x7;
+  amount_t x8;
+  amount_t x9;
+  amount_t x10;
+
+  x1  = "$123.45";
+  x2  = "-$123.45";
+  x3  = "$-123.45";
+  x4  = "DM 123.45";
+  x5  = "-DM 123.45";
+  x6  = "DM -123.45";
+  x7  = "123.45 euro";
+  x8  = "-123.45 euro";
+  x9  = "123.45€";
+  x10 = "-123.45€";
+
+  assertTrue(x0.is_null());
+  assertThrow(x0.is_zero(), amount_error);
+  assertThrow(x0.is_realzero(), amount_error);
+  assertThrow(assert(x0.sign() == 0), amount_error);
+  assertThrow(assert(x0.compare(x1) < 0), amount_error);
+  assertThrow(assert(x0.compare(x2) > 0), amount_error);
+  assertThrow(assert(x0.compare(x0) == 0), amount_error);
+
+  assertTrue(x1 != x2);
+  assertTrue(x1 != x4);
+  assertTrue(x1 != x7);
+  assertTrue(x1 != x9);
+  assertTrue(x2 == x3);
+  assertTrue(x4 != x5);
+  assertTrue(x5 == x6);
+  assertTrue(x7 == - x8);
+  assertTrue(x9 == - x10);
+
+  assertValid(x0);
+  assertValid(x1);
+  assertValid(x2);
+  assertValid(x3);
+  assertValid(x4);
+  assertValid(x5);
+  assertValid(x6);
+  assertValid(x7);
+  assertValid(x8);
+  assertValid(x9);
+  assertValid(x10);
+}
+
+void AmountTestCase::testComparisons()
+{
+  amount_t x0;
+  amount_t x1(-123L);
+  amount_t x2(123L);
+  amount_t x3(-123.45);
+  amount_t x4(123.45);
+  amount_t x5("-123.45");
+  amount_t x6("123.45");
+
+  assertThrow(x0 > x1, amount_error);
+  assertThrow(x0 < x2, amount_error);
+  assertThrow(x0 > x3, amount_error);
+  assertThrow(x0 < x4, amount_error);
+  assertThrow(x0 > x5, amount_error);
+  assertThrow(x0 < x6, amount_error);
+
+  assertTrue(x1 > x3);
+  assertTrue(x3 <= x5);
+  assertTrue(x3 >= x5);
+  assertTrue(x3 < x1);
+  assertTrue(x3 < x4);
+
+  assertTrue(x1 < 100L);
+  assertTrue(100L > x1);
+  assertTrue(x1 < 100UL);
+  assertTrue(100UL > x1);
+  assertTrue(x1 < 100.0);
+  assertTrue(100.0 > x1);
+
+  assertValid(x0);
+  assertValid(x1);
+  assertValid(x2);
+  assertValid(x3);
+  assertValid(x4);
+  assertValid(x5);
+  assertValid(x6);
+}
+
+void AmountTestCase::testCommodityComparisons()
+{
+  amount_t x1("$-123");
+  amount_t x2("$123.00");
+  amount_t x3(internalAmount("$-123.4544"));
+  amount_t x4(internalAmount("$123.4544"));
+  amount_t x5("$-123.45");
+  amount_t x6("$123.45");
+  amount_t x7("DM 123.45");
+
+  assertTrue(x1 > x3);
+  assertTrue(x3 <= x5);
+  assertTrue(x3 < x5);
+  assertTrue(x3 <= x5);
+  assertFalse(x3 == x5);
+  assertTrue(x3 < x1);
+  assertTrue(x3 < x4);
+  assertFalse(x6 == x7);
+  assertThrow(x6 < x7, amount_error);
+
+  assertValid(x1);
+  assertValid(x2);
+  assertValid(x3);
+  assertValid(x4);
+  assertValid(x5);
+  assertValid(x6);
+}
+
+void AmountTestCase::testIntegerAddition()
+{
+  amount_t x0;
+  amount_t x1(123L);
+  amount_t y1(456L);
+
+  assertEqual(amount_t(579L), x1 + y1);
+  assertEqual(amount_t(579L), x1 + 456L);
+  assertEqual(amount_t(579L), 456L + x1);
+
+  x1 += amount_t(456L);
+  assertEqual(amount_t(579L), x1);
+  x1 += 456L;
+  assertEqual(amount_t(1035L), x1);
+
+  amount_t x4("123456789123456789123456789");
+
+  assertEqual(amount_t("246913578246913578246913578"), x4 + x4);
+
+  assertValid(x0);
+  assertValid(x1);
+  assertValid(y1);
+  assertValid(x4);
+}
+
+void AmountTestCase::testFractionalAddition()
+{
+  amount_t x1(123.123);
+  amount_t y1(456.456);
+
+  assertEqual(amount_t(579.579), x1 + y1);
+  assertEqual(amount_t(579.579), x1 + 456.456);
+  assertEqual(amount_t(579.579), 456.456 + x1);
+
+  x1 += amount_t(456.456);
+  assertEqual(amount_t(579.579), x1);
+  x1 += 456.456;
+  assertEqual(amount_t(1036.035), x1);
+  x1 += 456L;
+  assertEqual(amount_t(1492.035), x1);
+
+  amount_t x2("123456789123456789.123456789123456789");
+
+  assertEqual(amount_t("246913578246913578.246913578246913578"), x2 + x2);
+
+  assertValid(x1);
+  assertValid(y1);
+  assertValid(x2);
+}
+
+void AmountTestCase::testCommodityAddition()
+{
+  amount_t x0;
+  amount_t x1("$123.45");
+  amount_t x2(internalAmount("$123.456789"));
+  amount_t x3("DM 123.45");
+  amount_t x4("123.45 euro");
+  amount_t x5("123.45€");
+  amount_t x6("123.45");
+
+  assertEqual(amount_t("$246.90"), x1 + x1);
+  assertNotEqual(amount_t("$246.91"), x1 + x2);
+  assertEqual(internalAmount("$246.906789"), x1 + x2);
+
+  // Converting to string drops internal precision
+  assertEqual(string("$246.90"), (x1 + x1).to_string());
+  assertEqual(string("$246.91"), (x1 + x2).to_string());
+
+  assertThrow(x1 + x0, amount_error);
+  assertThrow(x0 + x1, amount_error);
+  assertThrow(x0 + x0, amount_error);
+  assertThrow(x1 + x3, amount_error);
+  assertThrow(x1 + x4, amount_error);
+  assertThrow(x1 + x5, amount_error);
+  assertThrow(x1 + x6, amount_error);
+  assertThrow(x1 + 123.45, amount_error);
+  assertThrow(x1 + 123L, amount_error);
+
+  assertEqual(amount_t("DM 246.90"), x3 + x3);
+  assertEqual(amount_t("246.90 euro"), x4 + x4);
+  assertEqual(amount_t("246.90€"), x5 + x5);
+
+  assertEqual(string("DM 246.90"), (x3 + x3).to_string());
+  assertEqual(string("246.90 euro"), (x4 + x4).to_string());
+  assertEqual(string("246.90€"), (x5 + x5).to_string());
+
+  x1 += amount_t("$456.45");
+  assertEqual(amount_t("$579.90"), x1);
+  x1 += amount_t("$456.45");
+  assertEqual(amount_t("$1036.35"), x1);
+  x1 += amount_t("$456");
+  assertEqual(amount_t("$1492.35"), x1);
+
+  amount_t x7(internalAmount("$123456789123456789.123456789123456789"));
+
+  assertEqual(internalAmount("$246913578246913578.246913578246913578"), x7 + x7);
+
+  assertValid(x1);
+  assertValid(x2);
+  assertValid(x3);
+  assertValid(x4);
+  assertValid(x5);
+  assertValid(x6);
+  assertValid(x7);
+}
+
+void AmountTestCase::testIntegerSubtraction()
+{
+  amount_t x1(123L);
+  amount_t y1(456L);
+
+  assertEqual(amount_t(333L), y1 - x1);
+  assertEqual(amount_t(-333L), x1 - y1);
+  assertEqual(amount_t(23L), x1 - 100L);
+  assertEqual(amount_t(-23L), 100L - x1);
+
+  x1 -= amount_t(456L);
+  assertEqual(amount_t(-333L), x1);
+  x1 -= 456L;
+  assertEqual(amount_t(-789L), x1);
+
+  amount_t x4("123456789123456789123456789");
+  amount_t y4("8238725986235986");
+
+  assertEqual(amount_t("123456789115218063137220803"), x4 - y4);
+  assertEqual(amount_t("-123456789115218063137220803"), y4 - x4);
+
+  assertValid(x1);
+  assertValid(y1);
+  assertValid(x4);
+  assertValid(y4);
+}
+
+void AmountTestCase::testFractionalSubtraction()
+{
+  amount_t x1(123.123);
+  amount_t y1(456.456);
+
+  assertEqual(amount_t(-333.333), x1 - y1);
+  assertEqual(amount_t(333.333), y1 - x1);
+
+  x1 -= amount_t(456.456);
+  assertEqual(amount_t(-333.333), x1);
+  x1 -= 456.456;
+  assertEqual(amount_t(-789.789), x1);
+  x1 -= 456L;
+  assertEqual(amount_t(-1245.789), x1);
+
+  amount_t x2("123456789123456789.123456789123456789");
+  amount_t y2("9872345982459.248974239578");
+
+  assertEqual(amount_t("123446916777474329.874482549545456789"), x2 - y2);
+  assertEqual(amount_t("-123446916777474329.874482549545456789"), y2 - x2);
+
+  assertValid(x1);
+  assertValid(y1);
+  assertValid(x2);
+  assertValid(y2);
+}
+
+void AmountTestCase::testCommoditySubtraction()
+{
+  amount_t x0;
+  amount_t x1("$123.45");
+  amount_t x2(internalAmount("$123.456789"));
+  amount_t x3("DM 123.45");
+  amount_t x4("123.45 euro");
+  amount_t x5("123.45€");
+  amount_t x6("123.45");
+
+  assertNotEqual(amount_t(), x1 - x1);
+  assertEqual(amount_t("$0"), x1 - x1);
+  assertEqual(amount_t("$23.45"), x1 - amount_t("$100.00"));
+  assertEqual(amount_t("$-23.45"), amount_t("$100.00") - x1);
+  assertNotEqual(amount_t("$-0.01"), x1 - x2);
+  assertEqual(internalAmount("$-0.006789"), x1 - x2);
+
+  // Converting to string drops internal precision.  If an amount is
+  // zero, it drops the commodity as well.
+  assertEqual(string("$0.00"), (x1 - x1).to_string());
+  assertEqual(string("$-0.01"), (x1 - x2).to_string());
+
+  assertThrow(x1 - x0, amount_error);
+  assertThrow(x0 - x1, amount_error);
+  assertThrow(x0 - x0, amount_error);
+  assertThrow(x1 - x3, amount_error);
+  assertThrow(x1 - x4, amount_error);
+  assertThrow(x1 - x5, amount_error);
+  assertThrow(x1 - x6, amount_error);
+  assertThrow(x1 - 123.45, amount_error);
+  assertThrow(x1 - 123L, amount_error);
+
+  assertEqual(amount_t("DM 0.00"), x3 - x3);
+  assertEqual(amount_t("DM 23.45"), x3 - amount_t("DM 100.00"));
+  assertEqual(amount_t("DM -23.45"), amount_t("DM 100.00") - x3);
+  assertEqual(amount_t("0.00 euro"), x4 - x4);
+  assertEqual(amount_t("23.45 euro"), x4 - amount_t("100.00 euro"));
+  assertEqual(amount_t("-23.45 euro"), amount_t("100.00 euro") - x4);
+  assertEqual(amount_t("0.00€"), x5 - x5);
+  assertEqual(amount_t("23.45€"), x5 - amount_t("100.00€"));
+  assertEqual(amount_t("-23.45€"), amount_t("100.00€") - x5);
+
+  assertEqual(string("DM 0.00"), (x3 - x3).to_string());
+  assertEqual(string("DM 23.45"), (x3 - amount_t("DM 100.00")).to_string());
+  assertEqual(string("DM -23.45"), (amount_t("DM 100.00") - x3).to_string());
+  assertEqual(string("0.00 euro"), (x4 - x4).to_string());
+  assertEqual(string("23.45 euro"), (x4 - amount_t("100.00 euro")).to_string());
+  assertEqual(string("-23.45 euro"), (amount_t("100.00 euro") - x4).to_string());
+  assertEqual(string("0.00€"), (x5 - x5).to_string());
+  assertEqual(string("23.45€"), (x5 - amount_t("100.00€")).to_string());
+  assertEqual(string("-23.45€"), (amount_t("100.00€") - x5).to_string());
+
+  x1 -= amount_t("$456.45");
+  assertEqual(amount_t("$-333.00"), x1);
+  x1 -= amount_t("$456.45");
+  assertEqual(amount_t("$-789.45"), x1);
+  x1 -= amount_t("$456");
+  assertEqual(amount_t("$-1245.45"), x1);
+
+  amount_t x7(internalAmount("$123456789123456789.123456789123456789"));
+  amount_t x8(internalAmount("$2354974984698.98459845984598"));
+
+  assertEqual(internalAmount("$123454434148472090.138858329277476789"), x7 - x8);
+  assertEqual(string("$123454434148472090.138858329277476789"), (x7 - x8).to_string());
+  assertEqual(string("$123454434148472090.14"),
+	      (amount_t("$1.00") * (x7 - x8)).to_string());
+  assertEqual(internalAmount("$-123454434148472090.138858329277476789"), x8 - x7);
+  assertEqual(string("$-123454434148472090.138858329277476789"), (x8 - x7).to_string());
+  assertEqual(string("$-123454434148472090.14"),
+	      (amount_t("$1.00") * (x8 - x7)).to_string());
+
+  assertValid(x1);
+  assertValid(x2);
+  assertValid(x3);
+  assertValid(x4);
+  assertValid(x5);
+  assertValid(x6);
+  assertValid(x7);
+  assertValid(x8);
+}
+
+void AmountTestCase::testIntegerMultiplication()
+{
+  amount_t x1(123L);
+  amount_t y1(456L);
+
+  assertEqual(amount_t(0L), x1 * 0L);
+  assertEqual(amount_t(0L), amount_t(0L) * x1);
+  assertEqual(amount_t(0L), 0L * x1);
+  assertEqual(x1, x1 * 1L);
+  assertEqual(x1, amount_t(1L) * x1);
+  assertEqual(x1, 1L * x1);
+  assertEqual(- x1, x1 * -1L);
+  assertEqual(- x1, amount_t(-1L) * x1);
+  assertEqual(- x1, -1L * x1);
+  assertEqual(amount_t(56088L), x1 * y1);
+  assertEqual(amount_t(56088L), y1 * x1);
+  assertEqual(amount_t(56088L), x1 * 456L);
+  assertEqual(amount_t(56088L), amount_t(456L) * x1);
+  assertEqual(amount_t(56088L), 456L * x1);
+
+  x1 *= amount_t(123L);
+  assertEqual(amount_t(15129L), x1);
+  x1 *= 123L;
+  assertEqual(amount_t(1860867L), x1);
+
+  amount_t x4("123456789123456789123456789");
+
+  assertEqual(amount_t("15241578780673678546105778281054720515622620750190521"),
+	      x4 * x4);
+
+  assertValid(x1);
+  assertValid(y1);
+  assertValid(x4);
+}
+
+void AmountTestCase::testFractionalMultiplication()
+{
+  amount_t x1(123.123);
+  amount_t y1(456.456);
+
+  assertEqual(amount_t(0L), x1 * 0L);
+  assertEqual(amount_t(0L), amount_t(0L) * x1);
+  assertEqual(amount_t(0L), 0L * x1);
+  assertEqual(x1, x1 * 1L);
+  assertEqual(x1, amount_t(1L) * x1);
+  assertEqual(x1, 1L * x1);
+  assertEqual(- x1, x1 * -1L);
+  assertEqual(- x1, amount_t(-1L) * x1);
+  assertEqual(- x1, -1L * x1);
+  assertEqual(amount_t("56200.232088"), x1 * y1);
+  assertEqual(amount_t("56200.232088"), y1 * x1);
+  assertEqual(amount_t("56200.232088"), x1 * 456.456);
+  assertEqual(amount_t("56200.232088"), amount_t(456.456) * x1);
+  assertEqual(amount_t("56200.232088"), 456.456 * x1);
+
+  x1 *= amount_t(123.123);
+  assertEqual(amount_t("15159.273129"), x1);
+  x1 *= 123.123;
+  assertEqual(amount_t("1866455.185461867"), x1);
+  x1 *= 123L;
+  assertEqual(amount_t("229573987.811809641"), x1);
+
+  amount_t x2("123456789123456789.123456789123456789");
+
+  assertEqual(amount_t("15241578780673678546105778311537878.046486820281054720515622620750190521"),
+	      x2 * x2);
+
+  assertValid(x1);
+  assertValid(y1);
+  assertValid(x2);
+}
+
+void AmountTestCase::testCommodityMultiplication()
+{
+  amount_t x0;
+  amount_t x1("$123.12");
+  amount_t y1("$456.45");
+  amount_t x2(internalAmount("$123.456789"));
+  amount_t x3("DM 123.45");
+  amount_t x4("123.45 euro");
+  amount_t x5("123.45€");
+
+  assertEqual(amount_t("$0.00"), x1 * 0L);
+  assertEqual(amount_t("$0.00"), 0L * x1);
+  assertEqual(x1, x1 * 1L);
+  assertEqual(x1, 1L * x1);
+  assertEqual(- x1, x1 * -1L);
+  assertEqual(- x1, -1L * x1);
+  assertEqual(internalAmount("$56198.124"), x1 * y1);
+  assertEqual(string("$56198.12"), (x1 * y1).to_string());
+  assertEqual(internalAmount("$56198.124"), y1 * x1);
+  assertEqual(string("$56198.12"), (y1 * x1).to_string());
+
+  // Internal amounts retain their precision, even when being
+  // converted to strings
+  assertEqual(internalAmount("$15199.99986168"), x1 * x2);
+  assertEqual(internalAmount("$15199.99986168"), x2 * x1);
+  assertEqual(string("$15200.00"), (x1 * x2).to_string());
+  assertEqual(string("$15199.99986168"), (x2 * x1).to_string());
+
+  assertThrow(x1 * x0, amount_error);
+  assertThrow(x0 * x1, amount_error);
+  assertThrow(x0 * x0, amount_error);
+  assertThrow(x1 * x3, amount_error);
+  assertThrow(x1 * x4, amount_error);
+  assertThrow(x1 * x5, amount_error);
+
+  x1 *= amount_t("123.12");
+  assertEqual(internalAmount("$15158.5344"), x1);
+  assertEqual(string("$15158.53"), x1.to_string());
+  x1 *= 123.12;
+  assertEqual(internalAmount("$1866318.755328"), x1);
+  assertEqual(string("$1866318.76"), x1.to_string());
+  x1 *= 123L;
+  assertEqual(internalAmount("$229557206.905344"), x1);
+  assertEqual(string("$229557206.91"), x1.to_string());
+
+  amount_t x7(internalAmount("$123456789123456789.123456789123456789"));
+
+  assertEqual(internalAmount("$15241578780673678546105778311537878.046486820281054720515622620750190521"),
+	      x7 * x7);
+
+  assertValid(x1);
+  assertValid(x2);
+  assertValid(x3);
+  assertValid(x4);
+  assertValid(x5);
+  assertValid(x7);
+}
+
+void AmountTestCase::testIntegerDivision()
+{
+  amount_t x1(123L);
+  amount_t y1(456L);
+
+  assertThrow(x1 / 0L, amount_error);
+  assertEqual(amount_t(0L), amount_t(0L) / x1);
+  assertEqual(amount_t(0L), 0L / x1);
+  assertEqual(x1, x1 / 1L);
+  assertEqual(amount_t("0.008130"), amount_t(1L) / x1);
+  assertEqual(amount_t("0.008130"), 1L / x1);
+  assertEqual(- x1, x1 / -1L);
+  assertEqual(- amount_t("0.008130"), amount_t(-1L) / x1);
+  assertEqual(- amount_t("0.008130"), -1L / x1);
+  assertEqual(amount_t("0.269737"), x1 / y1);
+  assertEqual(amount_t("3.707317"), y1 / x1);
+  assertEqual(amount_t("0.269737"), x1 / 456L);
+  assertEqual(amount_t("3.707317"), amount_t(456L) / x1);
+  assertEqual(amount_t("3.707317"), 456L / x1);
+
+  x1 /= amount_t(456L);
+  assertEqual(amount_t("0.269737"), x1);
+  x1 /= 456L;
+  assertEqual(amount_t("0.00059152850877193"), x1);
+
+  amount_t x4("123456789123456789123456789");
+  amount_t y4("56");
+
+  assertEqual(amount_t(1L), x4 / x4);
+  assertEqual(amount_t("2204585520061728377204585.517857"), x4 / y4);
+
+  assertValid(x1);
+  assertValid(y1);
+  assertValid(x4);
+  assertValid(y4);
+}
+
+void AmountTestCase::testFractionalDivision()
+{
+  amount_t x1(123.123);
+  amount_t y1(456.456);
+
+  assertThrow(x1 / 0L, amount_error);
+  assertEqual(amount_t("0.008121959"), amount_t(1.0) / x1);
+  assertEqual(amount_t("0.008121959"), 1.0 / x1);
+  assertEqual(x1, x1 / 1.0);
+  assertEqual(amount_t("0.008121959"), amount_t(1.0) / x1);
+  assertEqual(amount_t("0.008121959"), 1.0 / x1);
+  assertEqual(- x1, x1 / -1.0);
+  assertEqual(- amount_t("0.008121959"), amount_t(-1.0) / x1);
+  assertEqual(- amount_t("0.008121959"), -1.0 / x1);
+  assertEqual(amount_t("0.269736842105263"), x1 / y1);
+  assertEqual(amount_t("3.707317073170732"), y1 / x1);
+  assertEqual(amount_t("0.269736842105263"), x1 / 456.456);
+  assertEqual(amount_t("3.707317073170732"), amount_t(456.456) / x1);
+  assertEqual(amount_t("3.707317073170732"), 456.456 / x1);
+
+  x1 /= amount_t(456.456);
+  assertEqual(amount_t("0.269736842105263"), x1);
+  x1 /= 456.456;
+  assertEqual(amount_t("0.000590937225286255411255411255411255411"), x1);
+  x1 /= 456L;
+  assertEqual(amount_t("0.000001295914967733016252753094858358016252192982456140350877192982456140350877192982"), x1);
+
+  amount_t x4("1234567891234567.89123456789");
+  amount_t y4("56.789");
+
+  assertEqual(amount_t(1.0), x4 / x4);
+  assertEqual(amount_t("21739560323910.7554497273748437197344556164046"), x4 / y4);
+
+  assertValid(x1);
+  assertValid(y1);
+  assertValid(x4);
+  assertValid(y4);
+}
+
+void AmountTestCase::testCommodityDivision()
+{
+  amount_t x0;
+  amount_t x1("$123.12");
+  amount_t y1("$456.45");
+  amount_t x2(internalAmount("$123.456789"));
+  amount_t x3("DM 123.45");
+  amount_t x4("123.45 euro");
+  amount_t x5("123.45€");
+
+  assertThrow(x1 / 0L, amount_error);
+  assertEqual(amount_t("$0.00"), 0L / x1);
+  assertEqual(x1, x1 / 1L);
+  assertEqual(internalAmount("$0.00812216"), 1L / x1);
+  assertEqual(- x1, x1 / -1L);
+  assertEqual(internalAmount("$-0.00812216"), -1L / x1);
+  assertEqual(internalAmount("$0.26973382"), x1 / y1);
+  assertEqual(string("$0.27"), (x1 / y1).to_string());
+  assertEqual(internalAmount("$3.70735867"), y1 / x1);
+  assertEqual(string("$3.71"), (y1 / x1).to_string());
+
+  // Internal amounts retain their precision, even when being
+  // converted to strings
+  assertEqual(internalAmount("$0.99727201"), x1 / x2);
+  assertEqual(internalAmount("$1.00273545321637426901"), x2 / x1);
+  assertEqual(string("$1.00"), (x1 / x2).to_string());
+  assertEqual(string("$1.00273545321637426901"), (x2 / x1).to_string());
+
+  assertThrow(x1 / x0, amount_error);
+  assertThrow(x0 / x1, amount_error);
+  assertThrow(x0 / x0, amount_error);
+  assertThrow(x1 / x3, amount_error);
+  assertThrow(x1 / x4, amount_error);
+  assertThrow(x1 / x5, amount_error);
+
+  x1 /= amount_t("123.12");
+  assertEqual(internalAmount("$1.00"), x1);
+  assertEqual(string("$1.00"), x1.to_string());
+  x1 /= 123.12;
+  assertEqual(internalAmount("$0.00812216"), x1);
+  assertEqual(string("$0.01"), x1.to_string());
+  x1 /= 123L;
+  assertEqual(internalAmount("$0.00006603"), x1);
+  assertEqual(string("$0.00"), x1.to_string());
+
+  amount_t x6(internalAmount("$237235987235987.98723987235978"));
+  amount_t x7(internalAmount("$123456789123456789.123456789123456789"));
+
+  assertEqual(amount_t("$1"), x7 / x7);
+  assertEqual(internalAmount("$0.0019216115121765559608381226612019501046413574469262"),
+	      x6 / x7);
+  assertEqual(internalAmount("$520.39654928343335571379527154924040947271699678158689736256"),
+	      x7 / x6);
+
+  assertValid(x1);
+  assertValid(x2);
+  assertValid(x3);
+  assertValid(x4);
+  assertValid(x5);
+  assertValid(x6);
+  assertValid(x7);
+}
+
+void AmountTestCase::testNegation()
+{
+  amount_t x0;
+  amount_t x1(-123456L);
+  amount_t x3(-123.456);
+  amount_t x5("-123456");
+  amount_t x6("-123.456");
+  amount_t x7(string("-123456"));
+  amount_t x8(string("-123.456"));
+  amount_t x9(- x3);
+
+  assertThrow(x0.negate(), amount_error);
+  assertEqual(x5, x1);
+  assertEqual(x7, x1);
+  assertEqual(x6, x3);
+  assertEqual(x8, x3);
+  assertEqual(- x6, x9);
+  assertEqual(x3.negate(), x9);
+
+  amount_t x10(x9.negate());
+
+  assertEqual(x3, x10);
+
+  assertValid(x1);
+  assertValid(x3);
+  assertValid(x5);
+  assertValid(x6);
+  assertValid(x7);
+  assertValid(x8);
+  assertValid(x9);
+  assertValid(x10);
+}
+
+void AmountTestCase::testCommodityNegation()
+{
+  amount_t x1("$123.45");
+  amount_t x2("-$123.45");
+  amount_t x3("$-123.45");
+  amount_t x4("DM 123.45");
+  amount_t x5("-DM 123.45");
+  amount_t x6("DM -123.45");
+  amount_t x7("123.45 euro");
+  amount_t x8("-123.45 euro");
+  amount_t x9("123.45€");
+  amount_t x10("-123.45€");
+
+  assertEqual(amount_t("$-123.45"), - x1);
+  assertEqual(amount_t("$123.45"), - x2);
+  assertEqual(amount_t("$123.45"), - x3);
+  assertEqual(amount_t("DM -123.45"), - x4);
+  assertEqual(amount_t("DM 123.45"), - x5);
+  assertEqual(amount_t("DM 123.45"), - x6);
+  assertEqual(amount_t("-123.45 euro"), - x7);
+  assertEqual(amount_t("123.45 euro"), - x8);
+  assertEqual(amount_t("-123.45€"), - x9);
+  assertEqual(amount_t("123.45€"), - x10);
+
+  assertEqual(amount_t("$-123.45"), x1.negate());
+  assertEqual(amount_t("$123.45"), x2.negate());
+  assertEqual(amount_t("$123.45"), x3.negate());
+
+  assertEqual(string("$-123.45"), (- x1).to_string());
+  assertEqual(string("$123.45"), (- x2).to_string());
+  assertEqual(string("$123.45"), (- x3).to_string());
+  assertEqual(string("DM -123.45"), (- x4).to_string());
+  assertEqual(string("DM 123.45"), (- x5).to_string());
+  assertEqual(string("DM 123.45"), (- x6).to_string());
+  assertEqual(string("-123.45 euro"), (- x7).to_string());
+  assertEqual(string("123.45 euro"), (- x8).to_string());
+  assertEqual(string("-123.45€"), (- x9).to_string());
+  assertEqual(string("123.45€"), (- x10).to_string());
+
+  assertEqual(amount_t("$-123.45"), x1.negate());
+  assertEqual(amount_t("$123.45"), x2.negate());
+  assertEqual(amount_t("$123.45"), x3.negate());
+
+  assertValid(x1);
+  assertValid(x2);
+  assertValid(x3);
+  assertValid(x4);
+  assertValid(x5);
+  assertValid(x6);
+  assertValid(x7);
+  assertValid(x8);
+  assertValid(x9);
+  assertValid(x10);
+}
+
+void AmountTestCase::testAbs()
+{
+  amount_t x0;
+  amount_t x1(-1234L);
+  amount_t x2(1234L);
+
+  assertThrow(x0.abs(), amount_error);
+  assertEqual(amount_t(1234L), x1.abs());
+  assertEqual(amount_t(1234L), x2.abs());
+
+  assertValid(x0);
+  assertValid(x1);
+  assertValid(x2);
+}
+
+void AmountTestCase::testCommodityAbs()
+{
+  amount_t x1("$-1234.56");
+  amount_t x2("$1234.56");
+
+  assertEqual(amount_t("$1234.56"), x1.abs());
+  assertEqual(amount_t("$1234.56"), x2.abs());
+
+  assertValid(x1);
+  assertValid(x2);
+}
+
+void AmountTestCase::testFractionalRound()
+{
+  amount_t x0;
+  amount_t x1("1234.567890");
+
+  assertThrow(x0.precision(), amount_error);
+  assertThrow(x0.round(), amount_error);
+  assertThrow(x0.round(2), amount_error);
+  assertThrow(x0.unround(), amount_error);
+  assertEqual(amount_t::precision_t(6), x1.precision());
+
+  amount_t x1b(x1.unround());
+
+  assertEqual(x1b.precision(), x1b.unround().precision());
+
+  amount_t y7(x1.round(7));
+  amount_t y6(x1.round(6));
+  amount_t y5(x1.round(5));
+  amount_t y4(x1.round(4));
+  amount_t y3(x1.round(3));
+  amount_t y2(x1.round(2));
+  amount_t y1(x1.round(1));
+  amount_t y0(x1.round(0));
+
+  assertEqual(amount_t::precision_t(6), y7.precision());
+  assertEqual(amount_t::precision_t(6), y6.precision());
+  assertEqual(amount_t::precision_t(5), y5.precision());
+  assertEqual(amount_t::precision_t(4), y4.precision());
+  assertEqual(amount_t::precision_t(3), y3.precision());
+  assertEqual(amount_t::precision_t(2), y2.precision());
+  assertEqual(amount_t::precision_t(1), y1.precision());
+  assertEqual(amount_t::precision_t(0), y0.precision());
+
+  assertEqual(amount_t("1234.56789"), y7);
+  assertEqual(amount_t("1234.56789"), y6);
+  assertEqual(amount_t("1234.56789"), y5);
+  assertEqual(amount_t("1234.5679"), y4);
+  assertEqual(amount_t("1234.568"), y3);
+  assertEqual(amount_t("1234.57"), y2);
+  assertEqual(amount_t("1234.6"), y1);
+  assertEqual(amount_t("1235"), y0);
+
+  amount_t x2("9876.543210");
+
+  assertEqual(amount_t("9876.543210"), x2.round(6));
+  assertEqual(amount_t("9876.54321"), x2.round(5));
+  assertEqual(amount_t("9876.5432"), x2.round(4));
+  assertEqual(amount_t("9876.543"), x2.round(3));
+  assertEqual(amount_t("9876.54"), x2.round(2));
+  assertEqual(amount_t("9876.5"), x2.round(1));
+  assertEqual(amount_t("9877"), x2.round(0));
+
+  amount_t x3("-1234.567890");
+
+  assertEqual(amount_t("-1234.56789"), x3.round(6));
+  assertEqual(amount_t("-1234.56789"), x3.round(5));
+  assertEqual(amount_t("-1234.5679"), x3.round(4));
+  assertEqual(amount_t("-1234.568"), x3.round(3));
+  assertEqual(amount_t("-1234.57"), x3.round(2));
+  assertEqual(amount_t("-1234.6"), x3.round(1));
+  assertEqual(amount_t("-1235"), x3.round(0));
+
+  amount_t x4("-9876.543210");
+
+  assertEqual(amount_t("-9876.543210"), x4.round(6));
+  assertEqual(amount_t("-9876.54321"), x4.round(5));
+  assertEqual(amount_t("-9876.5432"), x4.round(4));
+  assertEqual(amount_t("-9876.543"), x4.round(3));
+  assertEqual(amount_t("-9876.54"), x4.round(2));
+  assertEqual(amount_t("-9876.5"), x4.round(1));
+  assertEqual(amount_t("-9877"), x4.round(0));
+
+  amount_t x5("0.0000000000000000000000000000000000001");
+
+  assertEqual(amount_t("0.0000000000000000000000000000000000001"),
+	      x5.round(37));
+  assertEqual(amount_t(0L), x5.round(36));
+
+  assertValid(x1);
+  assertValid(x2);
+  assertValid(x3);
+  assertValid(x4);
+  assertValid(x5);
+}
+
+void AmountTestCase::testCommodityRound()
+{
+  amount_t x1(internalAmount("$1234.567890"));
+
+  assertEqual(internalAmount("$1234.56789"), x1.round(6));
+  assertEqual(internalAmount("$1234.56789"), x1.round(5));
+  assertEqual(internalAmount("$1234.5679"), x1.round(4));
+  assertEqual(internalAmount("$1234.568"), x1.round(3));
+  assertEqual(amount_t("$1234.57"), x1.round(2));
+  assertEqual(amount_t("$1234.6"), x1.round(1));
+  assertEqual(amount_t("$1235"), x1.round(0));
+
+  amount_t x2(internalAmount("$9876.543210"));
+
+  assertEqual(internalAmount("$9876.543210"), x2.round(6));
+  assertEqual(internalAmount("$9876.54321"), x2.round(5));
+  assertEqual(internalAmount("$9876.5432"), x2.round(4));
+  assertEqual(internalAmount("$9876.543"), x2.round(3));
+  assertEqual(amount_t("$9876.54"), x2.round(2));
+  assertEqual(amount_t("$9876.5"), x2.round(1));
+  assertEqual(amount_t("$9877"), x2.round(0));
+
+  amount_t x3(internalAmount("$-1234.567890"));
+
+  assertEqual(internalAmount("$-1234.56789"), x3.round(6));
+  assertEqual(internalAmount("$-1234.56789"), x3.round(5));
+  assertEqual(internalAmount("$-1234.5679"), x3.round(4));
+  assertEqual(internalAmount("$-1234.568"), x3.round(3));
+  assertEqual(amount_t("$-1234.57"), x3.round(2));
+  assertEqual(amount_t("$-1234.6"), x3.round(1));
+  assertEqual(amount_t("$-1235"), x3.round(0));
+
+  amount_t x4(internalAmount("$-9876.543210"));
+
+  assertEqual(internalAmount("$-9876.543210"), x4.round(6));
+  assertEqual(internalAmount("$-9876.54321"), x4.round(5));
+  assertEqual(internalAmount("$-9876.5432"), x4.round(4));
+  assertEqual(internalAmount("$-9876.543"), x4.round(3));
+  assertEqual(amount_t("$-9876.54"), x4.round(2));
+  assertEqual(amount_t("$-9876.5"), x4.round(1));
+  assertEqual(amount_t("$-9877"), x4.round(0));
+
+  amount_t x5("$123.45");
+
+  x5 *= 100.12;
+
+  assertEqual(internalAmount("$12359.814"), x5);
+  assertEqual(string("$12359.81"), x5.to_string());
+  assertEqual(string("$12359.814"), x5.to_fullstring());
+  assertEqual(string("$12359.814"), x5.unround().to_string());
+
+  assertValid(x1);
+  assertValid(x2);
+  assertValid(x3);
+  assertValid(x4);
+  assertValid(x5);
+}
+
+void AmountTestCase::testCommodityDisplayRound()
+{
+  amount_t x1("$0.85");
+  amount_t x2("$0.1");
+
+  x1 *= 0.19;
+
+  assertNotEqual(amount_t("$0.16"), x1);
+  assertEqual(internalAmount("$0.1615"), x1);
+  assertEqual(string("$0.16"), x1.to_string());
+
+  assertEqual(amount_t("$0.10"), x2);
+  assertNotEqual(internalAmount("$0.101"), x2);
+  assertEqual(string("$0.10"), x2.to_string());
+
+  x1 *= 7L;
+
+  assertNotEqual(amount_t("$1.13"), x1);
+  assertEqual(internalAmount("$1.1305"), x1);
+  assertEqual(string("$1.13"), x1.to_string());
+}
+
+void AmountTestCase::testReduction()
+{
+  amount_t x0;
+  amount_t x1("60s");
+  amount_t x2("600s");
+  amount_t x3("6000s");
+  amount_t x4("360000s");
+  amount_t x5("10m");		// 600s
+  amount_t x6("100m");		// 6000s
+  amount_t x7("1000m");		// 60000s
+  amount_t x8("10000m");	// 600000s
+  amount_t x9("10h");		// 36000s
+  amount_t x10("100h");		// 360000s
+  amount_t x11("1000h");	// 3600000s
+  amount_t x12("10000h");	// 36000000s
+
+  assertThrow(x0.reduce(), amount_error);
+  assertThrow(x0.unreduce(), amount_error);
+  assertEqual(x2, x5);
+  assertEqual(x3, x6);
+  assertEqual(x4, x10);
+  assertEqual(string("100.0h"), x4.unreduce().to_string());
+}
+
+void AmountTestCase::testSign()
+{
+  amount_t x0;
+  amount_t x1("0.0000000000000000000000000000000000001");
+  amount_t x2("-0.0000000000000000000000000000000000001");
+  amount_t x3("1");
+  amount_t x4("-1");
+
+  assertThrow(x0.sign(), amount_error);
+  assertTrue(x1.sign() > 0);
+  assertTrue(x2.sign() < 0);
+  assertTrue(x3.sign() > 0);
+  assertTrue(x4.sign() < 0);
+
+  assertValid(x0);
+  assertValid(x1);
+  assertValid(x2);
+  assertValid(x3);
+  assertValid(x4);
+}
+
+void AmountTestCase::testCommoditySign()
+{
+  amount_t x1(internalAmount("$0.0000000000000000000000000000000000001"));
+  amount_t x2(internalAmount("$-0.0000000000000000000000000000000000001"));
+  amount_t x3("$1");
+  amount_t x4("$-1");
+
+  assertTrue(x1.sign() != 0);
+  assertTrue(x2.sign() != 0);
+  assertTrue(x3.sign() > 0);
+  assertTrue(x4.sign() < 0);
+
+  assertValid(x1);
+  assertValid(x2);
+  assertValid(x3);
+  assertValid(x4);
+}
+
+void AmountTestCase::testTruth()
+{
+  amount_t x0;
+  amount_t x1("1234");
+  amount_t x2("1234.56");
+
+  assertThrow(assert(x0 ? 1 : 0), amount_error);
+
+  assertTrue(x1);
+  assertTrue(x2);
+
+  assertValid(x0);
+  assertValid(x1);
+  assertValid(x2);
+}
+
+void AmountTestCase::testCommodityTruth()
+{
+  amount_t x1("$1234");
+  amount_t x2("$1234.56");
+
+  if (x1)
+    assertTrue(true);
+  else
+    assertTrue(false);
+
+  if (x2)
+    assertTrue(true);
+  else
+    assertTrue(false);
+
+  assertValid(x1);
+  assertValid(x2);
+}
+
+void AmountTestCase::testForZero()
+{
+  amount_t x0;
+  amount_t x1("0.000000000000000000001");
+
+  assertTrue(x1);
+  assertThrow(x0.is_zero(), amount_error);
+  assertThrow(x0.is_realzero(), amount_error);
+  assertFalse(x1.is_zero());
+  assertFalse(x1.is_realzero());
+
+  assertValid(x0);
+  assertValid(x1);
+}
+
+void AmountTestCase::testCommodityForZero()
+{
+  amount_t x1(internalAmount("$0.000000000000000000001"));
+
+  assertFalse(x1);
+  assertTrue(x1.is_zero());
+  assertFalse(x1.is_realzero());
+
+  assertValid(x1);
+}
+
+void AmountTestCase::testIntegerConversion()
+{
+  amount_t x0;
+  amount_t x1(123456L);
+  amount_t x2("12345682348723487324");
+
+  assertThrow(x0.to_long(), amount_error);
+  assertThrow(x0.to_double(), amount_error);
+  assertFalse(x2.fits_in_long());
+  assertEqual(123456L, x1.to_long());
+  assertEqual(123456.0, x1.to_double());
+  assertEqual(string("123456"), x1.to_string());
+  assertEqual(string("123456"), x1.quantity_string());
+
+  assertValid(x1);
+}
+
+void AmountTestCase::testFractionalConversion()
+{
+  amount_t x1(1234.56);
+  amount_t x2("1234.5683787634678348734");
+
+  assertThrow(x1.to_long(), amount_error); // loses precision
+  assertThrow(x2.to_double(), amount_error); // loses precision
+  assertFalse(x2.fits_in_double());
+  assertEqual(1234L, x1.to_long(true));
+  assertEqual(1234.56, x1.to_double());
+  assertEqual(string("1234.56"), x1.to_string());
+  assertEqual(string("1234.56"), x1.quantity_string());
+
+  assertValid(x1);
+}
+
+void AmountTestCase::testCommodityConversion()
+{
+  amount_t x1("$1234.56");
+
+  assertThrow(x1.to_long(), amount_error); // loses precision
+  assertEqual(1234L, x1.to_long(true));
+  assertEqual(1234.56, x1.to_double());
+  assertEqual(string("$1234.56"), x1.to_string());
+  assertEqual(string("1234.56"), x1.quantity_string());
+
+  assertValid(x1);
+}
+
+void AmountTestCase::testPrinting()
+{
+  amount_t x0;
+  amount_t x1("982340823.380238098235098235098235098");
+
+  {
+    std::ostringstream bufstr;
+    assertThrow(bufstr << x0, amount_error);
+  }
+
+  {
+    std::ostringstream bufstr;
+    bufstr << x1;
+
+    assertEqual(std::string("982340823.380238098235098235098235098"),
+		bufstr.str());
+  }
+
+  assertValid(x0);
+  assertValid(x1);
+}
+
+void AmountTestCase::testCommodityPrinting()
+{
+  amount_t x1(internalAmount("$982340823.386238098235098235098235098"));
+  amount_t x2("$982340823.38");
+
+  {
+    std::ostringstream bufstr;
+    bufstr << x1;
+
+    assertEqual(std::string("$982340823.386238098235098235098235098"),
+		bufstr.str());
+  }
+
+  {
+    std::ostringstream bufstr;
+    bufstr << (x1 * x2).to_string();
+
+    assertEqual(std::string("$964993493285024293.18099172508158508135413499124"),
+		bufstr.str());
+  }
+
+  {
+    std::ostringstream bufstr;
+    bufstr << (x2 * x1).to_string();
+
+    assertEqual(std::string("$964993493285024293.18"), bufstr.str());
+  }
+
+  assertValid(x1);
+  assertValid(x2);
+}
+
+void AmountTestCase::testSerialization()
+{
+  amount_t x0;
+  amount_t x1("$8,192.34");
+  amount_t x2("8192.34");
+  amount_t x3("8192.34");
+  amount_t x4("-8192.34");
+  amount_t x5(x4);
+
+  // Force x3's pointer to actually be set to null_commodity
+  x3.set_commodity(*x3.current_pool->null_commodity);
+
+  std::string buf;
+  {
+    std::ostringstream storage;
+    assertThrow(x0.write(storage), amount_error);
+    x1.write(storage);
+    x2.write(storage);
+    x3.write(storage);
+    x4.write(storage);
+    x5.write(storage);
+    buf = storage.str();
+  }
+
+  amount_t x1b;
+  amount_t x2b;
+  amount_t x3b;
+  amount_t x4b;
+  amount_t x5b;
+  {
+    std::istringstream storage(buf);
+    x1b.read(storage);
+    x2b.read(storage);
+    x3b.read(storage);
+    x4b.read(storage);
+    x5b.read(storage);
+  }
+
+  assertEqual(x1, x1b);
+  assertEqual(x2, x2b);
+  assertEqual(x3, x3b);
+  assertEqual(x4, x4b);
+
+  const char * ptr = buf.c_str();
+
+  amount_t x1c;
+  amount_t x2c;
+  amount_t x3c;
+  amount_t x4c;
+  amount_t x5c;
+  {
+    x1c.read(ptr);
+    x2c.read(ptr);
+    x3c.read(ptr);
+    x4c.read(ptr);
+    x5c.read(ptr);
+  }
+
+  assertEqual(x1, x1b);
+  assertEqual(x2, x2b);
+  assertEqual(x3, x3b);
+  assertEqual(x4, x4b);
+
+  assertValid(x1);
+  assertValid(x2);
+  assertValid(x3);
+  assertValid(x4);
+  assertValid(x1b);
+  assertValid(x2b);
+  assertValid(x3b);
+  assertValid(x4b);
+  assertValid(x1c);
+  assertValid(x2c);
+  assertValid(x3c);
+  assertValid(x4c);
+}
diff --git a/test/numerics/t_amount.h b/test/numerics/t_amount.h
new file mode 100644
index 00000000..2d5a327a
--- /dev/null
+++ b/test/numerics/t_amount.h
@@ -0,0 +1,110 @@
+#ifndef _T_AMOUNT_H
+#define _T_AMOUNT_H
+
+#include "UnitTests.h"
+
+class AmountTestCase : public CPPUNIT_NS::TestCase
+{
+  CPPUNIT_TEST_SUITE(AmountTestCase);
+
+  CPPUNIT_TEST(testConstructors);
+  CPPUNIT_TEST(testCommodityConstructors);
+  CPPUNIT_TEST(testParser);
+  CPPUNIT_TEST(testAssignment);
+  CPPUNIT_TEST(testCommodityAssignment);
+  CPPUNIT_TEST(testEquality);
+  CPPUNIT_TEST(testCommodityEquality);
+  CPPUNIT_TEST(testComparisons);
+  CPPUNIT_TEST(testCommodityComparisons);
+  CPPUNIT_TEST(testIntegerAddition);
+  CPPUNIT_TEST(testFractionalAddition);
+  CPPUNIT_TEST(testCommodityAddition);
+  CPPUNIT_TEST(testIntegerSubtraction);
+  CPPUNIT_TEST(testFractionalSubtraction);
+  CPPUNIT_TEST(testCommoditySubtraction);
+  CPPUNIT_TEST(testIntegerMultiplication);
+  CPPUNIT_TEST(testFractionalMultiplication);
+  CPPUNIT_TEST(testCommodityMultiplication);
+  CPPUNIT_TEST(testIntegerDivision);
+  CPPUNIT_TEST(testFractionalDivision);
+  CPPUNIT_TEST(testCommodityDivision);
+  CPPUNIT_TEST(testNegation);
+  CPPUNIT_TEST(testCommodityNegation);
+  CPPUNIT_TEST(testAbs);
+  CPPUNIT_TEST(testCommodityAbs);
+  CPPUNIT_TEST(testFractionalRound);
+  CPPUNIT_TEST(testCommodityRound);
+  CPPUNIT_TEST(testCommodityDisplayRound);
+  CPPUNIT_TEST(testReduction);
+  CPPUNIT_TEST(testSign);
+  CPPUNIT_TEST(testCommoditySign);
+  CPPUNIT_TEST(testTruth);
+  CPPUNIT_TEST(testCommodityTruth);
+  CPPUNIT_TEST(testForZero);
+  CPPUNIT_TEST(testCommodityForZero);
+  CPPUNIT_TEST(testIntegerConversion);
+  CPPUNIT_TEST(testFractionalConversion);
+  CPPUNIT_TEST(testCommodityConversion);
+  CPPUNIT_TEST(testPrinting);
+  CPPUNIT_TEST(testCommodityPrinting);
+  CPPUNIT_TEST(testSerialization);
+
+  CPPUNIT_TEST_SUITE_END();
+
+public:
+  ledger::session_t session;
+
+  AmountTestCase() {}
+  virtual ~AmountTestCase() {}
+
+  virtual void setUp();
+  virtual void tearDown();
+
+  void testConstructors();
+  void testCommodityConstructors();
+  void testParser();
+  void testAssignment();
+  void testCommodityAssignment();
+  void testEquality();
+  void testCommodityEquality();
+  void testComparisons();
+  void testCommodityComparisons();
+  void testIntegerAddition();
+  void testFractionalAddition();
+  void testCommodityAddition();
+  void testIntegerSubtraction();
+  void testFractionalSubtraction();
+  void testCommoditySubtraction();
+  void testIntegerMultiplication();
+  void testFractionalMultiplication();
+  void testCommodityMultiplication();
+  void testIntegerDivision();
+  void testFractionalDivision();
+  void testCommodityDivision();
+  void testNegation();
+  void testCommodityNegation();
+  void testAbs();
+  void testCommodityAbs();
+  void testFractionalRound();
+  void testCommodityRound();
+  void testCommodityDisplayRound();
+  void testReduction();
+  void testSign();
+  void testCommoditySign();
+  void testTruth();
+  void testCommodityTruth();
+  void testForZero();
+  void testCommodityForZero();
+  void testIntegerConversion();
+  void testFractionalConversion();
+  void testCommodityConversion();
+  void testPrinting();
+  void testCommodityPrinting();
+  void testSerialization();
+
+private:
+  AmountTestCase(const AmountTestCase &copy);
+  void operator=(const AmountTestCase &copy);
+};
+
+#endif // _T_AMOUNT_H
diff --git a/test/numerics/t_balance.cc b/test/numerics/t_balance.cc
new file mode 100644
index 00000000..ca759836
--- /dev/null
+++ b/test/numerics/t_balance.cc
@@ -0,0 +1,25 @@
+#include "t_balance.h"
+
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(BalanceTestCase, "numerics");
+
+void BalanceTestCase::setUp()
+{
+  ledger::set_session_context(&session);
+
+  // Cause the display precision for dollars to be initialized to 2.
+  amount_t x1("$1.00");
+  assertTrue(x1);
+
+  amount_t::stream_fullstrings = true; // make reports from UnitTests accurate
+}
+
+void BalanceTestCase::tearDown()
+{
+  amount_t::stream_fullstrings = false;
+
+  ledger::set_session_context();
+}
+
+void BalanceTestCase::testConstructors()
+{
+}
diff --git a/test/numerics/t_balance.h b/test/numerics/t_balance.h
new file mode 100644
index 00000000..7c27f7e8
--- /dev/null
+++ b/test/numerics/t_balance.h
@@ -0,0 +1,30 @@
+#ifndef _T_BALANCE_H
+#define _T_BALANCE_H
+
+#include "UnitTests.h"
+
+class BalanceTestCase : public CPPUNIT_NS::TestCase
+{
+  CPPUNIT_TEST_SUITE(BalanceTestCase);
+
+  CPPUNIT_TEST(testConstructors);
+
+  CPPUNIT_TEST_SUITE_END();
+
+public:
+  ledger::session_t session;
+
+  BalanceTestCase() {}
+  virtual ~BalanceTestCase() {}
+
+  virtual void setUp();
+  virtual void tearDown();
+
+  void testConstructors();
+
+private:
+  BalanceTestCase(const BalanceTestCase &copy);
+  void operator=(const BalanceTestCase &copy);
+};
+
+#endif // _T_BALANCE_H
diff --git a/test/numerics/t_commodity.cc b/test/numerics/t_commodity.cc
new file mode 100644
index 00000000..f9892287
--- /dev/null
+++ b/test/numerics/t_commodity.cc
@@ -0,0 +1,64 @@
+#include "t_commodity.h"
+
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(CommodityTestCase, "numerics");
+
+void CommodityTestCase::setUp() {
+  ledger::set_session_context(&session);
+}
+void CommodityTestCase::tearDown() {
+  ledger::set_session_context();
+}
+
+void CommodityTestCase::testPriceHistory()
+{
+  ptime jan17_07    = parse_datetime("2007/01/17 00:00:00");
+  ptime feb27_07    = parse_datetime("2007/02/27 18:00:00");
+  ptime feb28_07    = parse_datetime("2007/02/28 06:00:00");
+  ptime feb28_07sbm = parse_datetime("2007/02/28 11:59:59");
+  ptime mar01_07    = parse_datetime("2007/03/01 00:00:00");
+  ptime apr15_07    = parse_datetime("2007/04/15 13:00:00");
+
+  // jww (2007-04-17): tbd
+  amount_t x0;
+  amount_t x1("100.10 AAPL");
+
+  assertThrow(x0.value(), amount_error);
+  assertFalse(x1.value());
+
+  // Commodities cannot be constructed by themselves, since a great
+  // deal of their state depends on how they were seen to be used.
+  commodity_t& aapl(x1.commodity());
+
+  aapl.add_price(jan17_07, amount_t("$10.20"));
+  aapl.add_price(feb27_07, amount_t("$13.40"));
+  aapl.add_price(feb28_07, amount_t("$18.33"));
+  aapl.add_price(feb28_07sbm, amount_t("$18.30"));
+  aapl.add_price(mar01_07, amount_t("$19.50"));
+  aapl.add_price(apr15_07, amount_t("$21.22"));
+
+  optional<amount_t> amt1 = x1.value(feb28_07sbm);
+  assertTrue(amt1);
+  assertEqual(amount_t("$1831.83"), *amt1);
+
+  optional<amount_t> amt2 = x1.value(now);
+  assertTrue(amt2);
+  assertEqual(amount_t("$2124.12"), *amt2);
+
+  assertValid(x1);
+}
+
+void CommodityTestCase::testLots()
+{
+  // jww (2007-04-17): tbd
+}
+
+void CommodityTestCase::testScalingBase()
+{
+  // jww (2007-04-17): tbd
+}
+
+void CommodityTestCase::testReduction()
+{
+  // jww (2007-04-17): tbd
+}
+
diff --git a/test/numerics/t_commodity.h b/test/numerics/t_commodity.h
new file mode 100644
index 00000000..ed739751
--- /dev/null
+++ b/test/numerics/t_commodity.h
@@ -0,0 +1,36 @@
+#ifndef _T_COMMMODITY_H
+#define _T_COMMMODITY_H
+
+#include "UnitTests.h"
+
+class CommodityTestCase : public CPPUNIT_NS::TestCase
+{
+  CPPUNIT_TEST_SUITE(CommodityTestCase);
+
+  CPPUNIT_TEST(testPriceHistory);
+  CPPUNIT_TEST(testLots);
+  CPPUNIT_TEST(testScalingBase);
+  CPPUNIT_TEST(testReduction);
+
+  CPPUNIT_TEST_SUITE_END();
+
+public:
+  ledger::session_t session;
+
+  CommodityTestCase() {}
+  virtual ~CommodityTestCase() {}
+
+  virtual void setUp();
+  virtual void tearDown();
+
+  void testPriceHistory();
+  void testLots();
+  void testScalingBase();
+  void testReduction();
+
+private:
+  CommodityTestCase(const CommodityTestCase &copy);
+  void operator=(const CommodityTestCase &copy);
+};
+
+#endif // _T_COMMMODITY_H
diff --git a/test/python/PyUnitTests.py b/test/python/PyUnitTests.py
new file mode 100755
index 00000000..3c19093f
--- /dev/null
+++ b/test/python/PyUnitTests.py
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+PYTHONPATH="%builddir%":"%srcdir%":$PYTHONPATH \
+DYLD_LIBRARY_PATH="%builddir%/.libs":"%builddir%/gdtoa/.libs":$DYLD_LIBRARY_PATH \
+    python "%srcdir%"/tests/python/UnitTests.py
diff --git a/test/python/UnitTests.py b/test/python/UnitTests.py
new file mode 100644
index 00000000..843e9fc1
--- /dev/null
+++ b/test/python/UnitTests.py
@@ -0,0 +1,9 @@
+from unittest import TextTestRunner, TestSuite
+
+import tests.python.numerics.t_amount as t_amount
+
+suites = [
+    t_amount.suite(),
+]
+
+TextTestRunner().run(TestSuite(suites))
diff --git a/test/python/__init__.py b/test/python/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test/python/__init__.py
diff --git a/test/python/numerics/__init__.py b/test/python/numerics/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test/python/numerics/__init__.py
diff --git a/test/python/numerics/t_amount.py b/test/python/numerics/t_amount.py
new file mode 100644
index 00000000..f7eeee8f
--- /dev/null
+++ b/test/python/numerics/t_amount.py
@@ -0,0 +1,1470 @@
+# -*- coding: utf-8 -*-
+
+import unittest
+import exceptions
+import operator
+
+from ledger import *
+from StringIO import *
+
+internalAmount = amount.exact
+
+class t_amountTestCase(unittest.TestCase):
+    testSession = None
+
+    def assertValid(self, amt):
+        self.assertTrue(amt.valid())
+
+    def setUp(self):
+        #self.testSession = session()
+        #set_session_context(self.testSession)
+
+        # Cause the display precision for dollars to be initialized to 2.
+        x1 = amount("$1.00")
+        self.assertTrue(x1)
+
+        #amount.stream_fullstrings = True # make reports from UnitTests accurate
+
+    def tearDown(self):
+        pass
+        #amount.stream_fullstrings = False
+
+        #set_session_context()
+        #self.testSession = None
+
+    def testParser(self):
+        x0 = amount()
+        x1 = amount()
+        x2 = amount()
+        x3 = amount()
+        x4 = amount(123.456)
+        x5 = amount(x4)
+        x6 = amount(x4)
+        x7 = amount(x4)
+        x8 = amount("$123.45")
+        x9 = amount(x8)
+        x10 = amount(x8)
+        x11 = amount(x8)
+        x12 = amount("$100")
+
+        self.assertEqual(2, x12.commodity.precision)
+
+        #buf = "$100..."
+        #input = StringIO(buf)
+        #x13 = amount()
+        #x13.parse(input)
+        #self.assertEqual(x12, x13)
+
+        x14 = amount()
+        self.assertRaises(exceptions.ArithmeticError, lambda: x14.parse("DM"))
+
+        x15 = amount("$1.000.000,00")
+
+        x16 = amount("$2000")
+        self.assertEqual("$2.000,00", x16.to_string())
+        x16.parse("$2000,00")
+        self.assertEqual("$2.000,00", x16.to_string())
+
+        # Since European-ness is an additive quality, we must switch back
+        # to American-ness manually
+        x15.commodity.drop_flags(COMMODITY_STYLE_EUROPEAN)
+
+        x17 = amount("$1,000,000.00")
+
+        x18 = amount("$2000")
+        self.assertEqual("$2,000.00", x18.to_string())
+        x18.parse("$2,000")
+        self.assertEqual("$2,000.00", x18.to_string())
+
+        self.assertEqual(x15, x17)
+
+        x19 = amount("EUR 1000")
+        x20 = amount("EUR 1000")
+
+        self.assertEqual("EUR 1000", x19.to_string())
+        self.assertEqual("EUR 1000", x20.to_string())
+
+        x1.parse("$100.0000", AMOUNT_PARSE_NO_MIGRATE)
+        self.assertEqual(2, x12.commodity.precision)
+        self.assertEqual(x1.commodity, x12.commodity)
+        self.assertEqual(x1, x12)
+
+        x0.parse("$100.0000")
+        self.assertEqual(4, x12.commodity.precision)
+        self.assertEqual(x0.commodity, x12.commodity)
+        self.assertEqual(x0, x12)
+
+        x2.parse("$100.00", AMOUNT_PARSE_NO_REDUCE)
+        self.assertEqual(x2, x12)
+        x3.parse("$100.00", AMOUNT_PARSE_NO_MIGRATE | AMOUNT_PARSE_NO_REDUCE)
+        self.assertEqual(x3, x12)
+
+        x4.parse("$100.00")
+        self.assertEqual(x4, x12)
+        x5.parse("$100.00", AMOUNT_PARSE_NO_MIGRATE)
+        self.assertEqual(x5, x12)
+        x6.parse("$100.00", AMOUNT_PARSE_NO_REDUCE)
+        self.assertEqual(x6, x12)
+        x7.parse("$100.00", AMOUNT_PARSE_NO_MIGRATE | AMOUNT_PARSE_NO_REDUCE)
+        self.assertEqual(x7, x12)
+
+        x8.parse("$100.00")
+        self.assertEqual(x8, x12)
+        x9.parse("$100.00", AMOUNT_PARSE_NO_MIGRATE)
+        self.assertEqual(x9, x12)
+        x10.parse("$100.00", AMOUNT_PARSE_NO_REDUCE)
+        self.assertEqual(x10, x12)
+        x11.parse("$100.00", AMOUNT_PARSE_NO_MIGRATE | AMOUNT_PARSE_NO_REDUCE)
+        self.assertEqual(x11, x12)
+
+        self.assertValid(x0)
+        self.assertValid(x1)
+        self.assertValid(x2)
+        self.assertValid(x3)
+        self.assertValid(x5)
+        self.assertValid(x6)
+        self.assertValid(x7)
+        self.assertValid(x8)
+        self.assertValid(x9)
+        self.assertValid(x10)
+        self.assertValid(x11)
+        self.assertValid(x12)
+
+    def testConstructors(self):
+        x0 = amount()
+        x1 = amount(123456)
+        x2 = amount(123456L)
+        x3 = amount(123.456)
+        x5 = amount("123456")
+        x6 = amount("123.456")
+        x7 = amount("123456")
+        x8 = amount("123.456")
+        x9 = amount(x3)
+        x10 = amount(x6)
+        x11 = amount(x8)
+
+        self.assertRaises(exceptions.ArithmeticError, lambda: amount(0) == x0)
+        self.assertRaises(exceptions.ArithmeticError, lambda: amount() == x0)
+        self.assertRaises(exceptions.ArithmeticError, lambda: amount("0") == x0)
+        self.assertRaises(exceptions.ArithmeticError, lambda: amount("0.0") == x0)
+        self.assertEqual(x2, x1)
+        self.assertEqual(x5, x1)
+        self.assertEqual(x7, x1)
+        self.assertEqual(x6, x3)
+        self.assertEqual(x8, x3)
+        self.assertEqual(x10, x3)
+        self.assertEqual(x10, x9)
+
+        self.assertValid(x0)
+        self.assertValid(x1)
+        self.assertValid(x2)
+        self.assertValid(x3)
+        self.assertValid(x5)
+        self.assertValid(x6)
+        self.assertValid(x7)
+        self.assertValid(x8)
+        self.assertValid(x9)
+        self.assertValid(x10)
+        self.assertValid(x11)
+
+    def testCommodityConstructors(self):
+        x1 = amount("$123.45")
+        x2 = amount("-$123.45")
+        x3 = amount("$-123.45")
+        x4 = amount("DM 123.45")
+        x5 = amount("-DM 123.45")
+        x6 = amount("DM -123.45")
+        x7 = amount("123.45 euro")
+        x8 = amount("-123.45 euro")
+        x9 = amount("123.45€")
+        x10 = amount("-123.45€")
+
+        self.assertEqual(amount("$123.45"), x1)
+        self.assertEqual(amount("-$123.45"), x2)
+        self.assertEqual(amount("$-123.45"), x3)
+        self.assertEqual(amount("DM 123.45"), x4)
+        self.assertEqual(amount("-DM 123.45"), x5)
+        self.assertEqual(amount("DM -123.45"), x6)
+        self.assertEqual(amount("123.45 euro"), x7)
+        self.assertEqual(amount("-123.45 euro"), x8)
+        self.assertEqual(amount("123.45€"), x9)
+        self.assertEqual(amount("-123.45€"), x10)
+
+        self.assertEqual("$123.45", x1.to_string())
+        self.assertEqual("$-123.45", x2.to_string())
+        self.assertEqual("$-123.45", x3.to_string())
+        self.assertEqual("DM 123.45", x4.to_string())
+        self.assertEqual("DM -123.45", x5.to_string())
+        self.assertEqual("DM -123.45", x6.to_string())
+        self.assertEqual("123.45 euro", x7.to_string())
+        self.assertEqual("-123.45 euro", x8.to_string())
+        self.assertEqual("123.45€", x9.to_string())
+        self.assertEqual("-123.45€", x10.to_string())
+
+        self.assertValid(x1)
+        self.assertValid(x2)
+        self.assertValid(x3)
+        self.assertValid(x4)
+        self.assertValid(x5)
+        self.assertValid(x6)
+        self.assertValid(x7)
+        self.assertValid(x8)
+        self.assertValid(x9)
+        self.assertValid(x10)
+
+    def testAssignment(self):
+        x0 = amount()
+        x1 = amount(123456)
+        x2 = amount(123456L)
+        x3 = amount(123.456)
+        x5 = amount("123456")
+        x6 = amount("123.456")
+        x7 = "123456"
+        x8 = "123.456"
+        x9 = amount(x3)
+        x10 = amount(x6)
+
+        self.assertEqual(x2, x1)
+        self.assertEqual(x5, x1)
+        self.assertEqual(x7, x1)
+        self.assertEqual(x6, x3)
+        self.assertEqual(x8, x3)
+        self.assertEqual(x10, x3)
+        self.assertEqual(x10, x9)
+
+        x1  = amount(123456)
+        x2  = amount(123456L)
+        x3  = amount(123.456)
+        x5  = amount("123456")
+        x6  = amount("123.456")
+        x7  = amount("123456")
+        x8  = amount("123.456")
+        x9  = x3
+        x10 = amount(x6)
+
+        self.assertEqual(x2, x1)
+        self.assertEqual(x5, x1)
+        self.assertEqual(x7, x1)
+        self.assertEqual(x6, x3)
+        self.assertEqual(x8, x3)
+        self.assertEqual(x10, x3)
+        self.assertEqual(x10, x9)
+
+        self.assertFalse(x1.is_null())
+        x1 = x0			# sets x1 back to uninitialized state
+        self.assertTrue(x0.is_null())
+        self.assertTrue(x1.is_null())
+
+        self.assertValid(x0)
+        self.assertValid(x1)
+        self.assertValid(x2)
+        self.assertValid(x3)
+        self.assertValid(x5)
+        self.assertValid(x6)
+        self.assertValid(x7)
+        self.assertValid(x8)
+        self.assertValid(x9)
+        self.assertValid(x10)
+
+    def testCommodityAssignment(self):
+        x1 = amount("$123.45")
+        x2 = amount("-$123.45")
+        x3 = amount("$-123.45")
+        x4 = amount("DM 123.45")
+        x5 = amount("-DM 123.45")
+        x6 = amount("DM -123.45")
+        x7 = amount("123.45 euro")
+        x8 = amount("-123.45 euro")
+        x9 = amount("123.45€")
+        x10 = amount("-123.45€")
+
+        self.assertEqual(amount("$123.45"), x1)
+        self.assertEqual(amount("-$123.45"), x2)
+        self.assertEqual(amount("$-123.45"), x3)
+        self.assertEqual(amount("DM 123.45"), x4)
+        self.assertEqual(amount("-DM 123.45"), x5)
+        self.assertEqual(amount("DM -123.45"), x6)
+        self.assertEqual(amount("123.45 euro"), x7)
+        self.assertEqual(amount("-123.45 euro"), x8)
+        self.assertEqual(amount("123.45€"), x9)
+        self.assertEqual(amount("-123.45€"), x10)
+
+        self.assertEqual("$123.45", x1.to_string())
+        self.assertEqual("$-123.45", x2.to_string())
+        self.assertEqual("$-123.45", x3.to_string())
+        self.assertEqual("DM 123.45", x4.to_string())
+        self.assertEqual("DM -123.45", x5.to_string())
+        self.assertEqual("DM -123.45", x6.to_string())
+        self.assertEqual("123.45 euro", x7.to_string())
+        self.assertEqual("-123.45 euro", x8.to_string())
+        self.assertEqual("123.45€", x9.to_string())
+        self.assertEqual("-123.45€", x10.to_string())
+
+        self.assertValid(x1)
+        self.assertValid(x2)
+        self.assertValid(x3)
+        self.assertValid(x4)
+        self.assertValid(x5)
+        self.assertValid(x6)
+        self.assertValid(x7)
+        self.assertValid(x8)
+        self.assertValid(x9)
+        self.assertValid(x10)
+
+    def testEquality(self):
+        x1 = amount(123456)
+        x2 = amount(456789)
+        x3 = amount(333333)
+        x4 = amount(123456.0)
+        x5 = amount("123456.0")
+        x6 = amount(123456.0)
+
+        self.assertTrue(x1 == 123456)
+        self.assertTrue(x1 != x2)
+        self.assertTrue(x1 == (x2 - x3))
+        self.assertTrue(x1 == x4)
+        self.assertTrue(x4 == x5)
+        self.assertTrue(x4 == x6)
+
+        self.assertTrue(x1 == 123456)
+        self.assertTrue(123456 == x1)
+        self.assertTrue(x1 == 123456L)
+        self.assertTrue(123456L == x1)
+        self.assertTrue(x1 == 123456.0)
+        self.assertTrue(123456.0 == x1)
+
+        self.assertValid(x1)
+        self.assertValid(x2)
+        self.assertValid(x3)
+        self.assertValid(x4)
+        self.assertValid(x5)
+        self.assertValid(x6)
+
+    def testCommodityEquality(self):
+        x0 = amount()
+        x1 = amount("$123.45")
+        x2 = amount("-$123.45")
+        x3 = amount("$-123.45")
+        x4 = amount("DM 123.45")
+        x5 = amount("-DM 123.45")
+        x6 = amount("DM -123.45")
+        x7 = amount("123.45 euro")
+        x8 = amount("-123.45 euro")
+        x9 = amount("123.45€")
+        x10 = amount("-123.45€")
+
+        self.assertTrue(x0.is_null())
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0.is_zero())
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0.is_realzero())
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0.sign() == 0)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0.compare(x1) < 0)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0.compare(x2) > 0)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0.compare(x0) == 0)
+
+        self.assertTrue(x1 != x2)
+        self.assertTrue(x1 != x4)
+        self.assertTrue(x1 != x7)
+        self.assertTrue(x1 != x9)
+        self.assertTrue(x2 == x3)
+        self.assertTrue(x4 != x5)
+        self.assertTrue(x5 == x6)
+        self.assertTrue(x7 == - x8)
+        self.assertTrue(x9 == - x10)
+
+        self.assertValid(x0)
+        self.assertValid(x1)
+        self.assertValid(x2)
+        self.assertValid(x3)
+        self.assertValid(x4)
+        self.assertValid(x5)
+        self.assertValid(x6)
+        self.assertValid(x7)
+        self.assertValid(x8)
+        self.assertValid(x9)
+        self.assertValid(x10)
+
+    def testComparisons(self):
+        x0 = amount()
+        x1 = amount(-123)
+        x2 = amount(123)
+        x3 = amount(-123.45)
+        x4 = amount(123.45)
+        x5 = amount("-123.45")
+        x6 = amount("123.45")
+
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0 > x1)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0 < x2)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0 > x3)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0 < x4)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0 > x5)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0 < x6)
+
+        self.assertTrue(x1 > x3)
+        self.assertTrue(x3 <= x5)
+        self.assertTrue(x3 >= x5)
+        self.assertTrue(x3 < x1)
+        self.assertTrue(x3 < x4)
+
+        self.assertTrue(x1 < 100)
+        self.assertTrue(100 > x1)
+        self.assertTrue(x1 < 100L)
+        self.assertTrue(100L > x1)
+        self.assertTrue(x1 < 100.0)
+        self.assertTrue(100.0 > x1)
+
+        self.assertValid(x0)
+        self.assertValid(x1)
+        self.assertValid(x2)
+        self.assertValid(x3)
+        self.assertValid(x4)
+        self.assertValid(x5)
+        self.assertValid(x6)
+
+    def testCommodityComparisons(self):
+        x1 = amount("$-123")
+        x2 = amount("$123.00")
+        x3 = amount(internalAmount("$-123.4544"))
+        x4 = amount(internalAmount("$123.4544"))
+        x5 = amount("$-123.45")
+        x6 = amount("$123.45")
+        x7 = amount("DM 123.45")
+
+        self.assertTrue(x1 > x3)
+        self.assertTrue(x3 <= x5)
+        self.assertTrue(x3 < x5)
+        self.assertTrue(x3 <= x5)
+        self.assertFalse(x3 == x5)
+        self.assertTrue(x3 < x1)
+        self.assertTrue(x3 < x4)
+        self.assertFalse(x6 == x7)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x6 < x7)
+
+        self.assertValid(x1)
+        self.assertValid(x2)
+        self.assertValid(x3)
+        self.assertValid(x4)
+        self.assertValid(x5)
+        self.assertValid(x6)
+
+    def testIntegerAddition(self):
+        x0 = amount()
+        x1 = amount(123)
+        y1 = amount(456)
+
+        self.assertEqual(amount(579), x1 + y1)
+        self.assertEqual(amount(579), x1 + 456)
+        self.assertEqual(amount(579), 456 + x1)
+
+        x1 += amount(456)
+        self.assertEqual(amount(579), x1)
+        x1 += 456
+        self.assertEqual(amount(1035), x1)
+
+        x4 = amount("123456789123456789123456789")
+
+        self.assertEqual(amount("246913578246913578246913578"), x4 + x4)
+
+        self.assertValid(x0)
+        self.assertValid(x1)
+        self.assertValid(y1)
+        self.assertValid(x4)
+
+    def testFractionalAddition(self):
+        x1 = amount(123.123)
+        y1 = amount(456.456)
+
+        self.assertEqual(amount(579.579), x1 + y1)
+        self.assertEqual(amount(579.579), x1 + 456.456)
+        self.assertEqual(amount(579.579), 456.456 + x1)
+
+        x1 += amount(456.456)
+        self.assertEqual(amount(579.579), x1)
+        x1 += 456.456
+        self.assertEqual(amount(1036.035), x1)
+        x1 += 456
+        self.assertEqual(amount(1492.035), x1)
+
+        x2 = amount("123456789123456789.123456789123456789")
+
+        self.assertEqual(amount("246913578246913578.246913578246913578"), x2 + x2)
+
+        self.assertValid(x1)
+        self.assertValid(y1)
+        self.assertValid(x2)
+
+    def testCommodityAddition(self):
+        x0 = amount()
+        x1 = amount("$123.45")
+        x2 = amount(internalAmount("$123.456789"))
+        x3 = amount("DM 123.45")
+        x4 = amount("123.45 euro")
+        x5 = amount("123.45€")
+        x6 = amount("123.45")
+
+        self.assertEqual(amount("$246.90"), x1 + x1)
+        self.assertNotEqual(amount("$246.91"), x1 + x2)
+        self.assertEqual(internalAmount("$246.906789"), x1 + x2)
+
+        # Converting to string drops internal precision
+        self.assertEqual("$246.90", (x1 + x1).to_string())
+        self.assertEqual("$246.91", (x1 + x2).to_string())
+
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1 + x0)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0 + x1)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0 + x0)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1 + x3)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1 + x4)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1 + x5)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1 + x6)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1 + 123.45)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1 + 123)
+
+        self.assertEqual(amount("DM 246.90"), x3 + x3)
+        self.assertEqual(amount("246.90 euro"), x4 + x4)
+        self.assertEqual(amount("246.90€"), x5 + x5)
+
+        self.assertEqual("DM 246.90", (x3 + x3).to_string())
+        self.assertEqual("246.90 euro", (x4 + x4).to_string())
+        self.assertEqual("246.90€", (x5 + x5).to_string())
+
+        x1 += amount("$456.45")
+        self.assertEqual(amount("$579.90"), x1)
+        x1 += amount("$456.45")
+        self.assertEqual(amount("$1036.35"), x1)
+        x1 += amount("$456")
+        self.assertEqual(amount("$1492.35"), x1)
+
+        x7 = amount(internalAmount("$123456789123456789.123456789123456789"))
+
+        self.assertEqual(internalAmount("$246913578246913578.246913578246913578"), x7 + x7)
+
+        self.assertValid(x1)
+        self.assertValid(x2)
+        self.assertValid(x3)
+        self.assertValid(x4)
+        self.assertValid(x5)
+        self.assertValid(x6)
+        self.assertValid(x7)
+
+    def testIntegerSubtraction(self):
+        x1 = amount(123)
+        y1 = amount(456)
+
+        self.assertEqual(amount(333), y1 - x1)
+        self.assertEqual(amount(-333), x1 - y1)
+        self.assertEqual(amount(23), x1 - 100)
+        self.assertEqual(amount(-23), 100 - x1)
+
+        x1 -= amount(456)
+        self.assertEqual(amount(-333), x1)
+        x1 -= 456
+        self.assertEqual(amount(-789), x1)
+
+        x4 = amount("123456789123456789123456789")
+        y4 = amount("8238725986235986")
+
+        self.assertEqual(amount("123456789115218063137220803"), x4 - y4)
+        self.assertEqual(amount("-123456789115218063137220803"), y4 - x4)
+
+        self.assertValid(x1)
+        self.assertValid(y1)
+        self.assertValid(x4)
+        self.assertValid(y4)
+
+    def testFractionalSubtraction(self):
+        x1 = amount(123.123)
+        y1 = amount(456.456)
+
+        self.assertEqual(amount(-333.333), x1 - y1)
+        self.assertEqual(amount(333.333), y1 - x1)
+
+        x1 -= amount(456.456)
+        self.assertEqual(amount(-333.333), x1)
+        x1 -= 456.456
+        self.assertEqual(amount(-789.789), x1)
+        x1 -= 456
+        self.assertEqual(amount(-1245.789), x1)
+
+        x2 = amount("123456789123456789.123456789123456789")
+        y2 = amount("9872345982459.248974239578")
+
+        self.assertEqual(amount("123446916777474329.874482549545456789"), x2 - y2)
+        self.assertEqual(amount("-123446916777474329.874482549545456789"), y2 - x2)
+
+        self.assertValid(x1)
+        self.assertValid(y1)
+        self.assertValid(x2)
+        self.assertValid(y2)
+
+    def testCommoditySubtraction(self):
+        x0 = amount()
+        x1 = amount("$123.45")
+        x2 = amount(internalAmount("$123.456789"))
+        x3 = amount("DM 123.45")
+        x4 = amount("123.45 euro")
+        x5 = amount("123.45€")
+        x6 = amount("123.45")
+
+        self.assertNotEqual(amount(), x1 - x1)
+        self.assertEqual(amount("$0"), x1 - x1)
+        self.assertEqual(amount("$23.45"), x1 - amount("$100.00"))
+        self.assertEqual(amount("$-23.45"), amount("$100.00") - x1)
+        self.assertNotEqual(amount("$-0.01"), x1 - x2)
+        self.assertEqual(internalAmount("$-0.006789"), x1 - x2)
+
+        # Converting to string drops internal precision.  If an amount is
+        # zero, it drops the commodity as well.
+        self.assertEqual("$0.00", (x1 - x1).to_string())
+        self.assertEqual("$-0.01", (x1 - x2).to_string())
+
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1 - x0)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0 - x1)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0 - x0)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1 - x3)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1 - x4)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1 - x5)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1 - x6)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1 - 123.45)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1 - 123)
+
+        self.assertEqual(amount("DM 0.00"), x3 - x3)
+        self.assertEqual(amount("DM 23.45"), x3 - amount("DM 100.00"))
+        self.assertEqual(amount("DM -23.45"), amount("DM 100.00") - x3)
+        self.assertEqual(amount("0.00 euro"), x4 - x4)
+        self.assertEqual(amount("23.45 euro"), x4 - amount("100.00 euro"))
+        self.assertEqual(amount("-23.45 euro"), amount("100.00 euro") - x4)
+        self.assertEqual(amount("0.00€"), x5 - x5)
+        self.assertEqual(amount("23.45€"), x5 - amount("100.00€"))
+        self.assertEqual(amount("-23.45€"), amount("100.00€") - x5)
+
+        self.assertEqual("DM 0.00", (x3 - x3).to_string())
+        self.assertEqual("DM 23.45", (x3 - amount("DM 100.00")).to_string())
+        self.assertEqual("DM -23.45", (amount("DM 100.00") - x3).to_string())
+        self.assertEqual("0.00 euro", (x4 - x4).to_string())
+        self.assertEqual("23.45 euro", (x4 - amount("100.00 euro")).to_string())
+        self.assertEqual("-23.45 euro", (amount("100.00 euro") - x4).to_string())
+        self.assertEqual("0.00€", (x5 - x5).to_string())
+        self.assertEqual("23.45€", (x5 - amount("100.00€")).to_string())
+        self.assertEqual("-23.45€", (amount("100.00€") - x5).to_string())
+
+        x1 -= amount("$456.45")
+        self.assertEqual(amount("$-333.00"), x1)
+        x1 -= amount("$456.45")
+        self.assertEqual(amount("$-789.45"), x1)
+        x1 -= amount("$456")
+        self.assertEqual(amount("$-1245.45"), x1)
+
+        x7 = amount(internalAmount("$123456789123456789.123456789123456789"))
+        x8 = amount(internalAmount("$2354974984698.98459845984598"))
+
+        self.assertEqual(internalAmount("$123454434148472090.138858329277476789"), x7 - x8)
+        self.assertEqual("$123454434148472090.138858329277476789", (x7 - x8).to_string())
+        self.assertEqual("$123454434148472090.14",
+	      (amount("$1.00") * (x7 - x8)).to_string())
+        self.assertEqual(internalAmount("$-123454434148472090.138858329277476789"), x8 - x7)
+        self.assertEqual("$-123454434148472090.138858329277476789", (x8 - x7).to_string())
+        self.assertEqual("$-123454434148472090.14",
+	      (amount("$1.00") * (x8 - x7)).to_string())
+
+        self.assertValid(x1)
+        self.assertValid(x2)
+        self.assertValid(x3)
+        self.assertValid(x4)
+        self.assertValid(x5)
+        self.assertValid(x6)
+        self.assertValid(x7)
+        self.assertValid(x8)
+
+    def testIntegerMultiplication(self):
+        x1 = amount(123)
+        y1 = amount(456)
+
+        self.assertEqual(amount(0), x1 * 0)
+        self.assertEqual(amount(0), amount(0) * x1)
+        self.assertEqual(amount(0), 0 * x1)
+        self.assertEqual(x1, x1 * 1)
+        self.assertEqual(x1, amount(1) * x1)
+        self.assertEqual(x1, 1 * x1)
+        self.assertEqual(- x1, x1 * -1)
+        self.assertEqual(- x1, amount(-1) * x1)
+        self.assertEqual(- x1, -1 * x1)
+        self.assertEqual(amount(56088), x1 * y1)
+        self.assertEqual(amount(56088), y1 * x1)
+        self.assertEqual(amount(56088), x1 * 456)
+        self.assertEqual(amount(56088), amount(456) * x1)
+        self.assertEqual(amount(56088), 456 * x1)
+
+        x1 *= amount(123)
+        self.assertEqual(amount(15129), x1)
+        x1 *= 123
+        self.assertEqual(amount(1860867), x1)
+
+        x4 = amount("123456789123456789123456789")
+
+        self.assertEqual(amount("15241578780673678546105778281054720515622620750190521"),
+	      x4 * x4)
+
+        self.assertValid(x1)
+        self.assertValid(y1)
+        self.assertValid(x4)
+
+    def testFractionalMultiplication(self):
+        x1 = amount(123.123)
+        y1 = amount(456.456)
+
+        self.assertEqual(amount(0), x1 * 0)
+        self.assertEqual(amount(0), amount(0) * x1)
+        self.assertEqual(amount(0), 0 * x1)
+        self.assertEqual(x1, x1 * 1)
+        self.assertEqual(x1, amount(1) * x1)
+        self.assertEqual(x1, 1 * x1)
+        self.assertEqual(- x1, x1 * -1)
+        self.assertEqual(- x1, amount(-1) * x1)
+        self.assertEqual(- x1, -1 * x1)
+        self.assertEqual(amount("56200.232088"), x1 * y1)
+        self.assertEqual(amount("56200.232088"), y1 * x1)
+        self.assertEqual(amount("56200.232088"), x1 * 456.456)
+        self.assertEqual(amount("56200.232088"), amount(456.456) * x1)
+        self.assertEqual(amount("56200.232088"), 456.456 * x1)
+
+        x1 *= amount(123.123)
+        self.assertEqual(amount("15159.273129"), x1)
+        x1 *= 123.123
+        self.assertEqual(amount("1866455.185461867"), x1)
+        x1 *= 123
+        self.assertEqual(amount("229573987.811809641"), x1)
+
+        x2 = amount("123456789123456789.123456789123456789")
+
+        self.assertEqual(amount("15241578780673678546105778311537878.046486820281054720515622620750190521"),
+	      x2 * x2)
+
+        self.assertValid(x1)
+        self.assertValid(y1)
+        self.assertValid(x2)
+
+    def testCommodityMultiplication(self):
+        x0 = amount()
+        x1 = amount("$123.12")
+        y1 = amount("$456.45")
+        x2 = amount(internalAmount("$123.456789"))
+        x3 = amount("DM 123.45")
+        x4 = amount("123.45 euro")
+        x5 = amount("123.45€")
+
+        self.assertEqual(amount("$0.00"), x1 * 0)
+        self.assertEqual(amount("$0.00"), 0 * x1)
+        self.assertEqual(x1, x1 * 1)
+        self.assertEqual(x1, 1 * x1)
+        self.assertEqual(- x1, x1 * -1)
+        self.assertEqual(- x1, -1 * x1)
+        self.assertEqual(internalAmount("$56198.124"), x1 * y1)
+        self.assertEqual("$56198.12", (x1 * y1).to_string())
+        self.assertEqual(internalAmount("$56198.124"), y1 * x1)
+        self.assertEqual("$56198.12", (y1 * x1).to_string())
+
+        # Internal amounts retain their precision, even when being
+        # converted to strings
+        self.assertEqual(internalAmount("$15199.99986168"), x1 * x2)
+        self.assertEqual(internalAmount("$15199.99986168"), x2 * x1)
+        self.assertEqual("$15200.00", (x1 * x2).to_string())
+        self.assertEqual("$15199.99986168", (x2 * x1).to_string())
+
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1 * x0)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0 * x1)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0 * x0)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1 * x3)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1 * x4)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1 * x5)
+
+        x1 *= amount("123.12")
+        self.assertEqual(internalAmount("$15158.5344"), x1)
+        self.assertEqual("$15158.53", x1.to_string())
+        x1 *= 123.12
+        self.assertEqual(internalAmount("$1866318.755328"), x1)
+        self.assertEqual("$1866318.76", x1.to_string())
+        x1 *= 123
+        self.assertEqual(internalAmount("$229557206.905344"), x1)
+        self.assertEqual("$229557206.91", x1.to_string())
+
+        x7 = amount(internalAmount("$123456789123456789.123456789123456789"))
+
+        self.assertEqual(internalAmount("$15241578780673678546105778311537878.046486820281054720515622620750190521"),
+	      x7 * x7)
+
+        self.assertValid(x1)
+        self.assertValid(x2)
+        self.assertValid(x3)
+        self.assertValid(x4)
+        self.assertValid(x5)
+        self.assertValid(x7)
+
+    def testIntegerDivision(self):
+        x1 = amount(123)
+        y1 = amount(456)
+
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1 / 0)
+        self.assertEqual(amount(0), amount(0) / x1)
+        self.assertEqual(amount(0), 0 / x1)
+        self.assertEqual(x1, x1 / 1)
+        self.assertEqual(amount("0.008130"), amount(1) / x1)
+        self.assertEqual(amount("0.008130"), 1 / x1)
+        self.assertEqual(- x1, x1 / -1)
+        self.assertEqual(- amount("0.008130"), amount(-1) / x1)
+        self.assertEqual(- amount("0.008130"), -1 / x1)
+        self.assertEqual(amount("0.269737"), x1 / y1)
+        self.assertEqual(amount("3.707317"), y1 / x1)
+        self.assertEqual(amount("0.269737"), x1 / 456)
+        self.assertEqual(amount("3.707317"), amount(456) / x1)
+        self.assertEqual(amount("3.707317"), 456 / x1)
+
+        x1 /= amount(456)
+        self.assertEqual(amount("0.269737"), x1)
+        x1 /= 456
+        self.assertEqual(amount("0.00059152850877193"), x1)
+
+        x4 = amount("123456789123456789123456789")
+        y4 = amount("56")
+
+        self.assertEqual(amount(1), x4 / x4)
+        self.assertEqual(amount("2204585520061728377204585.517857"), x4 / y4)
+
+        self.assertValid(x1)
+        self.assertValid(y1)
+        self.assertValid(x4)
+        self.assertValid(y4)
+
+    def testFractionalDivision(self):
+        x1 = amount(123.123)
+        y1 = amount(456.456)
+
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1 / 0)
+        self.assertEqual(amount("0.008121959"), amount(1.0) / x1)
+        self.assertEqual(amount("0.008121959"), 1.0 / x1)
+        self.assertEqual(x1, x1 / 1.0)
+        self.assertEqual(amount("0.008121959"), amount(1.0) / x1)
+        self.assertEqual(amount("0.008121959"), 1.0 / x1)
+        self.assertEqual(- x1, x1 / -1.0)
+        self.assertEqual(- amount("0.008121959"), amount(-1.0) / x1)
+        self.assertEqual(- amount("0.008121959"), -1.0 / x1)
+        self.assertEqual(amount("0.269736842105263"), x1 / y1)
+        self.assertEqual(amount("3.707317073170732"), y1 / x1)
+        self.assertEqual(amount("0.269736842105263"), x1 / 456.456)
+        self.assertEqual(amount("3.707317073170732"), amount(456.456) / x1)
+        self.assertEqual(amount("3.707317073170732"), 456.456 / x1)
+
+        x1 /= amount(456.456)
+        self.assertEqual(amount("0.269736842105263"), x1)
+        x1 /= 456.456
+        self.assertEqual(amount("0.000590937225286255411255411255411255411"), x1)
+        x1 /= 456
+        self.assertEqual(amount("0.000001295914967733016252753094858358016252192982456140350877192982456140350877192982"), x1)
+
+        x4 = amount("1234567891234567.89123456789")
+        y4 = amount("56.789")
+
+        self.assertEqual(amount(1.0), x4 / x4)
+        self.assertEqual(amount("21739560323910.7554497273748437197344556164046"), x4 / y4)
+
+        self.assertValid(x1)
+        self.assertValid(y1)
+        self.assertValid(x4)
+        self.assertValid(y4)
+
+    def testCommodityDivision(self):
+        x0 = amount()
+        x1 = amount("$123.12")
+        y1 = amount("$456.45")
+        x2 = amount(internalAmount("$123.456789"))
+        x3 = amount("DM 123.45")
+        x4 = amount("123.45 euro")
+        x5 = amount("123.45€")
+
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1 / 0)
+        self.assertEqual(amount("$0.00"), 0 / x1)
+        self.assertEqual(x1, x1 / 1)
+        self.assertEqual(internalAmount("$0.00812216"), 1 / x1)
+        self.assertEqual(- x1, x1 / -1)
+        self.assertEqual(internalAmount("$-0.00812216"), -1 / x1)
+        self.assertEqual(internalAmount("$0.26973382"), x1 / y1)
+        self.assertEqual("$0.27", (x1 / y1).to_string())
+        self.assertEqual(internalAmount("$3.70735867"), y1 / x1)
+        self.assertEqual("$3.71", (y1 / x1).to_string())
+
+        # Internal amounts retain their precision, even when being
+        # converted to strings
+        self.assertEqual(internalAmount("$0.99727201"), x1 / x2)
+        self.assertEqual(internalAmount("$1.00273545321637426901"), x2 / x1)
+        self.assertEqual("$1.00", (x1 / x2).to_string())
+        self.assertEqual("$1.00273545321637426901", (x2 / x1).to_string())
+
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1 / x0)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0 / x1)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0 / x0)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1 / x3)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1 / x4)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1 / x5)
+
+        x1 /= amount("123.12")
+        self.assertEqual(internalAmount("$1.00"), x1)
+        self.assertEqual("$1.00", x1.to_string())
+        x1 /= 123.12
+        self.assertEqual(internalAmount("$0.00812216"), x1)
+        self.assertEqual("$0.01", x1.to_string())
+        x1 /= 123
+        self.assertEqual(internalAmount("$0.00006603"), x1)
+        self.assertEqual("$0.00", x1.to_string())
+
+        x6 = amount(internalAmount("$237235987235987.98723987235978"))
+        x7 = amount(internalAmount("$123456789123456789.123456789123456789"))
+
+        self.assertEqual(amount("$1"), x7 / x7)
+        self.assertEqual(internalAmount("$0.0019216115121765559608381226612019501046413574469262"),
+	      x6 / x7)
+        self.assertEqual(internalAmount("$520.39654928343335571379527154924040947271699678158689736256"),
+	      x7 / x6)
+
+        self.assertValid(x1)
+        self.assertValid(x2)
+        self.assertValid(x3)
+        self.assertValid(x4)
+        self.assertValid(x5)
+        self.assertValid(x6)
+        self.assertValid(x7)
+
+    def testNegation(self):
+        x0 = amount()
+        x1 = amount(-123456)
+        x3 = amount(-123.456)
+        x5 = amount("-123456")
+        x6 = amount("-123.456")
+        x7 = amount("-123456")
+        x8 = amount("-123.456")
+        x9 = amount(- x3)
+
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0.negate())
+        self.assertEqual(x5, x1)
+        self.assertEqual(x7, x1)
+        self.assertEqual(x6, x3)
+        self.assertEqual(x8, x3)
+        self.assertEqual(- x6, x9)
+        self.assertEqual(x3.negate(), x9)
+
+        x10 = amount(x9.negate())
+
+        self.assertEqual(x3, x10)
+
+        self.assertValid(x1)
+        self.assertValid(x3)
+        self.assertValid(x5)
+        self.assertValid(x6)
+        self.assertValid(x7)
+        self.assertValid(x8)
+        self.assertValid(x9)
+        self.assertValid(x10)
+
+    def testCommodityNegation(self):
+        x1 = amount("$123.45")
+        x2 = amount("-$123.45")
+        x3 = amount("$-123.45")
+        x4 = amount("DM 123.45")
+        x5 = amount("-DM 123.45")
+        x6 = amount("DM -123.45")
+        x7 = amount("123.45 euro")
+        x8 = amount("-123.45 euro")
+        x9 = amount("123.45€")
+        x10 = amount("-123.45€")
+
+        self.assertEqual(amount("$-123.45"), - x1)
+        self.assertEqual(amount("$123.45"), - x2)
+        self.assertEqual(amount("$123.45"), - x3)
+        self.assertEqual(amount("DM -123.45"), - x4)
+        self.assertEqual(amount("DM 123.45"), - x5)
+        self.assertEqual(amount("DM 123.45"), - x6)
+        self.assertEqual(amount("-123.45 euro"), - x7)
+        self.assertEqual(amount("123.45 euro"), - x8)
+        self.assertEqual(amount("-123.45€"), - x9)
+        self.assertEqual(amount("123.45€"), - x10)
+
+        self.assertEqual(amount("$-123.45"), x1.negate())
+        self.assertEqual(amount("$123.45"), x2.negate())
+        self.assertEqual(amount("$123.45"), x3.negate())
+
+        self.assertEqual("$-123.45", (- x1).to_string())
+        self.assertEqual("$123.45", (- x2).to_string())
+        self.assertEqual("$123.45", (- x3).to_string())
+        self.assertEqual("DM -123.45", (- x4).to_string())
+        self.assertEqual("DM 123.45", (- x5).to_string())
+        self.assertEqual("DM 123.45", (- x6).to_string())
+        self.assertEqual("-123.45 euro", (- x7).to_string())
+        self.assertEqual("123.45 euro", (- x8).to_string())
+        self.assertEqual("-123.45€", (- x9).to_string())
+        self.assertEqual("123.45€", (- x10).to_string())
+
+        self.assertEqual(amount("$-123.45"), x1.negate())
+        self.assertEqual(amount("$123.45"), x2.negate())
+        self.assertEqual(amount("$123.45"), x3.negate())
+
+        self.assertValid(x1)
+        self.assertValid(x2)
+        self.assertValid(x3)
+        self.assertValid(x4)
+        self.assertValid(x5)
+        self.assertValid(x6)
+        self.assertValid(x7)
+        self.assertValid(x8)
+        self.assertValid(x9)
+        self.assertValid(x10)
+
+    def testAbs(self):
+        x0 = amount()
+        x1 = amount(-1234)
+        x2 = amount(1234)
+
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0.abs())
+        self.assertEqual(amount(1234), x1.abs())
+        self.assertEqual(amount(1234), x2.abs())
+
+        self.assertValid(x0)
+        self.assertValid(x1)
+        self.assertValid(x2)
+
+    def testCommodityAbs(self):
+        x1 = amount("$-1234.56")
+        x2 = amount("$1234.56")
+
+        self.assertEqual(amount("$1234.56"), x1.abs())
+        self.assertEqual(amount("$1234.56"), x2.abs())
+
+        self.assertValid(x1)
+        self.assertValid(x2)
+
+    def testFractionalRound(self):
+        x0 = amount()
+        x1 = amount("1234.567890")
+
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0.precision)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0.round())
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0.round(2))
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0.unround())
+        self.assertEqual(6, x1.precision)
+
+        x1b = amount(x1.unround())
+
+        self.assertEqual(x1b.precision, x1b.unround().precision)
+
+        y7 = amount(x1.round(7))
+        y6 = amount(x1.round(6))
+        y5 = amount(x1.round(5))
+        y4 = amount(x1.round(4))
+        y3 = amount(x1.round(3))
+        y2 = amount(x1.round(2))
+        y1 = amount(x1.round(1))
+        y0 = amount(x1.round(0))
+
+        self.assertEqual(6, y7.precision)
+        self.assertEqual(6, y6.precision)
+        self.assertEqual(5, y5.precision)
+        self.assertEqual(4, y4.precision)
+        self.assertEqual(3, y3.precision)
+        self.assertEqual(2, y2.precision)
+        self.assertEqual(1, y1.precision)
+        self.assertEqual(0, y0.precision)
+
+        self.assertEqual(amount("1234.56789"), y7)
+        self.assertEqual(amount("1234.56789"), y6)
+        self.assertEqual(amount("1234.56789"), y5)
+        self.assertEqual(amount("1234.5679"), y4)
+        self.assertEqual(amount("1234.568"), y3)
+        self.assertEqual(amount("1234.57"), y2)
+        self.assertEqual(amount("1234.6"), y1)
+        self.assertEqual(amount("1235"), y0)
+
+        x2 = amount("9876.543210")
+
+        self.assertEqual(amount("9876.543210"), x2.round(6))
+        self.assertEqual(amount("9876.54321"), x2.round(5))
+        self.assertEqual(amount("9876.5432"), x2.round(4))
+        self.assertEqual(amount("9876.543"), x2.round(3))
+        self.assertEqual(amount("9876.54"), x2.round(2))
+        self.assertEqual(amount("9876.5"), x2.round(1))
+        self.assertEqual(amount("9877"), x2.round(0))
+
+        x3 = amount("-1234.567890")
+
+        self.assertEqual(amount("-1234.56789"), x3.round(6))
+        self.assertEqual(amount("-1234.56789"), x3.round(5))
+        self.assertEqual(amount("-1234.5679"), x3.round(4))
+        self.assertEqual(amount("-1234.568"), x3.round(3))
+        self.assertEqual(amount("-1234.57"), x3.round(2))
+        self.assertEqual(amount("-1234.6"), x3.round(1))
+        self.assertEqual(amount("-1235"), x3.round(0))
+
+        x4 = amount("-9876.543210")
+
+        self.assertEqual(amount("-9876.543210"), x4.round(6))
+        self.assertEqual(amount("-9876.54321"), x4.round(5))
+        self.assertEqual(amount("-9876.5432"), x4.round(4))
+        self.assertEqual(amount("-9876.543"), x4.round(3))
+        self.assertEqual(amount("-9876.54"), x4.round(2))
+        self.assertEqual(amount("-9876.5"), x4.round(1))
+        self.assertEqual(amount("-9877"), x4.round(0))
+
+        x5 = amount("0.0000000000000000000000000000000000001")
+
+        self.assertEqual(amount("0.0000000000000000000000000000000000001"),
+	      x5.round(37))
+        self.assertEqual(amount(0), x5.round(36))
+
+        self.assertValid(x1)
+        self.assertValid(x2)
+        self.assertValid(x3)
+        self.assertValid(x4)
+        self.assertValid(x5)
+
+    def testCommodityRound(self):
+        x1 = amount(internalAmount("$1234.567890"))
+
+        self.assertEqual(internalAmount("$1234.56789"), x1.round(6))
+        self.assertEqual(internalAmount("$1234.56789"), x1.round(5))
+        self.assertEqual(internalAmount("$1234.5679"), x1.round(4))
+        self.assertEqual(internalAmount("$1234.568"), x1.round(3))
+        self.assertEqual(amount("$1234.57"), x1.round(2))
+        self.assertEqual(amount("$1234.6"), x1.round(1))
+        self.assertEqual(amount("$1235"), x1.round(0))
+
+        x2 = amount(internalAmount("$9876.543210"))
+
+        self.assertEqual(internalAmount("$9876.543210"), x2.round(6))
+        self.assertEqual(internalAmount("$9876.54321"), x2.round(5))
+        self.assertEqual(internalAmount("$9876.5432"), x2.round(4))
+        self.assertEqual(internalAmount("$9876.543"), x2.round(3))
+        self.assertEqual(amount("$9876.54"), x2.round(2))
+        self.assertEqual(amount("$9876.5"), x2.round(1))
+        self.assertEqual(amount("$9877"), x2.round(0))
+
+        x3 = amount(internalAmount("$-1234.567890"))
+
+        self.assertEqual(internalAmount("$-1234.56789"), x3.round(6))
+        self.assertEqual(internalAmount("$-1234.56789"), x3.round(5))
+        self.assertEqual(internalAmount("$-1234.5679"), x3.round(4))
+        self.assertEqual(internalAmount("$-1234.568"), x3.round(3))
+        self.assertEqual(amount("$-1234.57"), x3.round(2))
+        self.assertEqual(amount("$-1234.6"), x3.round(1))
+        self.assertEqual(amount("$-1235"), x3.round(0))
+
+        x4 = amount(internalAmount("$-9876.543210"))
+
+        self.assertEqual(internalAmount("$-9876.543210"), x4.round(6))
+        self.assertEqual(internalAmount("$-9876.54321"), x4.round(5))
+        self.assertEqual(internalAmount("$-9876.5432"), x4.round(4))
+        self.assertEqual(internalAmount("$-9876.543"), x4.round(3))
+        self.assertEqual(amount("$-9876.54"), x4.round(2))
+        self.assertEqual(amount("$-9876.5"), x4.round(1))
+        self.assertEqual(amount("$-9877"), x4.round(0))
+
+        x5 = amount("$123.45")
+
+        x5 *= 100.12
+
+        self.assertEqual(internalAmount("$12359.814"), x5)
+        self.assertEqual("$12359.81", x5.to_string())
+        self.assertEqual("$12359.814", x5.to_fullstring())
+        self.assertEqual("$12359.814", x5.unround().to_string())
+
+        self.assertValid(x1)
+        self.assertValid(x2)
+        self.assertValid(x3)
+        self.assertValid(x4)
+        self.assertValid(x5)
+
+    def testCommodityDisplayRound(self):
+        x1 = amount("$0.85")
+        x2 = amount("$0.1")
+
+        x1 *= 0.19
+
+        self.assertNotEqual(amount("$0.16"), x1)
+        self.assertEqual(internalAmount("$0.1615"), x1)
+        self.assertEqual("$0.16", x1.to_string())
+
+        self.assertEqual(amount("$0.10"), x2)
+        self.assertNotEqual(internalAmount("$0.101"), x2)
+        self.assertEqual("$0.10", x2.to_string())
+
+        x1 *= 7
+
+        self.assertNotEqual(amount("$1.13"), x1)
+        self.assertEqual(internalAmount("$1.1305"), x1)
+        self.assertEqual("$1.13", x1.to_string())
+
+    def testReduction(self):
+        x0 = amount()
+        x1 = amount("60s")
+        x2 = amount("600s")
+        x3 = amount("6000s")
+        x4 = amount("360000s")
+        x5 = amount("10m")
+        x6 = amount("100m")
+        x7 = amount("1000m")
+        x8 = amount("10000m")
+        x9 = amount("10h")
+        x10 = amount("100h")
+        x11 = amount("1000h")
+        x12 = amount("10000h")
+
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0.reduce())
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0.unreduce())
+        self.assertEqual(x2, x5)
+        self.assertEqual(x3, x6)
+        self.assertEqual(x4, x10)
+        self.assertEqual("100.0h", x4.unreduce().to_string())
+
+    def testSign(self):
+        x0 = amount()
+        x1 = amount("0.0000000000000000000000000000000000001")
+        x2 = amount("-0.0000000000000000000000000000000000001")
+        x3 = amount("1")
+        x4 = amount("-1")
+
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0.sign())
+        self.assertTrue(x1.sign() > 0)
+        self.assertTrue(x2.sign() < 0)
+        self.assertTrue(x3.sign() > 0)
+        self.assertTrue(x4.sign() < 0)
+
+        self.assertValid(x0)
+        self.assertValid(x1)
+        self.assertValid(x2)
+        self.assertValid(x3)
+        self.assertValid(x4)
+
+    def testCommoditySign(self):
+        x1 = amount(internalAmount("$0.0000000000000000000000000000000000001"))
+        x2 = amount(internalAmount("$-0.0000000000000000000000000000000000001"))
+        x3 = amount("$1")
+        x4 = amount("$-1")
+
+        self.assertTrue(x1.sign() != 0)
+        self.assertTrue(x2.sign() != 0)
+        self.assertTrue(x3.sign() > 0)
+        self.assertTrue(x4.sign() < 0)
+
+        self.assertValid(x1)
+        self.assertValid(x2)
+        self.assertValid(x3)
+        self.assertValid(x4)
+
+    def testTruth(self):
+        x0 = amount()
+        x1 = amount("1234")
+        x2 = amount("1234.56")
+
+        self.assertRaises(exceptions.ArithmeticError, lambda: 1 if x0 else 0)
+
+        self.assertTrue(x1)
+        self.assertTrue(x2)
+
+        self.assertValid(x0)
+        self.assertValid(x1)
+        self.assertValid(x2)
+
+    def testCommodityTruth(self):
+        x1 = amount("$1234")
+        x2 = amount("$1234.56")
+
+        if x1:
+          self.assertTrue(True)
+        else:
+          self.assertTrue(False)
+
+        if x2:
+          self.assertTrue(True)
+        else:
+          self.assertTrue(False)
+
+        self.assertValid(x1)
+        self.assertValid(x2)
+
+    def testForZero(self):
+        x0 = amount()
+        x1 = amount("0.000000000000000000001")
+
+        self.assertTrue(x1)
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0.is_zero())
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0.is_realzero())
+        self.assertFalse(x1.is_zero())
+        self.assertFalse(x1.is_realzero())
+
+        self.assertValid(x0)
+        self.assertValid(x1)
+
+    def testCommodityForZero(self):
+        x1 = amount(internalAmount("$0.000000000000000000001"))
+
+        self.assertFalse(x1)
+        self.assertTrue(x1.is_zero())
+        self.assertFalse(x1.is_realzero())
+
+        self.assertValid(x1)
+
+    def testIntegerConversion(self):
+        x0 = amount()
+        x1 = amount(123456)
+        x2 = amount("12345682348723487324")
+
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0.to_long())
+        self.assertRaises(exceptions.ArithmeticError, lambda: x0.to_double())
+        self.assertFalse(x2.fits_in_long())
+        self.assertEqual(123456, x1.to_long())
+        self.assertEqual(123456.0, x1.to_double())
+        self.assertEqual("123456", x1.to_string())
+        self.assertEqual("123456", x1.quantity_string)
+
+        self.assertValid(x1)
+
+    def testFractionalConversion(self):
+        x1 = amount(1234.56)
+        x2 = amount("1234.5683787634678348734")
+
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1.to_long()) # loses precision
+        self.assertRaises(exceptions.ArithmeticError, lambda: x2.to_double()) # loses precision
+        self.assertFalse(x2.fits_in_double())
+        self.assertEqual(1234, x1.to_long(True))
+        self.assertEqual(1234.56, x1.to_double())
+        self.assertEqual("1234.56", x1.to_string())
+        self.assertEqual("1234.56", x1.quantity_string)
+
+        self.assertValid(x1)
+
+    def testCommodityConversion(self):
+        x1 = amount("$1234.56")
+
+        self.assertRaises(exceptions.ArithmeticError, lambda: x1.to_long()) # loses precision
+        self.assertEqual(1234, x1.to_long(True))
+        self.assertEqual(1234.56, x1.to_double())
+        self.assertEqual("$1234.56", x1.to_string())
+        self.assertEqual("1234.56", x1.quantity_string)
+
+        self.assertValid(x1)
+
+    def testPrinting(self):
+        pass
+        #x0 = amount()
+        #x1 = amount("982340823.380238098235098235098235098")
+        #
+        #bufstr = StringIO()
+        #self.assertRaises(exceptions.ArithmeticError, lambda: bufstr.write(x0))
+        #
+        #bufstr = StringIO()
+        #bufstr.write(x1)
+        #
+        #self.assertEqual("982340823.380238098235098235098235098",
+        #                 bufstr.getvalue())
+        #
+        #self.assertValid(x0)
+        #self.assertValid(x1)
+
+    def testCommodityPrinting(self):
+        pass
+        #x1 = amount(internalAmount("$982340823.386238098235098235098235098"))
+        #x2 = amount("$982340823.38")
+        #
+        #bufstr = StringIO()
+        #bufstr.write(x1)
+        #
+        #self.assertEqual("$982340823.386238098235098235098235098",
+        #                 bufstr.getvalue())
+        #
+        #bufstr = StringIO()
+        #bufstr.write((x1 * x2).to_string())
+        #
+        #self.assertEqual("$964993493285024293.18099172508158508135413499124",
+        #                 bufstr.getvalue())
+        #
+        #bufstr = StringIO()
+        #bufstr.write((x2 * x1).to_string())
+        #
+        #self.assertEqual("$964993493285024293.18", bufstr.getvalue())
+        #
+        #self.assertValid(x1)
+        #self.assertValid(x2)
+
+    def testSerialization(self):
+        pass
+        #x0 = amount()
+        #x1 = amount("$8,192.34")
+        #x2 = amount("8192.34")
+        #x3 = amount("8192.34")
+        #x4 = amount("-8192.34")
+        #x5 = amount(x4)
+        #
+        ## Force x3's pointer to actually be set to null_commodity
+        ##x3.set_commodity(*x3.current_pool.null_commodity)
+        #
+        #buf = ""
+        #storage = StringIO()
+        #self.assertRaises(exceptions.ArithmeticError, lambda: x0.write(storage))
+        #x1.write(storage)
+        #x2.write(storage)
+        #x3.write(storage)
+        #x4.write(storage)
+        #x5.write(storage)
+        #buf = storage.getvalue()
+        #
+        #x1b = amount()
+        #x2b = amount()
+        #x3b = amount()
+        #x4b = amount()
+        #x5b = amount()
+        #
+        #storage = StringIO(buf)
+        #x1b.read(storage)
+        #x2b.read(storage)
+        #x3b.read(storage)
+        #x4b.read(storage)
+        #x5b.read(storage)
+        #
+        #self.assertEqual(x1, x1b)
+        #self.assertEqual(x2, x2b)
+        #self.assertEqual(x3, x3b)
+        #self.assertEqual(x4, x4b)
+        #
+        #ptr = buf.c_str()
+        #
+        #x1c = amount()
+        #x2c = amount()
+        #x3c = amount()
+        #x4c = amount()
+        #x5c = amount()
+        #
+        #x1c.read(ptr)
+        #x2c.read(ptr)
+        #x3c.read(ptr)
+        #x4c.read(ptr)
+        #x5c.read(ptr)
+        #
+        #self.assertEqual(x1, x1b)
+        #self.assertEqual(x2, x2b)
+        #self.assertEqual(x3, x3b)
+        #self.assertEqual(x4, x4b)
+        #
+        #self.assertValid(x1)
+        #self.assertValid(x2)
+        #self.assertValid(x3)
+        #self.assertValid(x4)
+        #self.assertValid(x1b)
+        #self.assertValid(x2b)
+        #self.assertValid(x3b)
+        #self.assertValid(x4b)
+        #self.assertValid(x1c)
+        #self.assertValid(x2c)
+        #self.assertValid(x3c)
+        #self.assertValid(x4c)
+
+ 
+def suite():
+    return unittest.TestLoader().loadTestsFromTestCase(t_amountTestCase)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/utility/t_times.cc b/test/utility/t_times.cc
new file mode 100644
index 00000000..c2d6fe64
--- /dev/null
+++ b/test/utility/t_times.cc
@@ -0,0 +1,79 @@
+#include "t_times.h"
+
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(DateTimeTestCase, "utility");
+
+void DateTimeTestCase::setUp() {}
+void DateTimeTestCase::tearDown() {}
+
+void DateTimeTestCase::testConstructors()
+{
+  std::time_t time_t_now = std::time(NULL);
+  struct tm * moment = std::localtime(&time_t_now);
+
+  std::time_t localMoment = std::mktime(moment);
+
+  ptime d0;
+  ptime d1(parse_datetime("1990/01/01"));
+  ptime d3(boost::posix_time::from_time_t(localMoment));
+  ptime d4(parse_datetime("2006/12/25"));
+  //ptime d5(parse_datetime("12/25"));
+  ptime d6(parse_datetime("2006.12.25"));
+  //ptime d7(parse_datetime("12.25"));
+  ptime d8(parse_datetime("2006-12-25"));
+  //ptime d9(parse_datetime("12-25"));
+#if 0
+  ptime d10(parse_datetime("tue"));
+  ptime d11(parse_datetime("tuesday"));
+  ptime d12(parse_datetime("feb"));
+  ptime d13(parse_datetime("february"));
+  ptime d14(parse_datetime("2006"));
+#endif
+  ptime d15(d3);
+
+  assertTrue(d0.is_not_a_date_time());
+  assertFalse(d1.is_not_a_date_time());
+  assertFalse(d4.is_not_a_date_time());
+
+  assertTrue(now > d1);
+  //assertTrue(now <= d3);
+  assertTrue(now > d4);
+
+  assertEqual(d3, d15);
+  assertEqual(d4, d6);
+  assertEqual(d4, d8);
+  //assertEqual(d5, d7);
+  //assertEqual(d5, d9);
+#if 0
+  assertEqual(d10, d11);
+  assertEqual(d12, d13);
+#endif
+  
+#if 0
+  assertThrow(parse_datetime("2007/02/29"), datetime_error *);
+  assertThrow(parse_datetime("2007/13/01"), datetime_error *);
+  assertThrow(parse_datetime("2007/00/01"), datetime_error *);
+  assertThrow(parse_datetime("2007/01/00"), datetime_error *);
+  assertThrow(parse_datetime("2007/00/00"), datetime_error *);
+  assertThrow(parse_datetime("2007/05/32"), datetime_error *);
+
+  assertThrow(parse_datetime("2006x/12/25"), datetime_error *);
+  assertThrow(parse_datetime("2006/12x/25"), datetime_error *);
+  //assertThrow(parse_datetime("2006/12/25x"), datetime_error *);
+
+  assertThrow(parse_datetime("feb/12/25"), datetime_error *);
+  assertThrow(parse_datetime("2006/mon/25"), datetime_error *);
+  assertThrow(parse_datetime("2006/12/web"), datetime_error *);
+
+  assertThrow(parse_datetime("12*25"), datetime_error *);
+
+  assertThrow(parse_datetime("tuf"), datetime_error *);
+  assertThrow(parse_datetime("tufsday"), datetime_error *);
+  assertThrow(parse_datetime("fec"), datetime_error *);
+  assertThrow(parse_datetime("fecruary"), datetime_error *);
+  assertThrow(parse_datetime("207x"), datetime_error *);
+  assertThrow(parse_datetime("hello"), datetime_error *);
+
+  interval_t i1;
+  interval_t i2;
+#endif
+}
diff --git a/test/utility/t_times.h b/test/utility/t_times.h
new file mode 100644
index 00000000..5bbadf21
--- /dev/null
+++ b/test/utility/t_times.h
@@ -0,0 +1,28 @@
+#ifndef _T_TIMES_H
+#define _T_TIMES_H
+
+#include "UnitTests.h"
+
+class DateTimeTestCase : public CPPUNIT_NS::TestCase
+{
+  CPPUNIT_TEST_SUITE(DateTimeTestCase);
+
+  CPPUNIT_TEST(testConstructors);
+
+  CPPUNIT_TEST_SUITE_END();
+
+public:
+  DateTimeTestCase() {}
+  virtual ~DateTimeTestCase() {}
+
+  virtual void setUp();
+  virtual void tearDown();
+
+  void testConstructors();
+
+private:
+  DateTimeTestCase(const DateTimeTestCase &copy);
+  void operator=(const DateTimeTestCase &copy);
+};
+
+#endif /* _T_TIMES_H */
diff --git a/test/utility/t_utils.cc b/test/utility/t_utils.cc
new file mode 100644
index 00000000..eda84a3a
--- /dev/null
+++ b/test/utility/t_utils.cc
@@ -0,0 +1,10 @@
+#include "t_utils.h"
+
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(UtilitiesTestCase, "utility");
+
+void UtilitiesTestCase::setUp() {}
+void UtilitiesTestCase::tearDown() {}
+
+void UtilitiesTestCase::testConstructors()
+{
+}
diff --git a/test/utility/t_utils.h b/test/utility/t_utils.h
new file mode 100644
index 00000000..97154bae
--- /dev/null
+++ b/test/utility/t_utils.h
@@ -0,0 +1,28 @@
+#ifndef _T_UTILS_H
+#define _T_UTILS_H
+
+#include "UnitTests.h"
+
+class UtilitiesTestCase : public CPPUNIT_NS::TestCase
+{
+  CPPUNIT_TEST_SUITE(UtilitiesTestCase);
+
+  CPPUNIT_TEST(testConstructors);
+
+  CPPUNIT_TEST_SUITE_END();
+
+public:
+  UtilitiesTestCase() {}
+  virtual ~UtilitiesTestCase() {}
+
+  virtual void setUp();
+  virtual void tearDown();
+
+  void testConstructors();
+
+private:
+  UtilitiesTestCase(const UtilitiesTestCase &copy);
+  void operator=(const UtilitiesTestCase &copy);
+};
+
+#endif /* _T_UTILS_H */