[testing] add more tests

cmd/author.go

@@ -1,18 +1,40 @@
 package cmd
 
 import (
-	"fmt"
-
 	"github.com/cacoco/codemetagenerator/internal/model"
 	"github.com/cacoco/codemetagenerator/internal/utils"
 	"github.com/spf13/cobra"
 )
 
-func newAuthor(reader utils.Reader, writer utils.Writer) (*map[string]any, error) {
+func author(reader utils.Reader, writer utils.Writer, basedir string) (*map[string]any, error) {
+	inProgressFilePath := utils.GetInProgressFilePath(basedir)
+
+	codemeta, err := utils.Unmarshal(inProgressFilePath)
+	if err != nil {
+		handleErr(writer, err)
+		return nil, writer.Errorf("unable to load the in-progress codemeta.json file for editing. Have you run \"codemetagenerator new\" yet?")
+	}
+	mutateMap := *codemeta
+	currentValue := mutateMap[model.Author]
 	author, err := utils.NewPersonOrOrganizationPrompt(&reader, &writer, "Author")
 	if err != nil {
 		return nil, err
 	}
+	if currentValue == nil {
+		// set the new author as the value
+		mutateMap[model.Author] = []any{author}
+	} else {
+		// append new author to existing authors
+		mutateMap[model.Author] = append(currentValue.([]any), author)
+	}
+
+	err = utils.Marshal(inProgressFilePath, mutateMap)
+	if err != nil {
+		handleErr(writer, err)
+		return nil, writer.Errorf("unable to save in-progress codemeta.json file after editing")
+	} else {
+		writer.Println("⭐ Successfully updated in-progress codemeta.json file.")
+	}
 	return author, nil
 }
 
@@ -32,36 +54,8 @@
 
 When complete, run "generate" to generate the resultant 'codemeta.json' file.`,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		reader := &utils.StdinReader{}
-		writer := &utils.StdoutWriter{}
-
-		inProgressFilePath := utils.GetInProgressFilePath(utils.UserHomeDir)
-
-		codemeta, err := utils.Unmarshal(inProgressFilePath)
-		if err != nil {
-			handleErr(writer, err)
-			return fmt.Errorf("unable to load the in-progress codemeta.json file for editing. Have you run \"codemetagenerator new\" yet?")
-		}
-		mutateMap := *codemeta
-		currentValue := mutateMap[model.Author]
-		author, err := newAuthor(reader, writer)
-		if err != nil {
-			return err
-		}
-		if currentValue == nil {
-			mutateMap[model.Author] = []any{author}
-		} else {
-			mutateMap[model.Author] = append(currentValue.([]any), author)
-		}
-
-		err = utils.Marshal(inProgressFilePath, mutateMap)
-		if err != nil {
-			handleErr(writer, err)
-			return fmt.Errorf("unable to save in-progress codemeta.json file after editing")
-		} else {
-			fmt.Println("⭐ Successfully updated in-progress codemeta.json file.")
-		}
-		return nil
+		_, err := author(&utils.StdinReader{}, &utils.StdoutWriter{}, utils.UserHomeDir)
+		return err
 	},
 }
 

cmd/author_test.go

@@ -1,16 +1,38 @@
 package cmd
 
 import (
+	"bytes"
+	"os"
 	"testing"
 
 	"github.com/cacoco/codemetagenerator/internal/model"
 	"github.com/cacoco/codemetagenerator/internal/utils"
+	"github.com/ohler55/ojg/oj"
 	"github.com/onsi/gomega"
+	"github.com/spf13/cobra"
 )
 
-func TestNewAuthor(t *testing.T) {
+func TestAddAuthor(t *testing.T) {
 	g := gomega.NewWithT(t)
 
+	temp := t.TempDir()
+	// setup
+	os.Mkdir(utils.GetHomeDir(temp), 0755)
+
+	testMap := map[string]any{
+		model.Context:               model.DefaultContext,
+		model.Type:                  model.SoftwareSourceCodeType,
+		model.Description:           "description",
+		model.ContinuousIntegration: "https://url.org",
+	}
+
+	inProgressFilePath := utils.GetInProgressFilePath(temp)
+	// need an in-progress code meta file
+	err := utils.Marshal(inProgressFilePath, testMap)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+	}
+
 	var stack utils.Stack[string]
 	stack.Push("id\n")
 	stack.Push("person@email.org\n")
@@ -20,10 +42,7 @@ func TestNewAuthor(t *testing.T) {
 	reader := utils.TestReader{In: utils.TestStdin{Data: stack}}
 	writer := utils.TestWriter{}
 
-	author, err := newAuthor(&reader, &writer)
-	if author == nil {
-		t.Errorf("Expected author to not be nil")
-	}
+	author, err := author(&reader, &writer, temp)
 	if err != nil {
 		t.Errorf("Unexpected error: %v", err)
 	}
@@ -36,3 +55,73 @@ func TestNewAuthor(t *testing.T) {
 	}
 	g.Ω(*author).Should(gomega.Equal(expected))
 }
+
+func Test_ExecuteAuthorCmd(t *testing.T) {
+	g := gomega.NewWithT(t)
+
+	temp := t.TempDir()
+	// setup
+	os.Mkdir(utils.GetHomeDir(temp), 0755)
+
+	testMap := map[string]any{
+		model.Context:               model.DefaultContext,
+		model.Type:                  model.SoftwareSourceCodeType,
+		model.Description:           "description",
+		model.ContinuousIntegration: "https://url.org",
+	}
+
+	inProgressFilePath := utils.GetInProgressFilePath(temp)
+	// need an in-progress code meta file
+	err := utils.Marshal(inProgressFilePath, testMap)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+	}
+
+	var stack utils.Stack[string]
+	stack.Push("id\n")
+	stack.Push("person@email.org\n")
+	stack.Push("familyName\n")
+	stack.Push("givenName\n")
+	stack.Push("\n") // enter to select the first option
+	reader := utils.TestReader{In: utils.TestStdin{Data: stack}}
+	writer := utils.TestWriter{}
+
+	authorCmd := &cobra.Command{Use: "author", Args: cobra.NoArgs, RunE: func(cmd *cobra.Command, args []string) error {
+		_, err := author(&reader, &writer, temp)
+		return err
+	},
+	}
+	buf := bytes.NewBufferString("")
+	authorCmd.SetOut(buf)
+	authorCmd.SetErr(buf)
+	authorCmd.SetArgs([]string{})
+
+	err = authorCmd.Execute()
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+	}
+
+	// check file
+	fileBytes, err := utils.LoadFile(utils.GetInProgressFilePath(temp))
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+	}
+	var m = make(map[string]any)
+	oj.Unmarshal(fileBytes, &m)
+
+	expected := map[string]any{
+		model.Context:               model.DefaultContext,
+		model.Type:                  model.SoftwareSourceCodeType,
+		model.Description:           "description",
+		model.ContinuousIntegration: "https://url.org",
+		model.Author: []any{map[string]any{
+			model.Type:       model.PersonType,
+			model.FamilyName: "familyName",
+			model.GivenName:  "givenName",
+			model.Email:      "person@email.org",
+			model.Id:         "id",
+		}},
+	}
+
+	g.Ω(m).Should(gomega.Equal(expected))
+}

cmd/contributor.go

@@ -1,18 +1,40 @@
 package cmd
 
 import (
-	"fmt"
-
 	"github.com/cacoco/codemetagenerator/internal/model"
 	"github.com/cacoco/codemetagenerator/internal/utils"
 	"github.com/spf13/cobra"
 )
 
-func newContributor(reader utils.Reader, writer utils.Writer) (*map[string]any, error) {
+func contributor(reader utils.Reader, writer utils.Writer, basedir string) (*map[string]any, error) {
+	inProgressFilePath := utils.GetInProgressFilePath(basedir)
+
+	codemeta, err := utils.Unmarshal(inProgressFilePath)
+	if err != nil {
+		handleErr(writer, err)
+		return nil, writer.Errorf("unable to load the in-progress codemeta.json file for editing. Have you run \"codemetagenerator new\" yet?")
+	}
+	mutateMap := *codemeta
+	currrentValue := mutateMap[model.Contributor]
 	contributor, err := utils.NewPersonOrOrganizationPrompt(&reader, &writer, "Contributor")
 	if err != nil {
 		return nil, err
 	}
+	if currrentValue == nil {
+		// set the new contributor as the value
+		mutateMap[model.Contributor] = []any{contributor}
+	} else {
+		// append new contributor to existing contributors
+		mutateMap[model.Contributor] = append(currrentValue.([]any), contributor)
+	}
+
+	err = utils.Marshal(inProgressFilePath, mutateMap)
+	if err != nil {
+		handleErr(writer, err)
+		return nil, writer.Errorf("unable to save in-progress codemeta.json file after editing")
+	} else {
+		writer.Println("⭐ Successfully updated in-progress codemeta.json file.")
+	}
 	return contributor, nil
 }
 
@@ -32,37 +54,8 @@
 
 When complete, run "generate" to generate the resultant 'codemeta.json' file.`,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		reader := &utils.StdinReader{}
-		writer := &utils.StdoutWriter{}
-
-		inProgressFilePath := utils.GetInProgressFilePath(utils.UserHomeDir)
-
-		codemeta, err := utils.Unmarshal(inProgressFilePath)
-		if err != nil {
-			return fmt.Errorf("unable to load the in-progress codemeta.json file for editing. Have you run \"codemetagenerator new\" yet?")
-		}
-
-		mutateMap := *codemeta
-		currrentValue := mutateMap[model.Contributor]
-		contributor, err := newContributor(reader, writer)
-		if err != nil {
-			handleErr(writer, err)
-			return err
-		}
-		if currrentValue == nil {
-			mutateMap[model.Contributor] = []any{contributor}
-		} else {
-			mutateMap[model.Contributor] = append(currrentValue.([]any), contributor)
-		}
-
-		err = utils.Marshal(inProgressFilePath, mutateMap)
-		if err != nil {
-			handleErr(writer, err)
-			return fmt.Errorf("unable to save in-progress codemeta.json file after editing")
-		} else {
-			fmt.Println("⭐ Successfully updated in-progress codemeta.json file.")
-		}
-		return nil
+		_, err := contributor(&utils.StdinReader{}, &utils.StdoutWriter{}, utils.UserHomeDir)
+		return err
 	},
 }