fix a few test file module names that were missed

diff --git a/t/050-local/030-tags.t b/t/050-local/030-tags.t
index d9fee1ffa57d491f3183e62cb5ec236e1af6b5e3..09f5dbf30ad8bd0321296169f12b5a43b9573b50 100644 (file)
--- a/t/050-local/030-tags.t
+++ b/t/050-local/030-tags.t
@@ -78,7 +78,7 @@ for my $title ("A" .. "Z") {
 }
 
 {
-  my $tag_info = Products->collection_with_tags
+  my $tag_info = BSE::TB::Products->collection_with_tags
     (
      "all_visible_products",
      [ "iPod: Nano" ],

diff --git a/t/060-generate/010-generate.t b/t/060-generate/010-generate.t
index d54923cdd1a6b30521c28954cd02a7a2134db99c..37c3a3403d8c7386f79a0dddb19b1b470f60e1e5 100644 (file)
--- a/t/060-generate/010-generate.t
+++ b/t/060-generate/010-generate.t
@@ -115,7 +115,7 @@ BSE::Admin::StepParents->add($parent, $parent);
 is($parent->section->{id}, $parent->{id}, "parent should be it's own section");
 is($kids[0]->section->{id}, $parent->{id}, "kids section should be the parent");
 
-my $top = Articles->getByPkey(1);
+my $top = BSE::TB::Articles->getByPkey(1);
 ok($top, "grabbing Home page");
 
 template_test "cfg", $top, <<TEMPLATE, <<EXPECTED;
@@ -594,7 +594,7 @@ Category: Two
 
 EXPECTED
 
-my $cat = Articles->tag_category("Foo:");
+my $cat = BSE::TB::Articles->tag_category("Foo:");
 my @old_deps = $cat->deps;
 my $error;
 $cat->set_deps([ "Bar:" ], \$error);
@@ -768,7 +768,7 @@ sub template_test($$$$) {
     skip "$tag: couldn't make generator", 1 unless $gen;
     eval {
       $content =
-       $gen->generate_low($template, $article, 'Articles', 0);
+       $gen->generate_low($template, $article, 'BSE::TB::Articles', 0);
     };
     ok(defined $content, "$tag: generate content");
     diag $@ unless $content;
@@ -818,7 +818,7 @@ sub dyn_template_test($$$$) {
 sub _generate_dyn_template {
   my ($article, $template) = @_;
 
-  my $articles = 'Articles';
+  my $articles = 'BSE::TB::Articles';
   my $genname = $article->{generator};
   eval "use $genname";
   $@ && die $@;

diff --git a/t/060-generate/020-catalog.t b/t/060-generate/020-catalog.t
index b4cd0544b0e40be72c99285455a8cca18ebbd9ba..ed56fbc2b29796aac6c9fbfbd33a92524b159309 100644 (file)
--- a/t/060-generate/020-catalog.t
+++ b/t/060-generate/020-catalog.t
@@ -330,7 +330,7 @@ sub template_test($$$$) {
     skip "$tag: couldn't make generator", 1 unless $gen;
     eval {
       $content =
-       $gen->generate_low($template, $article, 'Articles', 0);
+       $gen->generate_low($template, $article, 'BSE::TB::Articles', 0);
     };
     ok($content, "$tag: generate content");
     diag $@ unless $content;

diff --git a/t/080-remote/010-save.t b/t/080-remote/010-save.t
index b658939b85864cfa8c50f3ca5cc343c13d65e84a..b84d3ff9b14a36dc8b2f0dc540c302853504e87e 100644 (file)
--- a/t/080-remote/010-save.t
+++ b/t/080-remote/010-save.t
@@ -4,10 +4,10 @@ use BSE::Test qw(make_ua base_url);
 use JSON;
 use DevHelp::HTML;
 use Test::More;
-use Article;
+use BSE::TB::Article;
 use Time::HiRes qw(time sleep);
 
-my @cols = Article->columns;
+my @cols = BSE::TB::Article->columns;
 
 my $base = 130;
 

diff --git a/t/080-remote/020-cat.t b/t/080-remote/020-cat.t
index 76acac4f72c98244f8e8c49e39c31947ce3bea3e..aa00082b940c9f6a6fe9397555d27956dd6f48d2 100644 (file)
--- a/t/080-remote/020-cat.t
+++ b/t/080-remote/020-cat.t
@@ -21,7 +21,7 @@ my $cat = do_add($add_url,
                  type => "Catalog",
                 }, "make test catalog");
 
-is($cat->{generator}, "Generate::Catalog", "make sure it's a catalog");
+is($cat->{generator}, "BSE::Generate::Catalog", "make sure it's a catalog");
 
 # and an article
 my $art = do_add($add_url, 
@@ -30,7 +30,7 @@ my $art = do_add($add_url,
                  title => "Test article",
                 }, "make test article");
 
-is($art->{generator}, "Generate::Article", "make sure it's an article");
+is($art->{generator}, "BSE::Generate::Article", "make sure it's an article");
 
 my $prod;
 {
@@ -42,7 +42,7 @@ my $prod;
       parentid => $cat->{id},
       title => "Some Product",
      }, "make test product");
-  is($result->{generator}, "Generate::Product",
+  is($result->{generator}, "BSE::Generate::Product",
      "check generator");
   $prod = $result;
 }

diff --git a/t/130-importer/020-article.t b/t/130-importer/020-article.t
index 470e0b14d2ebeeb0dba2d9cde7abb4341bbaa77f..641e20eb6c881f753656bfcccf9fdf12eb02c6d1 100644 (file)
--- a/t/130-importer/020-article.t
+++ b/t/130-importer/020-article.t
@@ -134,7 +134,7 @@ EOS
     close $fh;
     my $imp = BSE::Importer->new(cfg => $cfg, profile => "simpleupdate$when", callback => sub { note @_ });
     $imp->process($filename);
-    my $testb = Articles->getByPkey($testa->id);
+    my $testb = BSE::TB::Articles->getByPkey($testa->id);
     like($testb->body, qr/This is the body/, "check the body is updated");
     my @images = $testb->images;
     is(@images, 1, "have an image");
@@ -158,7 +158,7 @@ EOS
     close $fh;
     my $imp = BSE::Importer->new(cfg => $cfg, profile => "completefile$when", callback => sub { note @_ });
     $imp->process($filename);
-    my $testb = Articles->getByPkey($testa->id);
+    my $testb = BSE::TB::Articles->getByPkey($testa->id);
 
     my ($file) = grep $_->name eq "test", $testb->files;
     ok($file, "found the file with name 'test'")
@@ -184,7 +184,7 @@ EOS
     close $fh;
     my $imp = BSE::Importer->new(cfg => $cfg, profile => "updatefile$when", callback => sub { note @_ });
     $imp->process($filename);
-    my $testb = Articles->getByPkey($testa->id);
+    my $testb = BSE::TB::Articles->getByPkey($testa->id);
 
     my ($file) = grep $_->name eq "test", $testb->files;
     ok($file, "found the updated file with name 'test'")
@@ -211,7 +211,7 @@ EOS
     close $fh;
     my $imp = BSE::Importer->new(cfg => $cfg, profile => "updatefileb$when", callback => sub { note @_ });
     $imp->process($filename);
-    my $testb = Articles->getByPkey($testa->id);
+    my $testb = BSE::TB::Articles->getByPkey($testa->id);
 
     my ($file) = grep $_->name eq "test", $testb->files;
     ok($file, "found the updated file with name 'test'")
@@ -251,7 +251,7 @@ EOS
     close $fh;
     my $imp = BSE::Importer->new(cfg => $cfg, profile => "alias$when", callback => sub { note @_ });
     $imp->process($filename);
-    my $testb = Articles->getByPkey($testa->id);
+    my $testb = BSE::TB::Articles->getByPkey($testa->id);
     is($testb->linkAlias, "alias-${when}_more", "check alias set correctly");
   }
 

diff --git a/t/130-importer/030-product.t b/t/130-importer/030-product.t
index 5c61b85b2c7f79f4f7c31943ceb940df1eb8b40d..16b250acff724bf23f6c20a1cba9927e66eee9cf 100644 (file)
--- a/t/130-importer/030-product.t
+++ b/t/130-importer/030-product.t
@@ -95,7 +95,7 @@ EOS
     my $imp = BSE::Importer->new(cfg => $cfg, profile => "simpleupdate$when",
                                 callback => sub { note @_ });
     $imp->process($filename);
-    my $testb = Articles->getByPkey($testa->id);
+    my $testb = BSE::TB::Articles->getByPkey($testa->id);
     like($testb->body, qr/This is the body/, "check the body is updated");
   }
 

diff --git a/t/t000load.t b/t/t000load.t
index 8827c99e6d1d92e9f135bb76f8518cacce3c7f25..d1ee973335ad0583a8761fd6ea7f104981bd93e6 100644 (file)
--- a/t/t000load.t
+++ b/t/t000load.t
@@ -16,12 +16,12 @@ use_ok("BSE::TB::TagCategory");
 use_ok("BSE::TB::TagCategories");
 use_ok("BSE::TB::TagOwner");
 use_ok("BSE::TB::TagOwners");
-use_ok("Article");
-use_ok("Articles");
-use_ok('Generate');
-use_ok('Generate::Article');
-use_ok('Generate::Product');
-use_ok('Generate::Catalog');
+use_ok("BSE::TB::Article");
+use_ok("BSE::TB::Articles");
+use_ok('BSE::Generate');
+use_ok('BSE::Generate::Article');
+use_ok('BSE::Generate::Product');
+use_ok('BSE::Generate::Catalog');
 use_ok('BSE::Edit::Article');
 use_ok('BSE::Edit::Site');
 use_ok('BSE::Edit::Catalog');