diff options
| -rwxr-xr-x | LedgerSMB.pm | 2 | ||||
| -rw-r--r-- | t/02-number-handling.t | 90 | ||||
| -rw-r--r-- | t/03-date-handling.t | 18 | ||||
| -rw-r--r-- | t/10-form.t | 413 | ||||
| -rw-r--r-- | t/11-ledgersmb.t | 24 |
5 files changed, 524 insertions, 23 deletions
diff --git a/LedgerSMB.pm b/LedgerSMB.pm index 0b71c918..4b8ff496 100755 --- a/LedgerSMB.pm +++ b/LedgerSMB.pm @@ -268,7 +268,7 @@ sub format_amount { my $negative; if ($amount) { - $amount = $self->parse_amount( $myconfig, $amount ); + $amount = $self->parse_amount( 'user' => $myconfig, 'amount' => $amount ); $negative = ( $amount < 0 ); $amount =~ s/-//; } diff --git a/t/02-number-handling.t b/t/02-number-handling.t index 5b694b1d..cad4eff3 100644 --- a/t/02-number-handling.t +++ b/t/02-number-handling.t @@ -5,12 +5,16 @@ use warnings; use Test::More 'no_plan'; use Math::BigFloat; +use LedgerSMB; use LedgerSMB::Form; my $form = new Form; my %myconfig; ok(defined $form); isa_ok($form, 'Form'); +my $lsmb = new LedgerSMB; +ok(defined $lsmb); +isa_ok($lsmb, 'LedgerSMB'); my $expected; foreach my $value ('0.01', '0.05', '0.015', '0.025', '1.1', '1.5', '1.9', @@ -21,24 +25,32 @@ foreach my $value ('0.01', '0.05', '0.015', '0.025', '1.1', '1.5', '1.9', $expected = Math::BigFloat->new($value)->ffround(-$places); $expected->precision(undef); is($form->round_amount($value, $places), $expected, - "$value to $places decimal places - $expected"); + "form: $value to $places decimal places - $expected"); + is($lsmb->round_amount($value, $places), $expected, + "lsmb: $value to $places decimal places - $expected"); Math::BigFloat->round_mode('-inf'); $expected = Math::BigFloat->new(-$value)->ffround(-$places); $expected->precision(undef); is($form->round_amount(-$value, $places), $expected, - "-$value to $places decimal places - $expected"); + "form: -$value to $places decimal places - $expected"); + is($lsmb->round_amount(-$value, $places), $expected, + "lsmb: -$value to $places decimal places - $expected"); } foreach my $places ('-1', '-2') { Math::BigFloat->round_mode('+inf'); $expected = Math::BigFloat->new($value)->ffround(-($places-1)); is($form->round_amount($value, $places), $expected, - "$value to $places decimal places - $expected"); + "form: $value to $places decimal places - $expected"); + is($lsmb->round_amount($value, $places), $expected, + "lsmb: $value to $places decimal places - $expected"); Math::BigFloat->round_mode('-inf'); $expected = Math::BigFloat->new(-$value)->ffround(-($places-1)); is($form->round_amount(-$value, $places), $expected, - "-$value to $places decimal places - $expected"); + "form: -$value to $places decimal places - $expected"); + is($lsmb->round_amount(-$value, $places), $expected, + "lsmb: -$value to $places decimal places - $expected"); } } @@ -62,7 +74,11 @@ foreach my $format (0 .. $#formats) { ##$value = Math::BigFloat->new($value); $value = $form->parse_amount(\%myfooconfig,$value); is($form->format_amount(\%myconfig, $value, 2, 'x'), $expected, - "$value formatted as $formats[$format][0] - $expected"); + "form: $value formatted as $formats[$format][0] - $expected"); + is($lsmb->format_amount('user' => \%myconfig, + 'amount' => $value, 'precision' => 2, + 'neg_format' => 'x'), $expected, + "lsmb: $value formatted as $formats[$format][0] - $expected"); } } @@ -83,8 +99,16 @@ foreach my $format (0 .. $#formats) { #$value = $form->parse_amount(\%myconfig,$value); is($form->format_amount(\%myconfig, $form->format_amount(\%myconfig, $value, 2, 'x'), - 2, 'x'), - $expected, "Double formatting of $value as $formats[$format][0] - $expected"); + 2, 'x'), $expected, + "form: Double formatting of $value as $formats[$format][0] - $expected"); + is($lsmb->format_amount('user' => \%myconfig, + 'amount' => + $lsmb->format_amount('user' => \%myconfig, + 'amount' => $value, + 'precision' => 2, + 'neg_format' => 'x'), + 'precision' => 2, 'neg_format' => 'x'), $expected, + "lsmb: Double formatting of $value as $formats[$format][0] - $expected"); } } @@ -106,21 +130,34 @@ foreach my $format (0 .. $#formats) { $value = Math::BigFloat->new($value); } cmp_ok($form->parse_amount(\%myconfig, $expected), '==', $value, - "$expected parsed as $formats[$format][0] - $value"); + "form: $expected parsed as $formats[$format][0] - $value"); + cmp_ok($lsmb->parse_amount('user' => \%myconfig, + 'amount' => $expected), '==', $value, + "lsmb: $expected parsed as $formats[$format][0] - $value"); } $expected = '12 CR'; my $value = Math::BigFloat->new('12'); cmp_ok($form->parse_amount(\%myconfig, $expected), '==', $value, - "$expected parsed as $formats[$format][0] - $value"); + "form: $expected parsed as $formats[$format][0] - $value"); + cmp_ok($lsmb->parse_amount('user' => \%myconfig, 'amount' => $expected), + '==', $value, + "lsmb: $expected parsed as $formats[$format][0] - $value"); $expected = '21 DR'; $value = Math::BigFloat->new('-21'); cmp_ok($form->parse_amount(\%myconfig, $expected), '==', $value, - "$expected parsed as $formats[$format][0] - $value"); + "form: $expected parsed as $formats[$format][0] - $value"); + cmp_ok($lsmb->parse_amount('user' => \%myconfig, 'amount' => $expected), + '==', $value, + "lsmb: $expected parsed as $formats[$format][0] - $value"); cmp_ok($form->parse_amount(\%myconfig, ''), '==', 0, - "Empty string returns 0"); + "form: Empty string returns 0"); cmp_ok($form->parse_amount(\%myconfig, 'foo'), 'eq', - Math::BigFloat->bnan(), "Invalid string returns NaN"); + Math::BigFloat->bnan(), "form: Invalid string returns NaN"); + cmp_ok($lsmb->parse_amount('user' => \%myconfig, 'amount' => ''), '==', 0, + "lsmb: Empty string returns 0"); + cmp_ok($lsmb->parse_amount('user' => \%myconfig, 'amount' => 'foo'), 'eq', + Math::BigFloat->bnan(), "lsmb: Invalid string returns NaN"); } foreach my $format (0 .. $#formats) { @@ -143,23 +180,42 @@ foreach my $format (0 .. $#formats) { cmp_ok($form->parse_amount(\%myconfig, $form->parse_amount(\%myconfig, $expected)), '==', $value, - "$expected parsed as $formats[$format][0] - $value"); + "form: $expected parsed as $formats[$format][0] - $value"); + cmp_ok($lsmb->parse_amount('user' => \%myconfig, + 'amount' => $lsmb->parse_amount('user' => \%myconfig, + 'amount' => $expected)), + '==', $value, + "lsmb: $expected parsed as $formats[$format][0] - $value"); } $expected = '12 CR'; my $value = Math::BigFloat->new('12'); cmp_ok($form->parse_amount(\%myconfig, $form->parse_amount(\%myconfig, $expected)), '==', $value, - "$expected parsed as $formats[$format][0] - $value"); + "form: $expected parsed as $formats[$format][0] - $value"); + cmp_ok($lsmb->parse_amount('user' => \%myconfig, + 'amount' => $lsmb->parse_amount('user' => \%myconfig, + 'amount' => $expected)), + '==', $value, + "lsmb: $expected parsed as $formats[$format][0] - $value"); $expected = '21 DR'; $value = Math::BigFloat->new('-21'); cmp_ok($form->parse_amount(\%myconfig, $form->parse_amount(\%myconfig, $expected)), '==', $value, - "$expected parsed as $formats[$format][0] - $value"); + "form: $expected parsed as $formats[$format][0] - $value"); + cmp_ok($lsmb->parse_amount('user' => \%myconfig, + 'amount' => $lsmb->parse_amount('user' => \%myconfig, + 'amount' => $expected)), + '==', $value, + "lsmb: $expected parsed as $formats[$format][0] - $value"); cmp_ok($form->parse_amount(\%myconfig, ''), '==', 0, - "Empty string returns 0"); + "form: Empty string returns 0"); cmp_ok($form->parse_amount(\%myconfig, 'foo'), 'eq', - Math::BigFloat->bnan(), "Invalid string returns NaN"); + Math::BigFloat->bnan(), "form: Invalid string returns NaN"); + cmp_ok($lsmb->parse_amount('user' => \%myconfig, 'amount' => ''), '==', 0, + "lsmb: Empty string returns 0"); + cmp_ok($lsmb->parse_amount('user' => \%myconfig, 'amount' => 'foo'), 'eq', + Math::BigFloat->bnan(), "lsmb: Invalid string returns NaN"); } diff --git a/t/03-date-handling.t b/t/03-date-handling.t index be252e9d..2f9c1a06 100644 --- a/t/03-date-handling.t +++ b/t/03-date-handling.t @@ -9,6 +9,7 @@ use Test::More 'no_plan'; use Math::BigFloat; use LedgerSMB::Sysconfig; +use LedgerSMB; use LedgerSMB::Form; use LedgerSMB::Locale; @@ -18,6 +19,9 @@ my $locale_es = LedgerSMB::Locale->get_handle('es'); my %myconfig; ok(defined $form); isa_ok($form, 'Form'); +my $lsmb = new LedgerSMB; +ok(defined $lsmb); +isa_ok($lsmb, 'LedgerSMB'); $form->{dbh} = ${LedgerSMB::Sysconfig::GLOBALDBH}; my @formats = ( ['mm-dd-yy', '-', 2, '02-29-00', '03-01-00'], @@ -116,10 +120,18 @@ foreach my $format (0 .. $#formats) { my $sep = $formats[$format][1]; my $yearcount = $formats[$format][2]; cmp_ok($form->datetonum(\%myconfig, $formats[$format][3]), 'eq', - '20000229', "datetonum, $fmt"); + '20000229', "form: datetonum, $fmt"); + cmp_ok($lsmb->date_to_number('user' => \%myconfig, + 'date' => $formats[$format][3]), 'eq', + '20000229', "lsmb: date_to_number, $fmt"); } -cmp_ok($form->datetonum(\%myconfig), 'eq', '', "datetonum, empty string"); -cmp_ok($form->datetonum(\%myconfig, '1234'), 'eq', '1234', "datetonum, 1234"); +cmp_ok($form->datetonum(\%myconfig), 'eq', '', "form: datetonum, empty string"); +cmp_ok($form->datetonum(\%myconfig, '1234'), 'eq', '1234', + "form: datetonum, 1234"); +cmp_ok($lsmb->date_to_number('user' => \%myconfig), 'eq', '', + "lsmb: date_to_number, empty date"); +cmp_ok($lsmb->date_to_number('user' => \%myconfig, 'date' => '1234'), + 'eq', '1234', "lsmb: date_to_number, 1234"); # $form->split_date checks # Note that $form->split_date assumes the year range 2000-2099 diff --git a/t/10-form.t b/t/10-form.t new file mode 100644 index 00000000..68b5e264 --- /dev/null +++ b/t/10-form.t @@ -0,0 +1,413 @@ +#!/usr/bin/perl +##format_amount in 02-number-handling.t +##parse_amount in 02-number-handling.t +##round_amount in 02-number-handling.t +##current_date in 03-date-handling.t +##split_date in 03-date-handling.t +##format_date in 03-date-handling.t +##from_to in 03-date-handling.t +##datetonum in 03-date-handling.t +##add_date in 03-date-handling.t + +##escape in 10-form.t +##unescape in 10-form.t +##quote in 10-form.t +##unquote in 10-form.t +##numtextrows in 10-form.t +##debug in 10-form.t +##hide_form in 10-form.t +##info in 10-form.t +##error in 10-form.t +##isblank in 10-form.t +##header in 10-form.t +##sort_columns in 10-form.t +##sort_order in 10-form.t +##print_button in 10-form.t + +##encode_all null +##decode_all null + +##sub new { +##sub dberror { +##sub redirect { +##sub db_parse_numeric { +##sub callproc { +##sub get_my_emp_num { +##sub parse_template { +##sub format_line { +##sub cleanup { +##sub rerun_latex { +##sub format_string { +##sub db_init { +##sub run_custom_queries { +##sub dbconnect { +##sub dbconnect_noauto { +##sub dbquote { +##sub update_balance { +##sub update_exchangerate { +##sub save_exchangerate { +##sub get_exchangerate { +##sub check_exchangerate { +##sub add_shipto { +##sub get_employee { +##sub get_name { +##sub all_vc { +##sub all_taxaccounts { +##sub all_employees { +##sub all_projects { +##sub all_departments { +##sub all_years { +##sub create_links { +##sub lastname_used { +##sub like { +##sub redo_rows { +##sub get_partsgroup { +##sub update_status { +##sub save_status { +##sub get_recurring { +##sub save_recurring { +##sub save_intnotes { +##sub update_defaults { +##sub db_prepare_vars { +##sub audittrail { + +use strict; +use warnings; + +$ENV{TMPDIR} = 't/var'; + +use Test::More 'no_plan'; +use Test::Trap qw(trap $trap); +use Math::BigFloat; +use IO::String; + +use LedgerSMB::Form; + +sub form_info_func { + return $_[0]; +} + +sub form_error_func { + print $_[0]; +} + +my $form = new Form; +my %myconfig; +my $utfstr; +my @r; +my @ary; +my $aryref; +ok(defined $form); +isa_ok($form, 'Form'); + +## $form->escape checks +$utfstr = "\xd8\xad"; +utf8::decode($utfstr); +for my $sig ('1.3.37', '2.2.4', '2.0.59') { + $ENV{SERVER_SIGNATURE} = 'Apache/'.$sig; + cmp_ok($form->escape('foo'), 'eq', 'foo', + "($sig) escape: foo"); + cmp_ok($form->escape('foo bar'), 'eq', 'foo%20bar', + "($sig) escape: foo bar"); + cmp_ok($form->escape($utfstr), 'eq', '%d8%ad', + "($sig) escape: U+D8AD"); +} +$ENV{SERVER_SIGNATURE} = 'Apache/2.0.22'; +cmp_ok($form->escape('foo'), 'eq', 'foo', + '(2.0.22) escape: foo'); +cmp_ok($form->escape('foo bar'), 'eq', 'foo%2520bar', + '(2.0.22) escape: foo bar'); +cmp_ok($form->escape($utfstr), 'eq', '%25d8%25ad', + '(2.0.22) escape: U+D8AD'); +cmp_ok($form->escape('foo%20bar', 1), 'eq', 'foo%2520bar', + '(2.0.22, been) escape: foo bar'); + +## $form->unescape checks +$utfstr = "\xd8\xad"; +utf8::decode($utfstr); +cmp_ok($form->unescape('+'), 'eq', ' ', 'unescape: +'); +cmp_ok($form->unescape('\\'), 'eq', '', 'unescape: \\'); +cmp_ok($form->unescape('%20'), 'eq', ' ', 'unescape: %20'); +cmp_ok($form->unescape("foo\r\n"), 'eq', "foo\n", 'unescape: foo\r\n'); +ok(utf8::is_utf8($form->unescape('foo%d8%ad')), 'unescape: (utf8 output)'); +cmp_ok(unpack("H*", $form->unescape('%d8%ad')), 'eq', + unpack("H*", $utfstr), 'unescape: %d8%ad'); +cmp_ok(unpack("H*", $form->unescape($form->unescape('%d8%ad'))), 'eq', + unpack("H*", $utfstr), '(2x) unescape: %d8%ad'); + +## $form->quote checks +ok(!defined $form->quote(), 'quote: (undef)'); +cmp_ok($form->quote(\%myconfig), '==', \%myconfig, 'quote: (reference)'); +cmp_ok($form->quote('hello'), 'eq', 'hello', 'quote: hello'); +cmp_ok($form->quote('hello"world'), 'eq', 'hello"world', + 'quote: hello"world'); + +## $form->unquote checks +ok(!defined $form->unquote(), 'unquote: (undef)'); +cmp_ok($form->unquote(\%myconfig), '==', \%myconfig, 'unquote: (reference)'); +cmp_ok($form->unquote('hello'), 'eq', 'hello', 'unquote: hello'); +cmp_ok($form->unquote('hello"world'), 'eq', 'hello"world', + 'unquote: hello"world'); + +## $form->numtextrows checks +cmp_ok($form->numtextrows("hello world\n12345678901234567890\n", 20), '==', 2, + 'numtextrows: 2 rows'); +cmp_ok($form->numtextrows("hello world12345678901234567890\n", 20), '==', 2, + 'numtextrows: 2 rows (no space)'); +cmp_ok($form->numtextrows("hello world\n12345678901234567890\n", 20, 1), '==', 1, + 'numtextrows: 2 rows (1 max)'); +cmp_ok($form->numtextrows("hello world\n12345678901234567890\n", 20, 3), '==', 2, + 'numtextrows: 2 rows (3 max)'); + +## $form->debug checks +$form = new Form; +@r = trap{$form->debug}; +like($trap->stdout, qr/\naction = \ndbversion = \d+\.\d+\.\d+\nlogin = \nnextsub = \npath = bin\/mozilla\nversion = $form->{version}\n/, 'debug: STDOUT'); +SKIP: { + skip 'Environment for file test not clean' if -f "t/lsmb-10.$$"; + $form->debug("t/lsmb-10.$$"); + ok(-f "t/lsmb-10.$$", "debug: output file t/lsmb-10.$$ created"); + open(my $FH, '<', "t/lsmb-10.$$"); + my @str = <$FH>; + close($FH); + chomp(@str); + like(join("\n", @str), qr/action = \ndbversion = \d+\.\d+\.\d+\nlogin = \nnextsub = \npath = bin\/mozilla\nversion = $form->{version}/, "debug: t/lsmb-10.$$ contents"); + is(unlink("t/lsmb-10.$$"), 1, "debug: removing t/lsmb-10.$$"); + ok(!-e "t/lsmb-10.$$", "debug: t/lsmb-10.$$ removed"); +}; + +## $form->hide_form checks +$form = new Form; +$form->{header} = 1; +@r = trap{$form->hide_form}; +like($trap->stdout, qr/<input type="hidden" name="action" value="" \/>\n<input type="hidden" name="dbversion" value="\d+\.\d+\.\d+" \/>\n<input type="hidden" name="login" value="" \/>\n<input type="hidden" name="nextsub" value="" \/>\n<input type="hidden" name="path" value="bin\/mozilla" \/>\n<input type="hidden" name="version" value="$form->{version}" \/>/, + 'hide_form: base'); +ok(!$form->{header}, 'hide_form: header flag cleared'); + +$form->{header} = 1; +@r = trap{$form->hide_form('path')}; +is($trap->stdout, "<input type=\"hidden\" name=\"path\" value=\"bin/mozilla\" />\n", + 'hide_form: path'); +ok($form->{header}, 'hide_form: header flag not cleared'); + +## $form->info checks +$form = new Form; +$ENV{GATEWAY_INTERFACE} = 'yes'; +$form->{pre} = 'Blah'; +$form->{header} = 'Blah'; + +@r = trap{$form->info('hello world')}; +is($trap->stdout, '<b>hello world</b>', + 'info: CGI, pre-set header content'); +ok(!$form->{pre}, 'info: CGI, removed $self->{pre}'); + +delete $form->{header}; +@r = trap{$form->info('hello world')}; +like($trap->stdout, qr|Content-Type: text/html; charset=utf-8\n+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" \n\s+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\n<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n<head>\n\s+<title></title>\n\s+<meta http-equiv="Pragma" content="no-cache" />\n\s+<meta http-equiv="Expires" content="-1" />\n\s+<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />[\n\s]+<meta name="robots" content="noindex,nofollow" />[\n\s]+</head>[\n\s]+<body><b>hello world</b>|, + 'info: CGI, header content'); + +delete $ENV{GATEWAY_INTERFACE}; +delete $ENV{info_function}; +$form->{pre} = 'Blah'; +$form->{header} = 'Blah'; +@r = trap{$form->info('hello world')}; +is($trap->stdout, "hello world\n", + 'info: CLI, content'); +ok($form->{pre}, 'info: CLI, ignored $self->{pre}'); + +$ENV{info_function} = 'main::form_info_func'; +SKIP: { + skip 'Environment variable info_function could not be set' unless + $ENV{info_function} eq 'main::form_info_func'; + is($form->info('hello world'), 'hello world', + 'info: CLI, function call'); +}; + +## $form->error checks +$form = new Form; +$ENV{GATEWAY_INTERFACE} = 'yes'; +$form->{pre} = 'Blah'; +$form->{header} = 'Blah'; +@r = trap{$form->error('hello world')}; +is($trap->exit, 0, + 'error: CGI, normal termination'); +is($trap->stdout, '<body><h2 class="error">Error!</h2> <p><b>hello world</b></body>', + 'error: CGI, pre-set header content'); +ok(!$form->{pre}, 'error: CGI, removed $self->{pre}'); +delete $form->{header}; +@r = trap{$form->error('hello world')}; +is($trap->exit, 0, + 'error: CGI, normal termination'); +like($trap->stdout, qr|Content-Type: text/html; charset=utf-8\n+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" \n\s+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\n<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n<head>\n\s+<title></title>\n\s+<meta http-equiv="Pragma" content="no-cache" />\n\s+<meta http-equiv="Expires" content="-1" />\n\s+<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />[\n\s]+<meta name="robots" content="noindex,nofollow" />[\n\s]+</head>[\n\s]+<body><h2 class="error">Error!</h2> <p><b>hello world</b></body>|, + 'error: CGI, header content'); + +delete $ENV{GATEWAY_INTERFACE}; +delete $ENV{error_function}; +$form->{pre} = 'Blah'; +$form->{header} = 'Blah'; +@r = trap{$form->error('hello world')}; +is($trap->die, "Error: hello world\n", + 'error: CLI, content, terminated'); +ok($form->{pre}, 'error: CLI, ignored $self->{pre}'); + +$ENV{error_function} = 'main::form_error_func'; +SKIP: { + skip 'Environment variable error_function could not be set' unless + $ENV{error_function} eq 'main::form_error_func'; + @r = trap{$form->error('hello world')}; + is($trap->stdout, 'hello world', + 'error: CLI, function call called'); + is($trap->die, "Error: hello world\n", + 'error: CLI, function call termination'); +}; + +## $form->isblank checks +$form = new Form; +$ENV{GATEWAY_INTERFACE} = 'yes'; +$form->{header} = 'yes'; +$form->{blank} = ' '; +ok(!$form->isblank('version'), 'isblank: Not blank'); +@r = trap{$form->isblank('blank', 'hello world')}; +is($trap->stdout, '<body><h2 class="error">Error!</h2> <p><b>hello world</b></body>', + 'isblank: Blank'); +is($trap->exit, 0, + 'isblank: Blank, termination'); + +## $form->header checks +$form = new Form; +$form->{header} = 'yes'; +ok(!$form->header, 'header: preset'); + +$ENV{GATEWAY_INTERFACE} = 'yes'; +delete $form->{header}; +delete $form->{stylesheet}; +delete $form->{charset}; +delete $form->{titlebar}; +delete $form->{title}; +delete $form->{pre}; +@r = trap{$form->header}; +like($trap->stdout, qr|Content-Type: text/html; charset=utf-8\n\n+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" \n\s+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\n<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n<head>\n\s+<title></title>\n\s+<meta http-equiv="Pragma" content="no-cache" />\n\s+<meta http-equiv="Expires" content="-1" />\n\s+<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />[\n\s]+<meta name="robots" content="noindex,nofollow" />[\n\s]+</head>[\n\s]+|, + 'header: unset'); + +delete $form->{header}; +@r = trap{$form->header(1, 'hello world')}; +like($trap->stdout, qr|Content-Type: text/html; charset=utf-8\n\n+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" \n\s+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\n<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n<head>\n\s+<title></title>\n\s+<meta http-equiv="Pragma" content="no-cache" />\n\s+<meta http-equiv="Expires" content="-1" />\n\s+<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />[\n\s]+<meta name="robots" content="noindex,nofollow" />[\n\s]+hello world[\n\s]+</head>[\n\s]+|, + 'header: headeradd'); + +delete $form->{header}; +$form->{pre} = 'hello world'; +@r = trap{$form->header}; +like($trap->stdout, qr|Content-Type: text/html; charset=utf-8\n\n+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" \n\s+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\n<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n<head>\n\s+<title></title>\n\s+<meta http-equiv="Pragma" content="no-cache" />\n\s+<meta http-equiv="Expires" content="-1" />\n\s+<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />[\n\s]+<meta name="robots" content="noindex,nofollow" />[\n\s]+</head>[\n\s]+hello world \n|, + 'header: pre => \'hello world\''); +delete $form->{pre}; + +delete $form->{header}; +$form->{titlebar} = 'hello'; +@r = trap{$form->header}; +like($trap->stdout, qr|Content-Type: text/html; charset=utf-8\n\n+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" \n\s+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\n<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n<head>\n\s+<title>hello</title>\n\s+<meta http-equiv="Pragma" content="no-cache" />\n\s+<meta http-equiv="Expires" content="-1" />\n\s+<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />[\n\s]+<meta name="robots" content="noindex,nofollow" />[\n\s]+</head>[\n\s]+|, + 'header: titlebar => \'hello\''); + +delete $form->{header}; +$form->{title} = 'world'; +@r = trap{$form->header}; +like($trap->stdout, qr|Content-Type: text/html; charset=utf-8\n\n+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" \n\s+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\n<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n<head>\n\s+<title>world - hello</title>\n\s+<meta http-equiv="Pragma" content="no-cache" />\n\s+<meta http-equiv="Expires" content="-1" />\n\s+<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />[\n\s]+<meta name="robots" content="noindex,nofollow" />[\n\s]+</head>[\n\s]+|, + 'header: titlebar => \'hello\', title => \'world\''); +delete $form->{title}; +delete $form->{titlebar}; + +delete $form->{header}; +$form->{charset} = 'UTF-8'; +@r = trap{$form->header}; +like($trap->stdout, qr|Content-Type: text/html; charset=utf-8\n\n+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" \n\s+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\n<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n<head>\n\s+<title></title>\n\s+<meta http-equiv="Pragma" content="no-cache" />\n\s+<meta http-equiv="Expires" content="-1" />\n\s+<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />[\n\s]+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />[\n\s]+<meta name="robots" content="noindex,nofollow" />[\n\s]+</head>[\n\s]+|, + 'header: charset => \'UTF-8\''); +delete $form->{charset}; + +delete $form->{header}; +$form->{stylesheet} = "not a real file.$$"; +@r = trap{$form->header}; +like($trap->stdout, qr|Content-Type: text/html; charset=utf-8\n\n+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" \n\s+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\n<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n<head>\n\s+<title></title>\n\s+<meta http-equiv="Pragma" content="no-cache" />\n\s+<meta http-equiv="Expires" content="-1" />\n\s+<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />[\n\s]+<meta name="robots" content="noindex,nofollow" />[\n\s]+</head>[\n\s]+|, + "header: stylesheet => 'not a real file.$$'"); + +delete $form->{header}; +$form->{stylesheet} = 'ledgersmb.css'; +@r = trap{$form->header}; +like($trap->stdout, qr|Content-Type: text/html; charset=utf-8\n\n+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" \n\s+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\n<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n<head>\n\s+<title></title>\n\s+<meta http-equiv="Pragma" content="no-cache" />\n\s+<meta http-equiv="Expires" content="-1" />\n\s+<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />[\n\s]+<link rel="stylesheet" href="css/ledgersmb.css" type="text/css" title="LedgerSMB stylesheet" />[\n\s]+<meta name="robots" content="noindex,nofollow" />[\n\s]+</head>[\n\s]+|, + 'header: stylesheet => \'ledgersmb.css\''); + +delete $ENV{GATEWAY_INTERFACE}; +delete $form->{header}; +is($form->header, 1, 'header: non-CGI'); +is($form->{header}, 1, 'header: non-CGI header flag set'); + +## $form->sort_column checks +## Note that sort_column merely sorts the value of $form->{sort} to being the +## first element of the list, adding it if needed +$form = new Form; +@ary = ('projectnumber', 'description', 'name', 'startdate'); +$form->{sort} = 'name'; +is_deeply([$form->sort_columns(@ary)], + ['name', 'projectnumber', 'description', 'startdate'], + 'sort_column: sort name'); +$form->{sort} = 'apple'; +is_deeply([$form->sort_columns(@ary)], ['apple', @ary], + 'sort_column: sort non-existent'); +is($form->sort_columns, 0, + 'sort_column: sort, no columns'); +delete $form->{sort}; +is_deeply([$form->sort_columns(@ary)], \@ary, + 'sort_column: sort unset'); + +## $form->sort_order checks +## Note that $ordinal is intended to be a hashref mapping column names to +## position +$form = new Form; +$aryref = ['projectnumber', 'description', 'name', 'startdate']; +delete $form->{direction}; +delete $form->{sort}; +delete $form->{oldsort}; +is($form->sort_order($aryref), + 'projectnumber ASC,description,name,startdate', + 'sort_order: unset, no ordinal'); +is($form->{direction}, 'ASC', 'sort_order: unset direction ASC'); + +$form->{direction} = 'ASC'; +delete $form->{sort}; +delete $form->{oldsort}; +is($form->sort_order($aryref), + 'projectnumber DESC,description,name,startdate', + 'sort_order: direction => \'ASC\', no ordinal'); +is($form->{direction}, 'DESC', 'sort_order: ASC -> DESC, sort unset'); + +$form->{direction} = 'DESC'; +delete $form->{sort}; +delete $form->{oldsort}; +is($form->sort_order($aryref), + 'projectnumber ASC,description,name,startdate', + 'sort_order: direction => \'DESC\', no ordinal'); +is($form->{direction}, 'ASC', 'sort_order: DESC -> ASC, sort unset'); + +$form->{direction} = 'DESC'; +$form->{sort} = 'name'; +$form->{oldsort} = 'startdate'; +is($form->sort_order($aryref), + 'name DESC,projectnumber,description,startdate', + 'sort_order: direction => \'DESC\', sort => \'name\', no ordinal'); +is($form->{direction}, 'DESC', 'sort_order: DESC -/-> ASC, sort != oldsort'); + +$form->{direction} = 'DESC'; +$form->{sort} = 'name'; +$form->{oldsort} = 'startdate'; +is($form->sort_order($aryref, {name => 2, projectnumber => 3, startdate => 1}), + '2 DESC,3,description,1', + 'sort_order: direction => \'DESC\', sort => \'name\', ordinal'); +$form->{direction} = 'DESC'; +$form->{sort} = 'name'; +$form->{oldsort} = 'startdate'; +is($form->sort_order($aryref, {name => 0, projectnumber => 3, startdate => 1}), + 'name DESC,3,description,1', + 'sort_order: direction => \'DESC\', sort => \'name\', ordinal b'); + +## $form->print_button checks +$form = new Form; +@r = trap{$form->print_button({'pear' => {'key' => 'P', 'value' => 'Pears'}}, 'pear')}; +is($trap->stdout, "<button class=\"submit\" type=\"submit\" name=\"action\" value=\"pear\" accesskey=\"P\" title=\"Pears [Alt-P]\">Pears</button>\n", 'print_button'); diff --git a/t/11-ledgersmb.t b/t/11-ledgersmb.t index 71ebc5c1..ad8ba58d 100644 --- a/t/11-ledgersmb.t +++ b/t/11-ledgersmb.t @@ -11,8 +11,6 @@ use LedgerSMB; ##line subroutine ##108 new -##145 debug -##204 num_text_rows ##235 redirect ##254 format_amount ##364 parse_amount @@ -26,6 +24,8 @@ use LedgerSMB; my $lsmb = new LedgerSMB; my %myconfig; my $utfstr; +my @r; + ok(defined $lsmb); isa_ok($lsmb, 'LedgerSMB'); @@ -109,3 +109,23 @@ is($lsmb->num_text_rows('string' => "1\n\n2", 'cols' => 10), 3, 'num_text_rows: 3 rows, no breakage, blank line, no max row count'); is($lsmb->num_text_rows('string' => "012345 67890123456789", 'cols' => 10), 3, 'num_text_rows: 3 rows, word and non column breakage, no max row count'); + +# $lsmb->debug checks +$lsmb = new LedgerSMB; +@r = trap{$lsmb->debug($lsmb)}; +like($trap->stdout, qr|\n\$VAR1 = bless\( {[\n\s]+'action' => '',[\n\s]+'dbversion' => '\d+\.\d+\.\d+',[\n\s]+'path' => 'bin/mozilla',[\n\s]+'version' => '$lsmb->{version}'[\n\s]+}, 'LedgerSMB' \);|, + 'debug: $lsmb, no file'); +SKIP: { + skip 'Environment for file test not clean' if -f "t/var/lsmb-11.$$"; + $lsmb->{file} = "t/var/lsmb-11.$$"; + $lsmb->debug('file' => $lsmb->{file}, $lsmb); + ok(-f "t/var/lsmb-11.$$", "debug: output file t/var/lsmb-11.$$ created"); + open(my $FH, '<', "t/var/lsmb-11.$$"); + my @str = <$FH>; + close($FH); + chomp(@str); + like(join("\n", @str), qr|\$VAR1 = 'file';\n\$VAR2 = 't/var/lsmb-11.$$';\n\$VAR3 = bless\( {[\n\s]+'action' => '',[\n\s]+'dbversion' => '\d+\.\d+\.\d+',[\n\s]+'file' => 't/var/lsmb-11.$$',[\n\s]+'path' => 'bin/mozilla',[\n\s]+'version' => '$lsmb->{version}'[\n\s]+}, 'LedgerSMB' \);|, + 'debug: $lsmb with file, contents'); + is(unlink("t/var/lsmb-11.$$"), 1, "debug: removing t/var/lsmb-11.$$"); + ok(!-e "t/var/lsmb-11.$$", "debug: t/var/lsmb-11.$$ removed"); +}; |