CORRELATIONS: Improve error messages and coding style.

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

diff --git a/tests/language/stats/rank.at b/tests/language/stats/rank.at
index eb0b71b10752abd728fc894088e124bfdf8bb9d8..3351741f1bc640b7c29dc68856f8adf75c4dc7a6 100644 (file)
--- a/tests/language/stats/rank.at
+++ b/tests/language/stats/rank.at
@@ -122,13 +122,13 @@ b,Nb,N
 
 Table: Variables
 Name,Position,Label,Measurement Level,Role,Width,Alignment,Print Format,Write Format
-a,1,,Scale,Input,8,Right,F8.2,F8.2
-b,2,,Scale,Input,8,Right,F8.2,F8.2
-Ra,3,RANK of a,Scale,Input,8,Right,F9.3,F9.3
-RFR001,4,RFRACTION of a,Scale,Input,8,Right,F6.4,F6.4
+a,1,,Nominal,Input,8,Right,F8.2,F8.2
+b,2,,Nominal,Input,8,Right,F8.2,F8.2
+Ra,3,RANK of a,Ordinal,Input,8,Right,F9.3,F9.3
+RFR001,4,RFRACTION of a,Ordinal,Input,8,Right,F6.4,F6.4
 count,5,N of a,Scale,Input,8,Right,F6.0,F6.0
-Rb,6,RANK of b,Scale,Input,8,Right,F9.3,F9.3
-RFR002,7,RFRACTION of b,Scale,Input,8,Right,F6.4,F6.4
+Rb,6,RANK of b,Ordinal,Input,8,Right,F9.3,F9.3
+RFR002,7,RFRACTION of b,Ordinal,Input,8,Right,F6.4,F6.4
 Nb,8,N of b,Scale,Input,8,Right,F6.0,F6.0
 
 Table: Data List
@@ -477,10 +477,10 @@ foo,RAN001,RANK
 
 Table: Variables
 Name,Position,Label,Measurement Level,Role,Width,Alignment,Print Format,Write Format
-foo,1,,Scale,Input,8,Right,F8.2,F8.2
-rfoo,2,,Scale,Input,8,Right,F8.2,F8.2
-ran003,3,,Scale,Input,8,Right,F8.2,F8.2
-RAN001,4,RANK of foo,Scale,Input,8,Right,F9.3,F9.3
+foo,1,,Nominal,Input,8,Right,F8.2,F8.2
+rfoo,2,,Nominal,Input,8,Right,F8.2,F8.2
+ran003,3,,Nominal,Input,8,Right,F8.2,F8.2
+RAN001,4,RANK of foo,Ordinal,Input,8,Right,F9.3,F9.3
 ])
 AT_CLEANUP
 
@@ -595,12 +595,20 @@ RANK x
  /RANK INTO foo  bar wiz.
 ])
 AT_CHECK([pspp -O format=csv rank.sps], [1], [dnl
-rank.sps:15.1: error: RANK: Syntax error at end of command: expecting `@{:@'.
+"rank.sps:15.1: error: RANK: Syntax error expecting `@{:@'.
+   15 | .
+      | ^"
 
-rank.sps:19.11: error: RANK: Syntax error at `d': expecting integer.
+"rank.sps:19.11: error: RANK: Syntax error expecting positive integer for NTILES.
+   19 |   /NTILES(d)
+      |           ^"
 
-rank.sps:25: error: RANK: Variable x already exists.
+"rank.sps:25.13: error: RANK: Variable x already exists.
+   25 |  /RANK INTO x.
+      |             ^"
 
-rank.sps:30: error: RANK: Too many variables in INTO clause.
+"rank.sps:30.18-30.20: error: RANK: Too many variables in INTO clause.
+   30 |  /RANK INTO foo  bar wiz.
+      |                  ^~~"
 ])
 AT_CLEANUP