From: Gereon Kremer <nafur42@gmail.com>
Date: Wed, 26 May 2021 06:20:03 +0000 (+0200)
Subject: Ensure proper types in unit tests (#6598)
X-Git-Tag: cvc5-1.0.0~1695
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=14b4666bec5cf6a8058254d740e94eda388f4760;p=cvc5.git

Ensure proper types in unit tests (#6598)

This PR fixes a type mixup (the usual long vs long long mixup on macos systems) in the unit tests for the new api::Term getters.
Fixes #6594.
---

diff --git a/test/unit/api/term_black.cpp b/test/unit/api/term_black.cpp
index d7f9a4dc3..617f032ab 100644
--- a/test/unit/api/term_black.cpp
+++ b/test/unit/api/term_black.cpp
@@ -785,30 +785,30 @@ TEST_F(TestApiBlackTerm, getReal)
   ASSERT_TRUE(real8.isRealValue());
   ASSERT_TRUE(real9.isRealValue());
 
-  ASSERT_EQ(std::make_pair(0, 1u), real1.getReal32Value());
-  ASSERT_EQ(std::make_pair(0l, 1ul), real1.getReal64Value());
+  ASSERT_EQ((std::pair<int32_t, uint32_t>(0, 1)), real1.getReal32Value());
+  ASSERT_EQ((std::pair<int64_t, uint64_t>(0, 1)), real1.getReal64Value());
   ASSERT_EQ("0", real1.getRealValue());
 
-  ASSERT_EQ(std::make_pair(0, 1u), real2.getReal32Value());
-  ASSERT_EQ(std::make_pair(0l, 1ul), real2.getReal64Value());
+  ASSERT_EQ((std::pair<int32_t, uint32_t>(0, 1)), real2.getReal32Value());
+  ASSERT_EQ((std::pair<int64_t, uint64_t>(0, 1)), real2.getReal64Value());
   ASSERT_EQ("0", real2.getRealValue());
 
-  ASSERT_EQ(std::make_pair(-17, 1u), real3.getReal32Value());
-  ASSERT_EQ(std::make_pair(-17l, 1ul), real3.getReal64Value());
+  ASSERT_EQ((std::pair<int32_t, uint32_t>(-17, 1)), real3.getReal32Value());
+  ASSERT_EQ((std::pair<int64_t, uint64_t>(-17, 1)), real3.getReal64Value());
   ASSERT_EQ("-17", real3.getRealValue());
 
-  ASSERT_EQ(std::make_pair(-3, 5u), real4.getReal32Value());
-  ASSERT_EQ(std::make_pair(-3l, 5ul), real4.getReal64Value());
+  ASSERT_EQ((std::pair<int32_t, uint32_t>(-3, 5)), real4.getReal32Value());
+  ASSERT_EQ((std::pair<int64_t, uint64_t>(-3, 5)), real4.getReal64Value());
   ASSERT_EQ("-3/5", real4.getRealValue());
 
-  ASSERT_EQ(std::make_pair(127, 10u), real5.getReal32Value());
-  ASSERT_EQ(std::make_pair(127l, 10ul), real5.getReal64Value());
+  ASSERT_EQ((std::pair<int32_t, uint32_t>(127, 10)), real5.getReal32Value());
+  ASSERT_EQ((std::pair<int64_t, uint64_t>(127, 10)), real5.getReal64Value());
   ASSERT_EQ("127/10", real5.getRealValue());
 
-  ASSERT_EQ(std::make_pair(1l, 4294967297ul), real6.getReal64Value());
+  ASSERT_EQ((std::pair<int64_t, uint64_t>(1, 4294967297)), real6.getReal64Value());
   ASSERT_EQ("1/4294967297", real6.getRealValue());
 
-  ASSERT_EQ(std::make_pair(4294967297l, 1ul), real7.getReal64Value());
+  ASSERT_EQ((std::pair<int64_t, uint64_t>(4294967297, 1)), real7.getReal64Value());
   ASSERT_EQ("4294967297", real7.getRealValue());
 
   ASSERT_EQ("1/18446744073709551617", real8.getRealValue());