pivot-table: Change the default format to omit empty rows and columns.

[pspp] / tests / language / dictionary / missing-values.at

diff --git a/tests/language/dictionary/missing-values.at b/tests/language/dictionary/missing-values.at
index 8073ab79e1f1082a9ace2bd009222639774c4bd5..fd748385917c770b00b35e85a50f319f3d7f33a0 100644 (file)
--- a/tests/language/dictionary/missing-values.at
+++ b/tests/language/dictionary/missing-values.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
@@ -75,11 +75,13 @@ DISPLAY DICTIONARY str1 str2 longstr.
 
 * May mix variable types when clearing missing values.
 MISSING VALUES ALL ().
+MISSING VALUES num1 (1).
 DISPLAY DICTIONARY
 ])
 AT_CHECK([pspp -o pspp.csv missing-values.sps])
-AT_CHECK([sed -n '/^$/p; /^@<:@^"@:>@*"@<:@^"@:>@*$/N; s/^\(@<:@a-z0-9@:>@*\),".*Missing Values: \(.*\)",@<:@0-9@:>@*$/\1: \2/p; s/^\(@<:@a-z0-9@:>@*\),Format: @<:@A-Z0-9.@:>@*,@<:@0-9@:>@*$/\1: none/p' pspp.csv
-], [0], [dnl
+AT_CHECK([cat pspp.csv | sed '/^Table/d
+/^Name/d
+s/^\([[a-z0-9]]*\),.*,\([[^,]]*\)$/\1: \2/'], [0], [dnl
 date1: 1
 num1: 1
 
@@ -130,15 +132,15 @@ num1: 1 THRU HIGHEST; -1
 
 num1: 1 THRU HIGHEST; -1
 
-str1: ""abc  ""; ""def  ""
-str2: ""abc""; ""def""
-longstr: ""abc     ""; ""def     ""
+str1: """abc  ""; ""def  """
+str2: """abc""; ""def"""
+longstr: """abc     ""; ""def     """
 
-str1: none
-str2: none
-date1: none
-num1: none
-longstr: none
+str1: @&t@
+str2: @&t@
+date1: @&t@
+num1: 1
+longstr: @&t@
 ])
 AT_CLEANUP