MAPREDUCE-7288. Fix TestLongLong#testRightShift (#2183)

(cherry picked from commit dc5470ae86)
This commit is contained in:
Wanqiang Ji 2020-08-06 08:35:15 +08:00 committed by Akira Ajisaka
parent 647be0c0f6
commit f3ac1dde5e
No known key found for this signature in database
GPG Key ID: C1EDBB9CA400FD50
1 changed files with 17 additions and 21 deletions

View File

@ -53,32 +53,28 @@ public class TestLongLong {
verifyMultiplication(max, max); verifyMultiplication(max, max);
} }
static void verifyRightShift(long a, long b) {
final LongLong ll = new LongLong().set(a, b);
final BigInteger bi = ll.toBigInteger();
for (int i = 0; i < LongLong.SIZE >> 1; i++) {
final long result = ll.shiftRight(i) & MASK;
final long expected = bi.shiftRight(i).longValue() & MASK;
final String s = String.format(
"\na = %x\nb = %x\nll= " + ll + "\nbi= " + bi.toString(16) + "\n", a,
b);
Assert.assertEquals(s, expected, result);
}
final String s = String.format(
"\na = %x\nb = %x\nll= " + ll + "\nbi= " + bi.toString(16) + "\n", a,
b);
//System.out.println(s);
Assert.assertEquals(s, bi, ll.toBigInteger());
}
@Test @Test
public void testRightShift() { public void testRightShift() {
for(int i = 0; i < 1000; i++) { for(int i = 0; i < 1000; i++) {
final long a = nextPositiveLong(); final long a = nextPositiveLong();
final long b = nextPositiveLong(); final long b = nextPositiveLong();
verifyMultiplication(a, b); verifyRightShift(a, b);
}
}
private static void verifyRightShift(long a, long b) {
final LongLong ll = new LongLong().set(a, b);
final BigInteger bi = ll.toBigInteger();
final String s = String.format(
"\na = %x\nb = %x\nll= " + ll + "\nbi= " + bi.toString(16) + "\n", a,
b);
Assert.assertEquals(s, bi, ll.toBigInteger());
for (int i = 0; i < LongLong.SIZE >> 1; i++) {
final long result = ll.shiftRight(i) & MASK;
final long expected = bi.shiftRight(i).longValue() & MASK;
Assert.assertEquals(s, expected, result);
} }
} }
} }