[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp/t 05paragraph.t 06columnfractions.t ...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp/t 05paragraph.t 06columnfractions.t ... |
|
Date: |
Thu, 23 Sep 2010 20:14:14 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 10/09/23 20:14:14
Modified files:
tp/t : 05paragraph.t 06columnfractions.t 16raw.t
test_utils.pl
Added files:
tp/t/results : raw.pl
Log message:
More simplifications for the tests.
Test raw block commands.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/05paragraph.t?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/06columnfractions.t?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/16raw.t?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/test_utils.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw.pl?cvsroot=texinfo&rev=1.1
Patches:
Index: 05paragraph.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/05paragraph.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- 05paragraph.t 23 Sep 2010 20:00:00 -0000 1.3
+++ 05paragraph.t 23 Sep 2010 20:14:14 -0000 1.4
@@ -33,5 +33,3 @@
run_test_case ('paragraph', address@hidden, $arg_test_case,
$arg_generate, $arg_debug);
-
-ok(1);
Index: 06columnfractions.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/06columnfractions.t,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- 06columnfractions.t 21 Sep 2010 21:34:38 -0000 1.6
+++ 06columnfractions.t 23 Sep 2010 20:14:14 -0000 1.7
@@ -1,13 +1,8 @@
-#use strict;
-
use Test::More;
-#BEGIN { plan tests => 8 };
+use strict;
require 't/test_utils.pl';
-my $generate;
-# $generate = 1;
-
my @test_cases = (
[ 'good', '@multitable @columnfractions 0.4 .6 5.
@end multitable' ],
@@ -25,21 +20,21 @@
@end multitable' ]
);
-# following may be cut and paste.
-
-if ($generate) {
- plan tests => 1;
-}
-else {
- plan tests => (1 + scalar(@test_cases) * 3);
-}
+our $arg_generate;
ok(1);
-my $test = new_test('columnfractions', $generate);
+my $test = new_test('columnfractions', $arg_generate);
foreach my $test_case (@test_cases) {
$test->test($test_case);
}
$test->end_test();
+
+if ($arg_generate) {
+ plan tests => 2;
+}
+else {
+ plan tests => (2 + scalar(@test_cases) * 3);
+}
Index: 16raw.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/16raw.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- 16raw.t 23 Sep 2010 20:00:00 -0000 1.1
+++ 16raw.t 23 Sep 2010 20:14:14 -0000 1.2
@@ -44,5 +44,3 @@
run_test_case ('raw', address@hidden, $arg_test_case,
$arg_generate, $arg_debug);
-ok(1);
-
Index: test_utils.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/test_utils.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test_utils.pl 23 Sep 2010 20:00:00 -0000 1.6
+++ test_utils.pl 23 Sep 2010 20:14:14 -0000 1.7
@@ -1,5 +1,6 @@
use strict;
+use Test::More;
use Texinfo::Parser qw(:all);
use Data::Dumper;
use Data::Compare;
@@ -7,6 +8,8 @@
use vars qw(%result_texts %result_trees %result_errors);
+ok(1);
+
our $arg_generate;
our $arg_debug;
@@ -100,15 +103,15 @@
}
}
+ foreach my $test_case (@$ran_tests) {
+ $test->test($test_case);
+ }
if ($generate) {
plan tests => 1;
} else {
plan tests => (1 + scalar(@$ran_tests) * 3);
}
- foreach my $test_case (@$ran_tests) {
- $test->test($test_case);
- }
$test->end_test();
}
Index: results/raw.pl
===================================================================
RCS file: results/raw.pl
diff -N results/raw.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ results/raw.pl 23 Sep 2010 20:14:14 -0000 1.1
@@ -0,0 +1,312 @@
+use vars qw(%result_texts %result_trees %result_errors);
+
+################ nested macros
+$result_trees{'nested macros'} = {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => 'truc',
+ 'type' => 'macro_arg_name'
+ },
+ {
+ 'parent' => {},
+ 'text' => '{ arg, ex}',
+ 'type' => 'macro_arg_args'
+ }
+ ],
+ 'cmdname' => 'macro',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in macro \\arg\\
+',
+ 'type' => 'raw'
+ },
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => 'othermacro',
+ 'type' => 'macro_arg_name'
+ },
+ {
+ 'parent' => {},
+ 'text' => '',
+ 'type' => 'macro_arg_args'
+ }
+ ],
+ 'cmdname' => 'macro',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'other macro
+',
+ 'type' => 'raw'
+ }
+ ],
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '@macro
+',
+ 'type' => 'raw'
+ }
+ ],
+ 'parent' => {}
+ }
+ ]
+};
+$result_trees{'nested macros'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'nested macros'}{'contents'}[0];
+$result_trees{'nested macros'}{'contents'}[0]{'args'}[1]{'parent'} =
$result_trees{'nested macros'}{'contents'}[0];
+$result_trees{'nested macros'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'nested macros'}{'contents'}[0];
+$result_trees{'nested
macros'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'nested macros'}{'contents'}[0]{'contents'}[1];
+$result_trees{'nested
macros'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'parent'} =
$result_trees{'nested macros'}{'contents'}[0]{'contents'}[1];
+$result_trees{'nested
macros'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'nested macros'}{'contents'}[0]{'contents'}[1];
+$result_trees{'nested macros'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'nested macros'}{'contents'}[0];
+$result_trees{'nested macros'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'nested macros'}{'contents'}[0];
+$result_trees{'nested macros'}{'contents'}[0]{'parent'} =
$result_trees{'nested macros'};
+
+$result_texts{'nested macros'} = '@macro truc { arg, ex}
+in macro \arg\
address@hidden othermacro
+other macro
address@hidden macro
address@hidden
address@hidden macro
+';
+
+$result_errors{'nested macros'} = [];
+
+
+################ misc raw
+$result_trees{'misc raw'} = {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'normal_line'
+ },
+ {
+ 'cmdname' => 'html',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in html ',
+ 'type' => 'raw'
+ }
+ ],
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'normal_line'
+ },
+ {
+ 'cmdname' => 'tex',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in tex
+',
+ 'type' => 'raw'
+ }
+ ],
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'normal_line'
+ },
+ {
+ 'cmdname' => 'verbatim',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in verbatim
+',
+ 'type' => 'raw'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'in verbatim2
+',
+ 'type' => 'raw'
+ }
+ ],
+ 'parent' => {}
+ }
+ ]
+};
+$result_trees{'misc raw'}{'contents'}[0]{'parent'} = $result_trees{'misc raw'};
+$result_trees{'misc raw'}{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'misc raw'}{'contents'}[1];
+$result_trees{'misc raw'}{'contents'}[1]{'parent'} = $result_trees{'misc raw'};
+$result_trees{'misc raw'}{'contents'}[2]{'parent'} = $result_trees{'misc raw'};
+$result_trees{'misc raw'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'misc raw'}{'contents'}[3];
+$result_trees{'misc raw'}{'contents'}[3]{'parent'} = $result_trees{'misc raw'};
+$result_trees{'misc raw'}{'contents'}[4]{'parent'} = $result_trees{'misc raw'};
+$result_trees{'misc raw'}{'contents'}[5]{'contents'}[0]{'parent'} =
$result_trees{'misc raw'}{'contents'}[5];
+$result_trees{'misc raw'}{'contents'}[5]{'contents'}[1]{'parent'} =
$result_trees{'misc raw'}{'contents'}[5];
+$result_trees{'misc raw'}{'contents'}[5]{'parent'} = $result_trees{'misc raw'};
+
+$result_texts{'misc raw'} = '
address@hidden
+in html @end html
+
address@hidden
+in tex
address@hidden tex
+
address@hidden
+in verbatim
+in verbatim2
address@hidden verbatim
+';
+
+$result_errors{'misc raw'} = [];
+
+
+################ misc raw comments
+$result_trees{'misc raw comments'} = {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'normal_line'
+ },
+ {
+ 'cmdname' => 'html',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '@c comment space
+',
+ 'type' => 'raw'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'in html ',
+ 'type' => 'raw'
+ }
+ ],
+ 'parent' => {}
+ },
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => ' comment no space
+',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'normal_line'
+ },
+ {
+ 'cmdname' => 'tex',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in tex
+',
+ 'type' => 'raw'
+ }
+ ],
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => ' comment after end tex
+',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'normal_line'
+ },
+ {
+ 'cmdname' => 'verbatim',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in verbatim @c in verbatim
+',
+ 'type' => 'raw'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'in verbatim2
+',
+ 'type' => 'raw'
+ }
+ ],
+ 'parent' => {}
+ }
+ ]
+};
+$result_trees{'misc raw comments'}{'contents'}[0]{'parent'} =
$result_trees{'misc raw comments'};
+$result_trees{'misc raw comments'}{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'misc raw comments'}{'contents'}[1];
+$result_trees{'misc raw comments'}{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'misc raw comments'}{'contents'}[1];
+$result_trees{'misc raw comments'}{'contents'}[1]{'parent'} =
$result_trees{'misc raw comments'};
+$result_trees{'misc raw comments'}{'contents'}[2]{'args'}[0]{'parent'} =
$result_trees{'misc raw comments'}{'contents'}[2];
+$result_trees{'misc raw comments'}{'contents'}[2]{'parent'} =
$result_trees{'misc raw comments'};
+$result_trees{'misc raw comments'}{'contents'}[3]{'parent'} =
$result_trees{'misc raw comments'};
+$result_trees{'misc raw comments'}{'contents'}[4]{'contents'}[0]{'parent'} =
$result_trees{'misc raw comments'}{'contents'}[4];
+$result_trees{'misc raw comments'}{'contents'}[4]{'parent'} =
$result_trees{'misc raw comments'};
+$result_trees{'misc raw comments'}{'contents'}[5]{'parent'} =
$result_trees{'misc raw comments'};
+$result_trees{'misc raw comments'}{'contents'}[6]{'args'}[0]{'parent'} =
$result_trees{'misc raw comments'}{'contents'}[6];
+$result_trees{'misc raw comments'}{'contents'}[6]{'parent'} =
$result_trees{'misc raw comments'};
+$result_trees{'misc raw comments'}{'contents'}[7]{'parent'} =
$result_trees{'misc raw comments'};
+$result_trees{'misc raw comments'}{'contents'}[8]{'contents'}[0]{'parent'} =
$result_trees{'misc raw comments'}{'contents'}[8];
+$result_trees{'misc raw comments'}{'contents'}[8]{'contents'}[1]{'parent'} =
$result_trees{'misc raw comments'}{'contents'}[8];
+$result_trees{'misc raw comments'}{'contents'}[8]{'parent'} =
$result_trees{'misc raw comments'};
+
+$result_texts{'misc raw comments'} = '
address@hidden
address@hidden comment space
+in html @end html
address@hidden comment no space
+
address@hidden
+in tex
address@hidden tex
+ @c comment after end tex
+
address@hidden
+in verbatim @c in verbatim
+in verbatim2
address@hidden verbatim
+';
+
+$result_errors{'misc raw comments'} = [];
+
+
+
+1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp/t 05paragraph.t 06columnfractions.t ...,
Patrice Dumas <=