Add more tests

counter.go

@@ -109,6 +109,10 @@ func (c *Counter) GetCounterFilename(position int, suffix string, filenumber int
 			res += fmt.Sprintf(" %03d", filenumber)
 		}
 	}
+	if res == "" {
+		res = fmt.Sprintf("%03d", filenumber)
+	}
+	res = strings.TrimSpace(res)
 
 	filenamesInUse[res] = true
 

counter_prototype_test.go

@@ -59,7 +59,9 @@ func TestJSONPrototypes(t *testing.T) {
 	// check the marshalling of the template to an expected byte slice
 	actualBytes, err := json.MarshalIndent(newTempl, "", "  ")
 	assert.NoError(t, err)
-	assert.Equal(t, 12621, len(actualBytes))
+	if !assert.Equal(t, 13360, len(actualBytes)) {
+		t.FailNow()
+	}
 
 	expectedFile, err := os.Open("./testdata/parse_template_01.json")
 	assert.NoError(t, err)
@@ -69,7 +71,7 @@ func TestJSONPrototypes(t *testing.T) {
 	assert.NoError(t, err)
 
 	// // ensure we are using the expected file and that it has not been altered by mistake
-	if !assert.Equal(t, 12621, len(expectedBytes), "expected file has been altered, aborting test") {
+	if !assert.Equal(t, 13360, len(expectedBytes), "expected file has been altered, aborting test") {
 		t.FailNow()
 	}
 

counter_test.go

@@ -98,7 +98,7 @@ func TestGetCounterFilename(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			got := tt.counter.GetCounterFilename(tt.position, tt.suffix, tt.filenumber, tt.filenamesInUse)
 			if got != tt.expected {
-				t.Errorf("GetCounterFilename() = %v, want %v", got, tt.expected)
+				t.Errorf("GetCounterFilename() = '%v', want '%v'", got, tt.expected)
 			}
 		})
 	}

fsops/file.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"encoding/xml"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -16,7 +15,7 @@ import (
 func ReadMarkupFile(markupFilepath string, destination interface{}) error {
 	extension := filepath.Ext(markupFilepath)
 
-	data, err := ioutil.ReadFile(markupFilepath)
+	data, err := os.ReadFile(markupFilepath)
 	if err != nil {
 		return errors.Wrap(err, "could not read file content")
 	}
@@ -38,7 +37,7 @@ func ReadMarkupFile(markupFilepath string, destination interface{}) error {
 }
 
 func FilenameExistsInFolder(filename, folder string) bool {
-	fs, err := ioutil.ReadDir(folder)
+	fs, err := os.ReadDir(folder)
 	if err != nil {
 		log.WithError(err).Fatal("could not read images folder")
 	}