diff options
Diffstat (limited to 'test/unit/api')
| -rw-r--r-- | test/unit/api/op_black.h | 9 | ||||
| -rw-r--r-- | test/unit/api/solver_black.h | 23 |
2 files changed, 11 insertions, 21 deletions
diff --git a/test/unit/api/op_black.h b/test/unit/api/op_black.h index dcad8b649..6fb7e839c 100644 --- a/test/unit/api/op_black.h +++ b/test/unit/api/op_black.h @@ -29,7 +29,6 @@ class OpBlack : public CxxTest::TestSuite void testIsNull(); void testOpFromKind(); void testGetIndicesString(); - void testGetIndicesKind(); void testGetIndicesUint(); void testGetIndicesPairUint(); @@ -88,14 +87,6 @@ void OpBlack::testGetIndicesString() TS_ASSERT_THROWS(record_update_ot.getIndices<uint32_t>(), CVC4ApiException&); } -void OpBlack::testGetIndicesKind() -{ - Op chain_ot = d_solver.mkOp(CHAIN, AND); - TS_ASSERT(chain_ot.isIndexed()); - Kind chain_idx = chain_ot.getIndices<Kind>(); - TS_ASSERT(chain_idx == AND); -} - void OpBlack::testGetIndicesUint() { Op bitvector_repeat_ot = d_solver.mkOp(BITVECTOR_REPEAT, 5); diff --git a/test/unit/api/solver_black.h b/test/unit/api/solver_black.h index bf992d2d5..aea41a42b 100644 --- a/test/unit/api/solver_black.h +++ b/test/unit/api/solver_black.h @@ -461,7 +461,6 @@ void SolverBlack::testMkPosZero() void SolverBlack::testMkOp() { // mkOp(Kind kind, Kind k) - TS_ASSERT_THROWS_NOTHING(d_solver->mkOp(CHAIN, EQUAL)); TS_ASSERT_THROWS(d_solver->mkOp(BITVECTOR_EXTRACT, EQUAL), CVC4ApiException&); // mkOp(Kind kind, const std::string& arg) @@ -622,10 +621,10 @@ void SolverBlack::testMkTermFromOp() std::vector<Term> v1 = {d_solver->mkReal(1), d_solver->mkReal(2)}; std::vector<Term> v2 = {d_solver->mkReal(1), Term()}; std::vector<Term> v3 = {}; + std::vector<Term> v4 = {d_solver->mkReal(5)}; // simple operator terms Op opterm1 = d_solver->mkOp(BITVECTOR_EXTRACT, 2, 1); Op opterm2 = d_solver->mkOp(DIVISIBLE, 1); - Op opterm3 = d_solver->mkOp(CHAIN, EQUAL); // list datatype Sort sort = d_solver->mkParamSort("T"); @@ -679,33 +678,33 @@ void SolverBlack::testMkTermFromOp() CVC4ApiException&); // mkTerm(Op op, Term child1, Term child2) const - TS_ASSERT_THROWS_NOTHING( - d_solver->mkTerm(opterm3, d_solver->mkReal(1), d_solver->mkReal(2))); + TS_ASSERT_THROWS( + d_solver->mkTerm(opterm2, d_solver->mkReal(1), d_solver->mkReal(2)), + CVC4ApiException&); TS_ASSERT_THROWS_NOTHING( d_solver->mkTerm(APPLY_CONSTRUCTOR, consTerm1, d_solver->mkReal(0), d_solver->mkTerm(APPLY_CONSTRUCTOR, nilTerm1))); TS_ASSERT_THROWS(d_solver->mkTerm(opterm1, a, b), CVC4ApiException&); - TS_ASSERT_THROWS(d_solver->mkTerm(opterm3, d_solver->mkReal(1), Term()), + TS_ASSERT_THROWS(d_solver->mkTerm(opterm2, d_solver->mkReal(1), Term()), CVC4ApiException&); - TS_ASSERT_THROWS(d_solver->mkTerm(opterm3, Term(), d_solver->mkReal(1)), + TS_ASSERT_THROWS(d_solver->mkTerm(opterm2, Term(), d_solver->mkReal(1)), CVC4ApiException&); // mkTerm(Op op, Term child1, Term child2, Term child3) // const - TS_ASSERT_THROWS_NOTHING(d_solver->mkTerm( - opterm3, d_solver->mkReal(1), d_solver->mkReal(1), d_solver->mkReal(2))); TS_ASSERT_THROWS(d_solver->mkTerm(opterm1, a, b, a), CVC4ApiException&); TS_ASSERT_THROWS( d_solver->mkTerm( - opterm3, d_solver->mkReal(1), d_solver->mkReal(1), Term()), + opterm2, d_solver->mkReal(1), d_solver->mkReal(1), Term()), CVC4ApiException&); // mkTerm(Op op, const std::vector<Term>& children) const - TS_ASSERT_THROWS_NOTHING(d_solver->mkTerm(opterm3, v1)); - TS_ASSERT_THROWS(d_solver->mkTerm(opterm3, v2), CVC4ApiException&); - TS_ASSERT_THROWS(d_solver->mkTerm(opterm3, v3), CVC4ApiException&); + TS_ASSERT_THROWS_NOTHING(d_solver->mkTerm(opterm2, v4)); + TS_ASSERT_THROWS(d_solver->mkTerm(opterm2, v1), CVC4ApiException&); + TS_ASSERT_THROWS(d_solver->mkTerm(opterm2, v2), CVC4ApiException&); + TS_ASSERT_THROWS(d_solver->mkTerm(opterm2, v3), CVC4ApiException&); } void SolverBlack::testMkTrue() |