Migrate fixnum tests to unittest. Fix int32 rollover bug.

pkg/fixnum/test/int_32_test.dart

Index: pkg/fixnum/test/int_32_test.dart
diff --git a/pkg/fixnum/test/int_32_test.dart b/pkg/fixnum/test/int_32_test.dart
index 407f2a0adf12d093a9dff389496dc05c2fdb84f4..17c907f1c65ce7938f4f813f2dd38aafd527aac4 100644
--- a/pkg/fixnum/test/int_32_test.dart
+++ b/pkg/fixnum/test/int_32_test.dart
@@ -3,157 +3,224 @@
 // BSD-style license that can be found in the LICENSE file.
 
 library int32test;
-import "package:expect/expect.dart";
 import 'package:fixnum/fixnum.dart';
+import 'package:unittest/unittest.dart';
 
 void main() {
-  Expect.equals("0", new int32.fromInt(0).toString());
-  Expect.equals("1", new int32.fromInt(1).toString());
-  Expect.equals("-1", new int32.fromInt(-1).toString());
-  Expect.equals("1000", new int32.fromInt(1000).toString());
-  Expect.equals("-1000", new int32.fromInt(-1000).toString());
-  Expect.equals("2147483647", new int32.fromInt(2147483647).toString());
-  Expect.equals("-2147483648", new int32.fromInt(2147483648).toString());
-  Expect.equals("-2147483647", new int32.fromInt(2147483649).toString());
-  Expect.equals("-2147483646", new int32.fromInt(2147483650).toString());
-  Expect.equals("-2147483648", new int32.fromInt(-2147483648).toString());
-  Expect.equals("2147483647", new int32.fromInt(-2147483649).toString());
-  Expect.equals("2147483646",  new int32.fromInt(-2147483650).toString());
-
-  Expect.equals("-1", new int32.fromInt(-1).toHexString());
-  Expect.equals("-1", (new int32.fromInt(-1) >> 8).toHexString());
-  Expect.equals("-100", (new int32.fromInt(-1) << 8).toHexString());
-  Expect.equals("ffffff",
-      new int32.fromInt(-1).shiftRightUnsigned(8).toHexString());
-
-  Expect.equals("123456789", new int32.fromInt(123456789).toString());
-  Expect.equals("75bcd15", new int32.fromInt(123456789).toHexString());
-  Expect.equals("223101104124", new int32.fromInt(123456789).toRadixString(5));
-
-  try {
-    new int32.fromInt(17) >> -1;
-    Expect.fail("x >> -1 should throw ArgumentError");
-  } on ArgumentError catch (e) {
-  }
-
-  try {
-    new int32.fromInt(17) << -1;
-    Expect.fail("x >> -1 should throw ArgumentError");
-  } on ArgumentError catch (e) {
-  }
-
-  try {
-    new int32.fromInt(17).shiftRightUnsigned(-1);
-    Expect.fail("x >> -1 should throw ArgumentError");
-  } on ArgumentError catch (e) {
-  }
-
-  // wraparound
-  Expect.equals("-67153019", (new int32.fromInt(123456789) *
-      new int32.fromInt(987654321)).toString());
-  Expect.equals("121932631112635269", (new int64.fromInt(123456789) *
-      new int32.fromInt(987654321)).toString());
-  Expect.equals("121932631112635269", (new int32.fromInt(123456789) *
-      new int64.fromInt(987654321)).toString());
-  Expect.equals("121932631112635269", (new int64.fromInt(123456789) *
-      new int64.fromInt(987654321)).toString());
-
-  Expect.equals("432461",
-      (new int32.fromInt(829893893) ~/ new int32.fromInt(1919)).toString());
-  Expect.equals("432461",
-      (new int32.fromInt(829893893) ~/ new int64.fromInt(1919)).toString());
-  Expect.equals("432461",
-      (new int64.fromInt(829893893) ~/ new int32.fromInt(1919)).toString());
-  Expect.equals("432461",
-      (new int64.fromInt(829893893) ~/ new int64.fromInt(1919)).toString());
-  Expect.equals("432461",
-      (new int32.fromInt(829893893) ~/ 1919).toString());
-  Expect.equals("432461",
-      (new int64.fromInt(829893893) ~/ 1919).toString());
-
-  Expect.isTrue(new int32.fromInt(12345) == 12345);
-  Expect.isTrue(new int32.fromInt(12345) == new int32.fromInt(12345));
-  Expect.isTrue(new int64.fromInt(12345) == new int32.fromInt(12345));
-
-  Expect.equals(new int32.fromInt(~0x12345678),
-      ~(new int32.fromInt(0x12345678)));
-  Expect.equals(new int64.fromInt(-0x12345678),
-      -(new int32.fromInt(0x12345678)));
-
-  Expect.equals(new int32.fromInt(0x12345678 & 0x22222222),
-      new int32.fromInt(0x12345678) & new int32.fromInt(0x22222222));
-  Expect.equals(new int64.fromInt(0x12345678 & 0x22222222),
-      new int32.fromInt(0x12345678) & new int64.fromInt(0x22222222));
-  Expect.equals(new int32.fromInt(0x12345678 | 0x22222222),
-      new int32.fromInt(0x12345678) | new int32.fromInt(0x22222222));
-  Expect.equals(new int64.fromInt(0x12345678 | 0x22222222),
-      new int32.fromInt(0x12345678) | new int64.fromInt(0x22222222));
-  Expect.equals(new int32.fromInt(0x12345678 ^ 0x22222222),
-      new int32.fromInt(0x12345678) ^ new int32.fromInt(0x22222222));
-  Expect.equals(new int64.fromInt(0x12345678 ^ 0x22222222),
-      new int32.fromInt(0x12345678) ^ new int64.fromInt(0x22222222));
-
-  Expect.equals(new int32.fromInt(0x12345678 + 0x22222222),
-      new int32.fromInt(0x12345678) + new int32.fromInt(0x22222222));
-  Expect.equals(new int64.fromInt(0x12345678 + 0x22222222),
-     new int32.fromInt(0x12345678) + new int64.fromInt(0x22222222));
-  Expect.equals(new int32.fromInt(0x12345678 - 0x22222222),
-     new int32.fromInt(0x12345678) - new int32.fromInt(0x22222222));
-  Expect.equals(new int64.fromInt(0x12345678 - 0x22222222),
-     new int32.fromInt(0x12345678) - new int64.fromInt(0x22222222));
-  Expect.equals(new int32.fromInt(-899716112),
-      new int32.fromInt(0x12345678) * new int32.fromInt(0x22222222));
-  Expect.equals(new int64.fromInts(0x026D60DC, 0xCA5F6BF0),
-      new int32.fromInt(0x12345678) * new int64.fromInt(0x22222222));
-  Expect.equals(new int32.fromInt(0x12345678 % 0x22),
-      new int32.fromInt(0x12345678) % new int32.fromInt(0x22));
-  Expect.equals(new int32.fromInt(0x12345678 % 0x22),
-      new int32.fromInt(0x12345678) % new int64.fromInt(0x22));
-  Expect.equals(new int32.fromInt(0x12345678.remainder(0x22)),
-      new int32.fromInt(0x12345678).remainder(new int32.fromInt(0x22)));
-  Expect.equals(new int32.fromInt(0x12345678.remainder(-0x22)),
-      new int32.fromInt(0x12345678).remainder(new int32.fromInt(-0x22)));
-  Expect.equals(new int32.fromInt(-0x12345678.remainder(-0x22)),
-      new int32.fromInt(-0x12345678).remainder(new int32.fromInt(-0x22)));
-  Expect.equals(new int32.fromInt(-0x12345678.remainder(0x22)),
-      new int32.fromInt(-0x12345678).remainder(new int32.fromInt(0x22)));
-  Expect.equals(new int32.fromInt(0x12345678.remainder(0x22)),
-      new int32.fromInt(0x12345678).remainder(new int64.fromInt(0x22)));
-  Expect.equals(new int32.fromInt(0x12345678 ~/ 0x22),
-      new int32.fromInt(0x12345678) ~/ new int32.fromInt(0x22));
-  Expect.equals(new int32.fromInt(0x12345678 ~/ 0x22),
-      new int32.fromInt(0x12345678) ~/ new int64.fromInt(0x22));
-
-  Expect.equals(new int32.fromInt(0x12345678 >> 7),
-      new int32.fromInt(0x12345678) >> 7);
-  Expect.equals(new int32.fromInt(0x12345678 << 7),
-      new int32.fromInt(0x12345678) << 7);
-  Expect.equals(new int32.fromInt(0x12345678 >> 7),
-      new int32.fromInt(0x12345678).shiftRightUnsigned(7));
-
-  try {
-    new int32.fromInt(17) < null;
-    Expect.fail("x < null should throw ArgumentError");
-  } on ArgumentError catch (e) {
-  }
-
-  try {
-    new int32.fromInt(17) <= null;
-    Expect.fail("x <= null should throw ArgumentError");
-  } on ArgumentError catch (e) {
-  }
-
-  try {
-    new int32.fromInt(17) > null;
-    Expect.fail("x > null should throw ArgumentError");
-  } on ArgumentError catch (e) {
-  }
-
-  try {
-    new int32.fromInt(17) < null;
-    Expect.fail("x >= null should throw ArgumentError");
-  } on ArgumentError catch (e) {
-  }
-
-  Expect.isFalse(new int32.fromInt(17) == null);
+  group("arithmetic operators", () {
+    int32 n1 = new int32.fromInt(1234);
+    int32 n2 = new int32.fromInt(9876);
+    int32 n3 = new int32.fromInt(-1234);
+    int32 n4 = new int32.fromInt(-9876);
+    int32 n5 = new int32.fromInt(0x12345678);
+    int32 n6 = new int32.fromInt(0x22222222);
+
+    test("+", () {
+      expect(n1 + n2, new int32.fromInt(11110));
+      expect(n3 + n2, new int32.fromInt(8642));
+      expect(n3 + n4, new int32.fromInt(-11110));
+      expect(int32.MAX_VALUE + 1, int32.MIN_VALUE);
+      expect(() => (new int32.fromInt(17) + null), throws);
+    });
+
+    test("-", () {
+      expect(n1 - n2, new int32.fromInt(-8642));
+      expect(n3 - n2, new int32.fromInt(-11110));
+      expect(n3 - n4, new int32.fromInt(8642));
+      expect(int32.MIN_VALUE - 1, int32.MAX_VALUE);
+      expect(() => (new int32.fromInt(17) - null), throws);
+    });
+
+    test("unary -", () {
+      expect(-n1, new int32.fromInt(-1234));
+      expect(-int32.ZERO, int32.ZERO);
+    });
+
+    test("*", () {
+      expect(n1 * n2, new int32.fromInt(12186984));
+      expect(n2 * n3, new int32.fromInt(-12186984));
+      expect(n3 * n3, new int32.fromInt(1522756));
+      expect(n3 * n2, new int32.fromInt(-12186984));
+      expect(new int32.fromInt(0x12345678) * new int32.fromInt(0x22222222),
+          new int32.fromInt(-899716112));
+      expect((new int32.fromInt(123456789) * new int32.fromInt(987654321)),
+          new int32.fromInt(-67153019));
+      expect(new int32.fromInt(0x12345678) * new int64.fromInt(0x22222222),
+          new int64.fromInts(0x026D60DC, 0xCA5F6BF0));
+      expect((new int32.fromInt(123456789) * 987654321),
+          new int32.fromInt(-67153019));
+      expect(() => (new int32.fromInt(17) * null), throws);
+    });
+
+    test("~/", () {
+      expect(new int32.fromInt(829893893) ~/ new int32.fromInt(1919),
+          new int32.fromInt(432461));
+      expect(new int32.fromInt(0x12345678) ~/ new int32.fromInt(0x22),
+          new int32.fromInt(0x12345678 ~/ 0x22));
+      expect(new int32.fromInt(829893893) ~/ new int64.fromInt(1919),
+          new int32.fromInt(432461));
+      expect(new int32.fromInt(0x12345678) ~/ new int64.fromInt(0x22),
+          new int32.fromInt(0x12345678 ~/ 0x22));
+      expect(new int32.fromInt(829893893) ~/ 1919, new int32.fromInt(432461));
+      expect(() => (new int32.fromInt(17) ~/ null), throws);
+    });
+
+    test("%", () {
+      expect(new int32.fromInt(0x12345678) % new int32.fromInt(0x22),
+          new int32.fromInt(0x12345678 % 0x22));
+      expect(new int32.fromInt(0x12345678) % new int64.fromInt(0x22),
+          new int32.fromInt(0x12345678 % 0x22));
+      expect(() => (new int32.fromInt(17) % null), throws);
+    });
+
+    test("remainder", () {
+      expect(new int32.fromInt(0x12345678).remainder(new int32.fromInt(0x22)),
+          new int32.fromInt(0x12345678.remainder(0x22)));
+      expect(new int32.fromInt(0x12345678).remainder(new int32.fromInt(-0x22)),
+          new int32.fromInt(0x12345678.remainder(-0x22)));
+      expect(new int32.fromInt(-0x12345678).remainder(new int32.fromInt(-0x22)),
+          new int32.fromInt(-0x12345678.remainder(-0x22)));
+      expect(new int32.fromInt(-0x12345678).remainder(new int32.fromInt(0x22)),
+          new int32.fromInt(-0x12345678.remainder(0x22)));
+      expect(new int32.fromInt(0x12345678).remainder(new int64.fromInt(0x22)),
+          new int32.fromInt(0x12345678.remainder(0x22)));
+      expect(() => (new int32.fromInt(17).remainder(null)), throws);
+    });
+  });
+
+  group("comparison operators", () {

[justinfagnani, 2013/07/18 18:27:28]

Ideally we want comparison tests that also cover cases where the difference is
in the middle and high order bits. TODO?

[justinfagnani, 2013/07/18 18:58:56]

oops, I meant this for the 64 bit tests

[Chris Bracken, 2013/07/18 19:06:07]

Done in 64-bit tests.

+    test("<", () {
+      expect(new int32.fromInt(17) < new int32.fromInt(18), true);
+      expect(new int32.fromInt(17) < new int32.fromInt(17), false);
+      expect(new int32.fromInt(17) < new int32.fromInt(16), false);
+      expect(() => new int32.fromInt(17) < null, throws);
+    });
+
+    test("<=", () {
+      expect(new int32.fromInt(17) <= new int32.fromInt(18), true);
+      expect(new int32.fromInt(17) <= new int32.fromInt(17), true);
+      expect(new int32.fromInt(17) <= new int32.fromInt(16), false);
+      expect(() => new int32.fromInt(17) <= null, throws);
+    });
+
+    test("==", () {
+      expect(new int32.fromInt(17) == new int32.fromInt(18), false);
+      expect(new int32.fromInt(17) == new int32.fromInt(17), true);
+      expect(new int32.fromInt(17) == new int32.fromInt(16), false);
+      expect(new int32.fromInt(17) == null, false);
+    });
+
+    test(">=", () {
+      expect(new int32.fromInt(17) >= new int32.fromInt(18), false);
+      expect(new int32.fromInt(17) >= new int32.fromInt(17), true);
+      expect(new int32.fromInt(17) >= new int32.fromInt(16), true);
+      expect(() => new int32.fromInt(17) >= null, throws);
+    });
+
+    test(">", () {
+      expect(new int32.fromInt(17) > new int32.fromInt(18), false);
+      expect(new int32.fromInt(17) > new int32.fromInt(17), false);
+      expect(new int32.fromInt(17) > new int32.fromInt(16), true);
+      expect(() => new int32.fromInt(17) > null, throws);
+    });
+  });
+
+  group("bitwise operators", () {
+    test("&", () {
+      expect(new int32.fromInt(0x12345678) & new int32.fromInt(0x22222222),
+          new int32.fromInt(0x12345678 & 0x22222222));
+      expect(new int32.fromInt(0x12345678) & new int64.fromInt(0x22222222),
+          new int64.fromInt(0x12345678 & 0x22222222));
+      expect(() => (new int32.fromInt(17) & null), throwsArgumentError);
+    });
+
+    test("|", () {
+      expect(new int32.fromInt(0x12345678) | new int32.fromInt(0x22222222),
+          new int32.fromInt(0x12345678 | 0x22222222));
+      expect(new int32.fromInt(0x12345678) | new int64.fromInt(0x22222222),
+          new int64.fromInt(0x12345678 | 0x22222222));
+      expect(() => (new int32.fromInt(17) | null), throws);
+    });
+
+    test("^", () {
+      expect(new int32.fromInt(0x12345678) ^ new int32.fromInt(0x22222222),
+          new int32.fromInt(0x12345678 ^ 0x22222222));
+      expect(new int32.fromInt(0x12345678) ^ new int64.fromInt(0x22222222),
+          new int64.fromInt(0x12345678 ^ 0x22222222));
+      expect(() => (new int32.fromInt(17) ^ null), throws);
+    });
+
+    test("~", () {
+      expect(~(new int32.fromInt(0x12345678)), new int32.fromInt(~0x12345678));
+      expect(-(new int32.fromInt(0x12345678)), new int64.fromInt(-0x12345678));
+    });
+  });
+
+  group("bitshift operators", () {
+    test("<<", () {
+      expect(new int32.fromInt(0x12345678) << 7,
+          new int32.fromInt(0x12345678 << 7));
+      expect(() => (new int32.fromInt(17) << -1), throwsArgumentError);
+      expect(() => (new int32.fromInt(17) << null), throws);
+    });
+
+    test(">>", () {
+      expect(new int32.fromInt(0x12345678) >> 7,
+          new int32.fromInt(0x12345678 >> 7));
+      expect(() => (new int32.fromInt(17) >> -1), throwsArgumentError);
+      expect(() => (new int32.fromInt(17) >> null), throws);
+    });
+
+    test("shiftRightUnsigned", () {
+      expect(new int32.fromInt(0x12345678).shiftRightUnsigned(7),
+          new int32.fromInt(0x12345678 >> 7));
+      expect(() => (new int32.fromInt(17).shiftRightUnsigned(-1)),
+          throwsArgumentError);
+      expect(() => (new int32.fromInt(17).shiftRightUnsigned(null)), throws);
+    });
+  });
+
+  group("type conversions", () {
+    expect(new int32.fromInt(17).toInt(), 17);
+    expect(new int32.fromInt(-17).toInt(), -17);
+    expect(new int32.fromInt(17).toInt32(), new int32.fromInt(17));
+    expect(new int32.fromInt(-17).toInt32(), new int32.fromInt(-17));
+    expect(new int32.fromInt(17).toInt64(), new int64.fromInt(17));
+    expect(new int32.fromInt(-17).toInt64(), new int64.fromInt(-17));
+  });
+
+  group("string representation", () {
+    test("toString", () {
+      expect(new int32.fromInt(0).toString(), "0");
+      expect(new int32.fromInt(1).toString(), "1");
+      expect(new int32.fromInt(-1).toString(), "-1");
+      expect(new int32.fromInt(1000).toString(), "1000");
+      expect(new int32.fromInt(-1000).toString(), "-1000");
+      expect(new int32.fromInt(123456789).toString(), "123456789");
+      expect(new int32.fromInt(2147483647).toString(), "2147483647");
+      expect(new int32.fromInt(2147483648).toString(), "-2147483648");
+      expect(new int32.fromInt(2147483649).toString(), "-2147483647");
+      expect(new int32.fromInt(2147483650).toString(), "-2147483646");
+      expect(new int32.fromInt(-2147483648).toString(), "-2147483648");
+      expect(new int32.fromInt(-2147483649).toString(), "2147483647");
+      expect(new int32.fromInt(-2147483650).toString(), "2147483646");
+    });
+  });
+
+  group("toHexString", () {
+    test("returns hexadecimal string representation", () {
+      expect(new int32.fromInt(-1).toHexString(), "-1");
+      expect((new int32.fromInt(-1) >> 8).toHexString(), "-1");
+      expect((new int32.fromInt(-1) << 8).toHexString(), "-100");
+      expect(new int32.fromInt(123456789).toHexString(), "75bcd15");
+      expect(new int32.fromInt(-1).shiftRightUnsigned(8).toHexString(),
+          "ffffff");
+    });
+  });
+
+  group("toRadixString", () {
+    test("returns base n string representation", () {
+      expect(new int32.fromInt(123456789).toRadixString(5), "223101104124");
+    });
+  });
 }