[Templates-cvs] cvs commit: TT3/t/directive block.t end.t get.t if.t include.t interpolate.t macro.t process.t set.t switch.t tags.t unless.t wrapper.t
cvs@template-toolkit.org
cvs@template-toolkit.org
Wed, 01 Dec 2004 11:05:23 +0000
cvs 04/12/01 11:05:23
Modified: t/directive block.t end.t get.t if.t include.t interpolate.t
macro.t process.t set.t switch.t tags.t unless.t
wrapper.t
Log:
* changed tests to use Template::TT3::Scanner which comes pre-installed
with Template::TT3::Tagset, etc.
Revision Changes Path
1.4 +5 -9 TT3/t/directive/block.t
Index: block.t
===================================================================
RCS file: /template-toolkit/TT3/t/directive/block.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- block.t 2004/11/26 12:33:33 1.3
+++ block.t 2004/12/01 11:05:22 1.4
@@ -9,7 +9,7 @@
# This is free software; you can redistribute it and/or modify it
# under the same terms as Perl itself.
#
-# $Id: block.t,v 1.3 2004/11/26 12:33:33 abw Exp $
+# $Id: block.t,v 1.4 2004/12/01 11:05:22 abw Exp $
#
#========================================================================
@@ -18,11 +18,9 @@
use lib qw( ./lib ../lib ../../lib );
use Template::Handler;
-use Template::Scanner;
-use Template::Tagset::TT;
+use Template::TT3::Scanner;
use Template::Directive;
use Template::Directive::Block;
-use Template::Directives::TT;
use Template::Generator::Debug;
use Template::Test tests => 10, import => ':all';
@@ -34,8 +32,8 @@
$Template::Directive::DEBUG =
grep(/^--?d(ebug)?/, @ARGV);
-my $scanpkg = 'Template::Scanner';
-my $tagspkg = 'Template::Tagset::TT';
+my $scanpkg = 'Template::TT3::Scanner';
+#my $tagspkg = 'Template::Tagset::TT';
my $genpkg = 'Template::Generator::Debug';
my $handpkg = 'Template::Handler';
@@ -54,9 +52,7 @@
my $input = $test->{ input };
my $result;
- my $scanner = $scanpkg->new({
- tagset => $tagspkg,
- }) || die $scanpkg->error();
+ my $scanner = $scanpkg->new() || die $scanpkg->error();
my $handler = $handpkg->new( type => 'template' )
|| die $handpkg->error();
1.5 +7 -14 TT3/t/directive/end.t
Index: end.t
===================================================================
RCS file: /template-toolkit/TT3/t/directive/end.t,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- end.t 2004/11/26 12:33:33 1.4
+++ end.t 2004/12/01 11:05:22 1.5
@@ -9,7 +9,7 @@
# This is free software; you can redistribute it and/or modify it
# under the same terms as Perl itself.
#
-# $Id: end.t,v 1.4 2004/11/26 12:33:33 abw Exp $
+# $Id: end.t,v 1.5 2004/12/01 11:05:22 abw Exp $
#
#========================================================================
@@ -18,14 +18,13 @@
use lib qw( ./lib ../lib ../../lib );
use Template::Handler;
-use Template::Scanner;
-use Template::Tagset::TT;
-use Template::Directives::TT;
+use Template::TT3::Scanner;
+use Template::TT3::Directives;
use Template::Directive;
use Template::Directive::If;
use Template::Directive::End;
use Template::Generator::Debug;
-use Template::Test tests => 14, import => ':all';
+use Template::Test tests => 8, import => ':all';
our $DEBUG =
$Template::Directive::If::DEBUG =
@@ -33,11 +32,10 @@
$Template::Directive::DEBUG =
grep(/^--?d(ebug)?/, @ARGV);
-my $scanpkg = 'Template::Scanner';
-my $tagspkg = 'Template::Tagset::TT';
+my $scanpkg = 'Template::TT3::Scanner';
my $genpkg = 'Template::Generator::Debug';
-my $ttdirs = Template::Directives::TT->directives();
+my $ttdirs = Template::TT3::Directives->directives();
$ttdirs->{ end } = $ttdirs->{ END };
# create a generator to display parsed template
@@ -55,13 +53,8 @@
my $input = $test->{ input };
my $result;
- my $scanner = $scanpkg->new({
- tagset => $tagspkg,
- }) || die $scanpkg->error();
-# ok( $scanner, 'created another scanner' );
-
+ my $scanner = $scanpkg->new() || die $scanpkg->error();
my $handler = Template::Handler->new( type => 'template' );
- ok( $handler, "created a handler for $test->{ name }" );
# go scan!
if ($scanner->scan(\$input, $handler)) {
1.3 +5 -9 TT3/t/directive/get.t
Index: get.t
===================================================================
RCS file: /template-toolkit/TT3/t/directive/get.t,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- get.t 2004/11/26 12:33:33 1.2
+++ get.t 2004/12/01 11:05:22 1.3
@@ -9,7 +9,7 @@
# This is free software; you can redistribute it and/or modify it
# under the same terms as Perl itself.
#
-# $Id: get.t,v 1.2 2004/11/26 12:33:33 abw Exp $
+# $Id: get.t,v 1.3 2004/12/01 11:05:22 abw Exp $
#
#========================================================================
@@ -18,9 +18,8 @@
use lib qw( ./lib ../lib ../../lib );
use Template::Handler;
-use Template::Scanner;
-use Template::Tagset::TT;
-use Template::Directives::TT;
+use Template::TT3::Scanner;
+use Template::TT3::Directives;
use Template::Directives;
use Template::Directive::Get;
use Template::Generator::Debug;
@@ -31,8 +30,7 @@
$Template::Directive::DEBUG =
grep(/^--?d(ebug)?/, @ARGV);
-my $scanpkg = 'Template::Scanner';
-my $tagspkg = 'Template::Tagset::TT';
+my $scanpkg = 'Template::TT3::Scanner';
my $genpkg = 'Template::Generator::Debug';
my $handpkg = 'Template::Handler';
@@ -51,9 +49,7 @@
my $input = $test->{ input };
my $result;
- my $scanner = $scanpkg->new({
- tagset => $tagspkg,
- }) || die $scanpkg->error();
+ my $scanner = $scanpkg->new() || die $scanpkg->error();
my $handler = $handpkg->new( type => 'template' )
|| die $handpkg->error();
1.7 +4 -11 TT3/t/directive/if.t
Index: if.t
===================================================================
RCS file: /template-toolkit/TT3/t/directive/if.t,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- if.t 2004/11/26 12:33:33 1.6
+++ if.t 2004/12/01 11:05:22 1.7
@@ -9,7 +9,7 @@
# This is free software; you can redistribute it and/or modify it
# under the same terms as Perl itself.
#
-# $Id: if.t,v 1.6 2004/11/26 12:33:33 abw Exp $
+# $Id: if.t,v 1.7 2004/12/01 11:05:22 abw Exp $
#
#========================================================================
@@ -18,9 +18,7 @@
use lib qw( ./lib ../lib ../../lib );
use Template::Handler;
-use Template::Scanner;
-use Template::Tagset::TT;
-use Template::Directives::TT;
+use Template::TT3::Scanner;
use Template::Directive;
use Template::Directive::If;
use Template::Generator::Debug;
@@ -33,8 +31,7 @@
$Template::Directive::DEBUG =
grep(/^--?d(ebug)?/, @ARGV);
-my $scanpkg = 'Template::Scanner';
-my $tagspkg = 'Template::Tagset::TT';
+my $scanpkg = 'Template::TT3::Scanner';
my $genpkg = 'Template::Generator::Debug';
my $generators = {
@@ -66,11 +63,7 @@
$probe = 1 if $test->{ inflag }->{ probe_on };
$probe = 0 if $test->{ inflag }->{ probe_off };
- my $scanner = $scanpkg->new({
- tagset => $tagspkg,
- }) || die $scanpkg->error();
-# ok( $scanner, 'created another scanner' );
-
+ my $scanner = $scanpkg->new() || die $scanpkg->error();
my $handler = Template::Handler->new( type => 'template' );
ok( $handler, "created a handler for $test->{ name }" );
1.4 +4 -9 TT3/t/directive/include.t
Index: include.t
===================================================================
RCS file: /template-toolkit/TT3/t/directive/include.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- include.t 2004/11/26 12:33:33 1.3
+++ include.t 2004/12/01 11:05:22 1.4
@@ -9,7 +9,7 @@
# This is free software; you can redistribute it and/or modify it
# under the same terms as Perl itself.
#
-# $Id: include.t,v 1.3 2004/11/26 12:33:33 abw Exp $
+# $Id: include.t,v 1.4 2004/12/01 11:05:22 abw Exp $
#
#========================================================================
@@ -18,9 +18,7 @@
use lib qw( ./lib ../lib ../../lib );
use Template::Handler;
-use Template::Scanner;
-use Template::Tagset::TT;
-use Template::Directives::TT;
+use Template::TT3::Scanner;
use Template::Directives;
use Template::Directive::Include;
use Template::Generator::Debug;
@@ -31,8 +29,7 @@
$Template::Directive::DEBUG =
grep(/^--?d(ebug)?/, @ARGV);
-my $scanpkg = 'Template::Scanner';
-my $tagspkg = 'Template::Tagset::TT';
+my $scanpkg = 'Template::TT3::Scanner';
my $genpkg = 'Template::Generator::Debug';
my $handpkg = 'Template::Handler';
@@ -51,9 +48,7 @@
my $input = $test->{ input };
my $result;
- my $scanner = $scanpkg->new({
- tagset => $tagspkg,
- }) || die $scanpkg->error();
+ my $scanner = $scanpkg->new() || die $scanpkg->error();
my $handler = $handpkg->new( type => 'template' )
|| die $handpkg->error();
1.5 +4 -11 TT3/t/directive/interpolate.t
Index: interpolate.t
===================================================================
RCS file: /template-toolkit/TT3/t/directive/interpolate.t,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- interpolate.t 2004/11/26 12:33:33 1.4
+++ interpolate.t 2004/12/01 11:05:22 1.5
@@ -9,7 +9,7 @@
# This is free software; you can redistribute it and/or modify it
# under the same terms as Perl itself.
#
-# $Id: interpolate.t,v 1.4 2004/11/26 12:33:33 abw Exp $
+# $Id: interpolate.t,v 1.5 2004/12/01 11:05:22 abw Exp $
#
#========================================================================
@@ -19,8 +19,7 @@
use lib qw( ./lib ../lib ../../lib );
use Template::Handler;
use Template::Parser;
-use Template::Scanner;
-use Template::Tagset::TT;
+use Template::TT3::Scanner;
use Template::Generator::Debug;
use Template::Directive::Tags;
use Template::Directive::Interpolate;
@@ -35,9 +34,7 @@
grep(/^--?d(ebug)?/, @ARGV);
-
-my $scanpkg = 'Template::Scanner';
-my $tagspkg = 'Template::Tagset::TT';
+my $scanpkg = 'Template::TT3::Scanner';
my $genpkg = 'Template::Generator::Debug';
# create a generator to display parsed template
@@ -55,11 +52,7 @@
my $input = $test->{ input };
my $result;
- my $scanner = $scanpkg->new({
- tagset => $tagspkg,
- }) || die $scanpkg->error();
-# ok( $scanner, 'created another scanner' );
-
+ my $scanner = $scanpkg->new() || die $scanpkg->error();
my $handler = Template::Handler->new( type => 'template' );
ok( $handler, "created a handler for $test->{ name }" );
1.5 +4 -9 TT3/t/directive/macro.t
Index: macro.t
===================================================================
RCS file: /template-toolkit/TT3/t/directive/macro.t,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- macro.t 2004/11/26 12:33:33 1.4
+++ macro.t 2004/12/01 11:05:22 1.5
@@ -9,7 +9,7 @@
# This is free software; you can redistribute it and/or modify it
# under the same terms as Perl itself.
#
-# $Id: macro.t,v 1.4 2004/11/26 12:33:33 abw Exp $
+# $Id: macro.t,v 1.5 2004/12/01 11:05:22 abw Exp $
#
#========================================================================
@@ -18,11 +18,9 @@
use lib qw( ./lib ../lib ../../lib );
use Template::Handler;
-use Template::Scanner;
-use Template::Tagset::TT;
+use Template::TT3::Scanner;
use Template::Directives;
use Template::Directive::Macro;
-use Template::Directives::TT;
use Template::Generator::Debug;
use Template::Test tests => 32, import => ':all';
@@ -32,8 +30,7 @@
$Template::Scanner::DEBUG =
grep(/^--?d(ebug)?/, @ARGV);
-my $scanpkg = 'Template::Scanner';
-my $tagspkg = 'Template::Tagset::TT';
+my $scanpkg = 'Template::TT3::Scanner';
my $genpkg = 'Template::Generator::Debug';
my $handpkg = 'Template::Handler';
@@ -52,9 +49,7 @@
my $input = $test->{ input };
my $result;
- my $scanner = $scanpkg->new({
- tagset => $tagspkg,
- }) || die $scanpkg->error();
+ my $scanner = $scanpkg->new() || die $scanpkg->error();
my $handler = $handpkg->new( type => 'template' )
|| die $handpkg->error();
1.4 +4 -9 TT3/t/directive/process.t
Index: process.t
===================================================================
RCS file: /template-toolkit/TT3/t/directive/process.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- process.t 2004/11/26 12:33:33 1.3
+++ process.t 2004/12/01 11:05:22 1.4
@@ -9,7 +9,7 @@
# This is free software; you can redistribute it and/or modify it
# under the same terms as Perl itself.
#
-# $Id: process.t,v 1.3 2004/11/26 12:33:33 abw Exp $
+# $Id: process.t,v 1.4 2004/12/01 11:05:22 abw Exp $
#
#========================================================================
@@ -18,9 +18,7 @@
use lib qw( ./lib ../lib ../../lib );
use Template::Handler;
-use Template::Scanner;
-use Template::Tagset::TT;
-use Template::Directives::TT;
+use Template::TT3::Scanner;
use Template::Directives;
use Template::Directive::Process;
use Template::Generator::Debug;
@@ -31,8 +29,7 @@
$Template::Directive::DEBUG =
grep(/^--?d(ebug)?/, @ARGV);
-my $scanpkg = 'Template::Scanner';
-my $tagspkg = 'Template::Tagset::TT';
+my $scanpkg = 'Template::TT3::Scanner';
my $genpkg = 'Template::Generator::Debug';
my $handpkg = 'Template::Handler';
@@ -51,9 +48,7 @@
my $input = $test->{ input };
my $result;
- my $scanner = $scanpkg->new({
- tagset => $tagspkg,
- }) || die $scanpkg->error();
+ my $scanner = $scanpkg->new() || die $scanpkg->error();
my $handler = $handpkg->new( type => 'template' )
|| die $handpkg->error();
1.3 +4 -9 TT3/t/directive/set.t
Index: set.t
===================================================================
RCS file: /template-toolkit/TT3/t/directive/set.t,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- set.t 2004/11/26 12:33:33 1.2
+++ set.t 2004/12/01 11:05:22 1.3
@@ -9,7 +9,7 @@
# This is free software; you can redistribute it and/or modify it
# under the same terms as Perl itself.
#
-# $Id: set.t,v 1.2 2004/11/26 12:33:33 abw Exp $
+# $Id: set.t,v 1.3 2004/12/01 11:05:22 abw Exp $
#
#========================================================================
@@ -18,9 +18,7 @@
use lib qw( ./lib ../lib ../../lib );
use Template::Handler;
-use Template::Scanner;
-use Template::Tagset::TT;
-use Template::Directives::TT;
+use Template::TT3::Scanner;
use Template::Directives;
use Template::Directive::Set;
use Template::Generator::Debug;
@@ -32,8 +30,7 @@
$Template::Directive::DEBUG =
grep(/^--?d(ebug)?/, @ARGV);
-my $scanpkg = 'Template::Scanner';
-my $tagspkg = 'Template::Tagset::TT';
+my $scanpkg = 'Template::TT3::Scanner';
my $handpkg = 'Template::Handler';
my $generators = {
@@ -66,9 +63,7 @@
$probe = 1 if $test->{ inflag }->{ probe_on };
$probe = 0 if $test->{ inflag }->{ probe_off };
- my $scanner = $scanpkg->new({
- tagset => $tagspkg,
- }) || die $scanpkg->error();
+ my $scanner = $scanpkg->new() || die $scanpkg->error();
my $handler = $handpkg->new( type => 'template' )
|| die $handpkg->error();
1.7 +4 -8 TT3/t/directive/switch.t
Index: switch.t
===================================================================
RCS file: /template-toolkit/TT3/t/directive/switch.t,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- switch.t 2004/11/26 12:33:33 1.6
+++ switch.t 2004/12/01 11:05:22 1.7
@@ -9,7 +9,7 @@
# This is free software; you can redistribute it and/or modify it
# under the same terms as Perl itself.
#
-# $Id: switch.t,v 1.6 2004/11/26 12:33:33 abw Exp $
+# $Id: switch.t,v 1.7 2004/12/01 11:05:22 abw Exp $
#
#========================================================================
@@ -18,9 +18,7 @@
use lib qw( ./lib ../lib ../../lib );
use Template::Handler;
-use Template::Scanner;
-use Template::Tagset::TT;
-use Template::Directives::TT;
+use Template::TT3::Scanner;
use Template::Directives;
use Template::Directive::Switch;
use Template::Directive::Case;
@@ -36,7 +34,7 @@
#$Template::Generator::Debug::DEBUG =
grep(/^--?d(ebug)?/, @ARGV);
-my $scanpkg = 'Template::Scanner';
+my $scanpkg = 'Template::TT3::Scanner';
my $tagspkg = 'Template::Tagset::TT';
my $genpkg = 'Template::Generator::Debug';
my $handpkg = 'Template::Handler';
@@ -56,9 +54,7 @@
my $input = $test->{ input };
my $result;
- my $scanner = $scanpkg->new({
- tagset => $tagspkg,
- }) || die $scanpkg->error();
+ my $scanner = $scanpkg->new() || die $scanpkg->error();
my $handler = $handpkg->new( type => 'template' )
|| die $handpkg->error();
1.4 +4 -11 TT3/t/directive/tags.t
Index: tags.t
===================================================================
RCS file: /template-toolkit/TT3/t/directive/tags.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tags.t 2004/11/26 12:33:33 1.3
+++ tags.t 2004/12/01 11:05:22 1.4
@@ -9,7 +9,7 @@
# This is free software; you can redistribute it and/or modify it
# under the same terms as Perl itself.
#
-# $Id: tags.t,v 1.3 2004/11/26 12:33:33 abw Exp $
+# $Id: tags.t,v 1.4 2004/12/01 11:05:22 abw Exp $
#
#========================================================================
@@ -19,8 +19,7 @@
use lib qw( ./lib ../lib ../../lib );
use Template::Handler;
use Template::Parser;
-use Template::Scanner;
-use Template::Tagset::TT;
+use Template::TT3::Scanner;
use Template::Generator::Debug;
use Template::Directive::Tags;
use Template::Test tests => 13, import => ':all';
@@ -31,13 +30,11 @@
$Template::Parser::DEBUG =
$Template::Tag::DEBUG =
$Template::Tagset::DEBUG =
-$Template::Tagset::TT::DEBUG =
$Template::Tag::Directive::DEBUG =
grep(/^--?d(ebug)?/, @ARGV);
-my $scanpkg = 'Template::Scanner';
-my $tagspkg = 'Template::Tagset::TT';
+my $scanpkg = 'Template::TT3::Scanner';
my $genpkg = 'Template::Generator::Debug';
# create a generator to display parsed template
@@ -55,11 +52,7 @@
my $input = $test->{ input };
my $result;
- my $scanner = $scanpkg->new({
- tagset => $tagspkg,
- }) || die $scanpkg->error();
-# ok( $scanner, 'created another scanner' );
-
+ my $scanner = $scanpkg->new() || die $scanpkg->error();
my $handler = Template::Handler->new( type => 'template' );
ok( $handler, "created a handler for $test->{ name }" );
1.6 +4 -9 TT3/t/directive/unless.t
Index: unless.t
===================================================================
RCS file: /template-toolkit/TT3/t/directive/unless.t,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- unless.t 2004/11/26 12:33:33 1.5
+++ unless.t 2004/12/01 11:05:22 1.6
@@ -9,7 +9,7 @@
# This is free software; you can redistribute it and/or modify it
# under the same terms as Perl itself.
#
-# $Id: unless.t,v 1.5 2004/11/26 12:33:33 abw Exp $
+# $Id: unless.t,v 1.6 2004/12/01 11:05:22 abw Exp $
#
#========================================================================
@@ -18,9 +18,7 @@
use lib qw( ./lib ../lib ../../lib );
use Template::Handler;
-use Template::Scanner;
-use Template::Tagset::TT;
-use Template::Directives::TT;
+use Template::TT3::Scanner;
use Template::Directive;
use Template::Directive::Unless;
use Template::Generator::Debug;
@@ -31,8 +29,7 @@
$Template::Directive::DEBUG =
grep(/^--?d(ebug)?/, @ARGV);
-my $scanpkg = 'Template::Scanner';
-my $tagspkg = 'Template::Tagset::TT';
+my $scanpkg = 'Template::TT3::Scanner';
my $genpkg = 'Template::Generator::Debug';
my $handpkg = 'Template::Handler';
@@ -51,9 +48,7 @@
my $input = $test->{ input };
my $result;
- my $scanner = $scanpkg->new({
- tagset => $tagspkg,
- }) || die $scanpkg->error();
+ my $scanner = $scanpkg->new() || die $scanpkg->error();
my $handler = $handpkg->new( type => 'template' )
|| die $handpkg->error();
1.6 +4 -8 TT3/t/directive/wrapper.t
Index: wrapper.t
===================================================================
RCS file: /template-toolkit/TT3/t/directive/wrapper.t,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wrapper.t 2004/11/26 12:33:33 1.5
+++ wrapper.t 2004/12/01 11:05:22 1.6
@@ -9,7 +9,7 @@
# This is free software; you can redistribute it and/or modify it
# under the same terms as Perl itself.
#
-# $Id: wrapper.t,v 1.5 2004/11/26 12:33:33 abw Exp $
+# $Id: wrapper.t,v 1.6 2004/12/01 11:05:22 abw Exp $
#
#========================================================================
@@ -18,9 +18,7 @@
use lib qw( ./lib ../lib ../../lib );
use Template::Handler;
-use Template::Scanner;
-use Template::Tagset::TT;
-use Template::Directives::TT;
+use Template::TT3::Scanner;
use Template::Directive::Wrapper;
use Template::Directive;
use Template::Generator::Debug;
@@ -31,7 +29,7 @@
$Template::Directive::DEBUG =
grep(/^--?d(ebug)?/, @ARGV);
-my $scanpkg = 'Template::Scanner';
+my $scanpkg = 'Template::TT3::Scanner';
my $tagspkg = 'Template::Tagset::TT';
my $genpkg = 'Template::Generator::Debug';
my $handpkg = 'Template::Handler';
@@ -51,9 +49,7 @@
my $input = $test->{ input };
my $result;
- my $scanner = $scanpkg->new({
- tagset => $tagspkg,
- }) || die $scanpkg->error();
+ my $scanner = $scanpkg->new() || die $scanpkg->error();
my $handler = $handpkg->new( type => 'template' )
|| die $handpkg->error();