Test error cases

zix99 · Nov 25, 2019 · f3ba3a3 · f3ba3a3
1 parent 5ea4f42
commit f3ba3a3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/pkg/expressions/funcsArithmatic.go b/pkg/expressions/funcsArithmatic.go
@@ -6,7 +6,7 @@ import "strconv"
 func arithmaticHelperi(equation func(int, int) int) KeyBuilderFunction {
 	return KeyBuilderFunction(func(args []KeyBuilderStage) KeyBuilderStage {
 		if len(args) < 2 {
-			return stageError(ErrorArgCount)
+			return stageLiteral(ErrorArgCount)
 		}
 		return KeyBuilderStage(func(context KeyBuilderContext) string {
 			final, err := strconv.Atoi(args[0](context))
@@ -31,7 +31,7 @@ func arithmaticHelperi(equation func(int, int) int) KeyBuilderFunction {
 func arithmaticHelperf(equation func(float64, float64) float64) KeyBuilderFunction {
 	return KeyBuilderFunction(func(args []KeyBuilderStage) KeyBuilderStage {
 		if len(args) < 2 {
-			return stageError(ErrorArgCount)
+			return stageLiteral(ErrorArgCount)
 		}
 		return KeyBuilderStage(func(context KeyBuilderContext) string {
 			final, err := strconv.ParseFloat(args[0](context), 64)

diff --git a/pkg/expressions/funcs_test.go b/pkg/expressions/funcs_test.go
@@ -118,8 +118,20 @@ func TestArithmatic(t *testing.T) {
 	assert.Equal(t, "122 200 50 90", key)
 }
 
+func TestArithmaticError(t *testing.T) {
+	kb, _ := NewKeyBuilder().Compile("{sumi 1} {sumi 1 a} {sumi a 1} {sumi 1 1 b}")
+	key := kb.BuildKey(&testFuncContext)
+	assert.Equal(t, "<ARGN> <BAD-TYPE> <BAD-TYPE> <BAD-TYPE>", key)
+}
+
 func TestArithmaticf(t *testing.T) {
 	kb, _ := NewKeyBuilder().Compile("{sumf {1} {4}} {multf {1} 2} {divf {1} 2} {subf {1} 10}")
 	key := kb.BuildKey(&testFuncContext)
 	assert.Equal(t, "122 200 50 90", key)
 }
+
+func TestArithmaticfError(t *testing.T) {
+	kb, _ := NewKeyBuilder().Compile("{sumf 1} {sumf 1 a} {sumf a 1} {sumf 1 2 a}")
+	key := kb.BuildKey(&testFuncContext)
+	assert.Equal(t, "<ARGN> <BAD-TYPE> <BAD-TYPE> <BAD-TYPE>", key)
+}
diff --git a/pkg/expressions/stage.go b/pkg/expressions/stage.go
@@ -15,7 +15,10 @@ func stageLiteral(s string) KeyBuilderStage {
 }
 
 func stageSimpleVariable(s string) KeyBuilderStage {
-	index, _ := strconv.Atoi(s)
+	index, err := strconv.Atoi(s)
+	if err != nil {
+		return stageLiteral(ErrorType)
+	}
 	return KeyBuilderStage(func(context KeyBuilderContext) string {
 		return context.GetMatch(index)
 	})