Revert types for test assertion logs.

kennethshackleton · Sep 26, 2017 · 01c542a · 01c542a
1 parent a56c7f5
commit 01c542a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/tests/five_eval_tests.cpp b/tests/five_eval_tests.cpp
@@ -298,17 +298,17 @@ TEST_F(FiveEvalTest, SevenCardHand) {
     uint8_t five[5];
     uint8_t seven[7];
     seven[0] = i;
-    for (uint8_t j = 5; j < i; ++j) {
+    for (int j = 5; j < i; ++j) {
       seven[1] = j;
-      for (uint8_t k = 4; k < j; ++k) {
+      for (int k = 4; k < j; ++k) {
         seven[2] = k;
-        for (uint8_t l = 3; l < k; ++l) {
+        for (int l = 3; l < k; ++l) {
           seven[3] = l;
-          for (uint8_t m = 2; m < l; ++m) {
+          for (int m = 2; m < l; ++m) {
             seven[4] = m;
-            for (uint8_t n = 1; n < m; ++n) {
+            for (int n = 1; n < m; ++n) {
               seven[5] = n;
-              for (uint8_t p = 0; p < n; ++p) {
+              for (int p = 0; p < n; ++p) {
                 seven[6] = p;
                 int rbf = 0;
                 uint8_t v = 0;

diff --git a/tests/seven_eval_tests.cpp b/tests/seven_eval_tests.cpp
@@ -15,12 +15,12 @@ TEST_F(SevenEvalTest, CompareWithFiveEval) {
   std::atomic<long> count(0);
   auto const outer = [&](int const& i) {
     long inner_count = 0;
-    for (uint8_t j = i+1; j < 47; ++j) {
-      for (uint8_t k = j+1; k < 48; ++k) {
-        for (uint8_t l = k+1; l < 49; ++l) {
-          for (uint8_t m = l+1; m < 50; ++m) {
-            for (uint8_t n = m+1; n < 51; ++n) {
-              for (uint8_t p = n+1; p < 52; ++p) {
+    for (int j = i+1; j < 47; ++j) {
+      for (int k = j+1; k < 48; ++k) {
+        for (int l = k+1; l < 49; ++l) {
+          for (int m = l+1; m < 50; ++m) {
+            for (int n = m+1; n < 51; ++n) {
+              for (int p = n+1; p < 52; ++p) {
                 auto const five_rank = five_eval.GetRank(i, j, k, l, m, n, p);
                 auto const seven_rank = SevenEval::GetRank(i, j, k, l, m, n, p);
                 ASSERT_EQ(five_rank, seven_rank) << "Ranks at "
@@ -30,7 +30,8 @@ TEST_F(SevenEvalTest, CompareWithFiveEval) {
                                                  << l << ", "
                                                  << m << ", "
                                                  << n << ", "
-                                                 << p
+                                                 << p << " after "
+                                                 << inner_count
                                                  << " differ.";
                 ++inner_count;
               }