Improve Test coverage (#4)

* Improve Test Coverage

Write more tests to improve overall Test Coverage
Include New Usage Directory for authentication module

* Tidy Go mod file

Author: Ghvstcode

airtime/countries_test.go

@@ -1,6 +1,8 @@
 package airtime_test
 
 import (
+	"encoding/json"
+	reloadly "github.com/reloadly/reloadly-sdk-golang/airtime"
 	"net/http"
 	"testing"
 )
@@ -24,3 +26,32 @@ func TestClient_GetCountries(t *testing.T) {
 			t.Errorf("Expected body to be nil but got %q",  body)
 		}
 }
+
+func TestClient_GetCountriesByIso(t *testing.T) {
+	teardown := setup()
+
+	defer teardown()
+
+	mux.HandleFunc("/", func(rw http.ResponseWriter, req *http.Request) {
+		rw.WriteHeader(http.StatusOK)
+
+		data := reloadly.Country{
+			IsoName:        "NG",
+			CurrencyCode:   "NGN",
+			CurrencyName:   "Naira",
+		}
+
+		json.NewEncoder(rw).Encode(data)
+	})
+
+
+	body, err := client.GetCountriesByIso("NG")
+
+	if err != nil {
+		t.Errorf("Expected error to be %q but got nil",  err)
+	}
+
+	if body.IsoName != "NG" {
+		t.Errorf("Expected body to be NG but got %q",  body.IsoName)
+	}
+}

airtime/discounts_test.go

@@ -31,6 +31,36 @@ func TestClient_GetDiscounts(t *testing.T) {
 		t.Errorf("Expected TotalPages to be 5 but got %v",  body.TotalPages)
 	}
 
+	if body.TotalElements != 20 {
+		t.Errorf("Expected TotalElements to be 20 but got %v",  body.TotalElements)
+	}
+}
+
+func TestClient_GetDiscountsByOperatorID(t *testing.T) {
+	teardown := setup()
+
+	defer teardown()
+
+	mux.HandleFunc("/", func(rw http.ResponseWriter, req *http.Request) {
+		rw.WriteHeader(http.StatusOK)
+
+		data := reloadly.Discounts{
+			TotalElements: 20,
+			TotalPages:    5,
+		}
+		json.NewEncoder(rw).Encode(data)
+
+	})
+
+	body, err := client.GetDiscountsByOperatorID("")
+	if err != nil {
+		t.Errorf("Expected error to be nil but got %q",  err)
+	}
+
+	if body.TotalPages != 5 {
+		t.Errorf("Expected TotalPages to be 5 but got %v",  body.TotalPages)
+	}
+
 	if body.TotalElements != 20 {
 		t.Errorf("Expected TotalElements to be 20 but got %v",  body.TotalElements)
 	}

airtime/operators_test.go

@@ -81,4 +81,46 @@ func TestClient_GetOperatorsByISO(t *testing.T) {
 	if body.Size != 20 {
 		t.Errorf("Expected Size to be 20 but got %v",  body.Size)
 	}
+}
+
+func TestClient_GetOperators(t *testing.T) {
+	teardown := setup()
+
+	defer teardown()
+
+	mux.HandleFunc("/operators", func(rw http.ResponseWriter, req *http.Request) {
+		rw.WriteHeader(http.StatusOK)
+		data := reloadly.Operators{
+			TotalPages:    5,
+			Size: 20,
+		}
+
+		json.NewEncoder(rw).Encode(data)
+
+	})
+
+	body, err := client.GetOperators()
+	if err != nil {
+		t.Errorf("Expected error to be nil but got %q",  err)
+	}
+
+	if body.Size != 20 {
+		t.Errorf("Expected Size to be 20 but got %v",  body.Size)
+	}
+}
+
+func TestClient_GetOperatorsById(t *testing.T) {
+	teardown := setup()
+
+	defer teardown()
+
+	mux.HandleFunc("/", func(rw http.ResponseWriter, req *http.Request) {
+		rw.WriteHeader(http.StatusInternalServerError)
+
+	})
+
+	_, err := client.GetOperators()
+	if err == nil {
+		t.Errorf("Expected error but got nil")
+	}
 }

airtime/promotions_test.go

@@ -43,3 +43,33 @@ func TestClient_GetPromotionsByCode(t *testing.T) {
 	}
 }
 
+func TestClient_GetPromotionsById(t *testing.T) {
+	teardown := setup()
+
+	defer teardown()
+
+	mux.HandleFunc("/", func(rw http.ResponseWriter, req *http.Request) {
+		rw.WriteHeader(http.StatusInternalServerError)
+	})
+
+	_, err := client.GetPromotionsById(0123)
+	if err == nil {
+		t.Errorf("Expected error but got nil")
+	}
+}
+
+func TestClient_GetPromotionsByOperatorId(t *testing.T) {
+	teardown := setup()
+
+	defer teardown()
+
+	mux.HandleFunc("/", func(rw http.ResponseWriter, req *http.Request) {
+		rw.WriteHeader(http.StatusInternalServerError)
+	})
+
+	_, err := client.GetPromotionsByOperatorId(0123)
+	if err == nil {
+		t.Errorf("Expected error but got nil")
+	}
+}
+

