Changeset 361

Timestamp:

06/07/04 21:39:35 (4 years ago)

Author:

kake

Message:

Test overhaul - no longer require database access info.

Location:

trunk

Files:

• MANIFEST (modified) (1 diff)
• PREREQUISITES (modified) (1 diff)
• lib/OpenGuides.pm (modified) (1 diff)
• t/00_setup.t (deleted)
• t/01_add_test_data.t (deleted)
• t/01_load.t (added)
• t/11_utils.t (modified) (2 diffs)
• t/12_macros.t (modified) (2 diffs)
• t/13_cookies.t (modified) (2 diffs)
• t/15_template.t (modified) (3 diffs)
• t/15_wiki.conf (deleted)
• t/21_rdf.t (modified) (1 diff)
• t/21_wiki.conf (deleted)
• t/22_rss_modwiki.t (modified) (1 diff)
• t/31_supersearch.t (modified) (3 diffs)
• t/32_supersearch_simple_metadata.t (modified) (2 diffs)
• t/41_deletion.t (modified) (2 diffs)
• t/51_diff.t (deleted)
• t/61_bug_textareas.t (modified) (2 diffs)
• t/62_bug_os_coords.t (modified) (2 diffs)
• wiki.cgi (modified) (1 diff)

trunk/MANIFEST

@@ -48 +48 @@
 templates/userstats.tt
 templates/wanted_pages.tt
-t/00_setup.t
-t/01_add_test_data.t
+t/01_load.t
 t/11_utils.t
 t/12_macros.t
 t/13_cookies.t
 t/15_template.t
-t/15_wiki.conf
 t/21_rdf.t
-t/21_wiki.conf
 t/22_rss_modwiki.t
 t/31_supersearch.t
 t/32_supersearch_simple_metadata.t
 t/41_deletion.t
-t/51_diff.t
 t/61_bug_textareas.t
 t/62_bug_os_coords.t

trunk/PREREQUISITES

@@ -1 @@
-Modules required by OpenGuides 0.31
+Modules required by OpenGuides 0.33
 ===================================
 

trunk/lib/OpenGuides.pm

@@ -4 +4 @@
 use vars qw( $VERSION );
 
-$VERSION = '0.32';
+$VERSION = '0.33_01';
 
 =head1 NAME

trunk/t/11_utils.t

@@ -1 +1 @@
 use strict;
 use Config::Tiny;
-use Test::More tests => 9;
-
-# Need to use a BEGIN block for the test or we get "Too late to run INIT block"
-# from Class::Delegation
-
-BEGIN {
-  use_ok( "OpenGuides::Utils" );
-}
+use OpenGuides::Utils;
+use Test::More tests => 7;
 
 eval { my $wiki = OpenGuides::Utils->make_wiki_object; };
@@ -16 +10 @@
 ok( $@, "...and if config param isn't a Config::Tiny object" );
 
-my $config = Config::Tiny->read( "wiki.conf" )
-    or die "Couldn't read wiki.conf";
-my $wiki = eval { OpenGuides::Utils->make_wiki_object( config => $config ); };
-is( $@, "", "...but not if a Config::Tiny object is supplied" );
-isa_ok( $wiki, "CGI::Wiki" );
+eval { require DBD::SQLite; };
+my $have_sqlite = $@ ? 0 : 1;
 
-ok( $wiki->store,      "...and store defined" );
-ok( $wiki->search_obj, "...and search defined" );
-ok( $wiki->formatter,  "...and formatter defined" );
+SKIP: {
+    skip "DBD::SQLite not installed - no database to test with", 5
+      unless $have_sqlite;
 
-# Ensure that we take note of any defined dbhost - note that this test
-# is only useful if we've defined a dbhost during perl Build.PL
-is( $wiki->store->dbhost, $config->{_}->{dbhost}, "dbhost taken note of" );
+    my $config = Config::Tiny->new;
+    $config->{_} = {
+                     dbtype             => "sqlite",
+                     dbname             => "t/node.db",
+                     indexing_directory => "t/indexes",
+                     script_url         => "",
+                     script_name        => "",
+                   };
+
+    my $wiki = eval {
+        OpenGuides::Utils->make_wiki_object( config => $config );
+    };
+    is( $@, "",
+        "...but not if a Config::Tiny object with suitable data is supplied" );
+    isa_ok( $wiki, "CGI::Wiki" );
+
+    ok( $wiki->store,      "...and store defined" );
+    ok( $wiki->search_obj, "...and search defined" );
+    ok( $wiki->formatter,  "...and formatter defined" );
+}

