improve scale summary test

diff --git a/tests/language/stats/ctables.at b/tests/language/stats/ctables.at
index ef3faabbb8c5d659262fb56e9b02d89e8ce56d6e..8c80d22a36c5557375e9a8e87c070d62de0b8934 100644 (file)
--- a/tests/language/stats/ctables.at
+++ b/tests/language/stats/ctables.at
@@ -2,7 +2,6 @@ AT_BANNER([CTABLES])
 
 dnl Features not yet tested:
 dnl - Summary functions:
-dnl   * Separate summary functions for totals and subtotals.
 dnl   * U-prefix for unweighted summaries.
 dnl   * areaPCT.SUM and UareaPCT.SUM functions.
 dnl   * WEIGHT and adjustment weights.
@@ -4804,10 +4803,11 @@ FREQUENCIES
 SPLIT FILE OFF.
 
 CTABLES
-    /VLABELS VARIABLE=qn19a DISPLAY=NAME /*XXX NONE yields an assertion failure
-    /TABLE region BY qn19a[VALIDN, MISSING, MEAN, SEMEAN, MEDIAN, MODE, STDDEV, VARIANCE, RANGE, MINIMUM, MAXIMUM, SUM, COUNT, TOTALN, COLPCT.SUM]
+    /VLABELS VARIABLE=qn19a DISPLAY=NONE
+    /TABLE region BY qn19a[VALIDN, MISSING, MEAN, SEMEAN, MEDIAN, MODE, STDDEV, VARIANCE, RANGE, MINIMUM, MAXIMUM, SUM, COUNT, TOTALN, ROWPCT.SUM]
     /CATEGORIES VARIABLES=qn19a TOTAL=YES MISSING=INCLUDE
-    /SLABELS POSITION=ROW.
+    /SLABELS POSITION=ROW
+    /CLABELS ROWLABELS=OPPOSITE.
 ]])
 AT_CHECK([pspp ctables.sps -O box=unicode -O width=120], [0], [dnl
          Statistics
@@ -4907,74 +4907,26 @@ AT_CHECK([pspp ctables.sps -O box=unicode -O width=120], [0], [dnl
 │       Sum      │18877.00│
 ╰────────────────┴────────╯
 
-             Custom Tables
-╭───────────────────────────┬────────╮
-│                           │  QN19A │
-├───────────────────────────┼────────┤
-│REGION NE Valid N          │     936│
-│          Missing          │  473.00│
-│          Mean             │   19.33│
-│          Std Error of Mean│     .14│
-│          Median           │   18.00│
-│          Mode             │   18.00│
-│          Std Deviation    │    4.41│
-│          Variance         │   19.41│
-│          Range            │   59.00│
-│          Minimum          │     .00│
-│          Maximum          │   59.00│
-│          Sum              │18092.00│
-│          Count            │    1409│
-│          Total N          │    1409│
-│          Column Sum %     │   21.8%│
-│      ╶────────────────────┼────────┤
-│       MW Valid N          │    1019│
-│          Missing          │  635.00│
-│          Mean             │   19.83│
-│          Std Error of Mean│     .16│
-│          Median           │   19.00│
-│          Mode             │   18.00│
-│          Std Deviation    │    5.15│
-│          Variance         │   26.47│
-│          Range            │   71.00│
-│          Minimum          │    4.00│
-│          Maximum          │   75.00│
-│          Sum              │20206.00│
-│          Count            │    1654│
-│          Total N          │    1654│
-│          Column Sum %     │   24.3%│
-│      ╶────────────────────┼────────┤
-│       S  Valid N          │    1276│
-│          Missing          │ 1114.00│
-│          Mean             │   20.29│
-│          Std Error of Mean│     .18│
-│          Median           │   19.00│
-│          Mode             │   18.00│
-│          Std Deviation    │    6.44│
-│          Variance         │   41.43│
-│          Range            │   75.00│
-│          Minimum          │    4.00│
-│          Maximum          │   79.00│
-│          Sum              │25886.00│
-│          Count            │    2390│
-│          Total N          │    2390│
-│          Column Sum %     │   31.2%│
-│      ╶────────────────────┼────────┤
-│       W  Valid N          │     950│
-│          Missing          │  596.00│
-│          Mean             │   19.87│
-│          Std Error of Mean│     .17│
-│          Median           │   19.00│
-│          Mode             │   18.00│
-│          Std Deviation    │    5.25│
-│          Variance         │   27.59│
-│          Range            │   61.00│
-│          Minimum          │    4.00│
-│          Maximum          │   65.00│
-│          Sum              │18877.00│
-│          Count            │    1546│
-│          Total N          │    1546│
-│          Column Sum %     │   22.7%│
-╰───────────────────────────┴────────╯
+                         Custom Tables
+╭────────────────────────┬────────┬────────┬────────┬────────╮
+│                        │   NE   │   MW   │    S   │    W   │
+├────────────────────────┼────────┼────────┼────────┼────────┤
+│REGION Valid N          │     936│    1019│    1276│     950│
+│       Missing          │  473.00│  635.00│ 1114.00│  596.00│
+│       Mean             │   19.33│   19.83│   20.29│   19.87│
+│       Std Error of Mean│     .14│     .16│     .18│     .17│
+│       Median           │   18.00│   19.00│   19.00│   19.00│
+│       Mode             │   18.00│   18.00│   18.00│   18.00│
+│       Std Deviation    │    4.41│    5.15│    6.44│    5.25│
+│       Variance         │   19.41│   26.47│   41.43│   27.59│
+│       Range            │   59.00│   71.00│   75.00│   61.00│
+│       Minimum          │     .00│    4.00│    4.00│    4.00│
+│       Maximum          │   59.00│   75.00│   79.00│   65.00│
+│       Sum              │18092.00│20206.00│25886.00│18877.00│
+│       Count            │    1409│    1654│    2390│    1546│
+│       Total N          │    1409│    1654│    2390│    1546│
+│       Row Sum %        │   21.8%│   24.3%│   31.2%│   22.7%│
+╰────────────────────────┴────────┴────────┴────────┴────────╯
 ])
 AT_CLEANUP