http: update tests, add fifth file for checking metadata

backend/http/http_internal_test.go

@@ -61,10 +61,10 @@ func prepareServer(t *testing.T) configmap.Simple {
 		assert.Equal(t, headers[1], r.Header.Get(headers[0]), what+headers[0])
 		assert.Equal(t, headers[3], r.Header.Get(headers[2]), what+headers[2])
 
-		// Set the content disposition header for the file under four
+		// Set the content disposition header for the fifth file
 		// later we will check if it is set using the metadata method
-		if r.URL.Path == "/four/under four.txt" {
-			w.Header().Set("Content-Disposition", "attachment; filename=\"under four.txt\"")
+		if r.URL.Path == "/five.txt.gz" {
+			w.Header().Set("Content-Disposition", "attachment; filename=\"five.txt.gz\"")
 			w.Header().Set("Content-Type", "text/plain; charset=utf-8")
 			w.Header().Set("Cache-Control", "no-cache")
 			w.Header().Set("Content-Language", "en-US")
@@ -113,27 +113,33 @@ func testListRoot(t *testing.T, f fs.Fs, noSlash bool) {
 
 	sort.Sort(entries)
 
-	require.Equal(t, 4, len(entries))
+	require.Equal(t, 5, len(entries))
 
 	e := entries[0]
-	assert.Equal(t, "four", e.Remote())
+	assert.Equal(t, "five.txt.gz", e.Remote())
 	assert.Equal(t, int64(-1), e.Size())
-	_, ok := e.(fs.Directory)
+	_, ok := e.(fs.Object)
 	assert.True(t, ok)
 
 	e = entries[1]
+	assert.Equal(t, "four", e.Remote())
+	assert.Equal(t, int64(-1), e.Size())
+	_, ok = e.(fs.Directory)
+	assert.True(t, ok)
+
+	e = entries[2]
 	assert.Equal(t, "one%.txt", e.Remote())
 	assert.Equal(t, int64(5+lineEndSize), e.Size())
 	_, ok = e.(*Object)
 	assert.True(t, ok)
 
-	e = entries[2]
+	e = entries[3]
 	assert.Equal(t, "three", e.Remote())
 	assert.Equal(t, int64(-1), e.Size())
 	_, ok = e.(fs.Directory)
 	assert.True(t, ok)
 
-	e = entries[3]
+	e = entries[4]
 	assert.Equal(t, "two.html", e.Remote())
 	if noSlash {
 		assert.Equal(t, int64(-1), e.Size())
@@ -231,16 +237,16 @@ func TestNewObjectWithLeadingSlash(t *testing.T) {
 
 func TestNewObjectWithMetadata(t *testing.T) {
 	f := prepare(t)
-	o, err := f.NewObject(context.Background(), "/four/under four.txt")
+	o, err := f.NewObject(context.Background(), "/five.txt.gz")
 	require.NoError(t, err)
-	assert.Equal(t, "/four/under four.txt", o.Remote())
+	assert.Equal(t, "five.txt.gz", o.Remote())
 	ho, ok := o.(*Object)
 	assert.True(t, ok)
 	metadata, err := ho.Metadata(context.Background())
 	require.NoError(t, err)
 	assert.Equal(t, "text/plain; charset=utf-8", metadata["content-type"])
-	assert.Equal(t, "attachment; filename=\"under four.txt\"", metadata["content-disposition"])
-	assert.Equal(t, "under four.txt", metadata["content-disposition-filename"])
+	assert.Equal(t, "attachment; filename=\"five.txt.gz\"", metadata["content-disposition"])
+	assert.Equal(t, "five.txt.gz", metadata["content-disposition-filename"])
 	assert.Equal(t, "no-cache", metadata["cache-control"])
 	assert.Equal(t, "en-US", metadata["content-language"])
 	assert.Equal(t, "gzip", metadata["content-encoding"])