replica
/
diffblue-cbmc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5179 from diffblue/unit-deprecated 

unit tests: avoid deprecated constructors
This commit is contained in:
Daniel Kroening 2019-11-22 21:08:18 +00:00 committed by GitHub
parent a26ce5b746 04f73fbd3e
commit 87c3a3925e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
unit/util/expr_cast/expr_cast.cpp
View File

@ -145,9 +145,11 @@ SCENARIO("expr_dynamic_cast",
GIVEN("A byte extract expression with little endianness")
{
auto byte = byte_extract_exprt(ID_byte_extract_little_endian);
byte.op() = symbol_exprt(typet());
byte.offset() = constant_exprt("0", typet());
auto byte = byte_extract_exprt(
ID_byte_extract_little_endian,
symbol_exprt(typet()),
constant_exprt("0", typet()),
typet());
THEN("try_expr_dynamic_cast<byte_extract_expr> returns non-empty")
{
REQUIRE(expr_try_dynamic_cast<byte_extract_exprt>(byte));
@ -155,9 +157,11 @@ SCENARIO("expr_dynamic_cast",
}
GIVEN("A byte extract expression with big endianness")
{
auto byte = byte_extract_exprt(ID_byte_extract_big_endian);
byte.op() = symbol_exprt(typet());
byte.offset() = constant_exprt("0", typet());
auto byte = byte_extract_exprt(
ID_byte_extract_big_endian,
symbol_exprt(typet()),
constant_exprt("0", typet()),
typet());
THEN("try_expr_dynamic_cast<byte_extract_expr> returns non-empty")
{
REQUIRE(expr_try_dynamic_cast<byte_extract_exprt>(byte));
@ -177,9 +181,11 @@ SCENARIO("can_cast_expr", "[core][utils][expr_cast][can_cast_expr]")
{
GIVEN("A byte extract expression with little endianness")
{
auto byte = byte_extract_exprt(ID_byte_extract_little_endian);
byte.op() = symbol_exprt(typet());
byte.offset() = constant_exprt("0", typet());
auto byte = byte_extract_exprt(
ID_byte_extract_little_endian,
symbol_exprt(typet()),
constant_exprt("0", typet()),
typet());
THEN("can_expr_expr<byte_extract_expr> returns true")
{
REQUIRE(can_cast_expr<byte_extract_exprt>(byte));
@ -187,9 +193,11 @@ SCENARIO("can_cast_expr", "[core][utils][expr_cast][can_cast_expr]")
}
GIVEN("A byte extract expression with big endianness")
{
auto byte = byte_extract_exprt(ID_byte_extract_big_endian);
byte.op() = symbol_exprt(typet());
byte.offset() = constant_exprt("0", typet());
auto byte = byte_extract_exprt(
ID_byte_extract_big_endian,
symbol_exprt(typet()),
constant_exprt("0", typet()),
typet());
THEN("can_expr_expr<byte_extract_expr> returns true")
{
REQUIRE(can_cast_expr<byte_extract_exprt>(byte));

4
unit/util/irep_sharing.cpp
View File

@ -120,7 +120,7 @@ SCENARIO("exprt_sharing_trade_offs", "[!mayfail][core][utils][exprt]")
{
GIVEN("An expression created with add_to_operands(std::move(...))")
{
multi_ary_exprt test_expr(ID_1);
multi_ary_exprt test_expr(ID_1, {}, typet());
exprt test_subexpr(ID_1);
exprt test_subsubexpr(ID_1);
test_subexpr.add_to_operands(std::move(test_subsubexpr));
@ -154,7 +154,7 @@ SCENARIO("exprt_sharing", "[core][utils][exprt]")
{
GIVEN("An expression created with add_to_operands(std::move(...))")
{
multi_ary_exprt test_expr(ID_1);
multi_ary_exprt test_expr(ID_1, {}, typet());
exprt test_subexpr(ID_1);
exprt test_subsubexpr(ID_1);
test_subexpr.add_to_operands(std::move(test_subsubexpr));