internal: tests moved to separate folder

i582 · Nov 15, 2020 · 1b323c2 · 1b323c2
1 parent d04f689
commit 1b323c2
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 9 deletions.
diff --git a/internal/parser.go b/internal/parser.go
@@ -33,6 +33,7 @@ func Parse(format string) string {
 					resParts = append(resParts, string(tempToken))
 					tempToken = nil
 				}
+
 				inFormatGroup = true
 				inFormat = false
 				inText = false
@@ -81,7 +82,6 @@ func Parse(format string) string {
 			}
 
 			if s == '}' && index+1 < len(format) && format[index+1] == '}' {
-
 				inFormatGroup = false
 				inFormat = false
 				inText = true
@@ -142,7 +142,7 @@ func Parse(format string) string {
 }
 
 func groupStyle(format string, token string, style string) string {
-	styler, err := styleBuilder(style)
+	styler, err := StyleBuilder(style)
 	if err != nil {
 		log.Fatalf("Error parse style string in '%s' format string: %v", format, err)
 	}

diff --git a/internal/style.go b/internal/style.go
@@ -7,7 +7,9 @@ import (
 	"github.com/gookit/color"
 )
 
-func styleBuilder(styleString string) (func(string) string, error) {
+// StyleBuilder is a function that returns a callback function that will style
+// the supplied string according to the supplied format string.
+func StyleBuilder(styleString string) (func(string) string, error) {
 	if styleString == "" {
 		return nil, fmt.Errorf("style string is empty")
 	}
@@ -62,10 +64,6 @@ func styleBuilder(styleString string) (func(string) string, error) {
 	outFun := func(text string) string { return text }
 
 	for index, fun := range hexColorFuncs {
-		if index < 0 || index >= len(hexColors) {
-			continue
-		}
-
 		clr := hexColors[index]
 		outFun = fun(clr, outFun)
 	}

diff --git a/tests/parser_test.go b/tests/parser_test.go
@@ -0,0 +1,19 @@
+package tests
+
+import (
+	"testing"
+
+	"github.com/i582/cfmt"
+)
+
+func TestParse(t *testing.T) {
+	cfmt.Println("{{correct group}}::red|underline")
+	cfmt.Println("{{correct group}}::red|underline and {{other}}::red")
+	cfmt.Println("{{error group}} ")
+	cfmt.Println("{{overline group}}::overline")
+	cfmt.Println("{{reverse group}}::reverse")
+	cfmt.Println("{{faint group}}::faint")
+	cfmt.Println("{{blink group}}::blink")
+	cfmt.Println("{{hex color group}}::#ff00ff")
+	cfmt.Println("{{background color hex group}}::bg#ffff00")
+}
diff --git a/internal/style_test.go → tests/style_test.go b/internal/style_test.go → tests/style_test.go
@@ -1,9 +1,12 @@
-package internal
+package tests
 
 import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+
+	"github.com/i582/cfmt"
+	"github.com/i582/cfmt/internal"
 )
 
 type StyleBuilderSuite struct {
@@ -12,6 +15,10 @@ type StyleBuilderSuite struct {
 }
 
 func TestStyleBuilder(t *testing.T) {
+	cfmt.RegisterStyle("code", func(s string) string {
+		return cfmt.Sprintf("{{%s}}::red|underline", s)
+	})
+
 	suites := []StyleBuilderSuite{
 		{
 			Value: "red",
@@ -29,6 +36,14 @@ func TestStyleBuilder(t *testing.T) {
 			Value: "bg#ff00ff|bold",
 			Error: "",
 		},
+		{
+			Value: "code|underline|blink",
+			Error: "",
+		},
+		{
+			Value: "overline|reverse|faint",
+			Error: "",
+		},
 		{
 			Value: "bg#ff0|bold",
 			Error: "invalid hex: length of hex color must be 6",
@@ -48,7 +63,7 @@ func TestStyleBuilder(t *testing.T) {
 	}
 
 	for _, suite := range suites {
-		_, err := styleBuilder(suite.Value)
+		_, err := internal.StyleBuilder(suite.Value)
 		if err == nil && suite.Error != "" {
 			t.Error(cmp.Diff("", suite.Error))
 			continue