X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=perl-module%2Ft%2FPspp.t;h=a1ff5051a66fdde6d3d677009c99a06dcb8c7103;hb=9ade26c8349b4434008c46cf09bc7473ec743972;hp=ff0e4d1e0dac22d277a28f95d606398bbb637485;hpb=09669b94dcfcb20c354f454f34c1445a260e2980;p=pspp-builds.git diff --git a/perl-module/t/Pspp.t b/perl-module/t/Pspp.t index ff0e4d1e..a1ff5051 100644 --- a/perl-module/t/Pspp.t +++ b/perl-module/t/Pspp.t @@ -1,12 +1,14 @@ # -*-perl-*- -# Before `make install' is performed this script should be runnable with -# `make test'. After `make install' it should work as `perl PSPP.t' +# Before `make install' is performed this script should be runnable +# with `make test' as long as libpspp-core-$VERSION.so is in +# LD_LIBRARY_PATH. After `make install' it should work as `perl +# PSPP.t' ######################### # change 'tests => 1' to 'tests => last_test_to_print'; -use Test::More tests => 31; +use Test::More tests => 36; use Text::Diff; use File::Temp qw/ tempfile tempdir /; BEGIN { use_ok('PSPP') }; @@ -20,6 +22,13 @@ sub compare return ! diff ("$file", \$pattern); } +my $pspp_cmd = $ENV{PSPP_TEST_CMD}; + +if ( ! $pspp_cmd) +{ + $pspp_cmd="pspp"; +} + sub run_pspp_syntax { my $tempdir = shift; @@ -31,7 +40,7 @@ sub run_pspp_syntax print FH "$syntax"; close (FH); - system ("cd $tempdir; pspp -o raw-ascii $syntaxfile"); + system ("cd $tempdir; $pspp_cmd -o pspp.csv $syntaxfile"); } sub run_pspp_syntax_cmp @@ -43,7 +52,7 @@ sub run_pspp_syntax_cmp run_pspp_syntax ($tempdir, $syntax); - my $diff = diff ("$tempdir/pspp.list", \$result); + my $diff = diff ("$tempdir/pspp.csv", \$result); if ( ! ($diff eq "")) { @@ -60,25 +69,30 @@ sub run_pspp_syntax_cmp { my $d = PSPP::Dict->new(); ok (ref $d, "Dictionary Creation"); + ok ($d->get_var_cnt () == 0); $d->set_label ("My Dictionary"); - $d->set_documents ("These Documents"); + $d->add_document ("These Documents"); # Tests for variable creation my $var0 = PSPP::Var->new ($d, "le"); ok (!ref $var0, "Trap illegal variable name"); + ok ($d->get_var_cnt () == 0); $var0 = PSPP::Var->new ($d, "legal"); ok (ref $var0, "Accept legal variable name"); + ok ($d->get_var_cnt () == 1); my $var1 = PSPP::Var->new ($d, "legal"); ok (!ref $var1, "Trap duplicate variable name"); + ok ($d->get_var_cnt () == 1); $var1 = PSPP::Var->new ($d, "money", (fmt=>PSPP::Fmt::DOLLAR, width=>4, decimals=>2) ); ok (ref $var1, "Accept valid format"); + ok ($d->get_var_cnt () == 2); $d->set_weight ($var1); @@ -116,7 +130,7 @@ sub run_pspp_syntax_cmp ) ); - $d->set_documents ("This should not appear"); + $d->add_document ("This should not appear"); $d->clear_documents (); $d->add_document ("This is a document line"); @@ -161,32 +175,27 @@ sub run_pspp_syntax_cmp DISPLAY DOCUMENTS. LIST. SYNTAX -1.1 DISPLAY. -+--------+-------------------------------------------+--------+ -|Variable|Description |Position| -#========#===========================================#========# -|id |Format: F2.0 | 1| -| |Measure: Scale | | -| |Display Alignment: Right | | -| |Display Width: 8 | | -+--------+-------------------------------------------+--------+ -|name |Format: A20 | 2| -| |Measure: Nominal | | -| |Display Alignment: Left | | -| |Display Width: 20 | | -+--------+-------------------------------------------+--------+ +Variable,Description,,Position +id,Format: F2.0,,1 +,Measure: Scale,, +,Display Alignment: Right,, +,Display Width: 8,, +name,Format: A20,,2 +,Measure: Nominal,, +,Display Alignment: Left,, +,Display Width: 20,, File label: + This is the file label Documents in the active file: This is a document line -id name --- -------------------- -21 wheelbarrow - +Table: Data List +id,name +21,wheelbarrow RESULT @@ -229,9 +238,7 @@ RESULT $longstr->set_label ("My Long String"); my $re = $longstr->add_value_label ("xxx", "xfoo"); - ok (($re == 0), "Long strings cant have labels"); - - ok ($PSPP::errstr eq "Cannot add label to a long string variable", "Error msg"); + ok ($re, "Value label for long string"); $int->set_missing_values (9, 99); @@ -244,38 +251,30 @@ RESULT GET FILE='$tempfile'. DISPLAY DICTIONARY. SYNTAX -1.1 DISPLAY. -+----------+-----------------------------------------+--------+ -|Variable |Description |Position| -#==========#=========================================#========# -|integer |My Integer | 1| -| |Format: F8.0 | | -| |Measure: Scale | | -| |Display Alignment: Right | | -| |Display Width: 8 | | -| |Missing Values: 9; 99 | | -| +-----+-----------------------------------+ | -| | 0|Zero | | -| | 1|Unity | | -| | 2|Duality | | -+----------+-----+-----------------------------------+--------+ -|string |My String | 2| -| |Format: A8 | | -| |Measure: Nominal | | -| |Display Alignment: Left | | -| |Display Width: 8 | | -| |Missing Values: "this "; "that " | | -| +-----+-----------------------------------+ | -| | xx|foo | | -| | yy|bar | | -+----------+-----+-----------------------------------+--------+ -|longstring|My Long String | 3| -| |Format: A9 | | -| |Measure: Nominal | | -| |Display Alignment: Left | | -| |Display Width: 9 | | -+----------+-----------------------------------------+--------+ - +Variable,Description,,Position +integer,My Integer,,1 +,Format: F8.0,, +,Measure: Scale,, +,Display Alignment: Right,, +,Display Width: 8,, +,Missing Values: 9; 99,, +,0,Zero, +,1,Unity, +,2,Duality, +string,My String,,2 +,Format: A8,, +,Measure: Nominal,, +,Display Alignment: Left,, +,Display Width: 8,, +,"Missing Values: ""this ""; ""that """,, +,xx ,foo, +,yy ,bar, +longstring,My Long String,,3 +,Format: A9,, +,Measure: Nominal,, +,Display Alignment: Left,, +,Display Width: 9,, +,xxx ,xfoo, RESULT } @@ -293,7 +292,7 @@ begin data. 1111 One 1 1/1/1 1 1/1/1+01:01 2222 Two 2 2/2/2 2 2/2/2+02:02 3333 Three 3 3/3/3 3 3/3/3+03:03 -. . . . . +. . . . . . 5555 Five 5 5/5/5 5 5/5/5+05:05 end data. @@ -314,6 +313,12 @@ add value labels /string '1111' 'ones' '2222' 'twos' '3333' 'threes' /numeric 1 'Unity' 2 'Duality' 3 'Thripality'. +variable attribute + variables = numeric + attribute=colour[1]('blue') colour[2]('pink') colour[3]('violet') + attribute=size('large') nationality('foreign'). + + save outfile='$filename'. SYNTAX @@ -374,11 +379,11 @@ RESULT print MYFILE "$_ => $vl->{$_}\n" for keys %$vl; } - while (my $c = $sf->get_next_case () ) + while (my @c = $sf->get_next_case () ) { for ($v = 0; $v < $dict->get_var_cnt(); $v++) { - print MYFILE "val$v: \"@$c[$v]\"\n"; + print MYFILE "val$v: \"$c[$v]\"\n"; } print MYFILE "\n"; } @@ -456,9 +461,9 @@ EOF my $output = PSPP::Sysfile->new ("$tempdir/out.sav", $dict); - while (my $c = $input->get_next_case () ) + while (my (@c) = $input->get_next_case () ) { - $output->append_case ($c); + $output->append_case (\@c); } $output->close (); @@ -473,7 +478,7 @@ EOF SYNTAX - system ("cp $tempdir/pspp.list $tempdir/in.txt"); + system ("cp $tempdir/pspp.csv $tempdir/in.txt"); run_pspp_syntax ($tempdir, <get_dict (); - my $c = $sf->get_next_case (); + my (@c) = $sf->get_next_case (); my $var = $dict->get_var (0); - my $val = @$c[0]; + my $val = $c[0]; my $formatted = PSPP::format_value ($val, $var); my $str = gmtime ($val - PSPP::PERL_EPOCH); print "Formatted string is \"$formatted\"\n"; @@ -528,7 +533,7 @@ SYNTAX ok ( !ref $sf, "Returns undef on opening failure"); - ok ("$PSPP::errstr" eq "Error opening \"$tempdir/no-such-file.sav\" for reading as a system file: No such file or directory.", + ok ("$PSPP::errstr" eq "Error opening `$tempdir/no-such-file.sav' for reading as a system file: No such file or directory.", "Error string on open failure"); } @@ -544,29 +549,63 @@ SYNTAX my $dict = $sf->get_dict (); - my $c = $sf->get_next_case (); + my (@c) = $sf->get_next_case (); my $stringvar = $dict->get_var (0); my $numericvar = $dict->get_var (2); - my $val = @$c[0]; + my $val = $c[0]; ok ( !PSPP::value_is_missing ($val, $stringvar), "Missing Value Negative String"); - $val = @$c[2]; + $val = $c[2]; ok ( !PSPP::value_is_missing ($val, $numericvar), "Missing Value Negative Num"); - $c = $sf->get_next_case (); - $c = $sf->get_next_case (); + @c = $sf->get_next_case (); + @c = $sf->get_next_case (); - $val = @$c[0]; + $val = $c[0]; ok ( PSPP::value_is_missing ($val, $stringvar), "Missing Value Positive"); - $c = $sf->get_next_case (); - $val = @$c[2]; + @c = $sf->get_next_case (); + $val = $c[2]; ok ( PSPP::value_is_missing ($val, $numericvar), "Missing Value Positive SYS"); - $c = $sf->get_next_case (); - $val = @$c[2]; + @c = $sf->get_next_case (); + $val = $c[2]; ok ( PSPP::value_is_missing ($val, $numericvar), "Missing Value Positive Num"); } + + +#Test reading of custom attributes +{ + my $tempdir = tempdir( CLEANUP => 1 ); + + generate_sav_file ("$tempdir/in.sav", "$tempdir"); + + my $sf = PSPP::Reader->open ("$tempdir/in.sav"); + + my $dict = $sf->get_dict (); + + my $var = $dict->get_var_by_name ("numeric"); + + my $attr = $var->get_attributes (); + + open (MYFILE, ">$tempdir/out.txt"); + + foreach $k (keys %$attr) + { + my $ll = $attr->{$k}; + print MYFILE "$k =>"; + print MYFILE map "$_\n", join ', ', @$ll; + } + + close (MYFILE); + + ok (compare ("$tempdir/out.txt", <blue, pink, violet +nationality =>foreign +size =>large +EOF + +}