GET DATA /TYPE=TXT: Remove obsolete IMPORTCASES subcommand.

[pspp] / tests / language / data-io / get-data-txt.at

diff --git a/tests/language/data-io/get-data-txt.at b/tests/language/data-io/get-data-txt.at
index 4418974701233658dd5531635391977994eba4b9..9e01aae3744f921ac26b304e78b8bd62a6b6bfc9 100644 (file)
--- a/tests/language/data-io/get-data-txt.at
+++ b/tests/language/data-io/get-data-txt.at
@@ -36,9 +36,12 @@ begin data.
 ,4,,5
 6
 7,
+
 8 9
 0,1,,,
+
 ,,,,
+
 2
 
 3
@@ -47,7 +50,7 @@ begin data.
 end data.
 list.
 ])
-AT_CHECK([pspp -o pspp.csv get-data.sps])
+AT_CHECK([pspp -o pspp.csv get-data.sps], [0], [ignore])
 AT_CHECK([cat pspp.csv], [0], [dnl
 Table: Data List
 A,B,C,D
@@ -69,21 +72,21 @@ begin data.
 # These records
 # are skipped.
 1      2       3       4
-1      2       3       @&t@
+1      2       3       4       @&t@
 1      2               4
-1      2               @&t@
+1      2               4       @&t@
 1              3       4
-1              3       @&t@
+1              3       4       @&t@
 1                      4
-1                      @&t@
+1                      4       @&t@
        2       3       4
-       2       3       @&t@
+       2       3       4       @&t@
        2               4
-       2               @&t@
+       2               4       @&t@
                3       4
-               3       @&t@
+               3       4       @&t@
                        4
-                       @&t@
+                       4       @&t@
 end data.
 list.
 ])
@@ -92,21 +95,21 @@ AT_CHECK([cat pspp.csv], [0], [dnl
 Table: Data List
 A,B,C,D
 1.00,2.00,3.00,4.00
-1.00,2.00,3.00,.  @&t@
+1.00,2.00,3.00,4.00
+1.00,2.00,.  ,4.00
 1.00,2.00,.  ,4.00
-1.00,2.00,.  ,.  @&t@
 1.00,.  ,3.00,4.00
-1.00,.  ,3.00,.  @&t@
+1.00,.  ,3.00,4.00
+1.00,.  ,.  ,4.00
 1.00,.  ,.  ,4.00
-1.00,.  ,.  ,.  @&t@
 .  ,2.00,3.00,4.00
-.  ,2.00,3.00,.  @&t@
+.  ,2.00,3.00,4.00
+.  ,2.00,.  ,4.00
 .  ,2.00,.  ,4.00
-.  ,2.00,.  ,.  @&t@
 .  ,.  ,3.00,4.00
-.  ,.  ,3.00,.  @&t@
+.  ,.  ,3.00,4.00
+.  ,.  ,.  ,4.00
 .  ,.  ,.  ,4.00
-.  ,.  ,.  ,.  @&t@
 ])
 AT_CLEANUP
 
@@ -260,7 +263,7 @@ AT_DATA([pets.data], [dnl
 "Gilly", , White, "10 Apr 2007", 10, "3""", "Guinea Pig"
 ])
 AT_DATA([pets.sps], [dnl
-GET DATA /TYPE=TXT /FILE='pets.data' /DELIMITERS=', ' /QUALIFIER='''"' /ESCAPE
+GET DATA /TYPE=TXT /FILE='pets.data' /DELIMITERS=', ' /QUALIFIER='''"'
         /FIRSTCASE=3
         /VARIABLES=name A10
                    age F3.1
@@ -283,7 +286,7 @@ Gilly     ,. ,White,10.04.2007,10.00,"3""   ",Guinea Pig
 AT_CLEANUP
 dnl " (fixes Emacs highlighting)
 
-AT_SETUP([GET DATA /TYPE=TXT with IMPORTCASES])
+AT_SETUP([GET DATA /TYPE=TXT with IMPORTCASE])
 AT_CHECK([$PERL > test.data <<'EOF'
 for ($i = 1; $i <= 100; $i++) {
     printf "%02d\n", $i;
@@ -291,280 +294,38 @@ for ($i = 1; $i <= 100; $i++) {
 EOF
 ])
 AT_DATA([get-data.sps], [dnl
-get data /type=txt /file='test.data' /importcases=first 10 /variables x f8.0.
-list.
+get data /type=txt /file='test.data' /importcase=first 10 /variables x f8.0.
+get data /type=txt /file='test.data' /importcase=percent 1 /variables x f8.0.
+get data /type=txt /file='test.data' /importcase=percent 35 /variables x f8.0.
+get data /type=txt /file='test.data' /importcase=percent 95 /variables x f8.0.
+get data /type=txt /file='test.data' /importcase=percent 100 /variables x f8.0.
+])
+AT_CHECK([pspp -O format=csv get-data.sps], [0], [dnl
+get-data.sps:1: warning: GET DATA: Ignoring obsolete IMPORTCASES subcommand.  (N OF CASES or SAMPLE may be used to substitute.)
 
-get data /type=txt /file='test.data' /importcases=percent 1 /variables x f8.0.
-list.
+get-data.sps:2: warning: GET DATA: Ignoring obsolete IMPORTCASES subcommand.  (N OF CASES or SAMPLE may be used to substitute.)
 
-get data /type=txt /file='test.data' /importcases=percent 35 /variables x f8.0.
-list.
+get-data.sps:3: warning: GET DATA: Ignoring obsolete IMPORTCASES subcommand.  (N OF CASES or SAMPLE may be used to substitute.)
 
-get data /type=txt /file='test.data' /importcases=percent 95 /variables x f8.0.
-list.
+get-data.sps:4: warning: GET DATA: Ignoring obsolete IMPORTCASES subcommand.  (N OF CASES or SAMPLE may be used to substitute.)
+
+get-data.sps:5: warning: GET DATA: Ignoring obsolete IMPORTCASES subcommand.  (N OF CASES or SAMPLE may be used to substitute.)
+])
+AT_CLEANUP
 
-get data /type=txt /file='test.data' /importcases=percent 100 /variables x f8.0.
+AT_SETUP([GET DATA /TYPE=TXT with ENCODING subcommand])
+AT_CHECK([i18n-test supports_encodings UTF-8 ISO-8859-1])
+AT_DATA([get-data.sps], [dnl
+set locale='utf-8'
+get data /type=txt /file='data.txt' /encoding='iso-8859-1'
+  /delimiters="," /variables=s a8.
 list.
 ])
+printf '\351' > data.txt       # é in ISO-8859-1.
 AT_CHECK([pspp -o pspp.csv get-data.sps])
 AT_CHECK([cat pspp.csv], [0], [dnl
 Table: Data List
-x
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-
-Table: Data List
-x
-1
-2
-
-Table: Data List
-x
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-
-Table: Data List
-x
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54
-55
-56
-57
-58
-59
-60
-61
-62
-63
-64
-65
-66
-67
-68
-69
-70
-71
-72
-73
-74
-75
-76
-77
-78
-79
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90
-91
-92
-93
-94
-95
-96
-
-Table: Data List
-x
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54
-55
-56
-57
-58
-59
-60
-61
-62
-63
-64
-65
-66
-67
-68
-69
-70
-71
-72
-73
-74
-75
-76
-77
-78
-79
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90
-91
-92
-93
-94
-95
-96
-97
-98
-99
-100
+s
+é      @&t@
 ])
 AT_CLEANUP