1 files changed, 38 insertions, 38 deletions

diff --git a/tests/numerics/t_amount.h b/tests/numerics/t_amount.h
index ee227a5c..0bf0017f 100644
--- a/tests/numerics/t_amount.h
+++ b/tests/numerics/t_amount.h
@@ -3,48 +3,48 @@
 
 #include "UnitTests.h"
 
-class BasicAmountTestCase : public CPPUNIT_NS::TestCase
+class AmountTestCase : public CPPUNIT_NS::TestCase
 {
-  CPPUNIT_TEST_SUITE(BasicAmountTestCase);
+  CPPUNIT_TEST_SUITE(AmountTestCase);
 
   CPPUNIT_TEST(testConstructors);
+  CPPUNIT_TEST(testCommodityConstructors);
   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(testPrinting);
-  CPPUNIT_TEST(testCommodityConstructors);
-  CPPUNIT_TEST(testCommodityNegation);
-  CPPUNIT_TEST(testCommodityAssignment);
-  CPPUNIT_TEST(testCommodityEquality);
-  CPPUNIT_TEST(testCommodityAddition);
-  CPPUNIT_TEST(testCommoditySubtraction);
-  CPPUNIT_TEST(testCommodityMultiplication);
-  CPPUNIT_TEST(testCommodityDivision);
   CPPUNIT_TEST(testCommodityConversion);
-  CPPUNIT_TEST(testCommodityRound);
-  CPPUNIT_TEST(testCommodityDisplayRound);
-  CPPUNIT_TEST(testCommodityTruth);
-  CPPUNIT_TEST(testCommodityForZero);
-  CPPUNIT_TEST(testCommodityComparisons);
-  CPPUNIT_TEST(testCommoditySign);
-  CPPUNIT_TEST(testCommodityAbs);
+  CPPUNIT_TEST(testPrinting);
   CPPUNIT_TEST(testCommodityPrinting);
 
   CPPUNIT_TEST_SUITE_END();
@@ -52,55 +52,55 @@ class BasicAmountTestCase : public CPPUNIT_NS::TestCase
 public:
   ledger::session_t session;
 
-  BasicAmountTestCase() {}
-  virtual ~BasicAmountTestCase() {}
+  AmountTestCase() {}
+  virtual ~AmountTestCase() {}
 
   virtual void setUp();
   virtual void tearDown();
 
   void testConstructors();
+  void testCommodityConstructors();
   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 testPrinting();
-  void testCommodityConstructors();
-  void testCommodityNegation();
-  void testCommodityAssignment();
-  void testCommodityEquality();
-  void testCommodityAddition();
-  void testCommoditySubtraction();
-  void testCommodityMultiplication();
-  void testCommodityDivision();
   void testCommodityConversion();
-  void testCommodityRound();
-  void testCommodityDisplayRound();
-  void testCommodityTruth();
-  void testCommodityForZero();
-  void testCommodityComparisons();
-  void testCommoditySign();
-  void testCommodityAbs();
+  void testPrinting();
   void testCommodityPrinting();
 
 private:
-  BasicAmountTestCase(const BasicAmountTestCase &copy);
-  void operator=(const BasicAmountTestCase &copy);
+  AmountTestCase(const AmountTestCase &copy);
+  void operator=(const AmountTestCase &copy);
 };
 
 #endif // _T_AMOUNT_H