renamed tests

git-svn-id: file:///home/dpavlin/svn/Biblio-Isis/trunk@52 4670fa4d-42ec-0310-ab5b-a66af6943492

diff --git a/t/001_load.t b/t/001_load.t
deleted file mode 100755 (executable)
index bb5a636..0000000
--- a/t/001_load.t
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use blib;
-
-use Test::More tests => 2;
-use File::Spec;
-
-BEGIN { use_ok( 'Biblio::Isis' ); }
-
-my $path = File::Spec->catfile('data', 'winisis', 'BIBL');
-
-my $object = Biblio::Isis->new (
-       isisdb => $path,
-);
-
-isa_ok ($object, 'Biblio::Isis');
-
-

diff --git a/t/002_isis.t b/t/002_isis.t
deleted file mode 100755 (executable)
index 24f3b42..0000000
--- a/t/002_isis.t
+++ /dev/null
@@ -1,194 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use blib;
-
-use Test::More tests => 112;
-use File::Spec;
-
-BEGIN {
-       use_ok( 'Biblio::Isis' );
-       eval "use Data::Dump";
-
-       if (! $@) {
-               *Dumper = *Data::Dump::dump;
-       } else {
-               use Data::Dumper;
-       }
-}
-
-
-my $debug = shift @ARGV;
-my $isis;
-
-my $path_winisis = File::Spec->catfile('data', 'winisis', 'BIBL');
-my $path_isismarc = File::Spec->catfile('data', 'isismarc', 'BIBL');
-
-sub test_data {
-
-       my $args = {@_};
-
-       isa_ok ($isis, 'Biblio::Isis');
-
-       cmp_ok($isis->count, '==', 5, "count is 5");
-
-       # test .CNT data
-
-       SKIP: {
-               skip "no CNT file for this database", 5 unless $isis->{cnt_file};
-
-               ok(my $isis_cnt = $isis->read_cnt, "read_cnt");
-
-               cmp_ok(scalar keys %{$isis_cnt}, '==', 2, "returns 2 elements");
-
-               my $cnt = {
-                       '1' => {
-                               'N' => 15,
-                               'K' => 5,
-                               'FMAXPOS' => 8,
-                               'POSRX' => 1,
-                               'ABNORMAL' => 1,
-                               'ORDN' => 5,
-                               'LIV' => 0,
-                               'ORDF' => 5,
-                               'NMAXPOS' => 1
-                               },
-                       '2' => {
-                               'N' => 15,
-                               'K' => 5,
-                               'FMAXPOS' => 4,
-                               'POSRX' => 1,
-                               'ABNORMAL' => 0,
-                               'ORDN' => 5,
-                               'LIV' => 0,
-                               'ORDF' => 5,
-                               'NMAXPOS' => 1
-                               }
-               };
-
-               foreach my $c (keys %{$cnt}) {
-                       foreach my $kn (keys %{$cnt->{$c}}) {
-                               cmp_ok($isis_cnt->{$c}->{$kn}, '==', $cnt->{$c}->{$kn}, "cnt $c $kn same");
-                       }
-               }
-       }
-
-       # test fetch
-
-       my $data = [ {
-               '801' => [ '^aFFZG' ],
-               '702' => [ '^aHolder^bElizabeth' ],
-               '990' => [ '2140', '88', 'HAY' ],
-               '675' => [ '^a159.9' ],
-               '210' => [ '^aNew York^cNew York University press^dcop. 1988' ],
-       }, {
-               '210' => [ '^aNew York^cUniversity press^d1989' ],
-               '700' => [ '^aFrosh^bStephen' ],
-               '990' => [ '2140', '89', 'FRO' ],
-               '200' => [ '^aPsychoanalysis and psychology^eminding the gap^fStephen Frosh' ],
-               '215' => [ '^aIX, 275 str.^d23 cm' ],
-       }, {
-               '210' => [ '^aLondon^cFree Associoation Books^d1992' ],
-               '700' => [ '^aTurkle^bShirlie' ],
-               '990' => [ '2140', '92', 'LAC' ],
-               '200' => [ '^aPsychoanalitic politics^eJacques Lacan and Freud\'s French Revolution^fSherry Turkle' ],
-               '686' => [ '^a2140', '^a2140' ],
-       
-       }, {
-               '700' => [ '^aGross^bRichard' ],
-               '200' => [ '^aKey studies in psychology^fRichard D. Gross' ],
-               '210' => [ '^aLondon^cHodder & Stoughton^d1994' ],
-               '10' => [ '^a0-340-59691-0' ],
-       }, {
-               # identifier test
-               '200' => [ '1#^aPsychology^fCamille B. Wortman, Elizabeth F. Loftus, Mary E. Marshal' ],
-               225 => ["1#^aMcGraw-Hill series in Psychology"],
-               205 => ["^a4th ed"],
-       } ];
-               
-       foreach my $mfn (1 .. $isis->count) {
-
-               my $rec;
-               ok($rec = $isis->fetch($mfn), "fetch $mfn");
-
-
-               diag "<<<<< rec: ",Dumper( $rec ), "\n>>>>> row:", Dumper( $data->[$mfn-1] ) if ($debug);
-
-               foreach my $f (keys %{$data->[$mfn-1]}) {
-                       my $i = 0;
-                       foreach my $v (@{$data->[$mfn-1]->{$f}}) {
-                               $v =~ s/^[01# ][01# ]// if ($args->{no_ident});
-                               diag "compare '", $rec->{$f}->[$i], "' eq '$v'" if ($debug);
-                               cmp_ok($rec->{$f}->[$i], 'eq', $v, "MFN $mfn field: $f offset: $i");
-                               $i++;
-                       }
-               }
-       }
-
-       # test to_ascii
-
-       SKIP: {
-               eval "use Digest::MD5 qw(md5_hex)";
-
-               skip "no Digest::MD5 module", 5 if ($@);
-
-               foreach my $mfn (1 .. $isis->count) {
-                       my $md5 = md5_hex($isis->to_ascii($mfn));
-                       cmp_ok($md5, 'eq', $args->{md5_ascii}[$mfn - 1], "md5 $mfn");
-               }
-       }
-
-}
-
-$isis = Biblio::Isis->new (
-       isisdb => $path_winisis,
-       include_deleted => 1,
-       debug => $debug,
-);
-
-diag "new Biblio::Isis = ", Dumper($isis) if ($debug);
-
-test_data(
-       no_ident => 1,
-       md5_ascii => [ qw(
-               a369eff702307ba12eb81656ee0587fe
-               4fb38537a94f3f5954e40d9536b942b0
-               579a7c6901c654bdeac10547a98e5b71
-               7d2adf1675c83283aa9b82bf343e3d85
-               4cc1f798bbcf36862f7aa78c3410801a
-       ) ],
-);
-
-$isis = Biblio::Isis->new (
-       isisdb => $path_isismarc,
-       include_deleted => 1,
-);
-
-test_data(
-       md5_ascii => [ qw(
-               f5587d9bcaa54257a98fe27d3c17a0b6
-               3be9a049f686f2a36af93a856dcae0f2
-               3961be5e3ba8fb274c89c08d18df4bcc
-               5f73ec00d08af044a2c4105f7d889e24
-               843b9ebccf16a498fba623c78f21b6c0
-       ) ],
-);
-
-# check logically deleted
-
-$isis = Biblio::Isis->new (
-       isisdb => $path_winisis,
-       include_deleted => 1,
-);
-
-ok($isis->fetch(3), "deleted found");
-cmp_ok($isis->{deleted}, '==', 3, "MFN 3 is deleted");
-
-$isis = Biblio::Isis->new (
-       isisdb => $path_winisis,
-       debug => $debug,
-);
-
-ok(! $isis->fetch(3), "deleted not found");
-cmp_ok($isis->{deleted}, '==', 3, "MFN 3 is deleted");
-

diff --git a/t/1_load.t b/t/1_load.t
new file mode 100755 (executable)
index 0000000..bb5a636
--- /dev/null
+++ b/t/1_load.t
@@ -0,0 +1,19 @@
+#!/usr/bin/perl -w
+
+use strict;
+use blib;
+
+use Test::More tests => 2;
+use File::Spec;
+
+BEGIN { use_ok( 'Biblio::Isis' ); }
+
+my $path = File::Spec->catfile('data', 'winisis', 'BIBL');
+
+my $object = Biblio::Isis->new (
+       isisdb => $path,
+);
+
+isa_ok ($object, 'Biblio::Isis');
+
+

diff --git a/t/2_isis.t b/t/2_isis.t
new file mode 100755 (executable)
index 0000000..24f3b42
--- /dev/null
+++ b/t/2_isis.t
@@ -0,0 +1,194 @@
+#!/usr/bin/perl -w
+
+use strict;
+use blib;
+
+use Test::More tests => 112;
+use File::Spec;
+
+BEGIN {
+       use_ok( 'Biblio::Isis' );
+       eval "use Data::Dump";
+
+       if (! $@) {
+               *Dumper = *Data::Dump::dump;
+       } else {
+               use Data::Dumper;
+       }
+}
+
+
+my $debug = shift @ARGV;
+my $isis;
+
+my $path_winisis = File::Spec->catfile('data', 'winisis', 'BIBL');
+my $path_isismarc = File::Spec->catfile('data', 'isismarc', 'BIBL');
+
+sub test_data {
+
+       my $args = {@_};
+
+       isa_ok ($isis, 'Biblio::Isis');
+
+       cmp_ok($isis->count, '==', 5, "count is 5");
+
+       # test .CNT data
+
+       SKIP: {
+               skip "no CNT file for this database", 5 unless $isis->{cnt_file};
+
+               ok(my $isis_cnt = $isis->read_cnt, "read_cnt");
+
+               cmp_ok(scalar keys %{$isis_cnt}, '==', 2, "returns 2 elements");
+
+               my $cnt = {
+                       '1' => {
+                               'N' => 15,
+                               'K' => 5,
+                               'FMAXPOS' => 8,
+                               'POSRX' => 1,
+                               'ABNORMAL' => 1,
+                               'ORDN' => 5,
+                               'LIV' => 0,
+                               'ORDF' => 5,
+                               'NMAXPOS' => 1
+                               },
+                       '2' => {
+                               'N' => 15,
+                               'K' => 5,
+                               'FMAXPOS' => 4,
+                               'POSRX' => 1,
+                               'ABNORMAL' => 0,
+                               'ORDN' => 5,
+                               'LIV' => 0,
+                               'ORDF' => 5,
+                               'NMAXPOS' => 1
+                               }
+               };
+
+               foreach my $c (keys %{$cnt}) {
+                       foreach my $kn (keys %{$cnt->{$c}}) {
+                               cmp_ok($isis_cnt->{$c}->{$kn}, '==', $cnt->{$c}->{$kn}, "cnt $c $kn same");
+                       }
+               }
+       }
+
+       # test fetch
+
+       my $data = [ {
+               '801' => [ '^aFFZG' ],
+               '702' => [ '^aHolder^bElizabeth' ],
+               '990' => [ '2140', '88', 'HAY' ],
+               '675' => [ '^a159.9' ],
+               '210' => [ '^aNew York^cNew York University press^dcop. 1988' ],
+       }, {
+               '210' => [ '^aNew York^cUniversity press^d1989' ],
+               '700' => [ '^aFrosh^bStephen' ],
+               '990' => [ '2140', '89', 'FRO' ],
+               '200' => [ '^aPsychoanalysis and psychology^eminding the gap^fStephen Frosh' ],
+               '215' => [ '^aIX, 275 str.^d23 cm' ],
+       }, {
+               '210' => [ '^aLondon^cFree Associoation Books^d1992' ],
+               '700' => [ '^aTurkle^bShirlie' ],
+               '990' => [ '2140', '92', 'LAC' ],
+               '200' => [ '^aPsychoanalitic politics^eJacques Lacan and Freud\'s French Revolution^fSherry Turkle' ],
+               '686' => [ '^a2140', '^a2140' ],
+       
+       }, {
+               '700' => [ '^aGross^bRichard' ],
+               '200' => [ '^aKey studies in psychology^fRichard D. Gross' ],
+               '210' => [ '^aLondon^cHodder & Stoughton^d1994' ],
+               '10' => [ '^a0-340-59691-0' ],
+       }, {
+               # identifier test
+               '200' => [ '1#^aPsychology^fCamille B. Wortman, Elizabeth F. Loftus, Mary E. Marshal' ],
+               225 => ["1#^aMcGraw-Hill series in Psychology"],
+               205 => ["^a4th ed"],
+       } ];
+               
+       foreach my $mfn (1 .. $isis->count) {
+
+               my $rec;
+               ok($rec = $isis->fetch($mfn), "fetch $mfn");
+
+
+               diag "<<<<< rec: ",Dumper( $rec ), "\n>>>>> row:", Dumper( $data->[$mfn-1] ) if ($debug);
+
+               foreach my $f (keys %{$data->[$mfn-1]}) {
+                       my $i = 0;
+                       foreach my $v (@{$data->[$mfn-1]->{$f}}) {
+                               $v =~ s/^[01# ][01# ]// if ($args->{no_ident});
+                               diag "compare '", $rec->{$f}->[$i], "' eq '$v'" if ($debug);
+                               cmp_ok($rec->{$f}->[$i], 'eq', $v, "MFN $mfn field: $f offset: $i");
+                               $i++;
+                       }
+               }
+       }
+
+       # test to_ascii
+
+       SKIP: {
+               eval "use Digest::MD5 qw(md5_hex)";
+
+               skip "no Digest::MD5 module", 5 if ($@);
+
+               foreach my $mfn (1 .. $isis->count) {
+                       my $md5 = md5_hex($isis->to_ascii($mfn));
+                       cmp_ok($md5, 'eq', $args->{md5_ascii}[$mfn - 1], "md5 $mfn");
+               }
+       }
+
+}
+
+$isis = Biblio::Isis->new (
+       isisdb => $path_winisis,
+       include_deleted => 1,
+       debug => $debug,
+);
+
+diag "new Biblio::Isis = ", Dumper($isis) if ($debug);
+
+test_data(
+       no_ident => 1,
+       md5_ascii => [ qw(
+               a369eff702307ba12eb81656ee0587fe
+               4fb38537a94f3f5954e40d9536b942b0
+               579a7c6901c654bdeac10547a98e5b71
+               7d2adf1675c83283aa9b82bf343e3d85
+               4cc1f798bbcf36862f7aa78c3410801a
+       ) ],
+);
+
+$isis = Biblio::Isis->new (
+       isisdb => $path_isismarc,
+       include_deleted => 1,
+);
+
+test_data(
+       md5_ascii => [ qw(
+               f5587d9bcaa54257a98fe27d3c17a0b6
+               3be9a049f686f2a36af93a856dcae0f2
+               3961be5e3ba8fb274c89c08d18df4bcc
+               5f73ec00d08af044a2c4105f7d889e24
+               843b9ebccf16a498fba623c78f21b6c0
+       ) ],
+);
+
+# check logically deleted
+
+$isis = Biblio::Isis->new (
+       isisdb => $path_winisis,
+       include_deleted => 1,
+);
+
+ok($isis->fetch(3), "deleted found");
+cmp_ok($isis->{deleted}, '==', 3, "MFN 3 is deleted");
+
+$isis = Biblio::Isis->new (
+       isisdb => $path_winisis,
+       debug => $debug,
+);
+
+ok(! $isis->fetch(3), "deleted not found");
+cmp_ok($isis->{deleted}, '==', 3, "MFN 3 is deleted");
+

diff --git a/t/998_pod-coverage.t b/t/998_pod-coverage.t
deleted file mode 100755 (executable)
index 8f0fc65..0000000
--- a/t/998_pod-coverage.t
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/perl -w
-
-use Test::More;
-eval "use Test::Pod::Coverage 1.00";
-plan skip_all => "Test::Pod::Coverage 1.00 required for testing POD coverage" if $@;
-all_pod_coverage_ok();
-

diff --git a/t/999_pod.t b/t/999_pod.t
deleted file mode 100755 (executable)
index 7fc84fc..0000000
--- a/t/999_pod.t
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-
-use Test::More;
-eval "use Test::Pod 1.00";
-plan skip_all => "Test::Pod 1.00 required for testing POD" if $@;
-
-all_pod_files_ok();
-

diff --git a/t/9_pod-coverage.t b/t/9_pod-coverage.t
new file mode 100755 (executable)
index 0000000..8f0fc65
--- /dev/null
+++ b/t/9_pod-coverage.t
@@ -0,0 +1,7 @@
+#!/usr/bin/perl -w
+
+use Test::More;
+eval "use Test::Pod::Coverage 1.00";
+plan skip_all => "Test::Pod::Coverage 1.00 required for testing POD coverage" if $@;
+all_pod_coverage_ok();
+

diff --git a/t/9_pod.t b/t/9_pod.t
new file mode 100755 (executable)
index 0000000..7fc84fc
--- /dev/null
+++ b/t/9_pod.t
@@ -0,0 +1,11 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use Test::More;
+eval "use Test::Pod 1.00";
+plan skip_all => "Test::Pod 1.00 required for testing POD" if $@;
+
+all_pod_files_ok();
+