From: Ben Pfaff Date: Sat, 28 Jan 2023 17:46:32 +0000 (-0800) Subject: pivot-table: Add more tests for category and dimension borders. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11ddc49eb29f457fa33820c56fd658d95664bf0d;p=pspp pivot-table: Add more tests for category and dimension borders. --- diff --git a/tests/output/pivot-table.at b/tests/output/pivot-table.at index e7daa5563f..96138610be 100644 --- a/tests/output/pivot-table.at +++ b/tests/output/pivot-table.at @@ -651,7 +651,193 @@ AT_CHECK([pivot-table-test --table-look $srcdir/output/look.stt pivot.txt --box AT_CHECK([pspp-output -O box=unicode convert render.spv -], [0], [expout]) AT_CLEANUP -AT_SETUP([pivot table - category and dimension borders]) +AT_SETUP([pivot table - category and dimension borders 1]) +AT_DATA([pivot.txt], [[ +/col "a"*("a1", "ag1"("a2", "a3")) +/col "b"*("bg1"("b1", "b2"), "b3") +/row "c"*("c1", "cg1"("c2", "c3")) +/row "d"*("dg1"("d1", "d2"), "d3") +/cell[all, all, all, all] +/border "*" (none) +/border "dim-row-horz" (solid "blue") +/border "dim-col-vert" (solid "blue") +/title "Dimension Borders 1" +/display +/border "*" (none) +/border "cat-row-horz" (dashed "red") +/border "cat-col-vert" (dashed "red") +/title "Category Borders 1" +/display +/border "*" (none) +/border "dim-row-horz" (solid "blue") +/border "dim-col-vert" (solid "blue") +/border "cat-row-horz" (dashed "red") +/border "cat-col-vert" (dashed "red") +/title "Category and Dimension Borders 1" +]]) +AT_DATA([expout], [dnl +Dimension Borders 1 + b + bg1 │ + b1 │ b2 │ b3 + a │ a │ a + │ ag1 │ │ ag1 │ │ ag1 +d c a1│a2 a3│a1│a2 a3│a1│a2 a3 +dg1 d1 c1 0│ 1 2│ 3│ 4 5│ 6│ 7 8 + ╶─────────┼─────┼──┼─────┼──┼───── + cg1 c2 9│10 11│12│13 14│15│16 17 + c3 18│19 20│21│22 23│24│25 26 + ╶────────────┼─────┼──┼─────┼──┼───── + d2 c1 27│28 29│30│31 32│33│34 35 + ╶─────────┼─────┼──┼─────┼──┼───── + cg1 c2 36│37 38│39│40 41│42│43 44 + c3 45│46 47│48│49 50│51│52 53 +────────────────┼─────┼──┼─────┼──┼───── +d3 c1 54│55 56│57│58 59│60│61 62 + ╶─────────┼─────┼──┼─────┼──┼───── + cg1 c2 63│64 65│66│67 68│69│70 71 + c3 72│73 74│75│76 77│78│79 80 + +Category Borders 1 + b + bg1 + b1 b2 b3 + a a a + ag1 ag1 ag1 +d c a1 a2┊a3 a1 a2┊a3 a1 a2┊a3 +dg1 d1 c1 0 1┊ 2 3 4┊ 5 6 7┊ 8 + cg1 c2 9 10┊11 12 13┊14 15 16┊17 + ╶╌╌╌╌╌╌╌╌+╌╌╌╌╌╌╌╌+╌╌╌╌╌╌╌╌+╌╌ + c3 18 19┊20 21 22┊23 24 25┊26 + d2 c1 27 28┊29 30 31┊32 33 34┊35 + cg1 c2 36 37┊38 39 40┊41 42 43┊44 + ╶╌╌╌╌╌╌╌╌+╌╌╌╌╌╌╌╌+╌╌╌╌╌╌╌╌+╌╌ + c3 45 46┊47 48 49┊50 51 52┊53 +d3 c1 54 55┊56 57 58┊59 60 61┊62 + cg1 c2 63 64┊65 66 67┊68 69 70┊71 + ╶╌╌╌╌╌╌╌╌+╌╌╌╌╌╌╌╌+╌╌╌╌╌╌╌╌+╌╌ + c3 72 73┊74 75 76┊77 78 79┊80 + +Category and Dimension Borders 1 + b + bg1 │ + b1 │ b2 │ b3 + a │ a │ a + │ ag1 │ │ ag1 │ │ ag1 +d c a1│a2┊a3│a1│a2┊a3│a1│a2┊a3 +dg1 d1 c1 0│ 1┊ 2│ 3│ 4┊ 5│ 6│ 7┊ 8 + ╶─────────┼──┼──┼──┼──┼──┼──┼──┼── + cg1 c2 9│10┊11│12│13┊14│15│16┊17 + ╶╌╌╌╌╌┼╌╌+╌╌┼╌╌┼╌╌+╌╌┼╌╌┼╌╌+╌╌ + c3 18│19┊20│21│22┊23│24│25┊26 + ╶────────────┼──┼──┼──┼──┼──┼──┼──┼── + d2 c1 27│28┊29│30│31┊32│33│34┊35 + ╶─────────┼──┼──┼──┼──┼──┼──┼──┼── + cg1 c2 36│37┊38│39│40┊41│42│43┊44 + ╶╌╌╌╌╌┼╌╌+╌╌┼╌╌┼╌╌+╌╌┼╌╌┼╌╌+╌╌ + c3 45│46┊47│48│49┊50│51│52┊53 +────────────────┼──┼──┼──┼──┼──┼──┼──┼── +d3 c1 54│55┊56│57│58┊59│60│61┊62 + ╶─────────┼──┼──┼──┼──┼──┼──┼──┼── + cg1 c2 63│64┊65│66│67┊68│69│70┊71 + ╶╌╌╌╌╌┼╌╌+╌╌┼╌╌┼╌╌+╌╌┼╌╌┼╌╌+╌╌ + c3 72│73┊74│75│76┊77│78│79┊80 +]) +AT_CHECK([pivot-table-test --table-look $srcdir/output/look.stt pivot.txt --box unicode], [0], [expout]) +AT_CHECK([pspp-output -O box=unicode convert render.spv -], [0], [expout]) +AT_CLEANUP + +AT_SETUP([pivot table - category and dimension borders 2]) +AT_DATA([pivot.txt], [[ +/col "a"*("a1", "ag1"("a2", "a3")) +/col "b"*("bg1"("b1", "b2"), "b3") +/row "c"*("c1", "cg1"("c2", "c3")) +/row "d"*("dg1"("d1", "d2"), "d3") +/cell[all, all, all, all] +/border "*" (none) +/border "dim-row-vert" (solid "blue") +/border "dim-col-horz" (solid "blue") +/title "Dimension Borders 2" +/display +/border "*" (none) +/border "cat-row-vert" (dashed "red") +/border "cat-col-horz" (dashed "red") +/title "Category Borders 2" +/display +/border "*" (none) +/border "dim-row-vert" (solid "blue") +/border "cat-row-vert" (dashed "red") +/border "dim-col-horz" (solid "blue") +/border "cat-col-horz" (dashed "red") +/title "Category and Dimension Borders 2" +]]) +AT_DATA([expout], [dnl +Dimension Borders 2 + b + bg1 + b1 b2 b3 + ╶────────────────────────── + a a a + ag1 ag1 ag1 +d c a1 a2 a3 a1 a2 a3 a1 a2 a3 +dg1 d1│c1 0 1 2 3 4 5 6 7 8 + │cg1 c2 9 10 11 12 13 14 15 16 17 + │ c3 18 19 20 21 22 23 24 25 26 + d2│c1 27 28 29 30 31 32 33 34 35 + │cg1 c2 36 37 38 39 40 41 42 43 44 + │ c3 45 46 47 48 49 50 51 52 53 +d3 │c1 54 55 56 57 58 59 60 61 62 + │cg1 c2 63 64 65 66 67 68 69 70 71 + │ c3 72 73 74 75 76 77 78 79 80 + +Category Borders 2 + b + ╶╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ + bg1 + ╶╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╴ + b1 b2 b3 + a a a + ╶╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ + ag1 ag1 ag1 + ╶╌╌╌╌╌╴ ╶╌╌╌╌╌╴ ╶╌╌╌╌╌ +d c a1 a2 a3 a1 a2 a3 a1 a2 a3 +dg1┊d1 c1 0 1 2 3 4 5 6 7 8 + ┊ cg1┊c2 9 10 11 12 13 14 15 16 17 + ┊ ┊c3 18 19 20 21 22 23 24 25 26 + ┊d2 c1 27 28 29 30 31 32 33 34 35 + ┊ cg1┊c2 36 37 38 39 40 41 42 43 44 + ┊ ┊c3 45 46 47 48 49 50 51 52 53 +d3 c1 54 55 56 57 58 59 60 61 62 + cg1┊c2 63 64 65 66 67 68 69 70 71 + ┊c3 72 73 74 75 76 77 78 79 80 + +Category and Dimension Borders 2 + b + ╶╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ + bg1 + ╶╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╴ + b1 b2 b3 + ╶────────────────────────── + a a a + ╶╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ + ag1 ag1 ag1 + ╶╌╌╌╌╌╴ ╶╌╌╌╌╌╴ ╶╌╌╌╌╌ +d c a1 a2 a3 a1 a2 a3 a1 a2 a3 +dg1┊d1│c1 0 1 2 3 4 5 6 7 8 + ┊ │cg1┊c2 9 10 11 12 13 14 15 16 17 + ┊ │ ┊c3 18 19 20 21 22 23 24 25 26 + ┊d2│c1 27 28 29 30 31 32 33 34 35 + ┊ │cg1┊c2 36 37 38 39 40 41 42 43 44 + ┊ │ ┊c3 45 46 47 48 49 50 51 52 53 +d3 │c1 54 55 56 57 58 59 60 61 62 + │cg1┊c2 63 64 65 66 67 68 69 70 71 + │ ┊c3 72 73 74 75 76 77 78 79 80 +]) +AT_CHECK([pivot-table-test --table-look $srcdir/output/look.stt pivot.txt --box unicode], [0], [expout]) +AT_CHECK([pspp-output -O box=unicode convert render.spv -], [0], [expout]) +AT_CLEANUP + +AT_SETUP([pivot table - category and dimension borders 3]) AT_DATA([pivot.txt], [[ /col "a"("a1", "ag1"("a2", "a3")) /col "b"("bg1"("b1", "b2"), "b3") @@ -667,10 +853,10 @@ AT_DATA([pivot.txt], [[ "cat-col-horz" (dashed "red") "dim-col-vert" (solid "blue") "cat-col-vert" (dashed "red") -/title "Category and Dimension Borders" +/title "Category and Dimension Borders 3" ]]) AT_DATA([expout], [dnl -Category and Dimension Borders +Category and Dimension Borders 3 bg1 │ ╶╌╌╌╌╌╌╌╌┬╌╌╌╌╌╌╌╌┤ b1 │ b2 │ b3