Add remaining shift tests

Move some shift tests from the bitwise set of tests

Author: Thomas Kiley

unit/util/interval/bitwise.cpp

@@ -44,21 +44,5 @@ SCENARIO("bitwise interval domain", "[core][analyses][interval][bitwise]")
         constant_interval_exprt::bitwise_xor(five, nine) ==
         constant_interval_exprt(from_integer(12, unsigned_int)));
     }
-
-    THEN("Left shift on the 5 should produce 10")
-    {
-      REQUIRE(
-        constant_interval_exprt::left_shift(
-          five, constant_interval_exprt(from_integer(1, unsigned_int))) ==
-        constant_interval_exprt(from_integer(10, unsigned_int)));
-    }
-
-    THEN("Right shift on the 5 should produce 2")
-    {
-      REQUIRE(
-        constant_interval_exprt::right_shift(
-          five, constant_interval_exprt(from_integer(1, unsigned_int))) ==
-        constant_interval_exprt(from_integer(2, unsigned_int)));
-    }
   }
 }

unit/util/interval/shift.cpp

@@ -19,13 +19,36 @@ TEST_CASE("shift interval domain", "[core][analyses][interval][shift]")
 {
   SECTION("Left shift")
   {
+    REQUIRE(
+      constant_interval_exprt::left_shift(
+        constant_interval_exprt(CEV(5)), constant_interval_exprt(CEV(1))) ==
+      constant_interval_exprt(CEV(10)));
+
     const constant_interval_exprt four_to_eight(CEV(4), CEV(8));
     const constant_interval_exprt one(CEV(1));
     REQUIRE(
       constant_interval_exprt::left_shift(four_to_eight, one) ==
       constant_interval_exprt(CEV(8), CEV(16)));
+
+    const constant_interval_exprt negative_one(CEV(-1));
+    REQUIRE(constant_interval_exprt::left_shift(four_to_eight, negative_one)
+              .is_top());
   }
   SECTION("Right shift")
   {
+    REQUIRE(
+      constant_interval_exprt::right_shift(
+        constant_interval_exprt(CEV(5)), constant_interval_exprt(CEV(1))) ==
+      constant_interval_exprt(CEV(2)));
+
+    const constant_interval_exprt four_to_eight(CEV(4), CEV(8));
+    const constant_interval_exprt one(CEV(1));
+    REQUIRE(
+      constant_interval_exprt::right_shift(four_to_eight, one) ==
+      constant_interval_exprt(CEV(2), CEV(4)));
+
+    const constant_interval_exprt negative_one(CEV(-1));
+    REQUIRE(constant_interval_exprt::right_shift(four_to_eight, negative_one)
+              .is_top());
   }
 }