Merge remote-tracking branch 'origin/master' into sheet

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

diff --git a/tests/language/stats/rank.at b/tests/language/stats/rank.at
index f47d23e861cf04ce989750623c016f31908ca1dd..589375b67bee32ff09ad2225d25c9d89c0c80101 100644 (file)
--- a/tests/language/stats/rank.at
+++ b/tests/language/stats/rank.at
@@ -1,3 +1,19 @@
+dnl PSPP - a program for statistical analysis.
+dnl Copyright (C) 2017 Free Software Foundation, Inc.
+dnl 
+dnl This program is free software: you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation, either version 3 of the License, or
+dnl (at your option) any later version.
+dnl 
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
+dnl
 AT_BANNER([RANK])
 
 AT_SETUP([RANK simple case with defaults])
@@ -117,45 +133,21 @@ a into count(N of a)
 
 b into Nb(N of b)
 
-Variable,Description,,Position
-a,Format: F8.2,,1
-,Measure: Scale,,
-,Display Alignment: Right,,
-,Display Width: 8,,
-b,Format: F8.2,,2
-,Measure: Scale,,
-,Display Alignment: Right,,
-,Display Width: 8,,
-Ra,RANK of a,,3
-,Format: F9.3,,
-,Measure: Scale,,
-,Display Alignment: Right,,
-,Display Width: 8,,
-RFR001,RFRACTION of a,,4
-,Format: F6.4,,
-,Measure: Scale,,
-,Display Alignment: Right,,
-,Display Width: 8,,
-count,N of a,,5
-,Format: F6.0,,
-,Measure: Scale,,
-,Display Alignment: Right,,
-,Display Width: 8,,
-Rb,RANK of b,,6
-,Format: F9.3,,
-,Measure: Scale,,
-,Display Alignment: Right,,
-,Display Width: 8,,
-RFR002,RFRACTION of b,,7
-,Format: F6.4,,
-,Measure: Scale,,
-,Display Alignment: Right,,
-,Display Width: 8,,
-Nb,N of b,,8
-,Format: F6.0,,
-,Measure: Scale,,
-,Display Alignment: Right,,
-,Display Width: 8,,
+Variable,Description,Position
+a,Format: F8.2,1
+b,Format: F8.2,2
+Ra,"Label: RANK of a
+Format: F9.3",3
+RFR001,"Label: RFRACTION of a
+Format: F6.4",4
+count,"Label: N of a
+Format: F6.0",5
+Rb,"Label: RANK of b
+Format: F9.3",6
+RFR002,"Label: RFRACTION of b
+Format: F6.4",7
+Nb,"Label: N of b
+Format: F6.0",8
 
 Table: Data List
 a,b,Ra,RFR001,count,Rb,RFR002,Nb
@@ -530,24 +522,12 @@ Variables Created By RANK
 
 foo into RAN001(RANK of foo)
 
-Variable,Description,,Position
-foo,Format: F8.2,,1
-,Measure: Scale,,
-,Display Alignment: Right,,
-,Display Width: 8,,
-rfoo,Format: F8.2,,2
-,Measure: Scale,,
-,Display Alignment: Right,,
-,Display Width: 8,,
-ran003,Format: F8.2,,3
-,Measure: Scale,,
-,Display Alignment: Right,,
-,Display Width: 8,,
-RAN001,RANK of foo,,4
-,Format: F9.3,,
-,Measure: Scale,,
-,Display Alignment: Right,,
-,Display Width: 8,,
+Variable,Description,Position
+foo,Format: F8.2,1
+rfoo,Format: F8.2,2
+ran003,Format: F8.2,3
+RAN001,"Label: RANK of foo
+Format: F9.3",4
 ])
 AT_CLEANUP