Clean up

diff --git a/t/12-multi-categories-atom.t b/t/12-multi-categories-atom.t
index 25b0ff9..29ff648 100644 (file)
--- a/t/12-multi-categories-atom.t
+++ b/t/12-multi-categories-atom.t
@@ -1,6 +1,41 @@
 #!perl -w
 
 use strict;
-use vars qw($type $field);
-$type = "atom";
-require 't/12-multi-categories.base';
+use strict;
+use Test::More tests => 8 * 3;
+use XML::Feed;
+
+foreach my $test (["atom"], ["rss"], ["rss", "subjects"]) {
+
+    my $type  = $test->[0];
+    my $other = ('Atom' ne $type)? "RSS" : "Atom";
+    my $field = $test->[1] || "categories";
+
+    ok(my $feed = XML::Feed->parse("t/samples/${type}-multiple-${field}.xml"), "Parsed $type file with multiple categories");
+    my ($entry) = $feed->entries;
+
+    is_deeply(
+        [$entry->category()],
+        ["foo", "bar", "quux", "simon's tags"],        
+    "Got all categories");
+
+    my $xml = $feed->as_xml;
+    ok($feed = XML::Feed->parse(\$xml), "Reparsed $type from string");
+    is_deeply(
+        [$entry->category()],
+        ["foo", "bar", "quux", "simon's tags"],        
+    "Got all categories again");
+
+    ok($entry->category("quirka fleeg"), "Added a category");
+    is_deeply(
+        [$entry->category()],
+        ["foo", "bar", "quux", "simon's tags", "quirka fleeg"],        
+    "Got new category");
+
+    ok(my $new = $entry->convert($other), "Converted entry to $other");
+    is_deeply(
+        [$new->category()],
+        ["foo", "bar", "quux", "simon's tags", "quirka fleeg"],        
+    "Got converted categories");
+
+}

diff --git a/t/12-multi-categories-rss.t b/t/12-multi-categories-rss.t
deleted file mode 100644 (file)
index c467d74..0000000
--- a/t/12-multi-categories-rss.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#!perl -w
-
-use strict;
-use vars qw($type $field);
-$type = "rss";
-require 't/12-multi-categories.base';

diff --git a/t/12-multi-categories.base b/t/12-multi-categories.base
deleted file mode 100644 (file)
index e63b31c..0000000
--- a/t/12-multi-categories.base
+++ /dev/null
@@ -1,26 +0,0 @@
-use strict;
-use Test::More tests => 6;
-use XML::Feed;
-
-$field ||= "categories";
-ok(my $feed = XML::Feed->parse("t/samples/${type}-multiple-${field}.xml"), "Parsed $type file with multiple categories");
-my ($entry) = $feed->entries;
-
-is_deeply(
-        [$entry->category()],
-        ["foo", "bar", "quux", "simon's tags"],        
-"Got all categories");
-
-my $xml = $feed->as_xml;
-ok($feed = XML::Feed->parse(\$xml), "Reparsed $type from string");
-is_deeply(
-        [$entry->category()],
-        ["foo", "bar", "quux", "simon's tags"],        
-"Got all categories again");
-
-ok($entry->category("quirka fleeg"), "Added a category");
-is_deeply(
-        [$entry->category()],
-        ["foo", "bar", "quux", "simon's tags", "quirka fleeg"],        
-"Got new category");
-

diff --git a/t/12-multi-subjects-rss.t b/t/12-multi-subjects-rss.t
deleted file mode 100644 (file)
index c3cd317..0000000
--- a/t/12-multi-subjects-rss.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#!perl -w
-
-use vars qw($type $field);
-$type  = "rss";
-$field = "subjects";
-require 't/12-multi-categories.base';