add new ClearAll

[apt.git] / test / libapt / hashsums_test.cc

diff --git a/test/libapt/hashsums_test.cc b/test/libapt/hashsums_test.cc
index 12096be15761a73403aa236cad2a5f21c0f4cfce..396e4cf6b36304e114731eb189a050f97df40138 100644 (file)
--- a/test/libapt/hashsums_test.cc
+++ b/test/libapt/hashsums_test.cc
@@ -91,24 +91,64 @@ int main(int argc, char** argv)
       std::cerr << "Can't open file for 1. testing: " << argv[1] << std::endl;
       return 1;
    }
       std::cerr << "Can't open file for 1. testing: " << argv[1] << std::endl;
       return 1;
    }

+   {

    Hashes hashes;
    hashes.AddFD(fileno(fd));
    equals(argv[2], hashes.MD5.Result().Value());
    equals(argv[3], hashes.SHA1.Result().Value());
    equals(argv[4], hashes.SHA256.Result().Value());
    equals(argv[5], hashes.SHA512.Result().Value());
    Hashes hashes;
    hashes.AddFD(fileno(fd));
    equals(argv[2], hashes.MD5.Result().Value());
    equals(argv[3], hashes.SHA1.Result().Value());
    equals(argv[4], hashes.SHA256.Result().Value());
    equals(argv[5], hashes.SHA512.Result().Value());

-
+   }

    fseek(fd, 0L, SEEK_END);
    unsigned long sz = ftell(fd);
    fseek(fd, 0L, SEEK_SET);
    fseek(fd, 0L, SEEK_END);
    unsigned long sz = ftell(fd);
    fseek(fd, 0L, SEEK_SET);

-
-   Hashes hashes2;
-   hashes2.AddFD(fileno(fd), sz);
+   {
+   Hashes hashes;
+   hashes.AddFD(fileno(fd), sz);
+   equals(argv[2], hashes.MD5.Result().Value());
+   equals(argv[3], hashes.SHA1.Result().Value());
+   equals(argv[4], hashes.SHA256.Result().Value());
+   equals(argv[5], hashes.SHA512.Result().Value());
+   }
+   fseek(fd, 0L, SEEK_SET);
+   {
+   MD5Summation md5;
+   md5.AddFD(fileno(fd));
+   equals(argv[2], md5.Result().Value());
+   }
+   fseek(fd, 0L, SEEK_SET);
+   {
+   SHA1Summation sha1;
+   sha1.AddFD(fileno(fd));
+   equals(argv[3], sha1.Result().Value());
+   }
+   fseek(fd, 0L, SEEK_SET);
+   {
+   SHA256Summation sha2;
+   sha2.AddFD(fileno(fd));
+   equals(argv[4], sha2.Result().Value());
+   }
+   fseek(fd, 0L, SEEK_SET);
+   {
+   SHA512Summation sha2;
+   sha2.AddFD(fileno(fd));
+   equals(argv[5], sha2.Result().Value());
+   }

    fclose(fd);
    fclose(fd);

-   equals(argv[2], hashes2.MD5.Result().Value());
-   equals(argv[3], hashes2.SHA1.Result().Value());
-   equals(argv[4], hashes2.SHA256.Result().Value());
-   equals(argv[5], hashes2.SHA512.Result().Value());
+
+   // test HashString code
+   {
+   HashString sha2("SHA256", argv[4]);
+   equals(sha2.VerifyFile(argv[1]), true);
+   }
+   {
+   HashString sha2("SHA512", argv[5]);
+   equals(sha2.VerifyFile(argv[1]), true);
+   }
+   {
+   HashString sha2("SHA256:" + std::string(argv[4]));
+   equals(sha2.VerifyFile(argv[1]), true);
+   }

 
    return 0;
 }
 
    return 0;
 }