trunk/t/12_macros.t

@@ -4 +4 @@
 use Test::More tests => 2;
 
-my $config = Config::Tiny->read( "wiki.conf" )
-    or die "Couldn't read wiki.conf";
-my $wiki = OpenGuides::Utils->make_wiki_object( config => $config );
-my $formatter = $wiki->formatter;
+eval { require DBD::SQLite; };
+my $have_sqlite = $@ ? 0 : 1;
 
-my $wikitext = <<WIKI;
+SKIP: {
+    skip "DBD::SQLite not installed - no database to test with", 2
+      unless $have_sqlite;
+
+    my $config = Config::Tiny->new;
+    $config->{_} = {
+                     dbtype             => "sqlite",
+                     dbname             => "t/node.db",
+                     indexing_directory => "t/indexes",
+                     script_url         => "",
+                     script_name        => "",
+                   };
+
+    my $wiki = OpenGuides::Utils->make_wiki_object( config => $config );
+    my $formatter = $wiki->formatter;
+
+    my $wikitext = <<WIKI;
 
 \@INDEX_LINK [[Category Foo]]
@@ -17 +31 @@
 WIKI
 
-my $html = $formatter->format($wikitext);
-like( $html, qr/View all pages in Category Foo/,
-      "\@INDEX_LINK has right default link text" );
-like( $html, qr/>Bars<\/a>/, "...and can be overridden" );
+    my $html = $formatter->format($wikitext);
+    like( $html, qr/View all pages in Category Foo/,
+          "\@INDEX_LINK has right default link text" );
+    like( $html, qr/>Bars<\/a>/, "...and can be overridden" );
+}

trunk/t/13_cookies.t

@@ -1 +1 @@
 use strict;
 use Config::Tiny;
-use Test::More tests => 16;
-
-use_ok( "OpenGuides::CGI" );
+use OpenGuides::CGI;
+use Test::More tests => 15;
 
 eval { OpenGuides::CGI->make_prefs_cookie; };
@@ -11 +10 @@
 ok( $@, "...or if config isn't a Config::Tiny" );
 
-my $config = Config::Tiny->read( "t/21_wiki.conf" );
+my $config = Config::Tiny->new;
+$config->{_} = {
+                 site_name => "Test Site",
+               };
 
 eval { OpenGuides::CGI->make_prefs_cookie( config => $config ); };

trunk/t/15_template.t

@@ -1 +1 @@
 use strict;
-use Test::More tests => 28;
 use Config::Tiny;
 use Cwd;
 use CGI::Cookie;
 use CGI::Wiki::Formatter::UseMod;
+use OpenGuides::Template;
 use Test::MockObject;
-
-use_ok( "OpenGuides::Template" );
-
-my $config = Config::Tiny->read( "t/21_wiki.conf" );
-$config->{_}->{template_path} = cwd . "/t/templates";
+use Test::More tests => 27;
+
+my $config = Config::Tiny->new;
+$config->{_} = {
+                 template_path         => cwd . '/t/templates',
+                 site_name             => 'CGI::Wiki Test Site',
+                 script_url            => 'http://wiki.example.com/',
+                 script_name           => 'mywiki.cgi',
+                 default_country       => 'United Kingdom',
+                 default_city          => 'London',
+                 contact_email         => 'wiki@example.com',
+                 stylesheet_url        => 'http://wiki.example.com/styles.css',
+                 home_name             => 'Home Page',
+                 formatting_rules_node => 'Rules',
+               };
 
 # White box testing - we know that OpenGuides::Template only actually uses
 # the node_name_to_node_param method of the formatter component of the wiki
