From b6dd41ebc34e09838849acbeda6418e9286409a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Mon, 3 Mar 2014 10:45:03 +0200
Subject: [PATCH] Use gtest functions for comparing hash strings

This prints the mismatched strings if the test failed,
simplifying managing and updating the test suite.
---
 test/decode_encode_test.cpp | 2 +-
 test/decoder_test.cpp       | 2 +-
 test/encoder_test.cpp       | 2 +-
 test/utils/HashFunctions.h  | 5 +++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/decode_encode_test.cpp b/test/decode_encode_test.cpp
index 3cc4a7c8..42bc2d94 100644
--- a/test/decode_encode_test.cpp
+++ b/test/decode_encode_test.cpp
@@ -99,7 +99,7 @@ TEST_P(DecodeEncodeTest, CompareOutput) {
   unsigned char digest[SHA_DIGEST_LENGTH];
   SHA1Result(&ctx_, digest);
   if (!HasFatalFailure()) {
-    ASSERT_TRUE(CompareHash(digest, p.hashStr));
+    CompareHash(digest, p.hashStr);
   }
 }
 
diff --git a/test/decoder_test.cpp b/test/decoder_test.cpp
index 6b2355e1..189ef576 100644
--- a/test/decoder_test.cpp
+++ b/test/decoder_test.cpp
@@ -57,7 +57,7 @@ TEST_P(DecoderOutputTest, CompareOutput) {
   unsigned char digest[SHA_DIGEST_LENGTH];
   SHA1Result(&ctx_, digest);
   if (!HasFatalFailure()) {
-    ASSERT_TRUE(CompareHash(digest, p.hashStr));
+    CompareHash(digest, p.hashStr);
   }
 }
 
diff --git a/test/encoder_test.cpp b/test/encoder_test.cpp
index e2ef8376..319d38db 100644
--- a/test/encoder_test.cpp
+++ b/test/encoder_test.cpp
@@ -58,7 +58,7 @@ TEST_P(EncoderOutputTest, CompareOutput) {
   unsigned char digest[SHA_DIGEST_LENGTH];
   SHA1Result(&ctx_, digest);
   if (!HasFatalFailure()) {
-    ASSERT_TRUE(CompareHash(digest, p.hashStr));
+    CompareHash(digest, p.hashStr);
   }
 }
 
diff --git a/test/utils/HashFunctions.h b/test/utils/HashFunctions.h
index ef9b9b63..2936b954 100644
--- 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__