Convert (most of) the test data files into genuine XML. A handful still

are not, due mainly to the lack of support for XML character entities
(e.g. & => & ).  This will make it easier to validate test files using
tools like xmllint, as well as edit and view them using XML tools.

CHANGES

@@ -6,6 +6,12 @@
 
                                   Changelog
 
+Dan F (22 January 2007)
+- Converted (most of) the test data files into genuine XML.  A handful still
+  are not, due mainly to the lack of support for XML character entities
+  (e.g. & => & ).  This will make it easier to validate test files using
+  tools like xmllint, as well as to edit and view them using XML tools.
+
 Daniel (16 January 2007)
 - Armel Asselin improved libcurl to behave a lot better when an easy handle
   doing an FTP transfer is removed from a multi handle before completion. The

tests/FILEFORMAT

@@ -1,7 +1,16 @@
- The file format of the test suite is a very simple and extendable format. All
+ The test suite's file format is very simple and extendable, closely
-data for a single test case resides in a single ASCII file. Labels mark the
+resembling XML. All data for a single test case resides in a single
-beginning and the end of all sections. Each label must be written in its own
+ASCII file. Labels mark the beginning and the end of all sections, and each
-line and is resembling XML/HTML.
+label must be written in its own line.  Comments are either XML-style
+(enclosed with <!-- and -->) or C-style (beginning with #) and must appear
+on their own lines and not alongside actual test data.  Most test data files
+are syntactically valid XML, although a few files are not (lack of
+support for character entities is the biggest omission).
+
+ The file begins with a 'testcase' tag, which encompasses the remainder of
+the file.
+
+<testcase>
 
  Each file is split up in three main sections: reply, client and verify. The
 reply section is used for the server to know what to send as a reply for the
@@ -24,14 +33,14 @@ statistical/informational purposes.
 </info>
 
 <reply>
-<data [nocheck=1] [sendzero=yes] [base64=yes]>
+<data [nocheck="1"] [sendzero="yes"] [base64="yes"]>
-§data to sent to the client on its request and later verified that it arrived
+data to be sent to the client on its request and later verified that it arrived
 safely. Set the nocheck=1 to prevent the test script to verify the arrival
 of this data.
 
 If the data contains 'swsclose' anywhere within the start and end tag, and
 this is a HTTP test, then the connection will be closed by the server after
-this response is sent. If not, the connection will be kept persistant.
+this response is sent. If not, the connection will be kept persistent.
 
 If the data contains 'swsbounce' anywhere within the start and end tag, the
 HTTP server will detect if this is a second request using the same test and
@@ -55,7 +64,7 @@ B) The request was HTTP and included digest details, which adds 1000 to NUM
 C) If a HTTP request is NTLM type-1, it adds 1001 to num
 D) If a HTTP request is NTLM type-3, it adds 1002 to num
 </dataNUM>
-<datacheck [nonewline=yes]>
+<datacheck [nonewline="yes"]>
 if the data is sent but this is what should be checked afterwards. If
 'nonewline' is set, we will cut off the trailing newline of this given data
 before comparing with the one actually received by the client
@@ -115,13 +124,15 @@ A list of features that MUST be present in the client/library for this test to
 be able to run (if these features are not present, the test will be
 SKIPPED). Features testable here are:
 
-SSL
-netrc_debug
-large_file
-idn
 getrlimit
+GnuTLS
+idn
 ipv6
+large_file
 libz
+netrc_debug
+OpenSSL
+SSL
 </features>
 
 <killserver>
@@ -154,7 +165,7 @@ Set the given environment variables to the specified value before the actual
 command is run, they are cleared again after the command has been run.
 </setenv>
 
-<command [option=no-output]>
+<command [option="no-output"]>
 command line to run, there's a bunch of %variables that get replaced
 accordingly.
 
@@ -172,13 +183,20 @@ argument that directs the output to a file. The --output is also not added if
 the client/stdout section is used.
 
 Available substitute variables include:
-%HOSTIP    - IP address of the host running this test
+%HOSTIP    - IPv6 address of the host running this test
 %HOSTPORT  - Port number of the HTTP server
