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

Change-Id: I24ede3cc287bcc3b5e73eb400e4044c469657659