Imported Upstream version 4.8.1

[platform/upstream/gcc48.git] / libgo / go / net / http / responsewrite_test.go

diff --git a/libgo/go/net/http/responsewrite_test.go b/libgo/go/net/http/responsewrite_test.go
index f8e63ac..5c10e21 100644 (file)
--- a/libgo/go/net/http/responsewrite_test.go
+++ b/libgo/go/net/http/responsewrite_test.go
@@ -15,83 +15,83 @@ type respWriteTest struct {
        Raw  string
 }
 
-var respWriteTests = []respWriteTest{
-       // HTTP/1.0, identity coding; no trailer
-       {
-               Response{
-                       StatusCode:    503,
-                       ProtoMajor:    1,
-                       ProtoMinor:    0,
-                       Request:       dummyReq("GET"),
-                       Header:        Header{},
-                       Body:          ioutil.NopCloser(bytes.NewBufferString("abcdef")),
-                       ContentLength: 6,
-               },
+func TestResponseWrite(t *testing.T) {
+       respWriteTests := []respWriteTest{
+               // HTTP/1.0, identity coding; no trailer
+               {
+                       Response{
+                               StatusCode:    503,
+                               ProtoMajor:    1,
+                               ProtoMinor:    0,
+                               Request:       dummyReq("GET"),
+                               Header:        Header{},
+                               Body:          ioutil.NopCloser(bytes.NewBufferString("abcdef")),
+                               ContentLength: 6,
+                       },
 
-               "HTTP/1.0 503 Service Unavailable\r\n" +
-                       "Content-Length: 6\r\n\r\n" +
-                       "abcdef",
-       },
-       // Unchunked response without Content-Length.
-       {
-               Response{
-                       StatusCode:    200,
-                       ProtoMajor:    1,
-                       ProtoMinor:    0,
-                       Request:       dummyReq("GET"),
-                       Header:        Header{},
-                       Body:          ioutil.NopCloser(bytes.NewBufferString("abcdef")),
-                       ContentLength: -1,
+                       "HTTP/1.0 503 Service Unavailable\r\n" +
+                               "Content-Length: 6\r\n\r\n" +
+                               "abcdef",
                },
-               "HTTP/1.0 200 OK\r\n" +
-                       "\r\n" +
-                       "abcdef",
-       },
-       // HTTP/1.1, chunked coding; empty trailer; close
-       {
-               Response{
-                       StatusCode:       200,
-                       ProtoMajor:       1,
-                       ProtoMinor:       1,
-                       Request:          dummyReq("GET"),
-                       Header:           Header{},
-                       Body:             ioutil.NopCloser(bytes.NewBufferString("abcdef")),
-                       ContentLength:    6,
-                       TransferEncoding: []string{"chunked"},
-                       Close:            true,
+               // Unchunked response without Content-Length.
+               {
+                       Response{
+                               StatusCode:    200,
+                               ProtoMajor:    1,
+                               ProtoMinor:    0,
+                               Request:       dummyReq("GET"),
+                               Header:        Header{},
+                               Body:          ioutil.NopCloser(bytes.NewBufferString("abcdef")),
+                               ContentLength: -1,
+                       },
+                       "HTTP/1.0 200 OK\r\n" +
+                               "\r\n" +
+                               "abcdef",
                },
+               // HTTP/1.1, chunked coding; empty trailer; close
+               {
+                       Response{
+                               StatusCode:       200,
+                               ProtoMajor:       1,
+                               ProtoMinor:       1,
+                               Request:          dummyReq("GET"),
+                               Header:           Header{},
+                               Body:             ioutil.NopCloser(bytes.NewBufferString("abcdef")),
+                               ContentLength:    6,
+                               TransferEncoding: []string{"chunked"},
+                               Close:            true,
+                       },
 
-               "HTTP/1.1 200 OK\r\n" +
-                       "Connection: close\r\n" +
-                       "Transfer-Encoding: chunked\r\n\r\n" +
-                       "6\r\nabcdef\r\n0\r\n\r\n",
-       },
+                       "HTTP/1.1 200 OK\r\n" +
+                               "Connection: close\r\n" +
+                               "Transfer-Encoding: chunked\r\n\r\n" +
+                               "6\r\nabcdef\r\n0\r\n\r\n",
+               },
 
-       // Header value with a newline character (Issue 914).
-       // Also tests removal of leading and trailing whitespace.
-       {
-               Response{
-                       StatusCode: 204,
-                       ProtoMajor: 1,
-                       ProtoMinor: 1,
-                       Request:    dummyReq("GET"),
-                       Header: Header{
-                               "Foo": []string{" Bar\nBaz "},
+               // Header value with a newline character (Issue 914).
+               // Also tests removal of leading and trailing whitespace.
+               {
+                       Response{
+                               StatusCode: 204,
+                               ProtoMajor: 1,
+                               ProtoMinor: 1,
+                               Request:    dummyReq("GET"),
+                               Header: Header{
+                                       "Foo": []string{" Bar\nBaz "},
+                               },
+                               Body:             nil,
+                               ContentLength:    0,
+                               TransferEncoding: []string{"chunked"},
+                               Close:            true,
                        },
-                       Body:             nil,
-                       ContentLength:    0,
-                       TransferEncoding: []string{"chunked"},
-                       Close:            true,
-               },
 
-               "HTTP/1.1 204 No Content\r\n" +
-                       "Connection: close\r\n" +
-                       "Foo: Bar Baz\r\n" +
-                       "\r\n",
-       },
-}
+                       "HTTP/1.1 204 No Content\r\n" +
+                               "Connection: close\r\n" +
+                               "Foo: Bar Baz\r\n" +
+                               "\r\n",
+               },
+       }
 
-func TestResponseWrite(t *testing.T) {
        for i := range respWriteTests {
                tt := &respWriteTests[i]
                var braw bytes.Buffer