+%HOST6IP   - IPv6 address of the host running this test
+%HOST6PORT - IPv6 port number of the HTTP server
 %HTTPSPORT - Port number of the HTTPS server
 %FTPPORT   - Port number of the FTP server
+%FTP6PORT  - IPv6 port number of the FTP server
 %FTPSPORT  - Port number of the FTPS server
+%FTP2PORT  - Port number of the FTP server 2
+%TFTPPORT  - Port number of the TFTP server
+%TFTP6PORT - IPv6 port number of the TFTP server
 %SRCDIR    - Full path to the source dir
 %PWD       - Current directory
+%CURL      - Path to the curl executable
 </command>
 
 <file name="log/filename">
@@ -200,28 +218,28 @@ example.
 </errorcode>
 <strip>
 One regex per line that is removed from the protocol dumps before the
-comparison is made. This is very useful to remove dependencies on dynamicly
+comparison is made. This is very useful to remove dependencies on dynamically
 changing protocol data such as port numbers or user-agent strings.
 </strip>
 <strippart>
 One perl op per line that operates on the protocol dump. This is pretty
 advanced. Example: "s/^EPRT .*/EPRT stripped/"
 </strippart>
-<protocol [nonewline=yes]>
+<protocol [nonewline="yes"]>
 the protocol dump curl should transmit, if 'nonewline' is set, we will cut
 off the trailing newline of this given data before comparing with the one
 actually sent by the client
 </protocol>
-<stdout [mode=text]>
+<stdout [mode="text"]>
-This verfies that this data was passed to stdout.
+This verifies that this data was passed to stdout.
 
-Use the "mode=text" attribute if the output is in text mode on platforms that
+Use the "mode="text"" attribute if the output is in text mode on platforms that
 have a text/binary difference.
 </stdout>
-<file name="log/filename" [mode=text]>
+<file name="log/filename" [mode="text"]>
 The file's contents must be identical to this after the test is complete.
 
-Use the "mode=text" attribute if the output is in text mode on platforms that
+Use the "mode="text" attribute if the output is in text mode on platforms that
 have a text/binary difference.
 </file>
 <stripfile>
@@ -235,3 +253,5 @@ the contents of the upload data curl should have sent
 disable - disables the valgrind log check for this test
 </valgrind>
 </verify>
+
+</testcase>

tests/data/test1

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -20,7 +21,7 @@ Connection: close
 Content-Type: text/html
 Funny-head: yesyes
 
-<foo>
+-foo-
 </data>
 </reply>
 
@@ -51,3 +52,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>

tests/data/test10

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -63,3 +64,4 @@ the
       feature
 </protocol>
 </verify>
+</testcase>

tests/data/test100

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -55,3 +56,4 @@ LIST
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test101

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -55,3 +56,4 @@ LIST
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test102

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -48,3 +49,4 @@ RETR 102
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test103

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -50,3 +51,4 @@ RETR 103
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test104

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -39,3 +40,4 @@ REST 0
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test105

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -49,3 +50,4 @@ RETR 103
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test106

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -46,3 +47,4 @@ RETR 106
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test107

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -47,3 +48,4 @@ STOR 107
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test108

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -52,3 +53,4 @@ Moooooooooooo
  upload this
 </upload>
 </verify>
+</testcase>

tests/data/test109

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -46,3 +47,4 @@ Moooooooooooo
  upload this
 </upload>
 </verify>
+</testcase>

tests/data/test11

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -72,3 +73,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>

tests/data/test110

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -50,3 +51,4 @@ RETR 110
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test111

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -43,3 +44,4 @@ SIZE 111
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test112

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -47,3 +48,4 @@ QUIT
 worx?
 </upload>
 </verify>
+</testcase>

tests/data/test113

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -33,3 +34,4 @@ REPLY USER 314 bluah you fewl!
 USER anonymous
 </protocol>
 </verify>
+</testcase>

tests/data/test114

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -34,3 +35,4 @@ USER anonymous
 PASS curl_by_daniel@haxx.se
 </protocol>
 </verify>
+</testcase>