-# object passed in, and I CBA to faff about with picking out the test DB
-# info to make a proper wiki object here.
+# object passed in, and I CBA to make a proper wiki object here.
 my $fake_wiki = Test::MockObject->new;
 $fake_wiki->mock("formatter",
@@ -103 +112 @@
 
 # Test that home_link is set correctly when script_name is blank.
-$config = Config::Tiny->read( "t/15_wiki.conf" );
-$config->{_}->{template_path} = cwd . "/t/templates";
+$config->{_} = {
+                 template_path         => cwd . '/t/templates',
+                 site_name             => 'CGI::Wiki Test Site',
+                 script_url            => 'http://wiki.example.com/',
+                 script_name           => '',
+               };
 $output = OpenGuides::Template->output(
     wiki     => $fake_wiki,
@@ -115 +128 @@
 # Test that full_cgi_url comes out right if the trailing '/' is
 # missing from script_url in the config file.
-$config = Config::Tiny->read( "t/15_wiki.conf" );
-$config->{_}->{template_path} = cwd . "/t/templates";
-$config->{_}->{script_url} = "http://wiki.example.com";
-$config->{_}->{script_name} = "wiki.cgi";
+$config->{_} = {
+                 template_path         => cwd . '/t/templates',
+                 site_name             => 'CGI::Wiki Test Site',
+                 script_url            => 'http://wiki.example.com',
+                 script_name           => 'wiki.cgi',
+               };
 $output = OpenGuides::Template->output(
     wiki     => $fake_wiki,

trunk/t/21_rdf.t

@@ -1 @@
-use CGI::Wiki::TestConfig::Utilities;
-use CGI::Wiki;
-use CGI::Wiki::Formatter::UseMod;
+use CGI::Wiki::Setup::SQLite;
 use Config::Tiny;
+use OpenGuides::RDF;
+use OpenGuides::Utils;
 use URI::Escape;
+use Test::More tests => 22;
 
-use Test::More tests =>
-  (1 + 22 * $CGI::Wiki::TestConfig::Utilities::num_stores);
+eval { require DBD::SQLite; };
+my $have_sqlite = $@ ? 0 : 1;
 
-use_ok( "OpenGuides::RDF" );
+SKIP: {
+    skip "DBD::SQLite not installed - no database to test with", 22
+      unless $have_sqlite;
 
-my %stores = CGI::Wiki::TestConfig::Utilities->stores;
+    CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+    my $config = Config::Tiny->new;
+    $config->{_} = {
+                     dbtype             => "sqlite",
+                     dbname             => "t/node.db",
+                     indexing_directory => "t/indexes",
+                     script_url         => "http://wiki.example.com/",
+                     script_name        => "mywiki.cgi",
+                     site_name          => "CGI::Wiki Test Site",
+                     default_city       => "London",
+                     default_country    => "United Kingdom",
+                   };
 
-my ($store_name, $store);
-while ( ($store_name, $store) = each %stores ) {
-  SKIP: {
-      skip "$store_name storage backend not configured for testing", 22
-          unless $store;
+    my $wiki = OpenGuides::Utils->make_wiki_object( config => $config );
 
-      print "#\n##### TEST CONFIG: Store: $store_name\n#\n";
+    # Clear out the database from any previous runs.
+    foreach my $del_node ( $wiki->list_all_nodes ) {
+        $wiki->delete_node( $del_node ) or die "Can't delete $del_node";
+    }
 
-      my $wiki = CGI::Wiki->new(
-          store     => $store,
-          formatter => CGI::Wiki::Formatter::UseMod->new( munge_urls => 1 ),
-      );
-      my $config = Config::Tiny->read( "t/21_wiki.conf" );
+    my $rdf_writer = eval {
+        OpenGuides::RDF->new( wiki => $wiki, config => $config );
+    };
+    is( $@, "", "'new' doesn't croak if wiki and config objects supplied" );
+    isa_ok( $rdf_writer, "OpenGuides::RDF" );
 
-      my $rdf_writer = eval {
-          OpenGuides::RDF->new( wiki   => $wiki,
-                                config => $config
-          );
-      };
-      is( $@, "",
-         "'new' doesn't croak if wiki and config objects supplied"
-      );
-      isa_ok( $rdf_writer, "OpenGuides::RDF" );
+    # Test the data for a node that exists.
+    $wiki->write_node( "Calthorpe Arms",
+                       "CAMRA-approved pub near King's Cross",
+                       undef,
+                       {
+                         comment            => "Stub page, please update!",
+                         username           => "Kake",
+                         postcode           => "WC1X 8JR",
+                         locale             => [ "Bloomsbury", "St Pancras" ],
+                         phone              => "test phone number",
+                         website            => "test website",
+                         opening_hours_text => "test hours",
+                         latitude           => "51.524193",
+                         longitude          => "-0.114436"
+                       }
+    );
 
-      # Test the data for a node that exists.
-      my $rdfxml = $rdf_writer->emit_rdfxml( node => "Calthorpe Arms" );
+    my $rdfxml = $rdf_writer->emit_rdfxml( node => "Calthorpe Arms" );
 
-      like( $rdfxml, qr|<\?xml version="1.0"\?>|,
-            "RDF is encoding-neutral" );
+    like( $rdfxml, qr|<\?xml version="1.0"\?>|, "RDF is encoding-neutral" );
 
-      like( $rdfxml, qr|<wn:Neighborhood>Bloomsbury</wn:Neighborhood>|,
-            "finds the first locale" );
-      like( $rdfxml, qr|<wn:Neighborhood>St Pancras</wn:Neighborhood>|,
-            "finds the second locale" );
+    like( $rdfxml, qr|<wn:Neighborhood>Bloomsbury</wn:Neighborhood>|,
+          "finds the first locale" );
+    like( $rdfxml, qr|<wn:Neighborhood>St Pancras</wn:Neighborhood>|,
+         "finds the second locale" );
 
-      like( $rdfxml, qr|<phone>test phone number</phone>|,
-            "picks up phone number" );
+    like( $rdfxml, qr|<phone>test phone number</phone>|,
+          "picks up phone number" );
 
-      like( $rdfxml, qr|<chefmoz:Hours>test hours</chefmoz:Hours>|,
-            "picks up opening hours text" );
+    like( $rdfxml, qr|<chefmoz:Hours>test hours</chefmoz:Hours>|,
+          "picks up opening hours text" );
 
-      like( $rdfxml, qr|<homePage>test website</homePage>|,
-            "picks up website" );
+    like( $rdfxml, qr|<homePage>test website</homePage>|, "picks up website" );
 
-      like( $rdfxml,
-           qr|<dc:title>CGI::Wiki Test Site: Calthorpe Arms</dc:title>|,
-            "sets the title correctly" );
+    like( $rdfxml,
+          qr|<dc:title>CGI::Wiki Test Site: Calthorpe Arms</dc:title>|,
+          "sets the title correctly" );
 
-      like( $rdfxml, qr|<dc:contributor>Kake</dc:contributor>|,
-            "last username to edit used as contributor" );
+    like( $rdfxml, qr|<dc:contributor>Kake</dc:contributor>|,
+          "last username to edit used as contributor" );
 
-      like( $rdfxml, qr|<wiki:version>1</wiki:version>|, "version picked up" );
+    like( $rdfxml, qr|<wiki:version>1</wiki:version>|, "version picked up" );
 
-      like( $rdfxml, qr|<rdf:Description rdf:about="">|, "sets the 'about' correctly" );
+    like( $rdfxml, qr|<rdf:Description rdf:about="">|,
+          "sets the 'about' correctly" );
 
-      like( $rdfxml, qr|<dc:source rdf:resource="http://wiki.example.com/mywiki.cgi\?id=Calthorpe_Arms" />|,
-            "set the dc:source with the version-independent uri" );
+    like( $rdfxml, qr|<dc:source rdf:resource="http://wiki.example.com/mywiki.cgi\?id=Calthorpe_Arms" />|,
+          "set the dc:source with the version-independent uri" );
 
-      like( $rdfxml, qr|<country>United Kingdom</country>|,
-            "default country picked up" ).
-      like( $rdfxml, qr|<city>London</city>|,
-            "default city picked up" ).
-      like( $rdfxml, qr|<postalCode>WC1X 8JR</postalCode>|,
-            "postcode picked up" );
-      like( $rdfxml, qr|<geo:lat>51.524193</geo:lat>|,
-            "latitude picked up" );
-      like( $rdfxml, qr|<geo:long>-0.114436</geo:long>|,
-            "longitude picked up" );
+    like( $rdfxml, qr|<country>United Kingdom</country>|, "country" ).
+    like( $rdfxml, qr|<city>London</city>|, "city" ).
+    like( $rdfxml, qr|<postalCode>WC1X 8JR</postalCode>|, "postcode" );
+    like( $rdfxml, qr|<geo:lat>51.524193</geo:lat>|, "latitude" );
+    like( $rdfxml, qr|<geo:long>-0.114436</geo:long>|, "longitude" );
 
-      like( $rdfxml, qr|<dc:date>|, "date element included" );
-      unlike( $rdfxml, qr|<dc:date>1970|, "hasn't defaulted to the epoch" );
+    like( $rdfxml, qr|<dc:date>|, "date element included" );
+    unlike( $rdfxml, qr|<dc:date>1970|, "hasn't defaulted to the epoch" );
 
+    # Now test that there's a nice failsafe where a node doesn't exist.
+    $rdfxml = eval { $rdf_writer->emit_rdfxml( node => "I Do Not Exist" ); };
+    is( $@, "",
+        "->emit_rdfxml doesn't die when called on a nonexistent node" );
 
-      # Now test that there's a nice failsafe where a node doesn't exist.
-      $rdfxml = eval {
-          $rdf_writer->emit_rdfxml( node => "I Do Not Exist" );
-      };
-      is( $@, "",
-           "->emit_rdfxml doesn't die when called on a nonexistent node" );
-
-      like( $rdfxml, qr|<wiki:version>0</wiki:version>|,
-            "...and wiki:version is 0" );
-
-      #print $rdfxml;
-  }
+    like( $rdfxml, qr|<wiki:version>0</wiki:version>|,
+          "...and wiki:version is 0" );
 }

trunk/t/22_rss_modwiki.t

@@ -1 +1 @@
 use strict;
-use CGI::Wiki::Formatter::UseMod;
-use CGI::Wiki::TestConfig::Utilities;
-use CGI::Wiki;
+use CGI::Wiki::Setup::SQLite;
 use Config::Tiny;
+use OpenGuides::RDF;
+use OpenGuides::Utils;
+use Test::More tests => 1;
 
-use Test::More tests =>
-  (1 + 2 * $CGI::Wiki::TestConfig::Utilities::num_stores);
+eval { require DBD::SQLite; };
+my $have_sqlite = $@ ? 0 : 1;
 
-use_ok( "OpenGuides::RDF" );
+SKIP: {
+    skip "DBD::SQLite not installed - no database to test with", 1
+      unless $have_sqlite;
 
-my %stores = CGI::Wiki::TestConfig::Utilities->stores;
+    CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+    my $config = Config::Tiny->new;
+    $config->{_} = {
+                     dbtype             => "sqlite",
+                     dbname             => "t/node.db",
+                     indexing_directory => "t/indexes",
+                     script_url         => "http://wiki.example.com/",
+                     script_name        => "mywiki.cgi",
+                     site_name          => "CGI::Wiki Test Site",
+                   };
 
-my ($store_name, $store);
-while ( ($store_name, $store) = each %stores ) {
-  SKIP: {
-      skip "$store_name storage backend not configured for testing", 2
-          unless $store;
+    my $wiki = OpenGuides::Utils->make_wiki_object( config => $config );
 
-      print "#\n##### TEST CONFIG: Store: $store_name\n#\n";
+    my $rdf_writer = OpenGuides::RDF->new( wiki   => $wiki,
+                                           config => $config );
 
-      my $wiki = CGI::Wiki->new(
-          store     => $store,
-          formatter => CGI::Wiki::Formatter::UseMod->new );
-      my $config = Config::Tiny->read( "t/21_wiki.conf" );
-      my $rdf_writer = OpenGuides::RDF->new( wiki   => $wiki,
-                                             config => $config );
-      isa_ok( $rdf_writer, "OpenGuides::RDF" );
-
-      my $rss = eval { $rdf_writer->make_recentchanges_rss; };
-      is( $@, "", "->make_recentchanges_rss doesn't croak" );
-
-#      print $rss;
-
-  } # end of SKIP
+    my $rss = eval { $rdf_writer->make_recentchanges_rss; };
+    is( $@, "", "->make_recentchanges_rss doesn't croak" );
 }
 

trunk/t/31_supersearch.t

@@ -1 @@
-local $^W = 1;
 use strict;
-use vars qw( $sqlite_tests );
-BEGIN { $sqlite_tests = 16; }
-use Test::More tests => 1 + $sqlite_tests;
-
 use CGI::Wiki::Setup::SQLite;
 use Config::Tiny;
-
-use_ok( "OpenGuides::SuperSearch" );
+use OpenGuides::SuperSearch;
+use Test::More tests => 16;
 
 eval { require DBD::SQLite; };
-my $run_tests = $@ ? 0 : 1;
+my $have_sqlite = $@ ? 0 : 1;
 
 SKIP: {
-    skip "DBD::SQLite needed to run these tests", $sqlite_tests
-      unless $run_tests;
+    skip "DBD::SQLite not installed - no database to test with", 16
+      unless $have_sqlite;
 
-    # Ensure the test database is set up.
-    CGI::Wiki::Setup::SQLite::setup( "t/sqlite.31.db" );
-
+    CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     my $config = Config::Tiny->new;
     $config->{_} = {
                      dbtype             => "sqlite",
-                     dbname             => "t/sqlite.31.db",
-                     indexing_directory => "t/index.31/",
+                     dbname             => "t/node.db",
+                     indexing_directory => "t/indexes",
                      script_name        => "wiki.cgi",
                      script_url         => "http://example.com/",
@@ -30 +23 @@
                      template_path      => "./templates",
                    };
+
     my $search = OpenGuides::SuperSearch->new( config => $config );
     isa_ok( $search, "OpenGuides::SuperSearch" );
@@ -151 +145 @@
           "second page of results starts with right numbering" );
 }
-

trunk/t/32_supersearch_simple_metadata.t

@@ -1 @@
-local $^W = 1;
 use strict;
 use CGI::Wiki::Setup::SQLite;
 use Config::Tiny;
 use OpenGuides::SuperSearch;
-use Test::More;
+use Test::More tests => 10;
 
 eval { require DBD::SQLite; };
+my $have_sqlite = $@ ? 0 : 1;
 
-if ( $@ ) {
-    plan skip_all => "DBD::SQLite needed to run these tests";
-} else {
-    plan tests => 10;
+SKIP: {
+    skip "DBD::SQLite not installed - no database to test with", 10
+      unless $have_sqlite;
 
-    # Ensure the test database is set up.
-    CGI::Wiki::Setup::SQLite::setup( "t/sqlite.32.db" );
-
+    CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     my $config = Config::Tiny->new;
     $config->{_} = {
                      dbtype             => "sqlite",
-                     dbname             => "t/sqlite.32.db",
-                     indexing_directory => "t/index.32/",
+                     dbname             => "t/node.db",
+                     indexing_directory => "t/indexes",
                      script_name        => "wiki.cgi",
                      script_url         => "http://example.com/",
@@ -26 +23 @@
                      template_path      => "./templates",
                    };
+
     my $search = OpenGuides::SuperSearch->new( config => $config );
 

trunk/t/41_deletion.t

@@ -1 +1 @@
 use strict;
-use Test::More tests => 3;
 use Config::Tiny;
 use Cwd;
@@ -6 +5 @@
 use OpenGuides::Template;
 use Test::MockObject;
+use Test::More tests => 3;
 
 my $config = Config::Tiny->new;