summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2007-04-15 03:03:45 +0000
committerJohn Wiegley <johnw@newartisans.com>2008-04-13 03:35:32 -0400
commit0ef82600e5978495cccb4eed63b1de7094deab04 (patch)
tree1859e21fc102cc68f084238299048a954692421a
parentb10fcd00d036278eafcc635a1896f7522125ac04 (diff)
downloadfork-ledger-0ef82600e5978495cccb4eed63b1de7094deab04.tar.gz
fork-ledger-0ef82600e5978495cccb4eed63b1de7094deab04.tar.bz2
fork-ledger-0ef82600e5978495cccb4eed63b1de7094deab04.zip
Miscellaneous changes
-rw-r--r--Makefile.am2
-rw-r--r--tests/UnitTests.cc4
-rw-r--r--tests/UnitTests.h4
-rw-r--r--tests/corelib/numerics/BasicAmountTestCase.cc (renamed from tests/corelib/numerics/BasicAmountTest.cc)0
-rw-r--r--tests/corelib/numerics/BasicAmountTestCase.h (renamed from tests/corelib/numerics/BasicAmountTest.h)0
5 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index e8f34299..45f4d045 100644
--- a/Makefile.am
+++ b/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)
diff --git a/tests/UnitTests.cc b/tests/UnitTests.cc
index ee9c163e..1c695340 100644
--- a/tests/UnitTests.cc
+++ b/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:
diff --git a/tests/UnitTests.h b/tests/UnitTests.h
index e97456b4..13c95a73 100644
--- a/tests/UnitTests.h
+++ b/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)
diff --git a/tests/corelib/numerics/BasicAmountTest.cc b/tests/corelib/numerics/BasicAmountTestCase.cc
index e82f5d19..e82f5d19 100644
--- a/tests/corelib/numerics/BasicAmountTest.cc
+++ b/tests/corelib/numerics/BasicAmountTestCase.cc
diff --git a/tests/corelib/numerics/BasicAmountTest.h b/tests/corelib/numerics/BasicAmountTestCase.h
index 6e2f021e..6e2f021e 100644
--- a/tests/corelib/numerics/BasicAmountTest.h
+++ b/tests/corelib/numerics/BasicAmountTestCase.h