Miscellaneous changes

Makefile.am

@@ -161,7 +161,7 @@ check_PROGRAMS = $(TESTS)
 
 UnitTests_SOURCES = tests/UnitTests.cc \
 	\
-	tests/corelib/numerics/BasicAmountTest.cc
+	tests/corelib/numerics/BasicAmountTestCase.cc
 
 UnitTests_LDADD   = $(lib_LTLIBRARIES) -lcppunit
 UnitTests_LDFLAGS = $(LIBADD_DL)

tests/UnitTests.cc

@@ -46,8 +46,8 @@ public:
   virtual void tearDown() {}
 
   void testInitialization() {
-    assertEquals(std::string("Hello, world!"),
-		 std::string("Hello, world!"));
+    assertEqual(std::string("Hello, world!"),
+		std::string("Hello, world!"));
   }
 
 private:

tests/UnitTests.h

@@ -6,8 +6,8 @@
 #include <cppunit/Portability.h>
 
 #define assertDoublesEqual(x,y,z,w) CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(x,y,z,w)
-#define assertEquals(x,y)	    CPPUNIT_ASSERT_EQUAL(x,y)
-#define assertEqualsMessage(x,y,z)  CPPUNIT_ASSERT_EQUAL_MESSAGE(x,y,z)
+#define assertEqual(x,y)	    CPPUNIT_ASSERT_EQUAL(x,y)
+#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)