Merge lp:~vds/usso/test_refactoring into lp:usso

[Vincenzo Di Somma]

Refactoring usso tests.

[Domas Monkus (tasdomas)]

review: Approve

[Andrew W. Deane (andrew-w-deane)]

review: Approve

=== modified file 'example/usso_example.go'
--- example/usso_example.go	2014-01-22 17:36:47 +0000
+++ example/usso_example.go	2014-01-22 17:36:47 +0000
@@ -66,6 +66,9 @@
 	fmt.Printf("response: %+v\n", b.String())
 	token_details, _ := server.GetTokenDetails(ssodata)
 	fmt.Printf("token details: %s\n", token_details)
-	token_u1registration, _ := server.RegisterTokenToU1FileSync(ssodata)
-	fmt.Printf("token registration: %s\n", token_u1registration)
+	err = server.RegisterTokenToU1FileSync(ssodata)
+	if err != nil {
+		fmt.Printf("Error: %s\n", err)
+	}
+	fmt.Println("Token successfully registered to U1 File Sync Service.")
 }

=== modified file 'usso.go'
--- usso.go	2014-01-22 17:36:47 +0000
+++ usso.go	2014-01-22 17:36:47 +0000
@@ -12,7 +12,8 @@
 )
 
 type UbuntuSSOServer struct {
-	baseUrl string
+	baseUrl              string
+	tokenRegistrationUrl string
 }
 
 // tokenURL returns the URL where the Ubuntu SSO tokens can be requested.
@@ -34,16 +35,15 @@
 
 // ProductionUbuntuSSOServer represents the production Ubuntu SSO server
 // located at https://login.ubuntu.com.
-var ProductionUbuntuSSOServer = UbuntuSSOServer{"https://login.ubuntu.com"}
+var ProductionUbuntuSSOServer = UbuntuSSOServer{"https://login.ubuntu.com", "https://one.ubuntu.com/oauth/sso-finished-so-get-tokens/"}
 
 // StagingUbuntuSSOServer represents the staging Ubuntu SSO server located
 // at https://login.staging.ubuntu.com. Use it for testing.
-var StagingUbuntuSSOServer = UbuntuSSOServer{"https://login.staging.ubuntu.com"}
+var StagingUbuntuSSOServer = UbuntuSSOServer{"https://login.staging.ubuntu.com", "https://one.staging.ubuntu.com/oauth/sso-finished-so-get-tokens/"}
 
 // Giving user credentials and token name, retrieves oauth credentials
 // for the users, the oauth credentials can be used later to sign requests.
