...as will be needed by some upcoming replacements of CPPUNIT_ASSERT with
CPPUNIT_ASSERT_EQUAL

Change-Id: I7c861f1cb81de4540e88d89dbf095acc61a56503