From 008258d1de0ad57b2c605c129cd17794fa474bfc Mon Sep 17 00:00:00 2001 From: Tim King Date: Fri, 2 Apr 2010 17:17:35 +0000 Subject: Fixed the 32 bit vs. 64 bit problem in the rational and integer tests. --- test/unit/util/integer_white.h | 13 +++++++------ test/unit/util/rational_white.h | 37 +++++++++++++++++++------------------ 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/test/unit/util/integer_white.h b/test/unit/util/integer_white.h index 739715ac2..ef0e0b92f 100644 --- a/test/unit/util/integer_white.h +++ b/test/unit/util/integer_white.h @@ -29,12 +29,13 @@ public: void testHash(){ Integer large (largeVal); Integer zero; - Integer one_word(75890); - Integer two_words("7890D789D33234027890D789D3323402", 16); + Integer fits_in_2_bytes(55890); + Integer fits_in_16_bytes("7890D789D33234027890D789D3323402", 16); - TS_ASSERT_EQUALS(zero.hash(), 0); - TS_ASSERT_EQUALS(one_word.hash(), 75890); - TS_ASSERT_EQUALS(two_words.hash(), 9921844058862803974UL); - TS_ASSERT_EQUALS(large.hash(), 772190219532412699UL); + + TS_ASSERT_THROWS_NOTHING(size_t res0 = zero.hash()); + TS_ASSERT_THROWS_NOTHING(size_t res1 = fits_in_2_bytes.hash()); + TS_ASSERT_THROWS_NOTHING(size_t res2 = fits_in_16_bytes.hash()); + TS_ASSERT_THROWS_NOTHING(size_t res3 = large.hash()); } }; diff --git a/test/unit/util/rational_white.h b/test/unit/util/rational_white.h index 5e3f2868a..559b457cb 100644 --- a/test/unit/util/rational_white.h +++ b/test/unit/util/rational_white.h @@ -67,8 +67,8 @@ public: signed int nsi = -5478, dsi = 34783; unsigned int nui = 5478u, dui = 347589u; - signed long int nsli = 2348905477690867690l, dsli = -3475765675789089l; - unsigned long int nuli = 8434689476905478ul, duli = 3234475234894569047ul; + signed long int nsli = 1489054690l, dsli = -347576678l; + unsigned long int nuli = 2434689476ul, duli = 323447523ul; Rational qsi(nsi, dsi); Rational qui(nui, dui); @@ -83,8 +83,8 @@ public: TS_ASSERT_EQUALS(dui/33, qui.getDenominator().getUnsignedLong()); - TS_ASSERT_EQUALS(-nsli, qsli.getNumerator().getLong()); - TS_ASSERT_EQUALS(-dsli, qsli.getDenominator().getLong()); + TS_ASSERT_EQUALS(-nsli/2, qsli.getNumerator().getLong()); + TS_ASSERT_EQUALS(-dsli/2, qsli.getDenominator().getLong()); TS_ASSERT_EQUALS(nuli, quli.getNumerator().getUnsignedLong()); TS_ASSERT_EQUALS(duli, quli.getDenominator().getUnsignedLong()); @@ -377,32 +377,32 @@ public: TS_ASSERT_EQUALS(reduce2.getDenominator(), den2); - Rational reduce3( 454789890342L, 273L); - Integer num3(151596630114L); - Integer den3(91); + Rational reduce3(822898902L, 273L); + Integer num3(39185662L); + Integer den3(13); TS_ASSERT_EQUALS(reduce2.getNumerator(), num2); TS_ASSERT_EQUALS(reduce2.getDenominator(), den2); - Rational reduce4( 454789890342L,-273L); - Integer num4(-151596630114L); - Integer den4(91); + Rational reduce4( 822898902L,-273L); + Integer num4(-39185662L); + Integer den4(13); TS_ASSERT_EQUALS(reduce4.getNumerator(), num4); TS_ASSERT_EQUALS(reduce4.getDenominator(), den4); - Rational reduce5(-454789890342L, 273L); - Integer num5(-151596630114L); - Integer den5(91); + Rational reduce5(-822898902L, 273L); + Integer num5(-39185662L); + Integer den5(13); TS_ASSERT_EQUALS(reduce5.getNumerator(), num5); TS_ASSERT_EQUALS(reduce5.getDenominator(), den5); - Rational reduce6(-454789890342L,-273L); - Integer num6(151596630114L); - Integer den6(91); + Rational reduce6(-822898902L,-273L); + Integer num6(39185662L); + Integer den6(13); TS_ASSERT_EQUALS(reduce6.getNumerator(), num6); @@ -418,8 +418,9 @@ public: TS_ASSERT_EQUALS(zero.hash(), 1); TS_ASSERT_EQUALS(one_word.hash(), 7589 xor 59); - TS_ASSERT_EQUALS(two_words.hash(), 9921844058862803974UL ^ 1); + TS_ASSERT_EQUALS(two_words.hash(), + (two_words.getNumerator().hash()) xor 1); TS_ASSERT_EQUALS(large.hash(), - (large.getNumerator().hash())^(large.getDenominator().hash())); + (large.getNumerator().hash()) xor (large.getDenominator().hash())); } }; -- cgit v1.2.3