Merge pull request #5179 from diffblue/unit-deprecated

Daniel Kroening · web-flow · commit 87c3a3925ec2 · 2019-11-22T21:08:18.000Z
unit tests: avoid deprecated constructors
diff --git a/unit/util/expr_cast/expr_cast.cpp b/unit/util/expr_cast/expr_cast.cpp
@@ -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));
@@ -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));
diff --git a/unit/util/irep_sharing.cpp b/unit/util/irep_sharing.cpp
@@ -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));

Original file line number	Diff line number	Diff line change
`@@ -145,19 +145,23 @@ SCENARIO("expr_dynamic_cast",`
`145`	`145`
`146`	`146`	`GIVEN("A byte extract expression with little endianness")`
`147`	`147`	`{`
`148`		`- auto byte = byte_extract_exprt(ID_byte_extract_little_endian);`
`149`		`- byte.op() = symbol_exprt(typet());`
`150`		`- byte.offset() = constant_exprt("0", typet());`
	`148`	`+ auto byte = byte_extract_exprt(`
	`149`	`+ ID_byte_extract_little_endian,`
	`150`	`+ symbol_exprt(typet()),`
	`151`	`+ constant_exprt("0", typet()),`
	`152`	`+ typet());`
`151`	`153`	`THEN("try_expr_dynamic_cast<byte_extract_expr> returns non-empty")`
`152`	`154`	`{`
`153`	`155`	`REQUIRE(expr_try_dynamic_cast<byte_extract_exprt>(byte));`
`154`	`156`	`}`
`155`	`157`	`}`
`156`	`158`	`GIVEN("A byte extract expression with big endianness")`
`157`	`159`	`{`
`158`		`- auto byte = byte_extract_exprt(ID_byte_extract_big_endian);`
`159`		`- byte.op() = symbol_exprt(typet());`
`160`		`- byte.offset() = constant_exprt("0", typet());`
	`160`	`+ auto byte = byte_extract_exprt(`
	`161`	`+ ID_byte_extract_big_endian,`
	`162`	`+ symbol_exprt(typet()),`
	`163`	`+ constant_exprt("0", typet()),`
	`164`	`+ typet());`
`161`	`165`	`THEN("try_expr_dynamic_cast<byte_extract_expr> returns non-empty")`
`162`	`166`	`{`
`163`	`167`	`REQUIRE(expr_try_dynamic_cast<byte_extract_exprt>(byte));`
`@@ -177,19 +181,23 @@ SCENARIO("can_cast_expr", "[core][utils][expr_cast][can_cast_expr]")`
`177`	`181`	`{`
`178`	`182`	`GIVEN("A byte extract expression with little endianness")`
`179`	`183`	`{`
`180`		`- auto byte = byte_extract_exprt(ID_byte_extract_little_endian);`
`181`		`- byte.op() = symbol_exprt(typet());`
`182`		`- byte.offset() = constant_exprt("0", typet());`
	`184`	`+ auto byte = byte_extract_exprt(`
	`185`	`+ ID_byte_extract_little_endian,`
	`186`	`+ symbol_exprt(typet()),`
	`187`	`+ constant_exprt("0", typet()),`
	`188`	`+ typet());`
`183`	`189`	`THEN("can_expr_expr<byte_extract_expr> returns true")`
`184`	`190`	`{`
`185`	`191`	`REQUIRE(can_cast_expr<byte_extract_exprt>(byte));`
`186`	`192`	`}`
`187`	`193`	`}`
`188`	`194`	`GIVEN("A byte extract expression with big endianness")`
`189`	`195`	`{`
`190`		`- auto byte = byte_extract_exprt(ID_byte_extract_big_endian);`
`191`		`- byte.op() = symbol_exprt(typet());`
`192`		`- byte.offset() = constant_exprt("0", typet());`
	`196`	`+ auto byte = byte_extract_exprt(`
	`197`	`+ ID_byte_extract_big_endian,`
	`198`	`+ symbol_exprt(typet()),`
	`199`	`+ constant_exprt("0", typet()),`
	`200`	`+ typet());`
`193`	`201`	`THEN("can_expr_expr<byte_extract_expr> returns true")`
`194`	`202`	`{`
`195`	`203`	`REQUIRE(can_cast_expr<byte_extract_exprt>(byte));`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ SCENARIO("exprt_sharing_trade_offs", "[!mayfail][core][utils][exprt]")`
`120`	`120`	`{`
`121`	`121`	`GIVEN("An expression created with add_to_operands(std::move(...))")`
`122`	`122`	`{`
`123`		`- multi_ary_exprt test_expr(ID_1);`
	`123`	`+ multi_ary_exprt test_expr(ID_1, {}, typet());`
`124`	`124`	`exprt test_subexpr(ID_1);`
`125`	`125`	`exprt test_subsubexpr(ID_1);`
`126`	`126`	`test_subexpr.add_to_operands(std::move(test_subsubexpr));`
`@@ -154,7 +154,7 @@ SCENARIO("exprt_sharing", "[core][utils][exprt]")`
`154`	`154`	`{`
`155`	`155`	`GIVEN("An expression created with add_to_operands(std::move(...))")`
`156`	`156`	`{`
`157`		`- multi_ary_exprt test_expr(ID_1);`
	`157`	`+ multi_ary_exprt test_expr(ID_1, {}, typet());`
`158`	`158`	`exprt test_subexpr(ID_1);`
`159`	`159`	`exprt test_subsubexpr(ID_1);`
`160`	`160`	`test_subexpr.add_to_operands(std::move(test_subsubexpr));`