Commit ea509c95 authored by Bobby DeSimone's avatar Bobby DeSimone Committed by Brad Fitzpatrick

net/http/httputil: add tests for singleJoiningSlash.

These changes add tests for the unexported function singleJoiningSlash.

Change-Id: I107905aac4a3c2544be309098b67e970ea5b542c
GitHub-Last-Rev: ed6f86f619549f46ef53316b7febaac781b64e4b
GitHub-Pull-Request: golang/go#29088
Reviewed-on: https://go-review.googlesource.com/c/152337Reviewed-by: default avatarBrad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
parent b0a53d22
...@@ -7,23 +7,23 @@ ...@@ -7,23 +7,23 @@
package httputil package httputil
import ( import (
"bufio"
"bytes"
"errors"
"fmt"
"io"
"io/ioutil" "io/ioutil"
"log" "log"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"net/url" "net/url"
"testing" "os"
"time"
"reflect" "reflect"
"io" "strconv"
"strings" "strings"
"bufio"
"sync" "sync"
"strconv" "testing"
"bytes" "time"
"errors"
"fmt"
"os"
) )
const fakeHopHeader = "X-Fake-Hop-Header-For-Test" const fakeHopHeader = "X-Fake-Hop-Header-For-Test"
...@@ -1078,3 +1078,26 @@ func TestUnannouncedTrailer(t *testing.T) { ...@@ -1078,3 +1078,26 @@ func TestUnannouncedTrailer(t *testing.T) {
} }
} }
func TestSingleJoinSlash(t *testing.T) {
tests := []struct {
slasha string
slashb string
expected string
}{
{"https://www.google.com/", "/favicon.ico", "https://www.google.com/favicon.ico"},
{"https://www.google.com", "/favicon.ico", "https://www.google.com/favicon.ico"},
{"https://www.google.com", "favicon.ico", "https://www.google.com/favicon.ico"},
{"https://www.google.com", "", "https://www.google.com/"},
{"", "favicon.ico", "/favicon.ico"},
}
for _, tt := range tests {
if got := singleJoiningSlash(tt.slasha, tt.slashb); got != tt.expected {
t.Errorf("singleJoiningSlash(%s,%s) want %s got %s",
tt.slasha,
tt.slashb,
tt.expected,
got)
}
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment