clean: removed too deeply nested tests

test/article_test.go

@@ -11,122 +11,134 @@ import (
 	"testing"
 )
 
+var TestCreateArticleSuccess = func(t *testing.T) {
+	jsonBody, err := json.Marshal(map[string]string{
+		"title": "Test Title",
+		"body":  "Test Body",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	r, err := ApiRequest("POST", "/article", bytes.NewBuffer(jsonBody))
+
+	var response article.Article
+	bd, err := io.ReadAll(r.Body)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = json.Unmarshal(bd, &response)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	assert.Equal(t, http.StatusOK, r.StatusCode)
+	assert.Equal(t, "Test Title", response.Title)
+	assert.Equal(t, "Test Body", response.Body)
+}
+
+var TestCreateArticleFailTitleMissing = func(t *testing.T) {
+	jsonBody, err := json.Marshal(map[string]string{
+		"body": "Test Body",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	r, err := ApiRequest("POST", "/article", bytes.NewBuffer(jsonBody))
+
+	assert.Equal(t, http.StatusBadRequest, r.StatusCode)
+}
+
+var TestCreateArticleTitleTooShort = func(t *testing.T) {
+	jsonBody, err := json.Marshal(map[string]string{
+		"title": "Te",
+		"body":  "Test Body",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	r, err := ApiRequest("POST", "/article", bytes.NewBuffer(jsonBody))
+
+	assert.Equal(t, http.StatusBadRequest, r.StatusCode)
+}
+
+var TestGetArticleSuccess = func(t *testing.T) {
+	var createdArticle article.Article
+	var articleToCreate = article.Article{
+		Title: "Test Title",
+		Body:  "Test Body",
+	}
+	db := GetDb()
+	db.Create(&articleToCreate).Scan(&createdArticle)
+
+	r, err := ApiRequest("GET", "/article/"+strconv.Itoa(int(createdArticle.ID)), nil)
+
+	var response article.Article
+	bd, err := io.ReadAll(r.Body)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = json.Unmarshal(bd, &response)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	assert.Equal(t, http.StatusOK, r.StatusCode)
+	assert.Equal(t, createdArticle.ID, response.ID)
+	assert.Equal(t, createdArticle.Title, response.Title)
+	assert.Equal(t, createdArticle.Body, response.Body)
+}
+
+var TestGetAllArticlesSuccess = func(t *testing.T) {
+	var createdArticle article.Article
+	var articleToCreate = article.Article{
+		Title: "Test Title",
+		Body:  "Test Body",
+	}
+	db := GetDb()
+	db.Create(&articleToCreate).Scan(&createdArticle)
+
+	r, err := ApiRequest("GET", "/article", nil)
+
+	var response []article.Article
+	bd, err := io.ReadAll(r.Body)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = json.Unmarshal(bd, &response)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	assert.Equal(t, http.StatusOK, r.StatusCode)
+	assert.Equal(t, createdArticle.Title, response[0].Title)
+	assert.Equal(t, createdArticle.Body, response[0].Body)
+}
+
+var TestArticleCreate = func(t *testing.T) {
+	t.Run("Should return an article with the given title and body", TestCreateArticleSuccess)
+	t.Run("Should return an error if the title is missing", TestCreateArticleFailTitleMissing)
+	t.Run("Should return an error if the title is too short", TestCreateArticleTitleTooShort)
+}
+
+var TestArticleGet = func(t *testing.T) {
+	t.Run("Should return an article with the given id", TestGetArticleSuccess)
+}
+
+var TestArticleGetAll = func(t *testing.T) {
+	t.Run("Should return all articles", TestGetAllArticlesSuccess)
+}
+
 func TestArticle(t *testing.T) {
 	StartServerIfNotAlready()
 	WaitForServer()
 
-	t.Run("Create", func(t *testing.T) {
+	t.Run("Create", TestArticleCreate)
-		t.Run("Should return an article with the given title and body", func(t *testing.T) {
+	t.Run("Get", TestArticleGet)
-			jsonBody, err := json.Marshal(map[string]string{
+	t.Run("GetAll", TestArticleGetAll)
-				"title": "Test Title",
-				"body":  "Test Body",
-			})
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			r, err := ApiRequest("POST", "/article", bytes.NewBuffer(jsonBody))
-
-			var response article.Article
-			bd, err := io.ReadAll(r.Body)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			err = json.Unmarshal(bd, &response)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			assert.Equal(t, http.StatusOK, r.StatusCode)
-			assert.Equal(t, "Test Title", response.Title)
-			assert.Equal(t, "Test Body", response.Body)
-		})
-
-		t.Run("Should return an error if the title is missing", func(t *testing.T) {
-			jsonBody, err := json.Marshal(map[string]string{
-				"body": "Test Body",
-			})
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			r, err := ApiRequest("POST", "/article", bytes.NewBuffer(jsonBody))
-
-			assert.Equal(t, http.StatusBadRequest, r.StatusCode)
-		})
-
-		t.Run("Should return an error if the title is too short", func(t *testing.T) {
-			jsonBody, err := json.Marshal(map[string]string{
-				"title": "Te",
-				"body":  "Test Body",
-			})
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			r, err := ApiRequest("POST", "/article", bytes.NewBuffer(jsonBody))
-
-			assert.Equal(t, http.StatusBadRequest, r.StatusCode)
-		})
-	})
-
-	t.Run("Get", func(t *testing.T) {
-		t.Run("Should return an article with the given id", func(t *testing.T) {
-			var createdArticle article.Article
-			var articleToCreate = article.Article{
-				Title: "Test Title",
-				Body:  "Test Body",
-			}
-			db := GetDb()
-			db.Create(&articleToCreate).Scan(&createdArticle)
-
-			r, err := ApiRequest("GET", "/article/"+strconv.Itoa(int(createdArticle.ID)), nil)
-
-			var response article.Article
-			bd, err := io.ReadAll(r.Body)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			err = json.Unmarshal(bd, &response)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			assert.Equal(t, http.StatusOK, r.StatusCode)
-			assert.Equal(t, createdArticle.ID, response.ID)
-			assert.Equal(t, createdArticle.Title, response.Title)
-			assert.Equal(t, createdArticle.Body, response.Body)
-		})
-	})
-
-	t.Run("GetAll", func(t *testing.T) {
-		t.Run("Should return all articles", func(t *testing.T) {
-			var createdArticle article.Article
-			var articleToCreate = article.Article{
-				Title: "Test Title",
-				Body:  "Test Body",
-			}
-			db := GetDb()
-			db.Create(&articleToCreate).Scan(&createdArticle)
-
-			r, err := ApiRequest("GET", "/article", nil)
-
-			var response []article.Article
-			bd, err := io.ReadAll(r.Body)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			err = json.Unmarshal(bd, &response)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			assert.Equal(t, http.StatusOK, r.StatusCode)
-			assert.Equal(t, createdArticle.Title, response[0].Title)
-			assert.Equal(t, createdArticle.Body, response[0].Body)
-		})
-	})
 }