string-map: New function string_map_equals().

[pspp] / tests / language / xforms / count.at

diff --git a/tests/language/xforms/count.at b/tests/language/xforms/count.at
index 2187d9788d2bd4e519dbc2a7ca75e486b84b254f..6f689c2c6ad0210a1af5bc20d56607c7e342197c 100644 (file)
--- a/tests/language/xforms/count.at
+++ b/tests/language/xforms/count.at
@@ -1,17 +1,39 @@
+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([COUNT])
 
 AT_SETUP([COUNT -- numeric data])
 AT_DATA([count.sps], [dnl
-DATA LIST LIST /x * y *.
+DATA LIST LIST /x y.
 BEGIN DATA.
 1 2
 2 3
 4 5
 2 2
 5 6
+7 2
+. 2
 END DATA.
 
-COUNT c=x y (2).
+MISSING VALUES x(7)/y(3).
+
+COUNT c=x y (2)/d=x y(7)/e=x y(missing)/f=x y(sysmis).
+
+FORMATS ALL(F1).
 
 LIST.
 ])
@@ -22,12 +44,14 @@ x,F8.0
 y,F8.0
 
 Table: Data List
-x,y,c
-1.00,2.00,1.00
-2.00,3.00,1.00
-4.00,5.00,.00
-2.00,2.00,2.00
-5.00,6.00,.00
+x,y,c,d,e,f
+1,2,1,0,0,0
+2,3,1,0,1,0
+4,5,0,0,0,0
+2,2,2,0,0,0
+5,6,0,0,0,0
+7,2,1,1,1,0
+.,2,1,0,1,1
 ])
 AT_CLEANUP
 
@@ -49,8 +73,6 @@ COUNT c=v1 to v2('2',' 4','1').
 LIST.
 ])
 AT_CHECK([pspp -O format=csv count.sps], [0], [dnl
-Title: Test COUNT transformation
-
 Table: Reading 1 record from INLINE.
 Variable,Record,Columns,Format
 v1,1,1-  2,A2
@@ -59,8 +81,8 @@ v2,1,3-  4,A2
 Table: Data List
 v1,v2,c
 12,34,.00
-32,1 ,1.00
-2 ,13,1.00
+32,1,1.00
+2,13,1.00
 41,21,.00
 11,04,.00
 03,4,1.00