1 files changed, 14 insertions, 22 deletions

diff --git a/test/MessageDigestHelperTest.cc b/test/MessageDigestHelperTest.cc
index faa7abd1..8bc781e0 100644
--- a/test/MessageDigestHelperTest.cc
+++ b/test/MessageDigestHelperTest.cc
@@ -4,16 +4,15 @@
 
 #include "util.h"
 #include "DefaultDiskWriter.h"
-#include "messageDigest.h"
+#include "MessageDigest.h"
 
 namespace aria2 {
 
 class MessageDigestHelperTest:public CppUnit::TestFixture {
 
   CPPUNIT_TEST_SUITE(MessageDigestHelperTest);
-  CPPUNIT_TEST(testDigestDiskWriter);
-  CPPUNIT_TEST(testDigestFilename);
-  CPPUNIT_TEST(testDigestData);
+  CPPUNIT_TEST(testHexDigestDiskWriter);
+  CPPUNIT_TEST(testDigest);
   CPPUNIT_TEST_SUITE_END();
 private:
 
@@ -21,40 +20,33 @@ public:
   void setUp() {
   }
 
-  void testDigestDiskWriter();
-  void testDigestFilename();
-  void testDigestData();
+  void testHexDigestDiskWriter();
+  void testDigest();
 };
 
 
 CPPUNIT_TEST_SUITE_REGISTRATION( MessageDigestHelperTest );
 
-void MessageDigestHelperTest::testDigestDiskWriter() {
+void MessageDigestHelperTest::testHexDigestDiskWriter() {
   SharedHandle<DefaultDiskWriter> diskio
     (new DefaultDiskWriter("4096chunk.txt"));
   diskio->openExistingFile();
   CPPUNIT_ASSERT_EQUAL(std::string("608cabc0f2fa18c260cafd974516865c772363d5"),
-                       MessageDigestHelper::digest
-                       (MessageDigestContext::SHA1, diskio, 0, 4096));
+                       MessageDigestHelper::hexDigest
+                       (MessageDigest::sha1(), diskio, 0, 4096));
 
   CPPUNIT_ASSERT_EQUAL(std::string("7a4a9ae537ebbbb826b1060e704490ad0f365ead"),
-                       MessageDigestHelper::digest
-                       (MessageDigestContext::SHA1, diskio, 5, 100));
+                       MessageDigestHelper::hexDigest
+                       (MessageDigest::sha1(), diskio, 5, 100));
 }
 
-void MessageDigestHelperTest::testDigestFilename()
-{
-  CPPUNIT_ASSERT_EQUAL(std::string("608cabc0f2fa18c260cafd974516865c772363d5"),
-                       MessageDigestHelper::digest
-                       (MessageDigestContext::SHA1, "4096chunk.txt"));
-}
-
-void MessageDigestHelperTest::testDigestData()
+void MessageDigestHelperTest::testDigest()
 {
   std::string data = "aria2";
+  SharedHandle<MessageDigest> sha1 = MessageDigest::sha1();
+  sha1->update(data.data(), data.size());
   CPPUNIT_ASSERT_EQUAL(std::string("f36003f22b462ffa184390533c500d8989e9f681"),
-                       MessageDigestHelper::digest
-                       (MessageDigestContext::SHA1, data.c_str(), data.size()));
+                       sha1->hexDigest());
 }
 
 } // namespace aria2