Increase test coverage

Author: corny

errors.go

@@ -10,5 +10,5 @@ type ResponseError struct {
 
 // Error returns a string representation
 func (err *ResponseError) Error() string {
-	return fmt.Sprintf("Unexpected status code %d for %s", err.StatusCode, err.URI)
+	return fmt.Sprintf("unexpected status code %d for %s", err.StatusCode, err.URI)
 }

errors_test.go

@@ -10,5 +10,5 @@ func TestResponseError(t *testing.T) {
 	assert.EqualError(t, &ResponseError{
 		URI:        "http://",
 		StatusCode: 500,
-	}, "Unexpected status code 500 for http://")
+	}, "unexpected status code 500 for http://")
 }

fritzbox.go

@@ -47,7 +47,6 @@ func (c *Client) request(rType requestType) (root *xmlpath.Node, err error) {
 		uri,
 		bytes.NewBufferString(`<?xml version='1.0' encoding='utf-8'?><s:Envelope s:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/' xmlns:s='http://schemas.xmlsoap.org/soap/envelope/'><s:Body>`+rType.soapBody+`</s:Body></s:Envelope>`),
 	)
-
 	if err != nil {
 		return
 	}
@@ -64,7 +63,6 @@ func (c *Client) request(rType requestType) (root *xmlpath.Node, err error) {
 	// Send request
 	client := &http.Client{Timeout: timeout}
 	resp, err := client.Do(req)
-
 	// Request failed?
 	if err != nil {
 		return

fritzbox_test.go

@@ -1,19 +1,23 @@
 package fritzbox
 
 import (
+	"context"
 	"errors"
 	"fmt"
+	"log"
+	"net"
+	"net/http"
 	"os"
 	"testing"
 
 	"gopkg.in/xmlpath.v2"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func testfile(name string) *xmlpath.Node {
 	file, err := os.Open(fmt.Sprintf("testdata/%s.xml", name))
-
 	if err != nil {
 		panic(err)
 	}
@@ -39,3 +43,56 @@ func checkFault(root *xmlpath.Node) error {
 	}
 	return nil
 }
+
+func TestClient(t *testing.T) {
+	assert := assert.New(t)
+	require := require.New(t)
+
+	listener, err := net.Listen("tcp", "127.0.0.1:0")
+	require.NoError(err)
+	defer listener.Close()
+
+	mux := http.NewServeMux()
+	mux.HandleFunc("/igdupnp/control/WANCommonIFC1", func(w http.ResponseWriter, r *http.Request) {
+		http.ServeFile(w, r, "testdata/linkspeed/valid.xml")
+	})
+
+	srv := &http.Server{Handler: mux}
+	go func() {
+		if e := srv.Serve(listener); !errors.Is(e, http.ErrServerClosed) {
+			log.Printf("unexpected HTTP server shutdown: %v", e)
+		}
+	}()
+	defer srv.Close()
+
+	client := Client{
+		Endpoint: listener.Addr().String(),
+		Context:  context.Background(),
+	}
+
+	// should succeed
+	linkSpeed, err := client.GetLinkspeed()
+	assert.NoError(err)
+	if assert.NotNil(linkSpeed) {
+		assert.Equal(51392000, linkSpeed.DownlinkBitRate)
+	}
+
+	// should fail (no handler)
+	_, err = client.GetPublicAddress()
+	if assert.Error(err) {
+		assert.Contains(err.Error(), "unexpected status code 404 for http://127")
+	}
+}
+
+func TestClientInvalidAddress(t *testing.T) {
+	assert := assert.New(t)
+	client := NewClientFromIP(net.IP{127, 0, 0, 2})
+
+	assert.Equal("127.0.0.2:49000", client.Endpoint)
+
+	// should succeed
+	_, err := client.GetLinkspeed()
+	if assert.Error(err) {
+		assert.Contains(err.Error(), "dial tcp 127.0.0.2:49000: connect: connection refused")
+	}
+}