Moved the test sources around, so that all the unit tests are in test/unit.

10 files changed, 0 insertions, 1951 deletions

diff --git a/test/numerics/t_amount.cc b/test/numerics/t_amount.cc
deleted file mode 100644
index 69d97af3..00000000
--- a/test/numerics/t_amount.cc
+++ /dev/null
@@ -1,1576 +0,0 @@
-#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.0");
-
-  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 == amount_t("123456.0"));
-  assertTrue(amount_t("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);
-#ifdef HAVE_GDTOA
-  assertTrue(x1 < 100.0);
-  assertTrue(100.0 > x1);
-#endif
-
-  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 + amount_t("456.456"));
-  assertEqual(amount_t("579.579"), amount_t("456.456") + x1);
-
-  x1 += amount_t("456.456");
-  assertEqual(amount_t("579.579"), x1);
-  x1 += amount_t("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);
-#ifdef HAVE_GDTOA
-  assertThrow(x1 + 123.45, amount_error);
-#endif
-  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 -= amount_t("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);
-#ifdef HAVE_GDTOA
-  assertThrow(x1 - 123.45, amount_error);
-#endif
-  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 * amount_t("456.456"));
-  assertEqual(amount_t("56200.232088"), amount_t("456.456") * x1);
-  assertEqual(amount_t("56200.232088"), amount_t("456.456") * x1);
-
-  x1 *= amount_t("123.123");
-  assertEqual(amount_t("15159.273129"), x1);
-  x1 *= amount_t("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 *= amount_t("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.00812195934"), amount_t("1.0") / x1);
-  assertEqual(amount_t("0.00812195934"), amount_t("1.0") / x1);
-  assertEqual(x1, x1 / amount_t("1.0"));
-  assertEqual(amount_t("0.00812195934"), amount_t("1.0") / x1);
-  assertEqual(amount_t("0.00812195934"), amount_t("1.0") / x1);
-  assertEqual(- x1, x1 / amount_t("-1.0"));
-  assertEqual(- amount_t("0.00812195934"), amount_t("-1.0") / x1);
-  assertEqual(- amount_t("0.00812195934"), amount_t("-1.0") / x1);
-  assertEqual(amount_t("0.269736842105263"), x1 / y1);
-  assertEqual(amount_t("3.707317073170732"), y1 / x1);
-  assertEqual(amount_t("0.269736842105263"), x1 / amount_t("456.456"));
-  assertEqual(amount_t("3.707317073170732"), amount_t("456.456") / x1);
-  assertEqual(amount_t("3.707317073170732"), amount_t("456.456") / x1);
-
-  x1 /= amount_t("456.456");
-  assertEqual(amount_t("0.269736842105263"), x1);
-  x1 /= amount_t("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 /= amount_t("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 *= amount_t("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 *= amount_t("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"));
-
-  assertTrue(x1);		// an internal amount never betrays its precision
-  assertFalse(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);
-#ifdef HAVE_GDTOA
-  assertThrow(x0.to_double(), amount_error);
-#endif
-  assertFalse(x2.fits_in_long());
-  assertEqual(123456L, x1.to_long());
-#ifdef HAVE_GDTOA
-  assertEqual(123456.0, x1.to_double());
-#endif
-  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
-#ifdef HAVE_GDTOA
-  assertThrow(x2.to_double(), amount_error); // loses precision
-  assertFalse(x2.fits_in_double());
-#endif
-  assertEqual(1234L, x1.to_long(true));
-#ifdef HAVE_GDTOA
-  assertEqual(1234.56, x1.to_double());
-#endif
-  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));
-#ifdef HAVE_GDTOA
-  assertEqual(1234.56, x1.to_double());
-#endif
-  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");
-
-#if 0
-  {
-    std::ostringstream bufstr;
-    assertThrow(bufstr << x0, amount_error);
-  }
-#endif
-
-  {
-    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
deleted file mode 100644
index 2d5a327a..00000000
--- a/test/numerics/t_amount.h
+++ /dev/null
@@ -1,110 +0,0 @@
-#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
deleted file mode 100644
index ca759836..00000000
--- a/test/numerics/t_balance.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-#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
deleted file mode 100644
index 7c27f7e8..00000000
--- a/test/numerics/t_balance.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#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
deleted file mode 100644
index a96bed72..00000000
--- a/test/numerics/t_commodity.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-#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()
-{
-  datetime_t jan17_07    = parse_datetime("2007/01/17 00:00:00");
-  datetime_t feb27_07    = parse_datetime("2007/02/27 18:00:00");
-  datetime_t feb28_07    = parse_datetime("2007/02/28 06:00:00");
-  datetime_t feb28_07sbm = parse_datetime("2007/02/28 11:59:59");
-  datetime_t mar01_07    = parse_datetime("2007/03/01 00:00:00");
-  datetime_t 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(current_time);
-  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
deleted file mode 100644
index ed739751..00000000
--- a/test/numerics/t_commodity.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#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/numerics/t_expr.cc b/test/numerics/t_expr.cc
deleted file mode 100644
index 026b4eec..00000000
--- a/test/numerics/t_expr.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "t_valexpr.h"
-
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(ValueExprTestCase, "numerics");
-
-void ValueExprTestCase::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 ValueExprTestCase::tearDown()
-{
-  amount_t::stream_fullstrings = false;
-
-  ledger::set_session_context();
-}
-
-void ValueExprTestCase::testConstructors()
-{
-}
diff --git a/test/numerics/t_expr.h b/test/numerics/t_expr.h
deleted file mode 100644
index 3cac4ed6..00000000
--- a/test/numerics/t_expr.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef _T_VALEXPR_H
-#define _T_VALEXPR_H
-
-#include "UnitTests.h"
-
-class ValueExprTestCase : public CPPUNIT_NS::TestCase
-{
-  CPPUNIT_TEST_SUITE(ValueExprTestCase);
-
-  CPPUNIT_TEST(testConstructors);
-
-  CPPUNIT_TEST_SUITE_END();
-
-public:
-  ledger::session_t session;
-
-  ValueExprTestCase() {}
-  virtual ~ValueExprTestCase() {}
-
-  virtual void setUp();
-  virtual void tearDown();
-
-  void testConstructors();
-
-private:
-  ValueExprTestCase(const ValueExprTestCase &copy);
-  void operator=(const ValueExprTestCase &copy);
-};
-
-#endif // _T_VALEXPR_H
diff --git a/test/numerics/t_valexpr.cc b/test/numerics/t_valexpr.cc
deleted file mode 100644
index 026b4eec..00000000
--- a/test/numerics/t_valexpr.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "t_valexpr.h"
-
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(ValueExprTestCase, "numerics");
-
-void ValueExprTestCase::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 ValueExprTestCase::tearDown()
-{
-  amount_t::stream_fullstrings = false;
-
-  ledger::set_session_context();
-}
-
-void ValueExprTestCase::testConstructors()
-{
-}
diff --git a/test/numerics/t_valexpr.h b/test/numerics/t_valexpr.h
deleted file mode 100644
index 3cac4ed6..00000000
--- a/test/numerics/t_valexpr.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef _T_VALEXPR_H
-#define _T_VALEXPR_H
-
-#include "UnitTests.h"
-
-class ValueExprTestCase : public CPPUNIT_NS::TestCase
-{
-  CPPUNIT_TEST_SUITE(ValueExprTestCase);
-
-  CPPUNIT_TEST(testConstructors);
-
-  CPPUNIT_TEST_SUITE_END();
-
-public:
-  ledger::session_t session;
-
-  ValueExprTestCase() {}
-  virtual ~ValueExprTestCase() {}
-
-  virtual void setUp();
-  virtual void tearDown();
-
-  void testConstructors();
-
-private:
-  ValueExprTestCase(const ValueExprTestCase &copy);
-  void operator=(const ValueExprTestCase &copy);
-};
-
-#endif // _T_VALEXPR_H