tests/data/test115

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -40,3 +41,4 @@ PASV
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test116

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -42,3 +43,4 @@ PWD
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test117

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -40,3 +41,4 @@ TYPE I
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test118

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -44,3 +45,4 @@ RETR 118
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test119

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -46,3 +47,4 @@ RETR 119
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test12

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -51,3 +52,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>

tests/data/test120

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -49,3 +50,4 @@ DELE file
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test121

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -47,3 +48,4 @@ DELE after_transfer
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test122

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -41,3 +42,4 @@ SIZE 122
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test123

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -36,3 +37,4 @@ TYPE I
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test124

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -43,3 +44,4 @@ RETR 124
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test125

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -37,3 +38,4 @@ CWD path
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test126

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -44,3 +45,4 @@ RETR 126
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test127

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -42,3 +43,4 @@ RETR 127
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test128

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -53,3 +54,4 @@ the
 --crlf option
 </upload>
 </verify>
+</testcase>

tests/data/test13

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -40,3 +41,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>

tests/data/test130

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -64,3 +65,4 @@ LIST
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test131

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -65,3 +66,4 @@ LIST
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test132

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -64,3 +65,4 @@ LIST
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test133

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -64,3 +65,4 @@ LIST
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test134

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -64,3 +65,4 @@ LIST
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test135

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -14,7 +15,7 @@ Range
 0123456789abcdef
 0123456789abcdef
 </data>
-<datacheck nonewline=yes>
+<datacheck nonewline="yes">
 0123456789abc
 </datacheck>
 <size>
@@ -49,3 +50,4 @@ RETR 135
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test136

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 FTP
@@ -38,3 +39,4 @@ RETR 136
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test137

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -36,3 +37,4 @@ RETR 137
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test138

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -39,3 +40,4 @@ RETR 138
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test139

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -36,3 +37,4 @@ RETR 139
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test14

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -40,3 +41,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>

tests/data/test140

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -31,3 +32,4 @@ MDTM 140
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test141

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -37,3 +38,4 @@ QUIT
 Last-Modified: Wed, 09 Apr 2003 10:26:59 GMT
 </stdout>
 </verify>
+</testcase>

tests/data/test142

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -181,3 +182,4 @@ RETR 142
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test143

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -33,3 +34,4 @@ RETR 143
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test144

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -38,3 +39,4 @@ NLST
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test145

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -41,3 +42,4 @@ NLST
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test146

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -44,3 +45,4 @@ RETR 146
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test147

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -46,3 +47,4 @@ RETR 147
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test148

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -39,3 +40,4 @@ MKD attempt
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test149

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -44,3 +45,4 @@ QUIT
 send away this contents
 </file>
 </verify>
+</testcase>

tests/data/test15

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -7,7 +8,7 @@ HTTP GET
 </info>
 # Server-side
 <reply>
-<data nocheck=true>
+<data nocheck="true">
 HTTP/1.4 200 OK
 Fake: yes
 Fake: yes
@@ -53,3 +54,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>

tests/data/test150

@@ -1,10 +1,13 @@
-# Server-side
+<testcase>
+
+<!-- Server-side -->
 <reply>
 
-# no <data> in this test since we have NTLM from the start
+<!-- no <data> in this test since we have NTLM from the start
+
+This is supposed to be returned when the server gets a first
+Authorization: NTLM line passed-in from the client -->
 
-# This is supposed to be returned when the server gets a first
-# Authorization: NTLM line passed-in from the client
 <data1001>
 HTTP/1.1 401 Now gimme that second request of crap
 Server: Microsoft-IIS/5.0
@@ -84,3 +87,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>

tests/data/test151

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -37,3 +38,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>

tests/data/test152

@@ -1,6 +1,7 @@
+<testcase>
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.0 401 BAD BOY
 Server: swsclose
 Content-Type: text/html
