shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #390 from mstorsjo/gtest-strcmp

Use gtest functions for comparing hash strings

--- a/test/decode_encode_test.cpp

+++ b/test/decode_encode_test.cpp

@@ -99,7 +99,7 @@

   unsigned char digest[SHA_DIGEST_LENGTH];

   SHA1Result(&ctx_, digest);

   if (!HasFatalFailure()) {

-    ASSERT_TRUE(CompareHash(digest, p.hashStr));

+    CompareHash(digest, p.hashStr);

   }

 }

--- a/test/decoder_test.cpp

+++ b/test/decoder_test.cpp

@@ -57,7 +57,7 @@

   unsigned char digest[SHA_DIGEST_LENGTH];

   SHA1Result(&ctx_, digest);

   if (!HasFatalFailure()) {

-    ASSERT_TRUE(CompareHash(digest, p.hashStr));

+    CompareHash(digest, p.hashStr);

   }

 }

--- a/test/encoder_test.cpp

+++ b/test/encoder_test.cpp

@@ -58,7 +58,7 @@

   unsigned char digest[SHA_DIGEST_LENGTH];

   SHA1Result(&ctx_, digest);

   if (!HasFatalFailure()) {

-    ASSERT_TRUE(CompareHash(digest, p.hashStr));

+    CompareHash(digest, p.hashStr);

   }

 }

--- a/test/utils/HashFunctions.h

+++ b/test/utils/HashFunctions.h

@@ -3,15 +3,16 @@

 #include <stdio.h>

 #include <string.h>

+#include <gtest/gtest.h>

 #include "../sha1.h"

-static bool CompareHash(const unsigned char* digest, const char* hashStr) {

+static void CompareHash(const unsigned char* digest, const char* hashStr) {

   char hashStrCmp[SHA_DIGEST_LENGTH * 2 + 1];

   for (int i = 0; i < SHA_DIGEST_LENGTH; ++i) {

     sprintf(&hashStrCmp[i*2], "%.2x", digest[i]);

   }

   hashStrCmp[SHA_DIGEST_LENGTH * 2] = '\0';

-  return strncmp(hashStr, hashStrCmp, SHA_DIGEST_LENGTH * 2) == 0;

+  EXPECT_STREQ(hashStr, hashStrCmp);

 }

 #endif //__HASHFUNCTIONS_H__