CORRELATIONS: Improve error messages and coding style.

[pspp] / tests / language / stats / descriptives.at

diff --git a/tests/language/stats/descriptives.at b/tests/language/stats/descriptives.at
index 8a1c26a7d472af03fa8c2b8efdef2d9f944ea10c..0c920130c955b0eab32dd28d5479419c4a35c7c2 100644 (file)
--- a/tests/language/stats/descriptives.at
+++ b/tests/language/stats/descriptives.at
@@ -340,10 +340,14 @@ DESCRIPTIVES /VAR=abc/SAVE.
 LIST.
 ])
 AT_CHECK([pspp -o pspp.csv -o pspp.txt descriptives.sps], [0], [dnl
-descriptives.sps:15: warning: DESCRIPTIVES: DESCRIPTIVES with Z scores ignores TEMPORARY.  Temporary transformations will be made permanent.
+descriptives.sps:15.23-15.26: warning: DESCRIPTIVES: DESCRIPTIVES with Z scores ignores TEMPORARY.  Temporary transformations will be made permanent.
+   15 | DESCRIPTIVES /VAR=abc/SAVE.
+      |                       ^~~~
 ])
 AT_CHECK([cat pspp.csv], [0], [dnl
-descriptives.sps:15: warning: DESCRIPTIVES: DESCRIPTIVES with Z scores ignores TEMPORARY.  Temporary transformations will be made permanent.
+"descriptives.sps:15.23-15.26: warning: DESCRIPTIVES: DESCRIPTIVES with Z scores ignores TEMPORARY.  Temporary transformations will be made permanent.
+   15 | DESCRIPTIVES /VAR=abc/SAVE.
+      |                       ^~~~"
 
 Table: Mapping of Variables to Z-scores
 Source,Target
@@ -454,9 +458,14 @@ END DATA.
 DESCRIPTIVES ALL/STATISTICS=COUNT MEAN.
 ])
 AT_CHECK([pspp descriptives.sps], [1], [dnl
-descriptives.sps:5.29-5.33: error: DESCRIPTIVES: Syntax error at `COUNT':
-expecting statistic name: reverting to default.
-
-descriptives.sps:5.35-5.38: error: DESCRIPTIVES: Syntax error at `MEAN'.
+descriptives.sps:5.29-5.33: error: DESCRIPTIVES: Syntax error expecting one of
+the following: MEAN, SEMEAN, STDDEV, VARIANCE, KURTOSIS, SEKURTOSIS, SKEWNESS,
+SESKEWNESS, RANGE, MINIMUM, MAXIMUM, SUM.
+    5 | DESCRIPTIVES ALL/STATISTICS=COUNT MEAN.
+      |                             ^~~~~
+
+descriptives.sps:5.35-5.38: error: DESCRIPTIVES: Syntax error.
+    5 | DESCRIPTIVES ALL/STATISTICS=COUNT MEAN.
+      |                                   ^~~~
 ])
 AT_CLEANUP