atcoder
diff --git a/‎tests.go
Copy file name to clipboardExpand all lines: tests.go
+74-19Lines changed: 74 additions & 19 deletions b/‎tests.go
Copy file name to clipboardExpand all lines: tests.go
+74-19Lines changed: 74 additions & 19 deletions
@@ -5,10 +5,14 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"mime"
 	"mime/multipart"
 	"net/http"
 	"net/http/cookiejar"
+	"net/textproto"
 	"net/url"
+	"os"
+	"path/filepath"
 	"regexp"
 	"strings"
 
@@ -62,8 +66,8 @@ func (t *TestSuite) WebSocketUrl() string {
 	return "ws://" + t.Host()
 }
 
-// Issue a GET request to the given path and store the result in Request and
-// RequestBody.
+// Issue a GET request to the given path and store the result in Response and
+// ResponseBody.
 func (t *TestSuite) Get(path string) {
 	t.GetCustom(t.BaseUrl() + path).Send()
 }
@@ -80,8 +84,8 @@ func (t *TestSuite) GetCustom(uri string) *TestRequest {
 	}
 }
 
-// Issue a DELETE request to the given path and store the result in Request and
-// RequestBody.
+// Issue a DELETE request to the given path and store the result in Response and
+// ResponseBody.
 func (t *TestSuite) Delete(path string) {
 	t.DeleteCustom(t.BaseUrl() + path).Send()
 }
@@ -99,7 +103,7 @@ func (t *TestSuite) DeleteCustom(uri string) *TestRequest {
 }
 
 // Issue a POST request to the given path, sending the given Content-Type and
-// data, and store the result in Request and RequestBody.  "data" may be nil.
+// data, and store the result in Response and ResponseBody.  "data" may be nil.
 func (t *TestSuite) Post(path string, contentType string, reader io.Reader) {
 	t.PostCustom(t.BaseUrl()+path, contentType, reader).Send()
 }
@@ -119,7 +123,7 @@ func (t *TestSuite) PostCustom(uri string, contentType string, reader io.Reader)
 }
 
 // Issue a POST request to the given path as a form post of the given key and
-// values, and store the result in Request and RequestBody.
+// values, and store the result in Response and ResponseBody.
 func (t *TestSuite) PostForm(path string, data url.Values) {
 	t.PostFormCustom(t.BaseUrl()+path, data).Send()
 }
@@ -130,23 +134,34 @@ func (t *TestSuite) PostFormCustom(uri string, data url.Values) *TestRequest {
 	return t.PostCustom(uri, "application/x-www-form-urlencoded", strings.NewReader(data.Encode()))
 }
 
-// Issue a multipart request for the method & fields given and read the response.
-// If successful, the caller may examine the Response and ResponseBody properties.
-func (t *TestSuite) MakeMultipartRequest(method string, path string, fields map[string]string) {
-	var b bytes.Buffer
-	w := multipart.NewWriter(&b)
+// Issue a multipart request to the given path sending given params and files,
+// and store the result in Response and ResponseBody.
+func (t *TestSuite) PostFile(path string, params url.Values, filePaths url.Values) {
+	t.PostFileCustom(t.BaseUrl()+path, params, filePaths).Send()
+}
+
+// Return a multipart request to the given uri in a form of its wrapper
+// with the given params and files.
+func (t *TestSuite) PostFileCustom(uri string, params url.Values, filePaths url.Values) *TestRequest {
+	body := &bytes.Buffer{}
+	writer := multipart.NewWriter(body)
 
-	for key, value := range fields {
-		w.WriteField(key, value)
+	for key, values := range filePaths {
+		for _, value := range values {
+			createFormFile(writer, key, value)
+		}
 	}
-	w.Close() //adds the terminating boundary
 
-	req, err := http.NewRequest(method, t.BaseUrl()+path, &b)
-	if err != nil {
-		panic(err)
+	for key, values := range params {
+		for _, value := range values {
+			err := writer.WriteField(key, value)
+			t.AssertEqual(nil, err)
+		}
 	}
-	req.Header.Set("Content-Type", w.FormDataContentType())
+	err := writer.Close()
+	t.AssertEqual(nil, err)
 
+	return t.PostCustom(uri, writer.FormDataContentType(), body)
 }
 
 // Issue any request and read the response. If successful, the caller may
@@ -251,11 +266,51 @@ func (t *TestSuite) AssertNotContains(s string) {
 	}
 }
 
-// Assert that the response matches the given regular expression.BUG
+// Assert that the response matches the given regular expression.
 func (t *TestSuite) AssertContainsRegex(regex string) {
 	r := regexp.MustCompile(regex)
 
 	if !r.Match(t.ResponseBody) {
 		panic(fmt.Errorf("Assertion failed. Expected response to match regexp %s", regex))
 	}
 }
+
+func createFormFile(writer *multipart.Writer, fieldname, filename string) {
+	// Try to open the file.
+	file, err := os.Open(filename)
+	if err != nil {
+		panic(err)
+	}
+	defer file.Close()
+
+	// Create a new form-data header with the provided field name and file name.
+	// Determine Content-Type of the file by its extension.
+	h := textproto.MIMEHeader{}
+	h.Set("Content-Disposition", fmt.Sprintf(
+		`form-data; name="%s"; filename="%s"`,
+		escapeQuotes(fieldname),
+		escapeQuotes(filepath.Base(filename)),
+	))
+	h.Set("Content-Type", "application/octet-stream")
+	if ct := mime.TypeByExtension(filepath.Ext(filename)); ct != "" {
+		h.Set("Content-Type", ct)
+	}
+	part, err := writer.CreatePart(h)
+	if err != nil {
+		panic(err)
+	}
+
+	// Copy the content of the file we have opened not reading the whole
+	// file into memory.
+	_, err = io.Copy(part, file)
+	if err != nil {
+		panic(err)
+	}
+}
+
+var quoteEscaper = strings.NewReplacer("\\", "\\\\", `"`, "\\\"")
+
+// This function was borrowed from mime/multipart package.
+func escapeQuotes(s string) string {
+	return quoteEscaper.Replace(s)
+}