@@ -40,3 +41,4 @@ Accept: */*
 22
 </errorcode>
 </verify>
+</testcase>

tests/data/test153

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 # reply back and ask for Digest auth
@@ -118,3 +119,4 @@ Content-Length: 30
 This IS the second real page!
 </stdout>
 </verify>
+</testcase>

tests/data/test154

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <servercmd>
@@ -92,3 +93,4 @@ line three
 four is the number of lines
 </protocol>
 </verify>
+</testcase>

tests/data/test155

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <servercmd>
@@ -123,3 +124,4 @@ line three
 four is the number of lines
 </protocol>
 </verify>
+</testcase>

tests/data/test156

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -48,3 +49,4 @@ line three
 four is the number of lines
 </protocol>
 </verify>
+</testcase>

tests/data/test157

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -35,3 +36,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>

tests/data/test158

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -46,3 +47,4 @@ daniel
 52
 </errorcode>
 </verify>
+</testcase>

tests/data/test159

@@ -1,10 +1,12 @@
+<testcase>
 # Server-side
 <reply>
 
-# no <data> in this test since we have NTLM from the start
+<!-- no <data> in this test since we have NTLM from the start
+
+This is supposed to be returned when the server gets a first
+Authorization: NTLM line passed-in from the client -->
 
-# This is supposed to be returned when the server gets a first
-# Authorization: NTLM line passed-in from the client
 <data1001>
 HTTP/1.1 401 Now gimme that second request of crap
 Server: Microsoft-IIS/5.0
@@ -84,3 +86,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>

tests/data/test16

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -47,3 +48,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>

tests/data/test160

@@ -1,6 +1,7 @@
+<testcase>
 # Server-side
 <reply>
-<data nocheck=true>
+<data nocheck="true">
 HTTP/1.1 200 OK swsclose
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Content-Length: 9
@@ -62,3 +63,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>

tests/data/test161

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -37,3 +38,4 @@ RETR 161
 18
 </errorcode>
 </verify>
+</testcase>

tests/data/test162

@@ -1,6 +1,7 @@
+<testcase>
 # Server-side
 <reply>
-<data1001 nocheck=1>
+<data1001 nocheck="1">
 HTTP/1.0 407 BAD BOY
 Proxy-Authenticate: Basic realm="Squid proxy-caching web server"
 Server: swsclose
@@ -47,3 +48,4 @@ Proxy-Connection: Keep-Alive
 22
 </errorcode>
 </verify>
+</testcase>

tests/data/test163

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -69,3 +70,4 @@ curl
 ------------------------------c2d1767eb6ac--
 </protocol>
 </verify>
+</testcase>

tests/data/test164

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 # This particular response is an exact excerpt from an actual Apache
 # server when asked for a 0-10,12-15 range.
@@ -56,3 +57,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>

tests/data/test165

@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -46,3 +47,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>

tests/data/test166

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -50,3 +51,4 @@ data inside the file
 ------------------------------b0b3d6d23991--
 </protocol>
 </verify>
+</testcase>

tests/data/test167

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -64,3 +65,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>

tests/data/test168

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 
@@ -85,3 +86,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>

tests/data/test169

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 
@@ -112,3 +113,4 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
+</testcase>

tests/data/test17

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -50,3 +51,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>

tests/data/test170

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 </reply>
@@ -39,3 +40,4 @@ Content-Length: 0
 52
 </errorcode>
 </verify>
+</testcase>

tests/data/test171

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -38,7 +39,7 @@ Accept: */*
 Proxy-Connection: Keep-Alive
 
 </protocol>
-<file name="log/jar171" mode=text>
+<file name="log/jar171" mode="text">
 # Netscape HTTP Cookie File
 # http://curlm.haxx.se/rfc/cookie_spec.html
 # This file was generated by libcurl! Edit at your own risk.
@@ -46,3 +47,4 @@ Proxy-Connection: Keep-Alive
 .z.x.com	TRUE	/	FALSE	0	XToken	xt
 </file>
 </verify>
+</testcase>

tests/data/test172

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -44,3 +45,4 @@ Cookie: nodomain=value; partmatch=present; tool=curl; name=fool
 
 </protocol>
 </verify>
+</testcase>

tests/data/test173

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -69,3 +70,4 @@ line8
 ------------------------------5dbea401cd8c--
 </protocol>
 </verify>
+</testcase>

