X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Flanguage%2Fstats%2Fctables.at;h=124b73938f1c0cbd5e35cbb918de3b810a9e353e;hb=2ec7a9fa319816227df1684cd32206fcec77d55c;hp=1d787428d3fd96cd8a8585e7228595f349f5a3f2;hpb=8498b2dd663b876b075b7a20f727d57b1a17d5cb;p=pspp

diff --git a/tests/language/stats/ctables.at b/tests/language/stats/ctables.at
index 1d787428d3..124b73938f 100644
--- a/tests/language/stats/ctables.at
+++ b/tests/language/stats/ctables.at
@@ -14,11 +14,9 @@ dnl   * .SE suffixes.
 dnl - CATEGORIES:
 dnl   * Data-dependent sorting.
 dnl - PCOMPUTE:
-dnl   * multi-dimensional
+dnl   * multi-dimensional (multiple CCT_POSTCOMPUTE in one cell
 dnl   * MISSING, OTHERNM
 dnl   * strings
-dnl - PPROPERTIES:
-dnl   * summary statistics and formats?
 dnl
 dnl Features not yet tested:
 dnl - Parsing (positive and negative)
@@ -28,6 +26,7 @@ dnl - test CLABELS ROWLABELS=LAYER.
 dnl - Test VLABELS.
 dnl - Test WEIGHT and adjustment weights.
 dnl - Test PCOMPUTE and PPROPERTIES.
+dnl   * PCOMPUTE for more than one kind of summary (e.g. [COUNT, ROWPCT]).
 dnl - EMPTY=INCLUDE For string ranges.
 dnl - Summary functions:
 dnl   * Separate summary functions for totals and subtotals.
@@ -858,31 +857,31 @@ AT_DATA([ctables.sps],
 CTABLES
     /PCOMPUTE &x=EXPR([3] + [4])
     /PCOMPUTE &y=EXPR([4] + [5])
-    /PPROPERTIES &x LABEL='3+4' HIDESOURCECATS=YES
+    /PPROPERTIES &x LABEL='3+4' HIDESOURCECATS=YES FORMAT=COUNT F8.2
     /PPROPERTIES &y LABEL='4+5'
     /TABLE=qn105ba BY qns1
     /CATEGORIES VARIABLES=qns1 [1, 2, SUBTOTAL, 3, 4, 5, &x, &y, SUBTOTAL]
 ]])
 AT_CHECK([pspp ctables.sps -O box=unicode -O width=120], [0], [dnl
                                                       Custom Tables
-╭─────────────────────────────────────────────────────────┬────────────────────────────────────────────────────────────╮
-│                                                         │ S1. Including yourself, how many members of this household │
-│                                                         │                    are age 16 or older?                    │
-│                                                         ├───────┬───────┬─────────┬───────┬────────┬──────┬──────────┤
-│                                                         │   1   │   2   │ Subtotal│   5   │   3+4  │  4+5 │ Subtotal │
-│                                                         ├───────┼───────┼─────────┼───────┼────────┼──────┼──────────┤
-│                                                         │ Count │ Count │  Count  │ Count │  Count │ Count│   Count  │
-├─────────────────────────────────────────────────────────┼───────┼───────┼─────────┼───────┼────────┼──────┼──────────┤
-│105b. How likely is it that drivers who have  Almost     │    147│    246│      393│     11│      81│    30│        92│
-│had too much to drink to drive safely will A. certain    │       │       │         │       │        │      │          │
-│Get stopped by the police?                    Very likely│    384│    552│      936│     14│     171│    65│       185│
-│                                              Somewhat   │    590│   1249│     1839│     20│     265│    92│       285│
-│                                              likely     │       │       │         │       │        │      │          │
-│                                              Somewhat   │    278│    647│      925│      6│     116│    38│       122│
-│                                              unlikely   │       │       │         │       │        │      │          │
-│                                              Very       │    141│    290│      431│      4│      59│    22│        63│
-│                                              unlikely   │       │       │         │       │        │      │          │
-╰─────────────────────────────────────────────────────────┴───────┴───────┴─────────┴───────┴────────┴──────┴──────────╯
+╭────────────────────────────────────────────────────────┬─────────────────────────────────────────────────────────────╮
+│                                                        │  S1. Including yourself, how many members of this household │
+│                                                        │                     are age 16 or older?                    │
+│                                                        ├───────┬───────┬──────────┬───────┬────────┬──────┬──────────┤
+│                                                        │   1   │   2   │ Subtotal │   5   │   3+4  │  4+5 │ Subtotal │
+│                                                        ├───────┼───────┼──────────┼───────┼────────┼──────┼──────────┤
+│                                                        │ Count │ Count │   Count  │ Count │  Count │ Count│   Count  │
+├────────────────────────────────────────────────────────┼───────┼───────┼──────────┼───────┼────────┼──────┼──────────┤
+│105b. How likely is it that drivers who have Almost     │    147│    246│       393│     11│   81.00│    30│        92│
+│had too much to drink to drive safely will   certain    │       │       │          │       │        │      │          │
+│A. Get stopped by the police?                Very likely│    384│    552│       936│     14│  171.00│    65│       185│
+│                                             Somewhat   │    590│   1249│      1839│     20│  265.00│    92│       285│
+│                                             likely     │       │       │          │       │        │      │          │
+│                                             Somewhat   │    278│    647│       925│      6│  116.00│    38│       122│
+│                                             unlikely   │       │       │          │       │        │      │          │
+│                                             Very       │    141│    290│       431│      4│   59.00│    22│        63│
+│                                             unlikely   │       │       │          │       │        │      │          │
+╰────────────────────────────────────────────────────────┴───────┴───────┴──────────┴───────┴────────┴──────┴──────────╯
 ])
 AT_CLEANUP