fix gofmt and goimports issues

go-cas · Sep 24, 2019 · 87e080a · 87e080a
1 parent 71c4d43
commit 87e080a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 23 deletions.
diff --git a/logout_request_test.go b/logout_request_test.go
@@ -91,4 +91,4 @@ func TestParseLogoutRequestWithISO8601(t *testing.T) {
 		t.Errorf("Expected IssueInstant to be <%v>, got <%v>",
 			instant, l.IssueInstant)
 	}
-}
+}
diff --git a/rest_client.go b/rest_client.go
@@ -1,12 +1,13 @@
 package cas
 
 import (
-	"net/url"
-	"net/http"
-	"github.com/golang/glog"
 	"fmt"
-	"path"
 	"io/ioutil"
+	"net/http"
+	"net/url"
+	"path"
+
+	"github.com/golang/glog"
 )
 
 // https://apereo.github.io/cas/4.2.x/protocol/REST-Protocol.html
@@ -17,7 +18,6 @@ type TicketGrantingTicket string
 // ServiceTicket stands for the access granted by the CAS server to an application for a specific user, also known as ST
 type ServiceTicket string
 
-
 // RestOptions provide options for the RestClient
 type RestOptions struct {
 	CasURL     *url.URL
@@ -175,4 +175,4 @@ func (c *RestClient) Logout(tgt TicketGrantingTicket) error {
 	}
 
 	return nil
-}
+}
diff --git a/rest_client_test.go b/rest_client_test.go
@@ -1,10 +1,10 @@
 package cas
 
 import (
-	"testing"
-	"net/http/httptest"
 	"net/http"
+	"net/http/httptest"
 	"net/url"
+	"testing"
 )
 
 func TestRequestGrantingTicket(t *testing.T) {
@@ -81,16 +81,15 @@ func TestRequestServiceTicket(t *testing.T) {
 		t.Error("failed to create cas url from test server")
 	}
 
-
 	serviceURL, err := url.Parse("https://hitchhiker.com/heartOfGold")
 	if err != nil {
 		t.Error("failed to create service url")
 	}
 
 	restClient := NewRestClient(&RestOptions{
-		CasURL: casURL,
+		CasURL:     casURL,
 		ServiceURL: serviceURL,
-		Client: server.Client(),
+		Client:     server.Client(),
 	})
 
 	st, err := restClient.RequestServiceTicket(TicketGrantingTicket("TGT-abc"))
@@ -113,9 +112,9 @@ func TestRequestServiceTicket(t *testing.T) {
 	}
 
 	restClient = NewRestClient(&RestOptions{
-		CasURL: casURL,
+		CasURL:     casURL,
 		ServiceURL: serviceURL,
-		Client: server.Client(),
+		Client:     server.Client(),
 	})
 
 	_, err = restClient.RequestServiceTicket(TicketGrantingTicket("TGT-abc"))
@@ -186,4 +185,4 @@ func TestLogout(t *testing.T) {
 	if err == nil {
 		t.Errorf("logout should failed for this TGT")
 	}
-}
+}
diff --git a/url_scheme_test.go b/url_scheme_test.go
@@ -10,22 +10,22 @@ func TestDefaultURLScheme(t *testing.T) {
 	scheme := NewDefaultURLScheme(url)
 
 	u, err := scheme.Login()
-	assertUrl(t, "/cas/login", u, err)
+	assertURL(t, "/cas/login", u, err)
 	u, err = scheme.Logout()
-	assertUrl(t, "/cas/logout", u, err)
+	assertURL(t, "/cas/logout", u, err)
 	u, err = scheme.Validate()
-	assertUrl(t, "/cas/validate", u, err)
+	assertURL(t, "/cas/validate", u, err)
 	u, err = scheme.ServiceValidate()
-	assertUrl(t, "/cas/serviceValidate", u, err)
+	assertURL(t, "/cas/serviceValidate", u, err)
 	u, err = scheme.RestGrantingTicket()
-	assertUrl(t, "/cas/v1/tickets", u, err)
+	assertURL(t, "/cas/v1/tickets", u, err)
 	u, err = scheme.RestServiceTicket("TGT-123")
-	assertUrl(t, "/cas/v1/tickets/TGT-123", u, err)
+	assertURL(t, "/cas/v1/tickets/TGT-123", u, err)
 	u, err = scheme.RestLogout("TGT-123")
-	assertUrl(t, "/cas/v1/tickets/TGT-123", u, err)
+	assertURL(t, "/cas/v1/tickets/TGT-123", u, err)
 }
 
-func assertUrl(t *testing.T, expected string, u *url.URL, err error) {
+func assertURL(t *testing.T, expected string, u *url.URL, err error) {
 	if err != nil {
 		t.Fatalf("returned error")
 	}