summaryrefslogtreecommitdiffstats
path: root/t
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2012-12-03 19:02:50 +0100
committerFrédéric Buclin <LpSolit@gmail.com>2012-12-03 19:02:50 +0100
commit5ac0fa098c1812d9b5c57e8844ec1f44ed1cde05 (patch)
treefebe727b833b60f60027f403eb13c1da4d18b1e5 /t
parent0d02249ab821358506048f922abba078770730fd (diff)
downloadbugzilla-5ac0fa098c1812d9b5c57e8844ec1f44ed1cde05.tar.gz
bugzilla-5ac0fa098c1812d9b5c57e8844ec1f44ed1cde05.tar.xz
Bug 817634: Tests in t/ should also check themselves where appropriate
r=glob a=LpSolit
Diffstat (limited to 't')
-rw-r--r--t/001compile.t5
-rw-r--r--t/005whitespace.t5
-rw-r--r--t/006spellcheck.t47
-rw-r--r--t/Support/Files.pm2
4 files changed, 33 insertions, 26 deletions
diff --git a/t/001compile.t b/t/001compile.t
index 186e2a8ee..af7793093 100644
--- a/t/001compile.t
+++ b/t/001compile.t
@@ -15,7 +15,8 @@ use 5.10.1;
use lib qw(. lib t);
use Config;
use Support::Files;
-use Test::More tests => scalar(@Support::Files::testitems);
+use Test::More tests => scalar(@Support::Files::testitems)
+ + scalar(@Support::Files::test_files);
BEGIN {
use_ok('Bugzilla::Constants');
@@ -59,7 +60,7 @@ sub compile_file {
ok(!$return_val, $file) or diag('--ERROR');
}
-my @testitems = @Support::Files::testitems;
+my @testitems = (@Support::Files::testitems, @Support::Files::test_files);
my $file_features = map_files_to_features();
# Test the scripts by compiling them
diff --git a/t/005whitespace.t b/t/005whitespace.t
index 624df69f6..8cb2f7e8f 100644
--- a/t/005whitespace.t
+++ b/t/005whitespace.t
@@ -17,10 +17,11 @@ use Support::Files;
use Support::Templates;
use File::Spec;
-use Test::More tests => ( scalar(@Support::Files::testitems)
+use Test::More tests => (scalar(@Support::Files::testitems)
+ + scalar(@Support::Files::test_files)
+ $Support::Templates::num_actual_files) * 3;
-my @testitems = @Support::Files::testitems;
+my @testitems = (@Support::Files::testitems, @Support::Files::test_files);
for my $path (@Support::Templates::include_paths) {
push(@testitems, map(File::Spec->catfile($path, $_),
Support::Templates::find_actual_files($path)));
diff --git a/t/006spellcheck.t b/t/006spellcheck.t
index 07cd3ea8c..7f17c5169 100644
--- a/t/006spellcheck.t
+++ b/t/006spellcheck.t
@@ -13,29 +13,29 @@
use lib 't';
use Support::Files;
-BEGIN { # yes the indenting is off, deal with it
-#add the words to check here:
-@evilwords = qw(
-anyways
-appearence
-arbitary
-cancelled
-critera
-databasa
-dependan
-existance
-existant
-paramater
-refered
-repsentation
-suported
-varsion
-);
-
-$testcount = scalar(@Support::Files::testitems);
+BEGIN {
+ #add the words to check here:
+ @evilwords = qw(
+ anyways
+ appearence
+ arbitary
+ cancelled
+ critera
+ databasa
+ dependan
+ existance
+ existant
+ paramater
+ refered
+ repsentation
+ suported
+ varsion
+ );
}
-use Test::More tests => $testcount;
+# -1 because 006spellcheck.t must not be checked.
+use Test::More tests => scalar(@Support::Files::testitems)
+ + scalar(@Support::Files::test_files) - 1;
# Capture the TESTOUT from Test::More or Test::Builder for printing errors.
# This will handle verbosity for us automatically.
@@ -51,7 +51,7 @@ my $fh;
}
}
-my @testitems = @Support::Files::testitems;
+my @testitems = (@Support::Files::testitems, @Support::Files::test_files);
# at last, here we actually run the test...
my $evilwordsregexp = join('|', @evilwords);
@@ -59,6 +59,9 @@ my $evilwordsregexp = join('|', @evilwords);
foreach my $file (@testitems) {
$file =~ s/\s.*$//; # nuke everything after the first space (#comment)
next if (!$file); # skip null entries
+ # Do not try to validate this file as it obviously contains a list
+ # of wrongly spelled words.
+ next if ($file eq 't/006spellcheck.t');
if (open (FILE, $file)) { # open the file for reading
diff --git a/t/Support/Files.pm b/t/Support/Files.pm
index 4b6297852..ed011a374 100644
--- a/t/Support/Files.pm
+++ b/t/Support/Files.pm
@@ -24,6 +24,8 @@ foreach my $extension (@extensions) {
find(sub { push(@files, $File::Find::name) if $_ =~ /\.pm$/;}, $extension);
}
+@test_files = glob('t/*.t');
+
sub isTestingFile {
my ($file) = @_;
my $exclude;