refactor(tests): introduce new BOXTEST

Signed-off-by: Henri Menke <[email protected]>
pgf-tikz · Dec 19, 2021 · 05f2026 · 05f2026
1 parent 1ad8f6e
commit 05f2026
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 29 deletions.
diff --git a/testfiles/pgf001.latexdvips.tlg b/testfiles/pgf001.latexdvips.tlg
@@ -25,7 +25,7 @@ TEST 1: pgf: \pgfpathmoveto
 ...\special{ps::[end]}
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
-\ENDPGFTEST ...th =\maxdimen \showbox \PGFTESTBOX 
+\ENDBOXTEST ...th =\maxdimen \showbox \PGFTESTBOX 
                                                   \endgroup \ENDTEST 
 l. ...\ENDPGFTEST
 ============================================================
@@ -54,7 +54,7 @@ TEST 2: pgf: \pgfpathlineto
 ...\special{ps::[end]}
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
-\ENDPGFTEST ...th =\maxdimen \showbox \PGFTESTBOX 
+\ENDBOXTEST ...th =\maxdimen \showbox \PGFTESTBOX 
                                                   \endgroup \ENDTEST 
 l. ...\ENDPGFTEST
 ============================================================
diff --git a/testfiles/pgf001.latexdvisvgm.tlg b/testfiles/pgf001.latexdvisvgm.tlg
@@ -26,7 +26,7 @@ TEST 1: pgf: \pgfpathmoveto
 ....\special{color pop}
 ....\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
-\ENDPGFTEST ...th =\maxdimen \showbox \PGFTESTBOX 
+\ENDBOXTEST ...th =\maxdimen \showbox \PGFTESTBOX 
                                                   \endgroup \ENDTEST 
 l. ...\ENDPGFTEST
 ============================================================
@@ -56,7 +56,7 @@ TEST 2: pgf: \pgfpathlineto
 ....\special{color pop}
 ....\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
-\ENDPGFTEST ...th =\maxdimen \showbox \PGFTESTBOX 
+\ENDBOXTEST ...th =\maxdimen \showbox \PGFTESTBOX 
                                                   \endgroup \ENDTEST 
 l. ...\ENDPGFTEST
 ============================================================
diff --git a/testfiles/pgf001.luatex.tlg b/testfiles/pgf001.luatex.tlg
@@ -21,7 +21,7 @@ TEST 1: pgf: \pgfpathmoveto
 ...\pdfliteral origin{Q }
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
-\ENDPGFTEST ...th =\maxdimen \showbox \PGFTESTBOX 
+\ENDBOXTEST ...th =\maxdimen \showbox \PGFTESTBOX 
                                                   \endgroup \ENDTEST 
 l. ...\ENDPGFTEST
 ============================================================
@@ -46,7 +46,7 @@ TEST 2: pgf: \pgfpathlineto
 ...\pdfliteral origin{Q }
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
-\ENDPGFTEST ...th =\maxdimen \showbox \PGFTESTBOX 
+\ENDBOXTEST ...th =\maxdimen \showbox \PGFTESTBOX 
                                                   \endgroup \ENDTEST 
 l. ...\ENDPGFTEST
 ============================================================
diff --git a/testfiles/pgf001.tlg b/testfiles/pgf001.tlg
@@ -21,7 +21,7 @@ TEST 1: pgf: \pgfpathmoveto
 ...\pdfliteral{Q }
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
-\ENDPGFTEST ...th =\maxdimen \showbox \PGFTESTBOX 
+\ENDBOXTEST ...th =\maxdimen \showbox \PGFTESTBOX 
                                                   \endgroup \ENDTEST 
 l. ...\ENDPGFTEST
 ============================================================
@@ -46,7 +46,7 @@ TEST 2: pgf: \pgfpathlineto
 ...\pdfliteral{Q }
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
-\ENDPGFTEST ...th =\maxdimen \showbox \PGFTESTBOX 
+\ENDBOXTEST ...th =\maxdimen \showbox \PGFTESTBOX 
                                                   \endgroup \ENDTEST 
 l. ...\ENDPGFTEST
 ============================================================
diff --git a/testfiles/pgf001.xetex.tlg b/testfiles/pgf001.xetex.tlg
@@ -23,7 +23,7 @@ TEST 1: pgf: \pgfpathmoveto
 ...\special{pdf:econtent}
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
-\ENDPGFTEST ...th =\maxdimen \showbox \PGFTESTBOX 
+\ENDBOXTEST ...th =\maxdimen \showbox \PGFTESTBOX 
                                                   \endgroup \ENDTEST 
 l. ...\ENDPGFTEST
 ============================================================
