[Koha-patches] [PATCH] Bug 5477 [SIGN-OFF] Fix test cases that require database access
Chris Nighswonger
chris.nighswonger at gmail.com
Fri Jan 28 20:04:08 CET 2011
From: Robin Sheat <robin at catalyst.net.nz>
This moves the DB-requiring tests out of the way, with the exception of
00-load.t which is used by the git hooks. For it, it makes it skip
loading problematic modules. This allows 'make test' to complete successfully
without a database configured, wich is a required part of making packages.
This has been tested against the v3.02.03 tag and the master branch.
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
---
t/00-load.t | 17 ++++-
t/Auth.t | 15 -----
t/Auth_with_cas.t | 14 ----
t/BackgroundJob.t | 36 -----------
t/External_BakerTaylor.t | 14 ----
t/Record.t | 110 ---------------------------------
t/Reports_Guided.t | 14 ----
t/Serials.t | 10 ---
t/Service.t | 14 ----
t/Tags.t | 14 ----
t/UploadedFile.t | 14 ----
t/VirtualShelves_Page.t | 14 ----
t/db_dependent/Auth.t | 15 +++++
t/db_dependent/Auth_with_cas.t | 14 ++++
t/db_dependent/BackgroundJob.t | 36 +++++++++++
t/db_dependent/External_BakerTaylor.t | 14 ++++
t/db_dependent/Record.t | 110 +++++++++++++++++++++++++++++++++
t/db_dependent/Reports_Guided.t | 14 ++++
t/db_dependent/Serials_2.t | 10 +++
t/db_dependent/Service.t | 14 ++++
t/db_dependent/Tags.t | 14 ++++
t/db_dependent/UploadedFile.t | 14 ++++
t/db_dependent/VirtualShelves_Page.t | 14 ++++
23 files changed, 283 insertions(+), 272 deletions(-)
delete mode 100644 t/Auth.t
delete mode 100755 t/Auth_with_cas.t
delete mode 100644 t/BackgroundJob.t
delete mode 100755 t/External_BakerTaylor.t
delete mode 100755 t/Record.t
delete mode 100755 t/Reports_Guided.t
delete mode 100644 t/Serials.t
delete mode 100755 t/Service.t
delete mode 100755 t/Tags.t
delete mode 100755 t/UploadedFile.t
delete mode 100755 t/VirtualShelves_Page.t
create mode 100644 t/db_dependent/Auth.t
create mode 100755 t/db_dependent/Auth_with_cas.t
create mode 100644 t/db_dependent/BackgroundJob.t
create mode 100755 t/db_dependent/External_BakerTaylor.t
create mode 100755 t/db_dependent/Record.t
create mode 100755 t/db_dependent/Reports_Guided.t
create mode 100644 t/db_dependent/Serials_2.t
create mode 100755 t/db_dependent/Service.t
create mode 100755 t/db_dependent/Tags.t
create mode 100755 t/db_dependent/UploadedFile.t
create mode 100755 t/db_dependent/VirtualShelves_Page.t
diff --git a/t/00-load.t b/t/00-load.t
index b5c7181..fa8181f 100644
--- a/t/00-load.t
+++ b/t/00-load.t
@@ -13,12 +13,23 @@ find({
wanted => sub {
my $m = $_;
return unless $m =~ s/[.]pm$//;
+ $m =~ s{^.*/C4/}{C4/};
+ $m =~ s{/}{::}g;
return if $m =~ /Auth_with_ldap/; # Dont test this, it will fail on use
return if $m =~ /Cache/; # Cache modules are a WIP, add the tests back when we are using them more
return if $m =~ /SIP/; # SIP modules will not load clean
- $m =~ s{^.*/C4/}{C4/};
- $m =~ s{/}{::}g;
- use_ok($m) || BAIL_OUT("***** PROBLEMS LOADING FILE '$m'");
+ return if $m =~ /C4::VirtualShelves$/; # Requires a DB
+ return if $m =~ /C4::Auth$/; # DB
+ return if $m =~ /C4::Tags$/; # DB
+ return if $m =~ /C4::Service/; # DB
+ return if $m =~ /C4::Auth_with_cas/; # DB
+ return if $m =~ /C4::BackgroundJob/; # DB
+ return if $m =~ /C4::UploadedFile/; # DB
+ return if $m =~ /C4::Record/; # DB
+ return if $m =~ /C4::Reports::Guided/; # DB
+ return if $m =~ /C4::Serials/; # DB
+ return if $m =~ /C4::VirtualShelves::Page/; # DB
+ use_ok($m) || BAIL_OUT("***** PROBLEMS LOADING FILE '$m'");
},
}, $lib);
done_testing();
diff --git a/t/Auth.t b/t/Auth.t
deleted file mode 100644
index 08b6849..0000000
--- a/t/Auth.t
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/perl
-#
-# This Koha test module is a stub!
-# Add more tests here!!!
-
-use strict;
-use warnings;
-
-use Test::More tests => 1;
-
-BEGIN {
- use_ok('C4::Auth');
-}
-
-
diff --git a/t/Auth_with_cas.t b/t/Auth_with_cas.t
deleted file mode 100755
index 77dd21f..0000000
--- a/t/Auth_with_cas.t
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/perl
-#
-# This Koha test module is a stub!
-# Add more tests here!!!
-
-use strict;
-use warnings;
-
-use Test::More tests => 1;
-
-BEGIN {
- use_ok('C4::Auth_with_cas');
-}
-
diff --git a/t/BackgroundJob.t b/t/BackgroundJob.t
deleted file mode 100644
index 2726eb3..0000000
--- a/t/BackgroundJob.t
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/perl
-#
-# This Koha test module is a stub!
-# Add more tests here!!!
-
-use strict;
-use warnings;
-use C4::Auth;
-use CGI;
-use Test::More tests => 8;
-
-BEGIN {
- use_ok('C4::BackgroundJob');
-}
-my $query = new CGI;
-my ($userid, $cookie, $sessionID) = &checkauth($query, 1);
-#my ($sessionID, $job_name, $job_invoker, $num_work_units) = @_;
-my $background;
-diag $sessionID;
-ok ($background=C4::BackgroundJob->new($sessionID));
-ok ($background->id);
-
-$background->name("George");
-is ($background->name, "George", "testing name");
-
-$background->invoker("enjoys");
-is ($background->invoker, "enjoys", "testing invoker");
-
-$background->progress("testing");
-is ($background->progress, "testing", "testing progress");
-
-ok ($background->status);
-
-$background->size("56");
-is ($background->size, "56", "testing size");
-
diff --git a/t/External_BakerTaylor.t b/t/External_BakerTaylor.t
deleted file mode 100755
index fdccaee..0000000
--- a/t/External_BakerTaylor.t
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/perl
-#
-# This Koha test module is a stub!
-# Add more tests here!!!
-
-use strict;
-use warnings;
-
-use Test::More tests => 1;
-
-BEGIN {
- use_ok('C4::External::BakerTaylor');
-}
-
diff --git a/t/Record.t b/t/Record.t
deleted file mode 100755
index 2e04449..0000000
--- a/t/Record.t
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/usr/bin/perl
-#
-# This Koha test module is a stub!
-# Add more tests here!!!
-
-use strict;
-use warnings;
-
-use Test::More tests => 10;
-use MARC::Record;
-
-BEGIN {
- use_ok('C4::Record');
-}
-
-#my ($marc,$to_flavour,$from_flavour,$encoding) = @_;
-
-my @marcarray=marc2marc;
-is ($marcarray[0],"Feature not yet implemented\n","error works");
-
-my $marc=new MARC::Record;
-my $marcxml=marc2marcxml($marc);
-my $testxml=qq(<?xml version="1.0" encoding="UTF-8"?>
-<record
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.loc.gov/MARC21/slim http://www.loc.gov/standards/marcxml/schema/MARC21slim.xsd"
- xmlns="http://www.loc.gov/MARC21/slim">
-
- <leader> a </leader>
-</record>
-);
-is ($marcxml, $testxml, "testing marc2xml");
-
-my $rawmarc=$marc->as_usmarc;
-$marcxml=marc2marcxml($rawmarc);
-$testxml=qq(<?xml version="1.0" encoding="UTF-8"?>
-<record
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.loc.gov/MARC21/slim http://www.loc.gov/standards/marcxml/schema/MARC21slim.xsd"
- xmlns="http://www.loc.gov/MARC21/slim">
-
- <leader>00026 a2200025 4500</leader>
-</record>
-);
-is ($marcxml, $testxml, "testing marc2xml");
-
-my $marcconvert=marcxml2marc($marcxml);
-is ($marcconvert->as_xml,$marc->as_xml, "testing xml2marc");
-
-my $marcdc=marc2dcxml($marc);
-my $test2xml=qq(<?xml version="1.0" encoding="UTF-8"?>
-<metadata
- xmlns="http://example.org/myapp/"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://example.org/myapp/ http://example.org/myapp/schema.xsd"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:dcterms="http://purl.org/dc/terms/">
-</metadata>);
-
-is ($marcdc, $test2xml, "testing marc2dcxml");
-
-my $marcqualified=marc2dcxml($marc,1);
-my $test3xml=qq(<?xml version="1.0" encoding="UTF-8"?>
-<metadata
- xmlns="http://example.org/myapp/"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://example.org/myapp/ http://example.org/myapp/schema.xsd"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:dcterms="http://purl.org/dc/terms/">
-</metadata>);
-
-is ($marcqualified, $test3xml, "testing marcQualified");
-
-my $mods=marc2modsxml($marc);
-my $test4xml=qq(<?xml version="1.0" encoding="UTF-8"?>
-<mods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.loc.gov/mods/v3" version="3.1" xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-1.xsd">
- <typeOfResource/>
- <originInfo>
- <issuance/>
- </originInfo>
- <recordInfo/>
-</mods>
-);
-
-is ($mods, $test4xml, "testing marc2mosxml");
-
-my $field = MARC::Field->new('245','','','a' => "Harry potter");
-$marc->append_fields($field);
-
-#my $endnote=marc2endnote($marc->as_usmarc);
-#print $endnote;
-
-my $bibtex=marc2bibtex($marc);
-my $test5xml=qq(\@book{,
- title = "Harry potter"
-}
-);
-
-is ($bibtex, $test5xml, "testing bibtex");
-
-my @entity=C4::Record::_entity_encode("Björn");
-is ($entity[0], "Björn", "Html umlauts");
-
-
-
-
-
-
-
-
diff --git a/t/Reports_Guided.t b/t/Reports_Guided.t
deleted file mode 100755
index 0b0cda6..0000000
--- a/t/Reports_Guided.t
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/perl
-#
-# This Koha test module is a stub!
-# Add more tests here!!!
-
-use strict;
-use warnings;
-
-use Test::More tests => 1;
-
-BEGIN {
- use_ok('C4::Reports::Guided');
-}
-
diff --git a/t/Serials.t b/t/Serials.t
deleted file mode 100644
index 01cf853..0000000
--- a/t/Serials.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/perl
-use strict;
-use warnings;
-
-use Test::More;
-
-use_ok('C4::Serials');
-my $supplierlist=eval{GetSuppliersWithLateIssues()};
-ok(length($@)==0,"No SQL problem in GetSuppliersWithLateIssues");
-done_testing();
diff --git a/t/Service.t b/t/Service.t
deleted file mode 100755
index 497cc1b..0000000
--- a/t/Service.t
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/perl
-#
-# This Koha test module is a stub!
-# Add more tests here!!!
-
-use strict;
-use warnings;
-
-use Test::More tests => 1;
-
-BEGIN {
- use_ok('C4::Service');
-}
-
diff --git a/t/Tags.t b/t/Tags.t
deleted file mode 100755
index 83b3c9b..0000000
--- a/t/Tags.t
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/perl
-#
-# This Koha test module is a stub!
-# Add more tests here!!!
-
-use strict;
-use warnings;
-
-use Test::More tests => 1;
-
-BEGIN {
- use_ok('C4::Tags');
-}
-
diff --git a/t/UploadedFile.t b/t/UploadedFile.t
deleted file mode 100755
index dd01e1b..0000000
--- a/t/UploadedFile.t
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/perl
-#
-# This Koha test module is a stub!
-# Add more tests here!!!
-
-use strict;
-use warnings;
-
-use Test::More tests => 1;
-
-BEGIN {
- use_ok('C4::UploadedFile');
-}
-
diff --git a/t/VirtualShelves_Page.t b/t/VirtualShelves_Page.t
deleted file mode 100755
index 236d147..0000000
--- a/t/VirtualShelves_Page.t
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/perl
-#
-# This Koha test module is a stub!
-# Add more tests here!!!
-
-use strict;
-use warnings;
-
-use Test::More tests => 1;
-
-BEGIN {
- use_ok('C4::VirtualShelves::Page');
-}
-
diff --git a/t/db_dependent/Auth.t b/t/db_dependent/Auth.t
new file mode 100644
index 0000000..08b6849
--- /dev/null
+++ b/t/db_dependent/Auth.t
@@ -0,0 +1,15 @@
+#!/usr/bin/perl
+#
+# This Koha test module is a stub!
+# Add more tests here!!!
+
+use strict;
+use warnings;
+
+use Test::More tests => 1;
+
+BEGIN {
+ use_ok('C4::Auth');
+}
+
+
diff --git a/t/db_dependent/Auth_with_cas.t b/t/db_dependent/Auth_with_cas.t
new file mode 100755
index 0000000..77dd21f
--- /dev/null
+++ b/t/db_dependent/Auth_with_cas.t
@@ -0,0 +1,14 @@
+#!/usr/bin/perl
+#
+# This Koha test module is a stub!
+# Add more tests here!!!
+
+use strict;
+use warnings;
+
+use Test::More tests => 1;
+
+BEGIN {
+ use_ok('C4::Auth_with_cas');
+}
+
diff --git a/t/db_dependent/BackgroundJob.t b/t/db_dependent/BackgroundJob.t
new file mode 100644
index 0000000..2726eb3
--- /dev/null
+++ b/t/db_dependent/BackgroundJob.t
@@ -0,0 +1,36 @@
+#!/usr/bin/perl
+#
+# This Koha test module is a stub!
+# Add more tests here!!!
+
+use strict;
+use warnings;
+use C4::Auth;
+use CGI;
+use Test::More tests => 8;
+
+BEGIN {
+ use_ok('C4::BackgroundJob');
+}
+my $query = new CGI;
+my ($userid, $cookie, $sessionID) = &checkauth($query, 1);
+#my ($sessionID, $job_name, $job_invoker, $num_work_units) = @_;
+my $background;
+diag $sessionID;
+ok ($background=C4::BackgroundJob->new($sessionID));
+ok ($background->id);
+
+$background->name("George");
+is ($background->name, "George", "testing name");
+
+$background->invoker("enjoys");
+is ($background->invoker, "enjoys", "testing invoker");
+
+$background->progress("testing");
+is ($background->progress, "testing", "testing progress");
+
+ok ($background->status);
+
+$background->size("56");
+is ($background->size, "56", "testing size");
+
diff --git a/t/db_dependent/External_BakerTaylor.t b/t/db_dependent/External_BakerTaylor.t
new file mode 100755
index 0000000..fdccaee
--- /dev/null
+++ b/t/db_dependent/External_BakerTaylor.t
@@ -0,0 +1,14 @@
+#!/usr/bin/perl
+#
+# This Koha test module is a stub!
+# Add more tests here!!!
+
+use strict;
+use warnings;
+
+use Test::More tests => 1;
+
+BEGIN {
+ use_ok('C4::External::BakerTaylor');
+}
+
diff --git a/t/db_dependent/Record.t b/t/db_dependent/Record.t
new file mode 100755
index 0000000..2e04449
--- /dev/null
+++ b/t/db_dependent/Record.t
@@ -0,0 +1,110 @@
+#!/usr/bin/perl
+#
+# This Koha test module is a stub!
+# Add more tests here!!!
+
+use strict;
+use warnings;
+
+use Test::More tests => 10;
+use MARC::Record;
+
+BEGIN {
+ use_ok('C4::Record');
+}
+
+#my ($marc,$to_flavour,$from_flavour,$encoding) = @_;
+
+my @marcarray=marc2marc;
+is ($marcarray[0],"Feature not yet implemented\n","error works");
+
+my $marc=new MARC::Record;
+my $marcxml=marc2marcxml($marc);
+my $testxml=qq(<?xml version="1.0" encoding="UTF-8"?>
+<record
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.loc.gov/MARC21/slim http://www.loc.gov/standards/marcxml/schema/MARC21slim.xsd"
+ xmlns="http://www.loc.gov/MARC21/slim">
+
+ <leader> a </leader>
+</record>
+);
+is ($marcxml, $testxml, "testing marc2xml");
+
+my $rawmarc=$marc->as_usmarc;
+$marcxml=marc2marcxml($rawmarc);
+$testxml=qq(<?xml version="1.0" encoding="UTF-8"?>
+<record
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.loc.gov/MARC21/slim http://www.loc.gov/standards/marcxml/schema/MARC21slim.xsd"
+ xmlns="http://www.loc.gov/MARC21/slim">
+
+ <leader>00026 a2200025 4500</leader>
+</record>
+);
+is ($marcxml, $testxml, "testing marc2xml");
+
+my $marcconvert=marcxml2marc($marcxml);
+is ($marcconvert->as_xml,$marc->as_xml, "testing xml2marc");
+
+my $marcdc=marc2dcxml($marc);
+my $test2xml=qq(<?xml version="1.0" encoding="UTF-8"?>
+<metadata
+ xmlns="http://example.org/myapp/"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://example.org/myapp/ http://example.org/myapp/schema.xsd"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:dcterms="http://purl.org/dc/terms/">
+</metadata>);
+
+is ($marcdc, $test2xml, "testing marc2dcxml");
+
+my $marcqualified=marc2dcxml($marc,1);
+my $test3xml=qq(<?xml version="1.0" encoding="UTF-8"?>
+<metadata
+ xmlns="http://example.org/myapp/"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://example.org/myapp/ http://example.org/myapp/schema.xsd"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:dcterms="http://purl.org/dc/terms/">
+</metadata>);
+
+is ($marcqualified, $test3xml, "testing marcQualified");
+
+my $mods=marc2modsxml($marc);
+my $test4xml=qq(<?xml version="1.0" encoding="UTF-8"?>
+<mods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.loc.gov/mods/v3" version="3.1" xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-1.xsd">
+ <typeOfResource/>
+ <originInfo>
+ <issuance/>
+ </originInfo>
+ <recordInfo/>
+</mods>
+);
+
+is ($mods, $test4xml, "testing marc2mosxml");
+
+my $field = MARC::Field->new('245','','','a' => "Harry potter");
+$marc->append_fields($field);
+
+#my $endnote=marc2endnote($marc->as_usmarc);
+#print $endnote;
+
+my $bibtex=marc2bibtex($marc);
+my $test5xml=qq(\@book{,
+ title = "Harry potter"
+}
+);
+
+is ($bibtex, $test5xml, "testing bibtex");
+
+my @entity=C4::Record::_entity_encode("Björn");
+is ($entity[0], "Björn", "Html umlauts");
+
+
+
+
+
+
+
+
diff --git a/t/db_dependent/Reports_Guided.t b/t/db_dependent/Reports_Guided.t
new file mode 100755
index 0000000..0b0cda6
--- /dev/null
+++ b/t/db_dependent/Reports_Guided.t
@@ -0,0 +1,14 @@
+#!/usr/bin/perl
+#
+# This Koha test module is a stub!
+# Add more tests here!!!
+
+use strict;
+use warnings;
+
+use Test::More tests => 1;
+
+BEGIN {
+ use_ok('C4::Reports::Guided');
+}
+
diff --git a/t/db_dependent/Serials_2.t b/t/db_dependent/Serials_2.t
new file mode 100644
index 0000000..01cf853
--- /dev/null
+++ b/t/db_dependent/Serials_2.t
@@ -0,0 +1,10 @@
+#!/usr/bin/perl
+use strict;
+use warnings;
+
+use Test::More;
+
+use_ok('C4::Serials');
+my $supplierlist=eval{GetSuppliersWithLateIssues()};
+ok(length($@)==0,"No SQL problem in GetSuppliersWithLateIssues");
+done_testing();
diff --git a/t/db_dependent/Service.t b/t/db_dependent/Service.t
new file mode 100755
index 0000000..497cc1b
--- /dev/null
+++ b/t/db_dependent/Service.t
@@ -0,0 +1,14 @@
+#!/usr/bin/perl
+#
+# This Koha test module is a stub!
+# Add more tests here!!!
+
+use strict;
+use warnings;
+
+use Test::More tests => 1;
+
+BEGIN {
+ use_ok('C4::Service');
+}
+
diff --git a/t/db_dependent/Tags.t b/t/db_dependent/Tags.t
new file mode 100755
index 0000000..83b3c9b
--- /dev/null
+++ b/t/db_dependent/Tags.t
@@ -0,0 +1,14 @@
+#!/usr/bin/perl
+#
+# This Koha test module is a stub!
+# Add more tests here!!!
+
+use strict;
+use warnings;
+
+use Test::More tests => 1;
+
+BEGIN {
+ use_ok('C4::Tags');
+}
+
diff --git a/t/db_dependent/UploadedFile.t b/t/db_dependent/UploadedFile.t
new file mode 100755
index 0000000..dd01e1b
--- /dev/null
+++ b/t/db_dependent/UploadedFile.t
@@ -0,0 +1,14 @@
+#!/usr/bin/perl
+#
+# This Koha test module is a stub!
+# Add more tests here!!!
+
+use strict;
+use warnings;
+
+use Test::More tests => 1;
+
+BEGIN {
+ use_ok('C4::UploadedFile');
+}
+
diff --git a/t/db_dependent/VirtualShelves_Page.t b/t/db_dependent/VirtualShelves_Page.t
new file mode 100755
index 0000000..236d147
--- /dev/null
+++ b/t/db_dependent/VirtualShelves_Page.t
@@ -0,0 +1,14 @@
+#!/usr/bin/perl
+#
+# This Koha test module is a stub!
+# Add more tests here!!!
+
+use strict;
+use warnings;
+
+use Test::More tests => 1;
+
+BEGIN {
+ use_ok('C4::VirtualShelves::Page');
+}
+
--
1.7.2.3
More information about the Koha-patches
mailing list