-func (server UbuntuSSOServer) GetToken(
-	email string, password string, tokenName string) (*SSOData, error) {
+func (server UbuntuSSOServer) GetToken(email string, password string, tokenName string) (*SSOData, error) {
 	credentials := map[string]string{
 		"email":      email,
 		"password":   password,
@@ -156,7 +156,7 @@
 // Register the toke to the U1 File Sync Service.
 func (server UbuntuSSOServer) RegisterTokenToU1FileSync(ssodata *SSOData) (err error) {
 	rp := RequestParameters{
-		BaseURL:         "https://one.ubuntu.com/oauth/sso-finished-so-get-tokens/",
+		BaseURL:         server.tokenRegistrationUrl,
 		HTTPMethod:      "GET",
 		SignatureMethod: HMACSHA1{}}
 

=== modified file 'usso_test.go'
--- usso_test.go	2014-01-22 17:36:47 +0000
+++ usso_test.go	2014-01-22 17:36:47 +0000
@@ -28,11 +28,6 @@
 	password       = "foobarpwd"
 )
 
-type SingleServingServer struct {
-	*httptest.Server
-	requestContent *string
-}
-
 // TestProductionUbuntuSSOServerURLs tests the URLs of the production server.
 func (suite *USSOTestSuite) TestProductionUbuntuSSOServerURLs(c *C) {
 	tokenURL := ProductionUbuntuSSOServer.tokenURL()
@@ -45,31 +40,47 @@
 	c.Assert(tokenURL, Equals, "https://login.staging.ubuntu.com/api/v2/tokens/oauth")
 }
 
-// newSingleServingServer create a single-serving test http server which will
-// return only one response as defined by the passed arguments.
-func newSingleServingServer(
-	uri string, response string, code int) *SingleServingServer {
+type TestServer struct {
+	*httptest.Server
+	requestContent *string
+}
+
+// newTestServer http server to mock U1 SSO server.
+func newTestServer(response, tokenDetails string, code int) *TestServer {
 	var requestContent string
-	var requested bool
 	handler := func(w http.ResponseWriter, r *http.Request) {
-		if requested {
-			http.Error(w, "Already requested", http.StatusServiceUnavailable)
-		}
 		res, err := ioutil.ReadAll(r.Body)
 		if err != nil {
 			panic(err)
 		}
-		requestContent = string(res)
-		if r.URL.String() != uri || strings.Contains(requestContent, "WRONG") {
+		if strings.Contains(string(res), "WRONG") {
 			http.Error(w, "404 page not found", http.StatusNotFound)
+		}
+		if r.URL.String() == "/api/v2/tokens/oauth" {
+			requestContent = string(res)
+			fmt.Fprint(w, response)
+			return
+		}
+		if r.URL.String() == "/api/v2/tokens/oauth/abcs" {
+			fmt.Fprint(w, tokenDetails)
+			return
+		}
+		if r.URL.String() == "/oauth/sso-finished-so-get-tokens/" {
+			fmt.Fprint(w, "ok")
+
+			concat := ""
+			for _, v := range r.Header["Authorization"] {
+				concat += v
+			}
+			requestContent = concat
+			return
 		} else {
-			w.WriteHeader(code)
-			fmt.Fprint(w, response)
+			http.Error(w, "404 page not found", http.StatusNotFound)
+			return
 		}
-		requested = true
 	}
 	server := httptest.NewServer(http.HandlerFunc(handler))
-	return &SingleServingServer{server, &requestContent}
+	return &TestServer{server, &requestContent}
 }
 
 func (suite *USSOTestSuite) TestGetTokenReturnsTokens(c *C) {
@@ -88,9 +99,8 @@
 	if err != nil {
 		panic(err)
 	}
-	server := newSingleServingServer("/api/v2/tokens/oauth",
-		string(jsonServerResponseData), 200)
-	var testSSOServer = &UbuntuSSOServer{server.URL}
+	server := newTestServer(string(jsonServerResponseData), "{}", 200)
+	var testSSOServer = &UbuntuSSOServer{server.URL, ""}
 	defer server.Close()
 
 	// The returned information is correct.
@@ -115,11 +125,10 @@
 
 // GetToken should return empty credentials and an error, if wrong account is provided.
 func (suite *USSOTestSuite) TestGetTokenFails(c *C) {
-	server := newSingleServingServer("/api/v2/tokens/oauth", "{}", 200)
-	var testSSOServer = &UbuntuSSOServer{server.URL}
+	server := newTestServer("{}", "{}", 200)
+	var testSSOServer = &UbuntuSSOServer{server.URL, ""}
 	defer server.Close()
 	ssodata, err := testSSOServer.GetToken(email, "WRONG", tokenName)
-	fmt.Println(ssodata, err)
 	c.Assert(err, NotNil)
 	c.Assert(ssodata, IsNil)
 }
@@ -138,16 +147,53 @@
 	if err != nil {
 		panic(err)
 	}
-	server := newSingleServingServer("/api/v2/tokens/oauth",
-		string(jsonServerResponseData), 200)
-	var testSSOServer = &UbuntuSSOServer{server.URL}
+	tokenDetails := map[string]string{
+		"token_name":   tokenName,
+		"date_updated": "2014-01-22T13:35:49.867",
+		"token_key":    tokenKey,
+		"href":         "/api/v2/tokens/oauth/JckChNpbXxPRmPkElLglSnqnjsnGseWJmNqTJCWfUtNBSsGtoG",
+		"date_created": "2014-01-17T20:03:24.993",
+		"consumer_key": consumerKey,
+	}
+	jsonTokenDetails, err := json.Marshal(tokenDetails)
+	if err != nil {
+		panic(err)
+	}
+	server := newTestServer(string(jsonServerResponseData), string(jsonTokenDetails), 200)
+	var testSSOServer = &UbuntuSSOServer{server.URL, ""}
 	defer server.Close()
 	ssodata, err := testSSOServer.GetToken(email, password, tokenName)
-
 	// The returned information is correct.
 	token_details, err := testSSOServer.GetTokenDetails(ssodata)
 	c.Assert(err, IsNil)
-
 	//The request that the fake Ubuntu SSO Server has the token details.
-	fmt.Printf("%s\n", token_details)
+	c.Assert(token_details, Equals, string(jsonTokenDetails))
+}
+
+func (suite *USSOTestSuite) TestRegisterToken(c *C) {
+	// Simulate a valid Ubuntu SSO Server response.
+	serverResponseData := map[string]string{
+		"date_updated": "2013-01-16 14:03:36",
+		"date_created": "2013-01-16 14:03:36",
+		"href":         "/api/v2/tokens/" + tokenKey,
+		"token_name":   tokenName,
+		"token_key":    tokenKey,
+		"consumer_key": consumerKey,
+	}
+	jsonServerResponseData, err := json.Marshal(serverResponseData)
+	if err != nil {
+		panic(err)
+	}
+	server := newTestServer(string(jsonServerResponseData), "{}", 200)
+	var testSSOServer = &UbuntuSSOServer{server.URL, server.URL + "/oauth/sso-finished-so-get-tokens/"}
+	defer server.Close()
+	ssodata, err := testSSOServer.GetToken(email, password, tokenName)
+	err = testSSOServer.RegisterTokenToU1FileSync(ssodata)
+	c.Assert(err, IsNil)
+	c.Assert(true, Equals, strings.Contains(*server.requestContent, "oauth_consumer_key=\"rfyzhdQ\""))
+	c.Assert(true, Equals, strings.Contains(*server.requestContent, "oauth_token=\"abcs\""))
+	c.Assert(true, Equals, strings.Contains(*server.requestContent, "oauth_signature_method=\"HMAC-SHA1\""))
+	c.Assert(true, Equals, strings.Contains(*server.requestContent, "oauth_version=\"1.0\""))
+	c.Assert(true, Equals, strings.Contains(*server.requestContent, ""))
+
 }