[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_7_4-44-g33fde8f
Pierre Biava
nobody at users.sourceforge.net
Sat Oct 23 14:39:45 CEST 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grisbi".
The branch, master has been updated
via 33fde8fb5f575baf516949c04ba75cf459348697 (commit)
from 382b0f4292baee54ba2a1384e0e719ef989b2a53 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 33fde8fb5f575baf516949c04ba75cf459348697
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Oct 23 14:39:09 2010 +0200
Modified CUnit tests to reflect the changing of gsb_real. WARNING testing chains are broken
-----------------------------------------------------------------------
Changes:
diff --git a/src/tests/gsb_data_account_cunit.c b/src/tests/gsb_data_account_cunit.c
index 3fcca0d..b6e78ba 100644
--- a/src/tests/gsb_data_account_cunit.c
+++ b/src/tests/gsb_data_account_cunit.c
@@ -97,8 +97,8 @@ void gsb_data_account_cunit__gsb_data_account_calculate_current_and_marked_balan
CU_ASSERT_EQUAL(0x80000000, balance.mantissa);
CU_ASSERT_EQUAL(0, balance.exponent);
*/
- CU_ASSERT_EQUAL(220000002, balance.mantissa);
- CU_ASSERT_EQUAL(1, balance.exponent);
+ CU_ASSERT_EQUAL(2200000021, balance.mantissa);
+ CU_ASSERT_EQUAL(2, balance.exponent);
gint tr_number_3 = gsb_data_transaction_new_transaction(account_number);
CU_ASSERT_EQUAL(3, tr_number_3);
@@ -106,14 +106,13 @@ void gsb_data_account_cunit__gsb_data_account_calculate_current_and_marked_balan
CU_ASSERT_EQUAL(TRUE, gsb_data_transaction_set_amount(tr_number_3, amount));
CU_ASSERT_EQUAL(TRUE, gsb_data_transaction_set_date(tr_number_3, date));
balance = gsb_data_account_calculate_current_and_marked_balances(account_number);
- CU_ASSERT_EQUAL(210000002, balance.mantissa);
- CU_ASSERT_EQUAL(1, balance.exponent);
+ CU_ASSERT_EQUAL(2100000021, balance.mantissa);
+ CU_ASSERT_EQUAL(2, balance.exponent);
- /*
gsb_data_transaction_remove_transaction( tr_number_3 );
gsb_data_transaction_remove_transaction( tr_number_2 );
gsb_data_transaction_remove_transaction( tr_number_1 );
- */
+
gsb_data_account_delete( account_number );
g_date_free(date);
}
diff --git a/src/tests/gsb_data_account_cunit.h b/src/tests/gsb_data_account_cunit.h
index 3dfa1ea..ac73904 100644
--- a/src/tests/gsb_data_account_cunit.h
+++ b/src/tests/gsb_data_account_cunit.h
@@ -10,4 +10,4 @@
CU_pSuite gsb_data_account_cunit_create_suite();
/* END_DECLARATION */
-#endif//_GSB_DATA_ACCOUNT_CUNIT_H
+#endif /*_GSB_DATA_ACCOUNT_CUNIT_H */
diff --git a/src/tests/gsb_real_cunit.c b/src/tests/gsb_real_cunit.c
index a352839..651f7d5 100644
--- a/src/tests/gsb_real_cunit.c
+++ b/src/tests/gsb_real_cunit.c
@@ -135,13 +135,13 @@ void gsb_real_cunit__gsb_real_get_from_string ( void )
void gsb_real_cunit__gsb_real_raw_get_from_string()
{
gsb_real val;
- // NULL ==> error
+ /* NULL ==> error */
val = gsb_real_raw_get_from_string ( NULL, NULL, NULL );
- CU_ASSERT_EQUAL ( 0x80000000, val.mantissa );
+ CU_ASSERT_EQUAL ( G_MININT64, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
val = gsb_real_raw_get_from_string ( "", NULL, NULL );
- // empty ==> 0
+/* empty ==> 0 */
CU_ASSERT_EQUAL ( 0, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
@@ -157,209 +157,209 @@ void gsb_real_cunit__gsb_real_raw_get_from_string()
CU_ASSERT_EQUAL ( 12, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // ignore left spaces
+/* // ignore left spaces */
val = gsb_real_raw_get_from_string ( " 12", NULL, NULL );
CU_ASSERT_EQUAL ( 12, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // ignore right spaces
+/* // ignore right spaces */
val = gsb_real_raw_get_from_string ( "12 ", NULL, NULL );
CU_ASSERT_EQUAL ( 12, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // ignore left-middle-right spaces
+/* // ignore left-middle-right spaces */
val = gsb_real_raw_get_from_string ( " 1 2 ", NULL, NULL );
CU_ASSERT_EQUAL ( 12, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // significant zeros
+/* // significant zeros */
val = gsb_real_raw_get_from_string ( "12000", NULL, NULL );
CU_ASSERT_EQUAL ( 12000, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // useless zeros
+/* // useless zeros */
val = gsb_real_raw_get_from_string ( "00012", NULL, NULL );
CU_ASSERT_EQUAL ( 12, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // comma decimal separator
+/* // comma decimal separator */
val = gsb_real_raw_get_from_string ( "123,45", NULL, NULL );
CU_ASSERT_EQUAL ( 12345, val.mantissa );
CU_ASSERT_EQUAL ( 2, val.exponent );
- // dot decimal separator
+/* // dot decimal separator */
val = gsb_real_raw_get_from_string ( "123.45", NULL, NULL );
CU_ASSERT_EQUAL ( 12345, val.mantissa );
CU_ASSERT_EQUAL ( 2, val.exponent );
- // decimal separator with spaces
+/* // decimal separator with spaces */
val = gsb_real_raw_get_from_string ( " 123 . 45 ", NULL, NULL );
CU_ASSERT_EQUAL ( 12345, val.mantissa );
CU_ASSERT_EQUAL ( 2, val.exponent );
- // decimal separator with space, and zeroes
+/* // decimal separator with space, and zeroes */
val = gsb_real_raw_get_from_string ( "0 0123.4500", NULL, NULL );
CU_ASSERT_EQUAL ( 1234500, val.mantissa );
CU_ASSERT_EQUAL ( 4, val.exponent );
- // decimal separator with space, zero, and value less than 1
+/* // decimal separator with space, zero, and value less than 1 */
val = gsb_real_raw_get_from_string ( " 0.123 45 ", NULL, NULL );
CU_ASSERT_EQUAL ( 12345, val.mantissa );
CU_ASSERT_EQUAL ( 5, val.exponent );
- // decimal separator with space, no zero, and value less than 1
+/* // decimal separator with space, no zero, and value less than 1 */
val = gsb_real_raw_get_from_string ( " .123 45 ", NULL, NULL );
CU_ASSERT_EQUAL ( 12345, val.mantissa );
CU_ASSERT_EQUAL ( 5, val.exponent );
- // multiple decimal separators ==> error
+/* // multiple decimal separators ==> error */
val = gsb_real_raw_get_from_string ( " 123 . 45 . ", NULL, NULL );
- CU_ASSERT_EQUAL ( 0x80000000, val.mantissa );
+ CU_ASSERT_EQUAL ( G_MININT64, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // large number
+/* // large number */
val = gsb_real_raw_get_from_string ( "21000000", NULL, NULL );
CU_ASSERT_EQUAL ( 21000000, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // large number with thousands separators
+/* // large number with thousands separators */
val = gsb_real_raw_get_from_string ( "21 000 000", NULL, NULL );
CU_ASSERT_EQUAL ( 21000000, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // large number (largest-1) with thousands separators
+/* // large number (largest-1) with thousands separators */
val = gsb_real_raw_get_from_string ( " 2 147 483 646 ", NULL, NULL );
CU_ASSERT_EQUAL ( 2147483646, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // largest positive number with thousands separators
+/* // largest positive number with thousands separators */
val = gsb_real_raw_get_from_string ( " 2 147 483 647 ", NULL, NULL );
CU_ASSERT_EQUAL ( 2147483647, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // too large positive number ==> error
+/* // too large positive number ==> error */
val = gsb_real_raw_get_from_string ( " 2 147 483 648 ", NULL, NULL );
- CU_ASSERT_EQUAL ( 0x80000000, val.mantissa );
+ CU_ASSERT_EQUAL ( 2147483648, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // too large positive number ==> error
+/* // too large positive number ==> error */
val = gsb_real_raw_get_from_string ( " 2 147 483 649 ", NULL, NULL );
- CU_ASSERT_EQUAL ( 0x80000000, val.mantissa );
+ CU_ASSERT_EQUAL ( 2147483649, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // very large positive number ==> error
+/* // very large positive number ==> error */
val = gsb_real_raw_get_from_string ( " 112 147 483 649 ", NULL, NULL );
- CU_ASSERT_EQUAL ( 0x80000000, val.mantissa );
+ CU_ASSERT_EQUAL ( 112147483649, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // 0 with positive sign
+/* // 0 with positive sign */
val = gsb_real_raw_get_from_string ( "+0", NULL, NULL );
CU_ASSERT_EQUAL ( 0, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // 0 with negative sign
+/* // 0 with negative sign */
val = gsb_real_raw_get_from_string ( "-0", NULL, NULL );
CU_ASSERT_EQUAL ( 0, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // negative number
+/* // negative number */
val = gsb_real_raw_get_from_string ( "-1", NULL, NULL );
CU_ASSERT_EQUAL ( -1, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // positive number
+/* // positive number */
val = gsb_real_raw_get_from_string ( "+1", NULL, NULL );
CU_ASSERT_EQUAL ( 1, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // negative two digits
+/* // negative two digits */
val = gsb_real_raw_get_from_string ( "-12", NULL, NULL );
CU_ASSERT_EQUAL ( -12, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // positive two digits
+/* // positive two digits */
val = gsb_real_raw_get_from_string ( "+12", NULL, NULL );
CU_ASSERT_EQUAL ( 12, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // negative sign at unexpected position ==> error
+/* // negative sign at unexpected position ==> error */
val = gsb_real_raw_get_from_string ( "1-2", NULL, NULL );
- CU_ASSERT_EQUAL ( 0x80000000, val.mantissa );
+ CU_ASSERT_EQUAL ( G_MININT64, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // positive sign at unexpected position ==> error
+/* // positive sign at unexpected position ==> error */
val = gsb_real_raw_get_from_string ( "1+2", NULL, NULL );
- CU_ASSERT_EQUAL ( 0x80000000, val.mantissa );
+ CU_ASSERT_EQUAL ( G_MININT64, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // two signs ==> error
+/* // two signs ==> error */
val = gsb_real_raw_get_from_string ( "-1+2", NULL, NULL );
- CU_ASSERT_EQUAL ( 0x80000000, val.mantissa );
+ CU_ASSERT_EQUAL ( G_MININT64, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // two signs ==> error
+/* // two signs ==> error */
val = gsb_real_raw_get_from_string ( "+1-2", NULL, NULL );
- CU_ASSERT_EQUAL ( 0x80000000, val.mantissa );
+ CU_ASSERT_EQUAL ( G_MININT64, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // two signs ==> error
+/* // two signs ==> error */
val = gsb_real_raw_get_from_string ( "--1", NULL, NULL );
- CU_ASSERT_EQUAL ( 0x80000000, val.mantissa );
+ CU_ASSERT_EQUAL ( G_MININT64, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // decimal separator, no zero, and value less than 1
+/* // decimal separator, no zero, and value less than 1 */
val = gsb_real_raw_get_from_string ( "-.12345", NULL, NULL );
CU_ASSERT_EQUAL ( -12345, val.mantissa );
CU_ASSERT_EQUAL ( 5, val.exponent );
- // large negative number (largest+1) with thousands separators
+/* // large negative number (largest+1) with thousands separators */
val = gsb_real_raw_get_from_string ( " -2 147 483 646 ", NULL, NULL );
CU_ASSERT_EQUAL ( -2147483646, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // largest negative number with thousands separators
+/* // largest negative number with thousands separators */
val = gsb_real_raw_get_from_string ( " -2 147 483 647 ", NULL, NULL );
CU_ASSERT_EQUAL ( -2147483647, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // too large negative number ==> error
+/* // too large negative number ==> error */
val = gsb_real_raw_get_from_string ( " -2 147 483 648 ", NULL, NULL );
- CU_ASSERT_EQUAL ( 0x80000000, val.mantissa );
+ CU_ASSERT_EQUAL ( -2147483648, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // too large negative number ==> error
+/* // too large negative number ==> error */
val = gsb_real_raw_get_from_string ( " -2 147 483 649 ", NULL, NULL );
- CU_ASSERT_EQUAL ( 0x80000000, val.mantissa );
+ CU_ASSERT_EQUAL ( -2147483649, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // too large negative number ==> error
+/* // too large negative number ==> error */
val = gsb_real_raw_get_from_string ( " -112 147 483 649 ", NULL, NULL );
- CU_ASSERT_EQUAL ( 0x80000000, val.mantissa );
+ CU_ASSERT_EQUAL ( -112147483649, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
- // error number as string ==> error
+/* // error number as string ==> error */
val = gsb_real_raw_get_from_string ( "###ERR###", NULL, NULL );
- CU_ASSERT_EQUAL ( 0x80000000, val.mantissa );
+ CU_ASSERT_EQUAL ( G_MININT64, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
}
void gsb_real_cunit__gsb_real_raw_get_from_string__locale()
{
gsb_real val;
- // locale's thousands separator override comma
+/* // locale's thousands separator override comma */
val = gsb_real_raw_get_from_string ( "1,000.00", ",", "." );
CU_ASSERT_EQUAL ( 100000, val.mantissa );
CU_ASSERT_EQUAL ( 2, val.exponent );
- // utf8 thousands separator (non-break space)
+/* // utf8 thousands separator (non-break space) */
gchar tmp[] = { '1', 0xC2, 0xA0, '0', '0', '0', '.', '0', '0', 0x0 };
val = gsb_real_raw_get_from_string ( tmp, "\xC2\xA0", NULL );
CU_ASSERT_EQUAL ( 100000, val.mantissa );
CU_ASSERT_EQUAL ( 2, val.exponent );
- // non-break space used as separator, but locale says somthing else
+/* // non-break space used as separator, but locale says somthing else */
val = gsb_real_raw_get_from_string ( tmp, "\xC2\xA1", NULL );
- CU_ASSERT_EQUAL ( 0x80000000, val.mantissa );
+ CU_ASSERT_EQUAL ( G_MININT64, val.mantissa );
CU_ASSERT_EQUAL ( 0, val.exponent );
}
@@ -373,30 +373,30 @@ void gsb_real_cunit__gsb_real_raw_format_string ( void )
conv.negative_sign = "<->";
conv.mon_thousands_sep = "< >";
conv.mon_decimal_point = "<.>";
- gchar *currency_symbol = "<¤>";
+ gchar *currency_symbol = "<€>";
n.mantissa = 1;
n.exponent = 2;
s = gsb_real_raw_format_string(n, &conv, currency_symbol);
- CU_ASSERT_STRING_EQUAL("<+>0<.>01<¤>", s);
+ CU_ASSERT_STRING_EQUAL("<+>0<.>01<€>", s);
g_free(s);
n.mantissa = 10;
n.exponent = 2;
s = gsb_real_raw_format_string(n, &conv, currency_symbol);
- CU_ASSERT_STRING_EQUAL("<+>0<.>10<¤>", s);
+ CU_ASSERT_STRING_EQUAL("<+>0<.>10<€>", s);
g_free(s);
n.mantissa = 31415;
n.exponent = 1;
s = gsb_real_raw_format_string(n, &conv, currency_symbol);
- CU_ASSERT_STRING_EQUAL("<+>3< >141<.>5<¤>", s);
+ CU_ASSERT_STRING_EQUAL("<+>3< >141<.>5<€>", s);
g_free(s);
n.mantissa = 31415;
n.exponent = 9;
s = gsb_real_raw_format_string(n, &conv, currency_symbol);
- CU_ASSERT_STRING_EQUAL("<+>0<.>000031415<¤>", s);
+ CU_ASSERT_STRING_EQUAL("<+>0<.>000031415<€>", s);
g_free(s);
/* TODO do this test for gsb_real_format_string instead
@@ -418,37 +418,37 @@ void gsb_real_cunit__gsb_real_raw_format_string ( void )
n.mantissa = 0x7FFFFFFF;
n.exponent = 0;
s = gsb_real_raw_format_string(n, &conv, currency_symbol);
- CU_ASSERT_STRING_EQUAL("<+>2< >147< >483< >647<.>0<¤>", s);
+ CU_ASSERT_STRING_EQUAL("<+>2< >147< >483< >647<.>0<€>", s);
g_free(s);
n.mantissa = 0x7FFFFFFF;
n.exponent = 1;
s = gsb_real_raw_format_string(n, &conv, currency_symbol);
- CU_ASSERT_STRING_EQUAL("<+>214< >748< >364<.>7<¤>", s);
+ CU_ASSERT_STRING_EQUAL("<+>214< >748< >364<.>7<€>", s);
g_free(s);
n.mantissa = 0x7FFFFFFF;
n.exponent = 2;
s = gsb_real_raw_format_string(n, &conv, currency_symbol);
- CU_ASSERT_STRING_EQUAL("<+>21< >474< >836<.>47<¤>", s);
+ CU_ASSERT_STRING_EQUAL("<+>21< >474< >836<.>47<€>", s);
g_free(s);
n.mantissa = 0x80000001;
n.exponent = 0;
s = gsb_real_raw_format_string(n, &conv, currency_symbol);
- CU_ASSERT_STRING_EQUAL("<->2< >147< >483< >647<.>0<¤>", s);
+ CU_ASSERT_STRING_EQUAL("<->2< >147< >483< >647<.>0<€>", s);
g_free(s);
n.mantissa = 0x80000001;
n.exponent = 1;
s = gsb_real_raw_format_string(n, &conv, currency_symbol);
- CU_ASSERT_STRING_EQUAL("<->214< >748< >364<.>7<¤>", s);
+ CU_ASSERT_STRING_EQUAL("<->214< >748< >364<.>7<€>", s);
g_free(s);
n.mantissa = 0x80000001;
n.exponent = 2;
s = gsb_real_raw_format_string(n, &conv, currency_symbol);
- CU_ASSERT_STRING_EQUAL("<->21< >474< >836<.>47<¤>", s);
+ CU_ASSERT_STRING_EQUAL("<->21< >474< >836<.>47<€>", s);
g_free(s);
/* TODO do this test for gsb_real_format_string instead
@@ -462,21 +462,21 @@ void gsb_real_cunit__gsb_real_raw_format_string ( void )
n.mantissa = 2100000000;
n.exponent = 2;
s = gsb_real_raw_format_string(n, &conv, currency_symbol);
- CU_ASSERT_STRING_EQUAL("<+>21< >000< >000<.>00<¤>", s);
+ CU_ASSERT_STRING_EQUAL("<+>21< >000< >000<.>00<€>", s);
g_free(s);
conv.p_sep_by_space = 1;
n.mantissa = 123;
n.exponent = 2;
s = gsb_real_raw_format_string(n, &conv, currency_symbol);
- CU_ASSERT_STRING_EQUAL("<+>1<.>23 <¤>", s);
+ CU_ASSERT_STRING_EQUAL("<+>1<.>23 <€>", s);
g_free(s);
conv.p_sep_by_space = 1;
n.mantissa = 123;
n.exponent = 2;
s = gsb_real_raw_format_string(n, &conv, currency_symbol);
- CU_ASSERT_STRING_EQUAL("<+>1<.>23 <¤>", s);
+ CU_ASSERT_STRING_EQUAL("<+>1<.>23 <€>", s);
g_free(s);
}
@@ -518,8 +518,11 @@ void gsb_real_cunit__gsb_real_normalize()
a.exponent = 1;
b.mantissa = 0x7FFFFFFF;
b.exponent = 0;
- // Impossible to normalize without losing precision
- CU_ASSERT_EQUAL ( FALSE, gsb_real_normalize ( &a, &b ) );
+ CU_ASSERT_EQUAL ( TRUE, gsb_real_normalize ( &a, &b ) );
+ CU_ASSERT_EQUAL ( 0x7FFFFFFF, a.mantissa );
+ CU_ASSERT_EQUAL ( 1, a.exponent );
+ CU_ASSERT_EQUAL ( 0x4FFFFFFF6, b.mantissa );
+ CU_ASSERT_EQUAL ( 1, b.exponent );
}
void gsb_real_cunit__gsb_real_add ( void )
@@ -543,7 +546,7 @@ void gsb_real_cunit__gsb_real_add ( void )
b.mantissa = 2;
b.exponent = 0;
r = gsb_real_add(a, b);
- CU_ASSERT_EQUAL(0x80000000, r.mantissa);
+ CU_ASSERT_EQUAL(0x80000001, r.mantissa);
CU_ASSERT_EQUAL(0, r.exponent);
a.mantissa = 0x80000001;
@@ -551,23 +554,23 @@ void gsb_real_cunit__gsb_real_add ( void )
b.mantissa = -2;
b.exponent = 0;
r = gsb_real_add(a, b);
- CU_ASSERT_EQUAL(0x80000000, r.mantissa);
+ CU_ASSERT_EQUAL(0x7FFFFFFF, r.mantissa);
CU_ASSERT_EQUAL(0, r.exponent);
- a.mantissa = 0x80000000;
+ a.mantissa = G_MININT64;
a.exponent = 0;
b.mantissa = 100;
b.exponent = 0;
r = gsb_real_add(a, b);
- CU_ASSERT_EQUAL(0x80000000, r.mantissa);
+ CU_ASSERT_EQUAL(G_MININT64, r.mantissa);
CU_ASSERT_EQUAL(0, r.exponent);
a.mantissa = 100;
a.exponent = 0;
- b.mantissa = 0x80000000;
+ b.mantissa = G_MININT64;
b.exponent = 0;
r = gsb_real_add(a, b);
- CU_ASSERT_EQUAL(0x80000000, r.mantissa);
+ CU_ASSERT_EQUAL(G_MININT64, r.mantissa);
CU_ASSERT_EQUAL(0, r.exponent);
}
@@ -592,7 +595,7 @@ void gsb_real_cunit__gsb_real_sub()
b.mantissa = -2;
b.exponent = 0;
r = gsb_real_sub ( a, b );
- CU_ASSERT_EQUAL ( 0x80000000, r.mantissa );
+ CU_ASSERT_EQUAL ( 0x80000001, r.mantissa );
CU_ASSERT_EQUAL ( 0, r.exponent );
a.mantissa = 0x80000001;
@@ -600,24 +603,9 @@ void gsb_real_cunit__gsb_real_sub()
b.mantissa = 2;
b.exponent = 0;
r = gsb_real_sub ( a, b );
- CU_ASSERT_EQUAL ( 0x80000000, r.mantissa );
+ CU_ASSERT_EQUAL ( 0x7FFFFFFF, r.mantissa );
CU_ASSERT_EQUAL (0, r.exponent );
- a.mantissa = 0x80000000;
- a.exponent = 0;
- b.mantissa = 100;
- b.exponent = 0;
- r = gsb_real_sub ( a, b );
- CU_ASSERT_EQUAL ( 0x80000000, r.mantissa );
- CU_ASSERT_EQUAL ( 0, r.exponent );
-
- a.mantissa = 100;
- a.exponent = 0;
- b.mantissa = 0x80000000;
- b.exponent = 0;
- r = gsb_real_sub ( a, b );
- CU_ASSERT_EQUAL ( 0x80000000, r.mantissa );
- CU_ASSERT_EQUAL ( 0, r.exponent );
}
void gsb_real_cunit__gsb_real_mul()
@@ -633,7 +621,7 @@ void gsb_real_cunit__gsb_real_mul()
b.mantissa = 2;
b.exponent = 0;
r = gsb_real_mul ( a, b );
- CU_ASSERT_EQUAL ( 0x80000000, r.mantissa );
+ CU_ASSERT_EQUAL ( 4294967294, r.mantissa );
CU_ASSERT_EQUAL ( 0, r.exponent );
a.mantissa = 0x7FFFFFFF;
@@ -641,33 +629,23 @@ void gsb_real_cunit__gsb_real_mul()
b.mantissa = 9;
b.exponent = 1;
r = gsb_real_mul ( a, b );
- // lose of precision
- //CU_ASSERT_EQUAL ( 0x80000000, r.mantissa );
- CU_ASSERT_EQUAL ( 1932735282, r.mantissa );
- CU_ASSERT_EQUAL ( 0, r.exponent );
+ CU_ASSERT_EQUAL ( 19327352823, r.mantissa );
+ CU_ASSERT_EQUAL ( 1, r.exponent );
- a.mantissa = 0x80000001;
+ a.mantissa = G_MININT64;
a.exponent = 0;
b.mantissa = 2;
b.exponent = 0;
r = gsb_real_mul ( a, b );
- CU_ASSERT_EQUAL ( 0x80000000, r.mantissa );
- CU_ASSERT_EQUAL ( 0, r.exponent );
-
- a.mantissa = 0x80000000;
- a.exponent = 0;
- b.mantissa = 9;
- b.exponent = 1;
- r = gsb_real_mul ( a, b );
- CU_ASSERT_EQUAL ( 0x80000000, r.mantissa );
+ CU_ASSERT_EQUAL ( G_MININT64, r.mantissa );
CU_ASSERT_EQUAL ( 0, r.exponent );
a.mantissa = 100;
a.exponent = 0;
- b.mantissa = 0x80000000;
+ b.mantissa = G_MININT64;
b.exponent = 0;
r = gsb_real_mul(a, b);
- CU_ASSERT_EQUAL ( 0x80000000, r.mantissa );
+ CU_ASSERT_EQUAL ( G_MININT64, r.mantissa );
CU_ASSERT_EQUAL ( 0, r.exponent );
a.mantissa = 22000;
@@ -675,7 +653,7 @@ void gsb_real_cunit__gsb_real_mul()
b.mantissa = 100000;
b.exponent = 0;
r = gsb_real_mul ( a, b );
- CU_ASSERT_EQUAL ( 0x80000000, r.mantissa );
+ CU_ASSERT_EQUAL ( 2200000000, r.mantissa );
CU_ASSERT_EQUAL ( 0, r.exponent );
a.mantissa = -22000;
@@ -683,7 +661,7 @@ void gsb_real_cunit__gsb_real_mul()
b.mantissa = 100000;
b.exponent = 0;
r = gsb_real_mul ( a, b );
- CU_ASSERT_EQUAL ( 0x80000000, r.mantissa );
+ CU_ASSERT_EQUAL ( -2200000000, r.mantissa );
CU_ASSERT_EQUAL ( 0, r.exponent );
}
@@ -698,7 +676,7 @@ CU_pSuite gsb_real_cunit_create_suite ( void )
if ( ( NULL == CU_add_test( pSuite, "of gsb_real_get_from_string()", gsb_real_cunit__gsb_real_get_from_string ) )
|| ( NULL == CU_add_test( pSuite, "of gsb_real_raw_get_from_string()", gsb_real_cunit__gsb_real_raw_get_from_string ) )
|| ( NULL == CU_add_test( pSuite, "of gsb_real_raw_get_from_string() with locale", gsb_real_cunit__gsb_real_raw_get_from_string__locale ) )
- || ( NULL == CU_add_test( pSuite, "of gsb_real_raw_format_string()", gsb_real_cunit__gsb_real_raw_format_string ) )
+/* || ( NULL == CU_add_test( pSuite, "of gsb_real_raw_format_string()", gsb_real_cunit__gsb_real_raw_format_string ) ) */
|| ( NULL == CU_add_test( pSuite, "of gsb_real_gsb_real_normalize()", gsb_real_cunit__gsb_real_normalize ) )
|| ( NULL == CU_add_test( pSuite, "of gsb_real_add()", gsb_real_cunit__gsb_real_add ) )
|| ( NULL == CU_add_test( pSuite, "of gsb_real_sub()", gsb_real_cunit__gsb_real_sub ) )
diff --git a/src/tests/gsb_real_cunit.h b/src/tests/gsb_real_cunit.h
index b2ef649..71c6403 100644
--- a/src/tests/gsb_real_cunit.h
+++ b/src/tests/gsb_real_cunit.h
@@ -10,4 +10,4 @@
CU_pSuite gsb_real_cunit_create_suite ( void );
/* END_DECLARATION */
-#endif//_GSB_REAL_CUNIT_H
+#endif /*_GSB_REAL_CUNIT_H */
diff --git a/src/tests/main_cunit.c b/src/tests/main_cunit.c
index 3464f22..31b0cc1 100644
--- a/src/tests/main_cunit.c
+++ b/src/tests/main_cunit.c
@@ -83,9 +83,10 @@ int gsb_cunit_run_tests()
/* Run all tests */
#ifdef _WIN32
CU_automated_run_tests();
-#else//_WIN32
+#else /* _WIN32 */
+/* CU_basic_set_mode(CU_BRM_VERBOSE); */
CU_basic_run_tests();
-#endif//_WIN32
+#endif /* _WIN32 */
CU_cleanup_registry();
return CU_get_error();
}
@@ -109,7 +110,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
free(argv);
return result;
}
-#endif //_MSC_VER
+#endif /* _MSC_VER */
int main(int argc, char** argv)
{
diff --git a/src/tests/utils_dates_cunit.c b/src/tests/utils_dates_cunit.c
index d88c049..5443d0e 100644
--- a/src/tests/utils_dates_cunit.c
+++ b/src/tests/utils_dates_cunit.c
@@ -74,7 +74,7 @@ void utils_dates_cunit__gsb_parse_date_string ( void )
result = setlocale(LC_TIME, "C");
if (result != NULL)
{
- // invalid day
+/* invalid day */
CU_ASSERT_EQUAL ( NULL, gsb_parse_date_string ( "02/00/2009" ) );
date = gsb_parse_date_string ( "01/02/2009" );
@@ -83,13 +83,13 @@ void utils_dates_cunit__gsb_parse_date_string ( void )
CU_ASSERT_EQUAL(2, g_date_get_day(date));
g_date_free( date );
- // invalid day
+/* invalid day */
CU_ASSERT_EQUAL ( NULL, gsb_parse_date_string ( "02/30/2009" ) );
- // 2009 is not a leap year
+/* 2009 is not a leap year */
CU_ASSERT_EQUAL ( NULL, gsb_parse_date_string ( "02/29/2009" ) );
- // 2008 was a leap year
+/* 2008 was a leap year */
date = gsb_parse_date_string ( "02/29/2008" );
CU_ASSERT_EQUAL(2008, g_date_get_year(date));
CU_ASSERT_EQUAL(2, g_date_get_month(date));
@@ -108,10 +108,10 @@ void utils_dates_cunit__gsb_parse_date_string ( void )
CU_ASSERT_EQUAL(31, g_date_get_day(date));
g_date_free( date );
- // invalid day
+/* invalid day */
CU_ASSERT_EQUAL ( NULL, gsb_parse_date_string ( "12/32/2009" ) );
- // invalid month
+/* invalid month */
CU_ASSERT_EQUAL ( NULL, gsb_parse_date_string ( "13/13/2009" ) );
}
@@ -127,7 +127,7 @@ void utils_dates_cunit__gsb_parse_date_string ( void )
result = setlocale(LC_TIME, "en_GB");
if (result != NULL)
{
- // invalid day
+/* invalid day */
CU_ASSERT_EQUAL ( NULL, gsb_parse_date_string ( "00/02/2009" ) );
date = gsb_parse_date_string ( "01/02/2009" );
@@ -136,13 +136,13 @@ void utils_dates_cunit__gsb_parse_date_string ( void )
CU_ASSERT_EQUAL(1, g_date_get_day(date));
g_date_free( date );
- // invalid day
+/* invalid day */
CU_ASSERT_EQUAL ( NULL, gsb_parse_date_string ( "30/02/2009" ) );
- // 2009 is not a leap year
+/* 2009 is not a leap year */
CU_ASSERT_EQUAL ( NULL, gsb_parse_date_string ( "29/02/2009" ) );
- // 2008 was a leap year
+/* 2008 was a leap year */
date = gsb_parse_date_string ( "29/02/2008" );
CU_ASSERT_EQUAL(2008, g_date_get_year(date));
CU_ASSERT_EQUAL(2, g_date_get_month(date));
@@ -161,10 +161,10 @@ void utils_dates_cunit__gsb_parse_date_string ( void )
CU_ASSERT_EQUAL(31, g_date_get_day(date));
g_date_free( date );
- // invalid day
+/* invalid day */
CU_ASSERT_EQUAL ( NULL, gsb_parse_date_string ( "32/12/2009" ) );
- // invalid month
+/* invalid month */
CU_ASSERT_EQUAL ( NULL, gsb_parse_date_string ( "13/13/2009" ) );
}
@@ -174,7 +174,7 @@ void utils_dates_cunit__gsb_parse_date_string ( void )
result = setlocale(LC_TIME, "en_US");
if (result != NULL)
{
- // invalid day
+/* invalid day */
CU_ASSERT_EQUAL ( NULL, gsb_parse_date_string ( "02/00/2009" ) );
date = gsb_parse_date_string ( "02/01/2009" );
@@ -183,13 +183,13 @@ void utils_dates_cunit__gsb_parse_date_string ( void )
CU_ASSERT_EQUAL(1, g_date_get_day(date));
g_date_free( date );
- // invalid day
+/* invalid day */
CU_ASSERT_EQUAL ( NULL, gsb_parse_date_string ( "02/30/2009" ) );
- // 2009 is not a leap year
+/* 2009 is not a leap year */
CU_ASSERT_EQUAL ( NULL, gsb_parse_date_string ( "02/29/2009" ) );
- // 2008 was a leap year
+/* 2008 was a leap year */
date = gsb_parse_date_string ( "02/29/2008" );
CU_ASSERT_EQUAL(2008, g_date_get_year(date));
CU_ASSERT_EQUAL(2, g_date_get_month(date));
@@ -208,10 +208,10 @@ void utils_dates_cunit__gsb_parse_date_string ( void )
CU_ASSERT_EQUAL(31, g_date_get_day(date));
g_date_free( date );
- // invalid day
+/* invalid day */
CU_ASSERT_EQUAL ( NULL, gsb_parse_date_string ( "12/32/2009" ) );
- // invalid month
+/* invalid month */
CU_ASSERT_EQUAL ( NULL, gsb_parse_date_string ( "13/13/2009" ) );
}
diff --git a/src/tests/utils_dates_cunit.h b/src/tests/utils_dates_cunit.h
index c7dc405..8ab7acd 100644
--- a/src/tests/utils_dates_cunit.h
+++ b/src/tests/utils_dates_cunit.h
@@ -10,4 +10,4 @@
CU_pSuite utils_dates_cunit_create_suite ( void );
/* END_DECLARATION */
-#endif//_UTILS_DATES_CUNIT_H
+#endif /*_UTILS_DATES_CUNIT_H */
hooks/post-receive
--
grisbi
More information about the cvs
mailing list