diff options
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/api/java/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/unit/api/term_black.cpp | 24 |
2 files changed, 14 insertions, 12 deletions
diff --git a/test/unit/api/java/CMakeLists.txt b/test/unit/api/java/CMakeLists.txt index 0ef649b87..fe497ef3b 100644 --- a/test/unit/api/java/CMakeLists.txt +++ b/test/unit/api/java/CMakeLists.txt @@ -17,6 +17,8 @@ find_package(Java REQUIRED) include(UseJava) find_package(JUnit REQUIRED) +get_target_property(CVC5_JAR_PATH cvc5jar JAR_FILE) + # specify source files for junit tests set(java_test_src_files ${CMAKE_CURRENT_SOURCE_DIR}/cvc5/SolverTest.java 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()); |