X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Flanguage%2Fdictionary%2Fmrsets.at;h=a520a41370a43aa4b8937c0736623f9da1c0d12d;hb=2053ecc53ff35591cdba70cf20d43d16ad680367;hp=08256768b3a525a3f4de4ecc14504c2f5d29096b;hpb=691a034d7f2139076fa012739dffd40ef5db4a9b;p=pspp

diff --git a/tests/language/dictionary/mrsets.at b/tests/language/dictionary/mrsets.at
index 08256768b3..a520a41370 100644
--- a/tests/language/dictionary/mrsets.at
+++ b/tests/language/dictionary/mrsets.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([MRSETS])
+dnl
+AT_BANNER([MRSETS])
 
 m4_define([DEFINE_MRSETS_DATA],
   [DATA LIST NOTABLE /w x y z 1-4 a b c d 5-8 (a).
@@ -81,56 +82,31 @@ mrsets.sps:38: warning: MRSETS: MDGROUP subcommand for group $d specifies LABELS
 "mrsets.sps:42: warning: MRSETS: Variables specified on MCGROUP should have the same categories, but a and c (and possibly others) in multiple category group $f have different value labels for value b."
 ])
 
-m4_define([MRSETS_DISPLAY_OUTPUT],
-  [Table: Multiple Response Sets
-Name,Variables,Details
-$a,"w
+m4_define([MRSETS_DISPLAY_OUTPUT], [dnl
+Table: Multiple Response Sets
+Name,Label,Encoding,Counted Value,Member Variables
+$a,First multiple dichotomy group,Dichotomies,5,"w
 x
 y
-z
-","Multiple dichotomy set
-Label: First multiple dichotomy group
-Label source: Provided by user
-Counted value: 5
-Category label source: Variable labels
-"
-$b,"z
-y
-","Multiple dichotomy set
-Counted value: 123
-Category label source: Value labels of counted value
-"
-$c,"w
+z"
+$b,,Dichotomies,123,"z
+y"
+$c,duplicate variable label,Dichotomies,1,"w
 x
 y
-z
-","Multiple dichotomy set
-Label: duplicate variable label
-Label source: First variable label among variables
-Counted value: 1
-Category label source: Value labels of counted value
-"
-$d,"a
+z"
+$d,,Dichotomies,c,"a
 b
 c
-d
-","Multiple dichotomy set
-Counted value: `c'
-Category label source: Variable labels
-"
-$e,"w
+d"
+$e,First multiple category group,Categories,,"w
 x
 y
-z
-","Multiple category set
-Label: First multiple category group
-"
-$f,"a
+z"
+$f,,Categories,,"a
 b
 c
-d
-","Multiple category set
-"
+d"
 ])
 
 AT_SETUP([MRSETS add, display, delete])
@@ -144,61 +120,60 @@ AT_DATA([mrsets.sps],
     /DELETE NAME=ALL
     /DISPLAY NAME=ALL.
 ]])
-AT_CHECK([pspp -O format=csv mrsets.sps], [0],
+AT_CHECK([pspp -o - -O format=csv -o mrsets.csv -o mrsets.txt -o mrsets.pdf mrsets.sps], [0],
   [DEFINE_MRSETS_OUTPUT
 Table: Multiple Response Sets
-Name,Variables,Details
-$a,"w
+Name,Label,Encoding,Counted Value,Member Variables
+$a,First multiple dichotomy group,Dichotomies,5,"w
 x
 y
-z
-","Multiple dichotomy set
-Label: First multiple dichotomy group
-Label source: Provided by user
-Counted value: 5
-Category label source: Variable labels
-"
+z"
 
-MRSETS_DISPLAY_OUTPUT
 Table: Multiple Response Sets
-Name,Variables,Details
-$a,"w
+Name,Label,Encoding,Counted Value,Member Variables
+$a,First multiple dichotomy group,Dichotomies,5,"w
+x
+y
+z"
+$b,,Dichotomies,123,"z
+y"
+$c,duplicate variable label,Dichotomies,1,"w
+x
+y
+z"
+$d,,Dichotomies,c,"a
+b
+c
+d"
+$e,First multiple category group,Categories,,"w
 x
 y
-z
-","Multiple dichotomy set
-Label: First multiple dichotomy group
-Label source: Provided by user
-Counted value: 5
-Category label source: Variable labels
-"
-$b,"z
+z"
+$f,,Categories,,"a
+b
+c
+d"
+
+Table: Multiple Response Sets
+Name,Label,Encoding,Counted Value,Member Variables
+$a,First multiple dichotomy group,Dichotomies,5,"w
+x
 y
-","Multiple dichotomy set
-Counted value: 123
-Category label source: Value labels of counted value
-"
-$d,"a
+z"
+$b,,Dichotomies,123,"z
+y"
+$d,,Dichotomies,c,"a
 b
 c
-d
-","Multiple dichotomy set
-Counted value: `c'
-Category label source: Variable labels
-"
-$e,"w
+d"
+$e,First multiple category group,Categories,,"w
 x
 y
-z
-","Multiple category set
-Label: First multiple category group
-"
-$f,"a
+z"
+$f,,Categories,,"a
 b
 c
-d
-","Multiple category set
-"
+d"
 
 mrsets.sps:50: note: MRSETS: The active dataset dictionary does not contain any multiple response sets.
 ])