airtime/reloadly_test.go

@@ -0,0 +1,3 @@
+package airtime
+
+

airtime/reports.go

@@ -64,6 +64,7 @@ type Transactions struct {
 //Apart from doing just that we also provide a neat way to integrate transactions into your own systems.
 //You can get a complete list of your past top-up transactions by calling the GetTransactions function. Internally, it makes a GET request to the /topups/reports/transactions Endpoint.
 //This will provide you with a paginated result with all your recent transactions and the ability to paginate to further previous transactions.
+
 func (c *Client)GetTransactions(filter ...Filters)(*Transactions, error){
 	o := &FilterOptions{}
 	for _, opt := range filter {

airtime/topup_test.go

@@ -2,10 +2,12 @@ package airtime_test
 
 import (
 	"encoding/json"
+	"errors"
 	reloadly "github.com/reloadly/reloadly-sdk-golang/airtime"
 	Err "github.com/reloadly/reloadly-sdk-golang/error"
 	"net/http"
 	"net/http/httptest"
+	"reflect"
 	"strings"
 	"testing"
 )
@@ -77,3 +79,48 @@ func TestClient_NautaCubaTopup(t *testing.T) {
 	}
 }
 
+func TestGetPhone(t *testing.T) {
+	cases := [] struct{
+		Number string
+		CountryCode string
+		ExpectedNumber string
+		ExpectedCountryCode string
+		ExpectedErr error
+	}{
+		{
+			Number: "",
+			CountryCode: "",
+			ExpectedNumber: "",
+			ExpectedCountryCode: "",
+			ExpectedErr: errors.New("Invalid_Credentials"),
+		},
+		{
+			Number: "5555",
+			CountryCode: "4444",
+			ExpectedNumber: "5555",
+			ExpectedCountryCode: "4444",
+			ExpectedErr: nil,
+		},
+	}
+
+
+	for _, c := range cases {
+		res, err := reloadly.GetPhone(c.Number, c.CountryCode)
+		if !reflect.DeepEqual(err, c.ExpectedErr) {
+			t.Fatalf("Expected err to be %q but it was %q", c.ExpectedErr, err)
+		}
+
+		if res != nil{
+			//t.Skip("Skipped the rest of the tests")
+			if c.ExpectedNumber != res.Number {
+				t.Fatalf("Expected Number to be %s but got %s", c.ExpectedNumber, res.Number)
+			}
+
+			if c.CountryCode != res.CountryCode {
+				t.Fatalf("Expected Country Code to be %s but got %s", c.ExpectedCountryCode, res.CountryCode)
+			}
+		}
+
+
+	}
+}

airtime/usage/USAGE.MD

@@ -26,7 +26,7 @@ Set the client id, client secret & environment; The most straight-forward or sim
     package main
 
     import (
-      	"github.com/Ghvstcode/reloadly" 
+      	"github.com/reloadly/reloadly-sdk-golang/authentication" 
       	"fmt"
     )
 
@@ -43,14 +43,14 @@ Set the client id, client secret & environment; The most straight-forward or sim
 ### Option 2
 
 You may alternatively acquire an access token from the
-[AuthenticationAPI](https://github.com/reloadly/reloadly-sdk-java/blob/master/reloadly-java-sdk-authentication/USAGE.md)
+[AuthenticationAPI](https://developers.reloadly.com/#authentication_auth_anc)
 and then set it.
 
 ```golang
       package main
 
       import (
-        "github.com/Ghvstcode/reloadly/authentication"
+        "github.com/reloadly/reloadly-sdk-golang/authentication"
         "fmt"
       )
 

authentication/Usage/Usage.MD

@@ -0,0 +1,26 @@
+You can use the authentication module to alternatively acquire authentication details(access token) from the
+[AuthenticationAPI](https://developers.reloadly.com/#authentication_auth_anc)
+and then set it.
+
+```golang
+      package main
+
+      import (
+        "github.com/reloadly/reloadly-sdk-golang/authentication"
+        "fmt"
+      )
+
+      func main(){
+        authClient, err := authentication.NewAuthClient(xx1234, xx23, false)
+        if err != nil {
+          fmt.Println(err)
+        }
+        
+        token, err := authClient.GetAccessToken()
+        if err != nil {
+          fmt.Println(err)
+        }
+        
+        fmt.Println(token.AccessToken)
+      }
+```

authentication/auth_test.go

@@ -39,7 +39,7 @@ func TestNewAuthClient(t *testing.T) {
 		}
 
 		if res != nil{
-			t.Skip("Skipped the rest of the tests")
+			//t.Skip("Skipped the rest of the tests")
 			if c.ExpectedSandbox != res.SandBox{
 				t.Fatalf("Expected Sandbox to be %t but got %s", c.ExpectedSandbox, res.URL)
 			}