fix regex for checking field names and add unit tests for helper.go f…

…unctions
cmdoret · Oct 7, 2020 · ecc8308 · ecc8308
1 parent 2fbe73a
commit ecc8308
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/dnaglider/pkg/helper.go b/dnaglider/pkg/helper.go
@@ -7,7 +7,7 @@ import (
 	"regexp"
 )
 
-var fieldRegex = regexp.MustCompile("(GC|GCSKEW|ATSKEW|ENTRO|[0-9K]MER|)")
+var fieldRegex = regexp.MustCompile("^(GC|GCSKEW|ATSKEW|ENTRO|[0-9]+MER)$")
 
 func checkError(err error) {
 	if err != nil {
@@ -21,6 +21,7 @@ func checkFields(fields []string) error {
 	for _, field := range fields {
 		if !fieldRegex.Match([]byte(field)) {
 			err = errors.New("Invalid field name")
+			return err
 		}
 	}
 	return err

diff --git a/dnaglider/pkg/helper_test.go b/dnaglider/pkg/helper_test.go
@@ -0,0 +1,16 @@
+package pkg
+
+import (
+	"testing"
+)
+
+func TestCheckFields(t *testing.T) {
+	validFields := []string{"GC", "GCSKEW", "ATSKEW", "ENTRO", "3MER", "14MER"}
+	invalidFields := []string{"John Smith", "paper"}
+	if err := checkFields(validFields); err != nil {
+		t.Errorf("Valid fields raised an error")
+	}
+	if err := checkFields(invalidFields); err == nil {
+		t.Errorf("Invalid fields did not raise an error")
+	}
+}