3 files changed, 67 insertions, 1 deletions
diff --git a/test/baseline/opt-aux-date.test b/test/baseline/opt-aux-date.test
index 9d1e73d0..495bb7e6 100644
--- a/test/baseline/opt-aux-date.test
+++ b/test/baseline/opt-aux-date.test
@@ -10,7 +10,7 @@
     Expenses:Books          $20.00
     Assets:Cash
 
-test reg --effective
+test reg --aux-date
 08-Jan-01 January               Expenses:Books               $10.00       $10.00
                                 Assets:Cash                 $-10.00            0
 08-Feb-01 End of January        Expenses:Books               $10.00       $10.00
diff --git a/test/regress/BF3C1F82.test b/test/regress/BF3C1F82.test
new file mode 100644
index 00000000..8d465f4d
--- /dev/null
+++ b/test/regress/BF3C1F82.test
@@ -0,0 +1,12 @@
+; Check that error reporting works for "-f -"
+
+2012/02/30 * Test
+  a  1
+  b
+test -f - reg -> 1
+__ERROR__
+While parsing file "/dev/stdin", line 3: 
+While parsing transaction:
+<no source context>
+Error: Day of month is not valid for year
+end test
diff --git a/test/unit/t_amount.cc b/test/unit/t_amount.cc
index 07cde8f3..b82de510 100644
--- a/test/unit/t_amount.cc
+++ b/test/unit/t_amount.cc
@@ -1109,6 +1109,60 @@ BOOST_AUTO_TEST_CASE(testCommodityAbs)
   BOOST_CHECK(x2.valid());
 }
 
+BOOST_AUTO_TEST_CASE(testFloor)
+{
+  amount_t x0;
+  amount_t x1("123.123");
+  amount_t x2("-123.123");
+
+  BOOST_CHECK_THROW(x0.floored(), amount_error);
+  BOOST_CHECK_EQUAL(amount_t(123L), x1.floored());
+  BOOST_CHECK_EQUAL(amount_t(-124L), x2.floored());
+
+  BOOST_CHECK(x0.valid());
+  BOOST_CHECK(x1.valid());
+  BOOST_CHECK(x2.valid());
+}
+
+BOOST_AUTO_TEST_CASE(testCommodityFloor)
+{
+  amount_t x1("$1234.56");
+  amount_t x2("$-1234.56");
+
+  BOOST_CHECK_EQUAL(amount_t("$1234"), x1.floored());
+  BOOST_CHECK_EQUAL(amount_t("$-1235"), x2.floored());
+
+  BOOST_CHECK(x1.valid());
+  BOOST_CHECK(x2.valid());
+}
+
+BOOST_AUTO_TEST_CASE(testCeiling)
+{
+  amount_t x0;
+  amount_t x1("123.123");
+  amount_t x2("-123.123");
+
+  BOOST_CHECK_THROW(x0.ceilinged(), amount_error);
+  BOOST_CHECK_EQUAL(amount_t(124L), x1.ceilinged());
+  BOOST_CHECK_EQUAL(amount_t(-123L), x2.ceilinged());
+
+  BOOST_CHECK(x0.valid());
+  BOOST_CHECK(x1.valid());
+  BOOST_CHECK(x2.valid());
+}
+
+BOOST_AUTO_TEST_CASE(testCommodityCeiling)
+{
+  amount_t x1("$1234.56");
+  amount_t x2("$-1234.56");
+
+  BOOST_CHECK_EQUAL(amount_t("$1235"), x1.ceilinged());
+  BOOST_CHECK_EQUAL(amount_t("$-1234"), x2.ceilinged());
+
+  BOOST_CHECK(x1.valid());
+  BOOST_CHECK(x2.valid());
+}
+
 #ifndef NOT_FOR_PYTHON
 #if 0
 BOOST_AUTO_TEST_CASE(testReduction)