tests/data/test174

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -30,7 +31,7 @@ http://%HOSTIP:%HTTPPORT/174 -u testuser:testpass --anyauth -d "junkelijunk"
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 POST /174 HTTP/1.1
 User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6
 Host: 127.0.0.1:%HTTPPORT
@@ -41,3 +42,4 @@ Content-Type: application/x-www-form-urlencoded
 junkelijunk
 </protocol>
 </verify>
+</testcase>

tests/data/test175

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -53,7 +54,7 @@ http://%HOSTIP:%HTTPPORT/175 -u auser:apasswd --digest -d "junkelijunk"
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 POST /175 HTTP/1.1
 User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6
 Host: 127.0.0.1:%HTTPPORT
@@ -71,3 +72,4 @@ Content-Type: application/x-www-form-urlencoded
 junkelijunk
 </protocol>
 </verify>
+</testcase>

tests/data/test176

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 # the first request has NTLM type-1 included, and then the 1001 is returned
@@ -56,7 +57,7 @@ http://%HOSTIP:%HTTPPORT/176 -u auser:apasswd --ntlm -d "junkelijunk"
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol nonewline=yes>
+<protocol nonewline="yes">
 POST /176 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6
@@ -75,3 +76,4 @@ Content-Type: application/x-www-form-urlencoded
 junkelijunk
 </protocol>
 </verify>
+</testcase>

tests/data/test177

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -38,3 +39,4 @@ Content-Type: application/x-www-form-urlencoded
 
 </protocol>
 </verify>
+</testcase>

tests/data/test178

@@ -1,3 +1,4 @@
+<testcase>
 #
 # Server-side
 <reply>
@@ -39,3 +40,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>

tests/data/test179

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -45,3 +46,4 @@ Cookie: moo2=indeed
 
 </protocol>
 </verify>
+</testcase>

tests/data/test18

@@ -1,3 +1,4 @@
+<testcase>
 <info>
 <keywords>
 HTTP
@@ -7,7 +8,7 @@ HTTP GET
 </info>
 # Server-side
 <reply>
-<data nocheck=1>
+<data nocheck="1">
 HTTP/1.1 200 OK
 Funny-head: yesyes
 Content-Length: 4
@@ -86,3 +87,4 @@ Content-Length: 4
 hoo
 </stdout>
 </verify>
+</testcase>

tests/data/test180

@@ -1,3 +1,4 @@
+<testcase>
 <reply>
 <data>
 HTTP/1.0 200 OK swsclose
@@ -55,3 +56,4 @@ the
       feature
 </protocol>
 </verify>
+</testcase>

tests/data/test181

@@ -1,3 +1,4 @@
+<testcase>
 <reply>
 <data>
 HTTP/1.0 200 OK swsclose
@@ -56,3 +57,4 @@ the
       feature
 </protocol>
 </verify>
+</testcase>

tests/data/test182

@@ -1,6 +1,7 @@
+<testcase>
 # Server-side
 <reply>
-<data sendzero=yes>
+<data sendzero="yes">
 </data>
 <size>
 0
@@ -33,3 +34,4 @@ RETR 182
 QUIT
 </protocol>
 </verify>
+</testcase>

tests/data/test183

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -48,3 +49,4 @@ Proxy-Connection: Keep-Alive
 </protocol>
 
 </verify>
+</testcase>

tests/data/test184

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -67,3 +68,4 @@ Proxy-Connection: Keep-Alive
 </protocol>
 
 </verify>
+</testcase>

tests/data/test185

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -67,3 +68,4 @@ Host: another.visitor.stay.a.while.stay.foreeeeeever
 </protocol>
 
 </verify>
+</testcase>

tests/data/test186

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -52,3 +53,4 @@ Content-Type: text/html
 ------------------------------212d9006ceb5--
 </protocol>
 </verify>
+</testcase>

tests/data/test187

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -65,3 +66,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>

tests/data/test188

@@ -1,3 +1,4 @@
+<testcase>
 # Server-side
 <reply>
 <data>
@@ -64,3 +65,4 @@ Accept: */*
 
 </protocol>
 </verify>
+</testcase>