MODIFY VARS: Fix bugs in REORDER and DROP subcommands, add tests.

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

diff --git a/tests/language/dictionary/attributes.at b/tests/language/dictionary/attributes.at
index ce5510f47e3214d813e4df83a14a9d5b0c4939e5..f0407b6369a4a55323611f8dae7bf3dd08578b0a 100644 (file)
--- a/tests/language/dictionary/attributes.at
+++ b/tests/language/dictionary/attributes.at
@@ -13,7 +13,8 @@ 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([VARIABLE ATTRIBUTES and DATAFILE ATTRIBUTES])
+dnl
+AT_BANNER([VARIABLE ATTRIBUTES and DATAFILE ATTRIBUTES])
 
 AT_SETUP([VARIABLE ATTRIBUTES and DATAFILE ATTRIBUTES])
 AT_DATA([save-attrs.pspp],
@@ -49,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