Skip to content

unit tests: avoid deprecated constructors #5179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kroening merged 1 commit into from
Nov 22, 2019
Merged

unit tests: avoid deprecated constructors #5179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions unit/util/expr_cast/expr_cast.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,19 +145,23 @@ 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));
}
}
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));
Expand All @@ -177,19 +181,23 @@ 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));
}
}
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));
Expand Down
4 changes: 2 additions & 2 deletions unit/util/irep_sharing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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));
Expand Down