2-d subtotals work

[pspp] / tests / language / dictionary / attributes.at

diff --git a/tests/language/dictionary/attributes.at b/tests/language/dictionary/attributes.at
index 8b9e7c96b701291cc79df34f2fb981235ce83423..b13f44306b82aa004fb03c5cdf74044b9b73fe08 100644 (file)
--- a/tests/language/dictionary/attributes.at
+++ b/tests/language/dictionary/attributes.at
@@ -1,16 +1,16 @@
 dnl PSPP - a program for statistical analysis.
 dnl Copyright (C) 2017 Free Software Foundation, Inc.
-dnl 
+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
 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
 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
@@ -50,34 +50,24 @@ VARIABLE ATTRIBUTE
 
 DISPLAY ATTRIBUTES.
 ]])
-AT_CHECK([pspp -O format=csv save-attrs.pspp], [0], 
-  [[Variable,Description
-a,"Attribute,Value
-ValidationRule[1],a * b > 3
-ValidationRule[2],a + b > 2"
-b,"Attribute,Value
-ValidationRule[1],a * b > 3
-ValidationRule[2],a + b > 2"
-c,"Attribute,Value
-QuestionWording,X or Y?"
-
-Table: Custom data file attributes.
-Attribute,Value
-array[1],array element 1
-array[2],array element 2
-key,value
+AT_CHECK([pspp -O format=csv save-attrs.pspp], [0],
+  [[Table: Variable and Dataset Attributes
+Variable and Name,,Value
+(dataset),array[1],array element 1
+,array[2],array element 2
+,key,value
+a,ValidationRule[1],a * b > 3
+,ValidationRule[2],a + b > 2
+b,ValidationRule[1],a * b > 3
+,ValidationRule[2],a + b > 2
+c,QuestionWording,X or Y?
 ]])
 AT_CHECK([pspp -O format=csv get-attrs.pspp], [0], [dnl
-Variable,Description
-a,
-b,"Attribute,Value
-ValidationRule,a * b > 3"
-c,"Attribute,Value
-QuestionWording,X or Y?"
-
-Table: Custom data file attributes.
-Attribute,Value
-array,array element 2
-key,value
+Table: Variable and Dataset Attributes
+Variable and Name,,Value
+(dataset),array,array element 2
+,key,value
+b,ValidationRule,a * b > 3
+c,QuestionWording,X or Y?
 ])
 AT_CLEANUP