summaryrefslogtreecommitdiff
path: root/test/unit/expr
diff options
context:
space:
mode:
Diffstat (limited to 'test/unit/expr')
-rw-r--r--test/unit/expr/expr_manager_public.h8
-rw-r--r--test/unit/expr/expr_public.h49
-rw-r--r--test/unit/expr/kind_map_black.h2
-rw-r--r--test/unit/expr/node_black.h20
-rw-r--r--test/unit/expr/node_builder_black.h94
-rw-r--r--test/unit/expr/node_manager_black.h4
-rw-r--r--test/unit/expr/node_manager_white.h4
-rw-r--r--test/unit/expr/symbol_table_black.h8
8 files changed, 98 insertions, 91 deletions
diff --git a/test/unit/expr/expr_manager_public.h b/test/unit/expr/expr_manager_public.h
index 9c604aa52..c2a33cc59 100644
--- a/test/unit/expr/expr_manager_public.h
+++ b/test/unit/expr/expr_manager_public.h
@@ -70,7 +70,7 @@ private:
{
delete d_exprManager;
}
- catch (Exception e)
+ catch (Exception& e)
{
cerr << "Exception during tearDown():" << endl << e;
throw;
@@ -118,12 +118,14 @@ private:
void testMkAssociativeTooFew() {
std::vector<Expr> vars = mkVars(d_exprManager->booleanType(), 1);
- TS_ASSERT_THROWS( d_exprManager->mkAssociative(AND,vars), IllegalArgumentException);
+ TS_ASSERT_THROWS(d_exprManager->mkAssociative(AND, vars),
+ IllegalArgumentException&);
}
void testMkAssociativeBadKind() {
std::vector<Expr> vars = mkVars(d_exprManager->integerType(), 10);
- TS_ASSERT_THROWS( d_exprManager->mkAssociative(LEQ,vars), IllegalArgumentException);
+ TS_ASSERT_THROWS(d_exprManager->mkAssociative(LEQ, vars),
+ IllegalArgumentException&);
}
};
diff --git a/test/unit/expr/expr_public.h b/test/unit/expr/expr_public.h
index d8774db82..9ff5e6578 100644
--- a/test/unit/expr/expr_public.h
+++ b/test/unit/expr/expr_public.h
@@ -80,7 +80,7 @@ private:
r1 = new Expr(d_em->mkConst(Rational(1, 5)));
r2 = new Expr(d_em->mkConst(Rational("0")));
}
- catch (Exception e)
+ catch (Exception& e)
{
cerr << "Exception during setUp():" << endl << e;
throw;
@@ -106,7 +106,9 @@ private:
delete a_bool;
delete d_em;
- } catch(Exception e) {
+ }
+ catch (Exception& e)
+ {
cerr << "Exception during tearDown():" << endl << e;
throw;
}
@@ -265,13 +267,13 @@ private:
TS_ASSERT(d_apply_fun_bool->hasOperator());
TS_ASSERT(!null->hasOperator());
- TS_ASSERT_THROWS(a_bool->getOperator(), IllegalArgumentException);
- TS_ASSERT_THROWS(b_bool->getOperator(), IllegalArgumentException);
+ TS_ASSERT_THROWS(a_bool->getOperator(), IllegalArgumentException&);
+ TS_ASSERT_THROWS(b_bool->getOperator(), IllegalArgumentException&);
TS_ASSERT(c_bool_and->getOperator() == *and_op);
- TS_ASSERT_THROWS(plus_op->getOperator(), IllegalArgumentException);
- TS_ASSERT_THROWS(and_op->getOperator(), IllegalArgumentException);
+ TS_ASSERT_THROWS(plus_op->getOperator(), IllegalArgumentException&);
+ TS_ASSERT_THROWS(and_op->getOperator(), IllegalArgumentException&);
TS_ASSERT(d_apply_fun_bool->getOperator() == *fun_op);
- TS_ASSERT_THROWS(null->getOperator(), IllegalArgumentException);
+ TS_ASSERT_THROWS(null->getOperator(), IllegalArgumentException&);
}
void testGetType() {
@@ -281,11 +283,11 @@ private:
TS_ASSERT(a_bool->getType(true) == d_em->booleanType());
TS_ASSERT(b_bool->getType(false) == d_em->booleanType());
TS_ASSERT(b_bool->getType(true) == d_em->booleanType());
- TS_ASSERT_THROWS(d_em->mkExpr(MULT,*a_bool,*b_bool).getType(true),
- TypeCheckingException);
-// These need better support for operators
-// TS_ASSERT(and_op->getType().isNull());
-// TS_ASSERT(plus_op->getType().isNull());
+ TS_ASSERT_THROWS(d_em->mkExpr(MULT, *a_bool, *b_bool).getType(true),
+ TypeCheckingException&);
+ // These need better support for operators
+ // TS_ASSERT(and_op->getType().isNull());
+ // TS_ASSERT(plus_op->getType().isNull());
TS_ASSERT(d_apply_fun_bool->getType() == d_em->booleanType());
TS_ASSERT(i1->getType().isInteger());
TS_ASSERT(i2->getType().isInteger());
@@ -426,25 +428,26 @@ private:
/* template <class T>
const T& getConst() const; */
- TS_ASSERT_THROWS(a_bool->getConst<Kind>(), IllegalArgumentException);
- TS_ASSERT_THROWS(b_bool->getConst<Kind>(), IllegalArgumentException);
- TS_ASSERT_THROWS(c_bool_and->getConst<Kind>(), IllegalArgumentException);
+ TS_ASSERT_THROWS(a_bool->getConst<Kind>(), IllegalArgumentException&);
+ TS_ASSERT_THROWS(b_bool->getConst<Kind>(), IllegalArgumentException&);
+ TS_ASSERT_THROWS(c_bool_and->getConst<Kind>(), IllegalArgumentException&);
TS_ASSERT(and_op->getConst<Kind>() == AND);
- TS_ASSERT_THROWS(and_op->getConst<Rational>(), IllegalArgumentException);
+ TS_ASSERT_THROWS(and_op->getConst<Rational>(), IllegalArgumentException&);
TS_ASSERT(plus_op->getConst<Kind>() == PLUS);
- TS_ASSERT_THROWS(plus_op->getConst<Rational>(), IllegalArgumentException);
- TS_ASSERT_THROWS(d_apply_fun_bool->getConst<Kind>(), IllegalArgumentException);
- TS_ASSERT_THROWS(null->getConst<Kind>(), IllegalArgumentException);
+ TS_ASSERT_THROWS(plus_op->getConst<Rational>(), IllegalArgumentException&);
+ TS_ASSERT_THROWS(d_apply_fun_bool->getConst<Kind>(),
+ IllegalArgumentException&);
+ TS_ASSERT_THROWS(null->getConst<Kind>(), IllegalArgumentException&);
TS_ASSERT(i1->getConst<Rational>() == 0);
TS_ASSERT(i2->getConst<Rational>() == 23);
TS_ASSERT(r1->getConst<Rational>() == Rational(1, 5));
TS_ASSERT(r2->getConst<Rational>() == Rational("0"));
- TS_ASSERT_THROWS(i1->getConst<Kind>(), IllegalArgumentException);
- TS_ASSERT_THROWS(i2->getConst<Kind>(), IllegalArgumentException);
- TS_ASSERT_THROWS(r1->getConst<Kind>(), IllegalArgumentException);
- TS_ASSERT_THROWS(r2->getConst<Kind>(), IllegalArgumentException);
+ TS_ASSERT_THROWS(i1->getConst<Kind>(), IllegalArgumentException&);
+ TS_ASSERT_THROWS(i2->getConst<Kind>(), IllegalArgumentException&);
+ TS_ASSERT_THROWS(r1->getConst<Kind>(), IllegalArgumentException&);
+ TS_ASSERT_THROWS(r2->getConst<Kind>(), IllegalArgumentException&);
}
void testGetExprManager() {
diff --git a/test/unit/expr/kind_map_black.h b/test/unit/expr/kind_map_black.h
index ef2cc8881..33af64580 100644
--- a/test/unit/expr/kind_map_black.h
+++ b/test/unit/expr/kind_map_black.h
@@ -100,7 +100,7 @@ public:
TS_ASSERT(!(AND ^ AND ^ AND).isEmpty());
#ifdef CVC4_ASSERTIONS
- TS_ASSERT_THROWS(~LAST_KIND, AssertArgumentException);
+ TS_ASSERT_THROWS(~LAST_KIND, AssertArgumentException&);
#endif /* CVC4_ASSERTIONS */
}
diff --git a/test/unit/expr/node_black.h b/test/unit/expr/node_black.h
index 461d59498..2415bd5e4 100644
--- a/test/unit/expr/node_black.h
+++ b/test/unit/expr/node_black.h
@@ -179,8 +179,8 @@ class NodeBlack : public CxxTest::TestSuite {
#ifdef CVC4_ASSERTIONS
// Basic bounds check on a node w/out children
- TS_ASSERT_THROWS(Node::null()[-1], AssertionException);
- TS_ASSERT_THROWS(Node::null()[0], AssertionException);
+ TS_ASSERT_THROWS(Node::null()[-1], AssertionException&);
+ TS_ASSERT_THROWS(Node::null()[0], AssertionException&);
#endif /* CVC4_ASSERTIONS */
// Basic access check
@@ -198,8 +198,8 @@ class NodeBlack : public CxxTest::TestSuite {
#ifdef CVC4_ASSERTIONS
// Bounds check on a node with children
- TS_ASSERT_THROWS(ite == ite[-1], AssertionException);
- TS_ASSERT_THROWS(ite == ite[4], AssertionException);
+ TS_ASSERT_THROWS(ite == ite[-1], AssertionException&);
+ TS_ASSERT_THROWS(ite == ite[4], AssertionException&);
#endif /* CVC4_ASSERTIONS */
}
@@ -420,8 +420,8 @@ class NodeBlack : public CxxTest::TestSuite {
TS_ASSERT(f == fa.getOperator());
#ifdef CVC4_ASSERTIONS
- TS_ASSERT_THROWS(f.getOperator(), IllegalArgumentException);
- TS_ASSERT_THROWS(a.getOperator(), IllegalArgumentException);
+ TS_ASSERT_THROWS(f.getOperator(), IllegalArgumentException&);
+ TS_ASSERT_THROWS(a.getOperator(), IllegalArgumentException&);
#endif /* CVC4_ASSERTIONS */
}
@@ -459,10 +459,10 @@ class NodeBlack : public CxxTest::TestSuite {
}
#ifdef CVC4_ASSERTIONS
- TS_ASSERT_THROWS(testNaryExpForSize(AND, 0), AssertionException);
- TS_ASSERT_THROWS(testNaryExpForSize(AND, 1), AssertionException);
- TS_ASSERT_THROWS(testNaryExpForSize(NOT, 0), AssertionException);
- TS_ASSERT_THROWS(testNaryExpForSize(NOT, 2), AssertionException);
+ TS_ASSERT_THROWS(testNaryExpForSize(AND, 0), AssertionException&);
+ TS_ASSERT_THROWS(testNaryExpForSize(AND, 1), AssertionException&);
+ TS_ASSERT_THROWS(testNaryExpForSize(NOT, 0), AssertionException&);
+ TS_ASSERT_THROWS(testNaryExpForSize(NOT, 2), AssertionException&);
#endif /* CVC4_ASSERTIONS */
}
diff --git a/test/unit/expr/node_builder_black.h b/test/unit/expr/node_builder_black.h
index f4fbbb5d9..963219291 100644
--- a/test/unit/expr/node_builder_black.h
+++ b/test/unit/expr/node_builder_black.h
@@ -90,9 +90,9 @@ private:
NodeBuilder<> def;
TS_ASSERT_EQUALS(def.getKind(), UNDEFINED_KIND);
#ifdef CVC4_ASSERTIONS
- TS_ASSERT_THROWS(def.getNumChildren(), AssertionException);
- TS_ASSERT_THROWS(def.begin(), AssertionException);
- TS_ASSERT_THROWS(def.end(), AssertionException);
+ TS_ASSERT_THROWS(def.getNumChildren(), AssertionException&);
+ TS_ASSERT_THROWS(def.begin(), AssertionException&);
+ TS_ASSERT_THROWS(def.end(), AssertionException&);
#endif /* CVC4_ASSERTIONS */
NodeBuilder<> spec(specKind);
@@ -104,9 +104,9 @@ private:
NodeBuilder<> from_nm(d_nm);
TS_ASSERT_EQUALS(from_nm.getKind(), UNDEFINED_KIND);
#ifdef CVC4_ASSERTIONS
- TS_ASSERT_THROWS(from_nm.getNumChildren(), AssertionException);
- TS_ASSERT_THROWS(from_nm.begin(), AssertionException);
- TS_ASSERT_THROWS(from_nm.end(), AssertionException);
+ TS_ASSERT_THROWS(from_nm.getNumChildren(), AssertionException&);
+ TS_ASSERT_THROWS(from_nm.begin(), AssertionException&);
+ TS_ASSERT_THROWS(from_nm.end(), AssertionException&);
#endif /* CVC4_ASSERTIONS */
NodeBuilder<> from_nm_kind(d_nm, specKind);
@@ -120,9 +120,9 @@ private:
NodeBuilder<K> ws;
TS_ASSERT_EQUALS(ws.getKind(), UNDEFINED_KIND);
#ifdef CVC4_ASSERTIONS
- TS_ASSERT_THROWS(ws.getNumChildren(), AssertionException);
- TS_ASSERT_THROWS(ws.begin(), AssertionException);
- TS_ASSERT_THROWS(ws.end(), AssertionException);
+ TS_ASSERT_THROWS(ws.getNumChildren(), AssertionException&);
+ TS_ASSERT_THROWS(ws.begin(), AssertionException&);
+ TS_ASSERT_THROWS(ws.end(), AssertionException&);
#endif /* CVC4_ASSERTIONS */
NodeBuilder<K> ws_kind(specKind);
@@ -134,9 +134,9 @@ private:
NodeBuilder<K> ws_from_nm(d_nm);
TS_ASSERT_EQUALS(ws_from_nm.getKind(), UNDEFINED_KIND);
#ifdef CVC4_ASSERTIONS
- TS_ASSERT_THROWS(ws_from_nm.getNumChildren(), AssertionException);
- TS_ASSERT_THROWS(ws_from_nm.begin(), AssertionException);
- TS_ASSERT_THROWS(ws_from_nm.end(), AssertionException);
+ TS_ASSERT_THROWS(ws_from_nm.getNumChildren(), AssertionException&);
+ TS_ASSERT_THROWS(ws_from_nm.begin(), AssertionException&);
+ TS_ASSERT_THROWS(ws_from_nm.end(), AssertionException&);
#endif /* CVC4_ASSERTIONS */
NodeBuilder<K> ws_from_nm_kind(d_nm, specKind);
@@ -158,33 +158,33 @@ private:
NodeBuilder<> copy(def);
TS_ASSERT_EQUALS(copy.getKind(), UNDEFINED_KIND);
#ifdef CVC4_ASSERTIONS
- TS_ASSERT_THROWS(copy.getNumChildren(), AssertionException);
- TS_ASSERT_THROWS(copy.begin(), AssertionException);
- TS_ASSERT_THROWS(copy.end(), AssertionException);
+ TS_ASSERT_THROWS(copy.getNumChildren(), AssertionException&);
+ TS_ASSERT_THROWS(copy.begin(), AssertionException&);
+ TS_ASSERT_THROWS(copy.end(), AssertionException&);
#endif /* CVC4_ASSERTIONS */
NodeBuilder<K> cp_ws(ws);
TS_ASSERT_EQUALS(cp_ws.getKind(), UNDEFINED_KIND);
#ifdef CVC4_ASSERTIONS
- TS_ASSERT_THROWS(cp_ws.getNumChildren(), AssertionException);
- TS_ASSERT_THROWS(cp_ws.begin(), AssertionException);
- TS_ASSERT_THROWS(cp_ws.end(), AssertionException);
+ TS_ASSERT_THROWS(cp_ws.getNumChildren(), AssertionException&);
+ TS_ASSERT_THROWS(cp_ws.begin(), AssertionException&);
+ TS_ASSERT_THROWS(cp_ws.end(), AssertionException&);
#endif /* CVC4_ASSERTIONS */
NodeBuilder<K-10> cp_from_larger(ws);
TS_ASSERT_EQUALS(cp_from_larger.getKind(), UNDEFINED_KIND);
#ifdef CVC4_ASSERTIONS
- TS_ASSERT_THROWS(cp_from_larger.getNumChildren(), AssertionException);
- TS_ASSERT_THROWS(cp_from_larger.begin(), AssertionException);
- TS_ASSERT_THROWS(cp_from_larger.end(), AssertionException);
+ TS_ASSERT_THROWS(cp_from_larger.getNumChildren(), AssertionException&);
+ TS_ASSERT_THROWS(cp_from_larger.begin(), AssertionException&);
+ TS_ASSERT_THROWS(cp_from_larger.end(), AssertionException&);
#endif /* CVC4_ASSERTIONS */
NodeBuilder<K+10> cp_from_smaller(ws);
TS_ASSERT_EQUALS(cp_from_smaller.getKind(), UNDEFINED_KIND);
#ifdef CVC4_ASSERTIONS
- TS_ASSERT_THROWS(cp_from_smaller.getNumChildren(), AssertionException);
- TS_ASSERT_THROWS(cp_from_smaller.begin(), AssertionException);
- TS_ASSERT_THROWS(cp_from_smaller.end(), AssertionException);
+ TS_ASSERT_THROWS(cp_from_smaller.getNumChildren(), AssertionException&);
+ TS_ASSERT_THROWS(cp_from_smaller.begin(), AssertionException&);
+ TS_ASSERT_THROWS(cp_from_smaller.end(), AssertionException&);
#endif /* CVC4_ASSERTIONS */
}
@@ -282,7 +282,7 @@ private:
Node n = noKind;
#ifdef CVC4_ASSERTIONS
- TS_ASSERT_THROWS(noKind.getKind(), AssertionException);
+ TS_ASSERT_THROWS(noKind.getKind(), AssertionException&);
#endif /* CVC4_ASSERTIONS */
NodeBuilder<> spec(PLUS);
@@ -297,7 +297,7 @@ private:
NodeBuilder<> nb;
#ifdef CVC4_ASSERTIONS
- TS_ASSERT_THROWS(nb.getNumChildren(), AssertionException);
+ TS_ASSERT_THROWS(nb.getNumChildren(), AssertionException&);
#endif /* CVC4_ASSERTIONS */
nb << PLUS << x << x;
@@ -309,7 +309,7 @@ private:
Node n = nb;// avoid warning on clear()
nb.clear();
#ifdef CVC4_ASSERTIONS
- TS_ASSERT_THROWS(nb.getNumChildren(), AssertionException);
+ TS_ASSERT_THROWS(nb.getNumChildren(), AssertionException&);
#endif /* CVC4_ASSERTIONS */
nb.clear(PLUS);
TS_ASSERT_EQUALS(nb.getNumChildren(), 0u);
@@ -321,9 +321,9 @@ private:
TS_ASSERT_EQUALS(nb.getNumChildren(), 6u);
#ifdef CVC4_ASSERTIONS
- TS_ASSERT_THROWS( nb << PLUS, AssertionException );
+ TS_ASSERT_THROWS(nb << PLUS, AssertionException&);
n = nb;
- TS_ASSERT_THROWS( nb.getNumChildren(), AssertionException );
+ TS_ASSERT_THROWS(nb.getNumChildren(), AssertionException&);
#endif /* CVC4_ASSERTIONS */
}
@@ -342,7 +342,7 @@ private:
#ifdef CVC4_ASSERTIONS
TS_ASSERT_THROWS(arr[-1], AssertionException&);
- TS_ASSERT_THROWS(arr[0], AssertionException);
+ TS_ASSERT_THROWS(arr[0], AssertionException&);
#endif /* CVC4_ASSERTIONS */
arr << i_0;
@@ -375,7 +375,7 @@ private:
#ifdef CVC4_ASSERTIONS
Node n = arr;
- TS_ASSERT_THROWS(arr[0], AssertionException);
+ TS_ASSERT_THROWS(arr[0], AssertionException&);
#endif /* CVC4_ASSERTIONS */
}
@@ -385,9 +385,9 @@ private:
TS_ASSERT_EQUALS(nb.getKind(), UNDEFINED_KIND);
#ifdef CVC4_ASSERTIONS
- TS_ASSERT_THROWS(nb.getNumChildren(), AssertionException);
- TS_ASSERT_THROWS(nb.begin(), AssertionException);
- TS_ASSERT_THROWS(nb.end(), AssertionException);
+ TS_ASSERT_THROWS(nb.getNumChildren(), AssertionException&);
+ TS_ASSERT_THROWS(nb.begin(), AssertionException&);
+ TS_ASSERT_THROWS(nb.end(), AssertionException&);
#endif /* CVC4_ASSERTIONS */
nb << specKind;
@@ -402,9 +402,9 @@ private:
TS_ASSERT_EQUALS(nb.getKind(), UNDEFINED_KIND);
#ifdef CVC4_ASSERTIONS
- TS_ASSERT_THROWS(nb.getNumChildren(), AssertionException);
- TS_ASSERT_THROWS(nb.begin(), AssertionException);
- TS_ASSERT_THROWS(nb.end(), AssertionException);
+ TS_ASSERT_THROWS(nb.getNumChildren(), AssertionException&);
+ TS_ASSERT_THROWS(nb.begin(), AssertionException&);
+ TS_ASSERT_THROWS(nb.end(), AssertionException&);
#endif /* CVC4_ASSERTIONS */
nb << specKind;
@@ -427,9 +427,9 @@ private:
TS_ASSERT_EQUALS(nb.getKind(), UNDEFINED_KIND);
#ifdef CVC4_ASSERTIONS
- TS_ASSERT_THROWS(nb.getNumChildren(), AssertionException);
- TS_ASSERT_THROWS(nb.begin(), AssertionException);
- TS_ASSERT_THROWS(nb.end(), AssertionException);
+ TS_ASSERT_THROWS(nb.getNumChildren(), AssertionException&);
+ TS_ASSERT_THROWS(nb.begin(), AssertionException&);
+ TS_ASSERT_THROWS(nb.end(), AssertionException&);
#endif /* CVC4_ASSERTIONS */
}
@@ -438,7 +438,7 @@ private:
#ifdef CVC4_ASSERTIONS
NodeBuilder<> spec(specKind);
- TS_ASSERT_THROWS( spec << PLUS, AssertionException );
+ TS_ASSERT_THROWS(spec << PLUS, AssertionException&);
#endif /* CVC4_ASSERTIONS */
NodeBuilder<> noSpec;
@@ -457,12 +457,12 @@ private:
nb.clear(PLUS);
#ifdef CVC4_ASSERTIONS
- TS_ASSERT_THROWS(n = nb, AssertionException);
+ TS_ASSERT_THROWS(n = nb, AssertionException&);
nb.clear(PLUS);
#endif /* CVC4_ASSERTIONS */
#ifdef CVC4_ASSERTIONS
- TS_ASSERT_THROWS( nb << PLUS, AssertionException );
+ TS_ASSERT_THROWS(nb << PLUS, AssertionException&);
#endif /* CVC4_ASSERTIONS */
NodeBuilder<> testRef;
@@ -470,7 +470,7 @@ private:
#ifdef CVC4_ASSERTIONS
NodeBuilder<> testTwo;
- TS_ASSERT_THROWS(testTwo << specKind << PLUS, AssertionException);
+ TS_ASSERT_THROWS(testTwo << specKind << PLUS, AssertionException&);
#endif /* CVC4_ASSERTIONS */
NodeBuilder<> testMixOrder1;
@@ -494,7 +494,7 @@ private:
#ifdef CVC4_ASSERTIONS
Node n = nb;
- TS_ASSERT_THROWS(nb << n, AssertionException);
+ TS_ASSERT_THROWS(nb << n, AssertionException&);
#endif /* CVC4_ASSERTIONS */
NodeBuilder<> overflow(specKind);
@@ -527,7 +527,7 @@ private:
Node q = d_nm->mkNode(AND, x, z, d_nm->mkNode(NOT, y));
#ifdef CVC4_ASSERTIONS
- TS_ASSERT_THROWS(d_nm->mkNode(XOR, y, x, x), AssertionException);
+ TS_ASSERT_THROWS(d_nm->mkNode(XOR, y, x, x), AssertionException&);
#endif /* CVC4_ASSERTIONS */
NodeBuilder<> b(specKind);
@@ -588,7 +588,7 @@ private:
TS_ASSERT_EQUALS(nexplicit.getNumChildren(), K);
#ifdef CVC4_ASSERTIONS
- TS_ASSERT_THROWS(Node blah = implicit, AssertionException);
+ TS_ASSERT_THROWS(Node blah = implicit, AssertionException&);
#endif /* CVC4_ASSERTIONS */
}
diff --git a/test/unit/expr/node_manager_black.h b/test/unit/expr/node_manager_black.h
index 5da55916b..d04e69446 100644
--- a/test/unit/expr/node_manager_black.h
+++ b/test/unit/expr/node_manager_black.h
@@ -300,7 +300,7 @@ class NodeManagerBlack : public CxxTest::TestSuite {
void testMkNodeTooFew() {
#ifdef CVC4_ASSERTIONS
Node x = d_nodeManager->mkSkolem( "x", d_nodeManager->booleanType() );
- TS_ASSERT_THROWS( d_nodeManager->mkNode(AND, x), AssertionException );
+ TS_ASSERT_THROWS(d_nodeManager->mkNode(AND, x), AssertionException&);
#endif
}
@@ -319,7 +319,7 @@ class NodeManagerBlack : public CxxTest::TestSuite {
vars.push_back(skolem_j);
vars.push_back(orNode);
}
- TS_ASSERT_THROWS(d_nodeManager->mkNode(AND, vars), AssertionException);
+ TS_ASSERT_THROWS(d_nodeManager->mkNode(AND, vars), AssertionException&);
#endif
}
};
diff --git a/test/unit/expr/node_manager_white.h b/test/unit/expr/node_manager_white.h
index 016ea7793..a0716671f 100644
--- a/test/unit/expr/node_manager_white.h
+++ b/test/unit/expr/node_manager_white.h
@@ -57,7 +57,7 @@ class NodeManagerWhite : public CxxTest::TestSuite {
TS_ASSERT_THROWS_NOTHING(nb.realloc(25));
TS_ASSERT_THROWS_NOTHING(nb.realloc(256));
#ifdef CVC4_ASSERTIONS
- TS_ASSERT_THROWS(nb.realloc(100), AssertionException);
+ TS_ASSERT_THROWS(nb.realloc(100), AssertionException&);
#endif /* CVC4_ASSERTIONS */
TS_ASSERT_THROWS_NOTHING(nb.realloc(257));
TS_ASSERT_THROWS_NOTHING(nb.realloc(4000));
@@ -67,7 +67,7 @@ class NodeManagerWhite : public CxxTest::TestSuite {
TS_ASSERT_THROWS_NOTHING(nb.realloc(65536));
TS_ASSERT_THROWS_NOTHING(nb.realloc(67108863));
#ifdef CVC4_ASSERTIONS
- TS_ASSERT_THROWS(nb.realloc(67108863), AssertionException);
+ TS_ASSERT_THROWS(nb.realloc(67108863), AssertionException&);
#endif /* CVC4_ASSERTIONS */
}
};
diff --git a/test/unit/expr/symbol_table_black.h b/test/unit/expr/symbol_table_black.h
index 2f6f88c27..99799544f 100644
--- a/test/unit/expr/symbol_table_black.h
+++ b/test/unit/expr/symbol_table_black.h
@@ -44,7 +44,7 @@ private:
{
d_exprManager = new ExprManager;
}
- catch (Exception e)
+ catch (Exception& e)
{
cerr << "Exception during setUp():" << endl << e;
throw;
@@ -55,7 +55,9 @@ private:
{
try {
delete d_exprManager;
- } catch(Exception e) {
+ }
+ catch (Exception& e)
+ {
cerr << "Exception during tearDown():" << endl << e;
throw;
}
@@ -160,6 +162,6 @@ private:
void testBadPop() {
SymbolTable symtab;
// TODO: What kind of exception gets thrown here?
- TS_ASSERT_THROWS( symtab.popScope(), ScopeException );
+ TS_ASSERT_THROWS(symtab.popScope(), ScopeException&);
}
};/* class SymbolTableBlack */
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback