Few improvements

search_test.go

@@ -28,7 +28,7 @@ func TestSegmentCleanup(t *testing.T) {
 func serveSearchResults() *httptest.Server {
 	searchResults, err := ioutil.ReadFile("./testFiles/searchResults.json")
 	if err != nil {
-		log.Fatalf("Error reading file: %s\n", err)
+		log.Fatalf("Error reading file: %s", err)
 	}
 
 	f := func(w http.ResponseWriter, r *http.Request) {

tm.go

@@ -23,18 +23,16 @@ func getQuery(url string) *http.Response {
 
 func (app *Application) getTMs(language string) []TM {
 	tmURL := app.BaseURL + "tms/"
-	var queryURL string
-	if language == "" {
-		queryURL = tmURL + app.AuthString
-	} else {
-		queryURL = tmURL + app.AuthString + "&targetLang=" + language
+	queryURL := tmURL + app.AuthString
+	if language != "" {
+		queryURL += "&targetLang=" + language
 	}
 
 	resp := getQuery(queryURL)
 	defer resp.Body.Close()
 
 	var results []TM
-	if resp.StatusCode == 401 {
+	if resp.StatusCode == http.StatusBadRequest {
 		time.Sleep(app.Delay)
 
 		status, err := app.login()
@@ -46,7 +44,10 @@ func (app *Application) getTMs(language string) []TM {
 		return app.getTMs(language)
 	}
 
-	jsonDecoder(resp.Body, &results)
+	err := jsonDecoder(resp.Body, &results)
+	if err != nil {
+		log.Printf("Error decoding results: %s", err)
+	}
 
 	return results
 }

tm_test.go

@@ -3,20 +3,19 @@ package main
 import (
 	"fmt"
 	"io/ioutil"
+	"log"
 	"net/http"
 	"net/http/httptest"
-	"os"
 	"testing"
 )
 
-func ServeTMs() *httptest.Server {
+func serveTMs() *httptest.Server {
 	tms, err := ioutil.ReadFile("./testFiles/tms.json")
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "Error reading file: %v\n", err)
+		log.Fatalf("Error reading file: %s", err)
 	}
 
 	f := func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(200)
 		w.Header().Set("Content-Type", "application/json")
 		fmt.Fprintln(w, string(tms))
 	}
@@ -25,19 +24,18 @@ func ServeTMs() *httptest.Server {
 }
 
 func TestGetTMs(t *testing.T) {
-	server := ServeTMs()
+	server := serveTMs()
 	defer server.Close()
 
 	var app Application
 	app.setBaseURL(server.URL)
 
-	t.Log("Testing if TMs are properly read from the server.")
 	tms := app.getTMs("")
 	if len(tms) != 2 {
-		t.Fatalf("Not all TMs read! (%v)", len(tms))
-	} else if tms[0].FriendlyName == "Test TM 1" || tms[0].FriendlyName == "Test TM 2" {
-		t.Log("TMs properly read!")
-	} else {
+		t.Fatalf("Not all TMs read! (%d)", len(tms))
+	}
+
+	if tms[0].FriendlyName != "Test TM 1" || tms[1].FriendlyName != "Test TM 2" {
 		t.Fatalf("Something went wrong while reading TMs!\n%v", tms)
 	}
 }