@@ -50,7 +50,7 @@ TEST 2: pgf: \pgfpathlineto
 ...\special{pdf:econtent}
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
-\ENDPGFTEST ...th =\maxdimen \showbox \PGFTESTBOX 
+\ENDBOXTEST ...th =\maxdimen \showbox \PGFTESTBOX 
                                                   \endgroup \ENDTEST 
 l. ...\ENDPGFTEST
 ============================================================
diff --git a/testfiles/pgf002.latexdvips.tlg b/testfiles/pgf002.latexdvips.tlg
@@ -214,7 +214,7 @@ TEST 1: tikz: matrix
 ...\special{ps::[end]}
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
-\ENDTIKZTEST ...h =\maxdimen \showbox \PGFTESTBOX 
+\ENDBOXTEST ...th =\maxdimen \showbox \PGFTESTBOX 
                                                   \endgroup \ENDTEST 
 l. ...\ENDTIKZTEST
 ============================================================
diff --git a/testfiles/pgf002.latexdvisvgm.tlg b/testfiles/pgf002.latexdvisvgm.tlg
@@ -145,7 +145,7 @@ TEST 1: tikz: matrix
 ....\special{color pop}
 ....\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
-\ENDTIKZTEST ...h =\maxdimen \showbox \PGFTESTBOX 
+\ENDBOXTEST ...th =\maxdimen \showbox \PGFTESTBOX 
                                                   \endgroup \ENDTEST 
 l. ...\ENDTIKZTEST
 ============================================================
diff --git a/testfiles/pgf002.luatex.tlg b/testfiles/pgf002.luatex.tlg
@@ -206,7 +206,7 @@ TEST 1: tikz: matrix
 ...\pdfliteral origin{Q }
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
-\ENDTIKZTEST ...h =\maxdimen \showbox \PGFTESTBOX 
+\ENDBOXTEST ...th =\maxdimen \showbox \PGFTESTBOX 
                                                   \endgroup \ENDTEST 
 l. ...\ENDTIKZTEST
 ============================================================
diff --git a/testfiles/pgf002.tlg b/testfiles/pgf002.tlg
@@ -210,7 +210,7 @@ TEST 1: tikz: matrix
 ...\pdfliteral{Q }
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
-\ENDTIKZTEST ...h =\maxdimen \showbox \PGFTESTBOX 
+\ENDBOXTEST ...th =\maxdimen \showbox \PGFTESTBOX 
                                                   \endgroup \ENDTEST 
 l. ...\ENDTIKZTEST
 ============================================================
diff --git a/testfiles/pgf002.xetex.tlg b/testfiles/pgf002.xetex.tlg
@@ -246,7 +246,7 @@ TEST 1: tikz: matrix
 ...\special{pdf:econtent}
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ! OK.
-\ENDTIKZTEST ...h =\maxdimen \showbox \PGFTESTBOX 
+\ENDBOXTEST ...th =\maxdimen \showbox \PGFTESTBOX 
                                                   \endgroup \ENDTEST 
 l. ...\ENDTIKZTEST
 ============================================================
diff --git a/testfiles/support/pgf-regression-test.tex b/testfiles/support/pgf-regression-test.tex
@@ -4,14 +4,12 @@
 
 \newbox\PGFTESTBOX
 
-\def\BEGINPGFTEST#1{%
-  \BEGINTEST{pgf: #1}%
+\def\BEGINBOXTEST#1{%
+  \BEGINTEST{#1}%
   \setbox\PGFTESTBOX=\hbox\bgroup
-    \pgfpicture
 }
 
-\def\ENDPGFTEST{%
-    \endpgfpicture
+\def\ENDBOXTEST{%
   \egroup
   \begingroup
     \showboxbreadth=\maxdimen
@@ -21,21 +19,24 @@
   \ENDTEST
 }
 
+\def\BEGINPGFTEST#1{%
+  \BEGINBOXTEST{pgf: #1}%
+    \pgfpicture
+}
+
+\def\ENDPGFTEST{%
+    \endpgfpicture
+  \ENDBOXTEST
+}
+
 \def\BEGINTIKZTEST#1{%
-  \BEGINTEST{tikz: #1}%
-  \setbox\PGFTESTBOX=\hbox\bgroup
+  \BEGINBOXTEST{tikz: #1}%
     \tikzpicture
 }
 
 \def\ENDTIKZTEST{%
     \endtikzpicture
-  \egroup
-  \begingroup
-    \showboxbreadth=\maxdimen
-    \showboxdepth=\maxdimen
-    \showbox\PGFTESTBOX
-  \endgroup
-  \ENDTEST
+  \ENDBOXTEST
 }
 
 \TIMO