Adding some coverage and badge

nikunjy · May 3, 2019 · 4e0219b · 4e0219b
1 parent 74a0b59
commit 4e0219b
Show file tree

Hide file tree

Showing 6 changed files with 278 additions and 47 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Golang Rules Engine  [![Build Status][ci-img]][ci]
+# Golang Rules Engine  [![Build Status][ci-img]][ci] [![codecov](https://codecov.io/gh/nikunjy/rules/branch/master/graph/badge.svg)](https://codecov.io/gh/nikunjy/rules)
 Rules engine written in golang with the help of antlr.
 
 This package will be very helpful in situations where you have a generic rule and want to verify if your values (specified using `map[string]interface{}`) satisfy the rule. 

diff --git a/parser/bool_operation.go b/parser/bool_operation.go
@@ -34,31 +34,3 @@ func (o *BoolOperation) NE(left Operand, right Operand) (bool, error) {
 	}
 	return l != r, nil
 }
-
-func (o *BoolOperation) GT(left Operand, right Operand) (bool, error) {
-	return false, ErrInvalidOperation
-}
-
-func (o *BoolOperation) LT(left Operand, right Operand) (bool, error) {
-	return false, ErrInvalidOperation
-}
-
-func (o *BoolOperation) GE(left Operand, right Operand) (bool, error) {
-	return false, ErrInvalidOperation
-}
-
-func (o *BoolOperation) LE(left Operand, right Operand) (bool, error) {
-	return false, ErrInvalidOperation
-}
-
-func (o *BoolOperation) CO(left Operand, right Operand) (bool, error) {
-	return false, ErrInvalidOperation
-}
-
-func (o *BoolOperation) SW(left Operand, right Operand) (bool, error) {
-	return false, ErrInvalidOperation
-}
-
-func (o *BoolOperation) EW(left Operand, right Operand) (bool, error) {
-	return false, ErrInvalidOperation
-}
diff --git a/parser/int_operation.go b/parser/int_operation.go
@@ -1,6 +1,7 @@
 package parser
 
 type IntOperation struct {
+	NullOperation
 }
 
 func (o *IntOperation) get(left Operand, right Operand) (int, int, error) {
@@ -67,18 +68,6 @@ func (o *IntOperation) LE(left Operand, right Operand) (bool, error) {
 	return l <= r, nil
 }
 
-func (o *IntOperation) CO(left Operand, right Operand) (bool, error) {
-	return false, ErrInvalidOperation
-}
-
-func (o *IntOperation) SW(left Operand, right Operand) (bool, error) {
-	return false, ErrInvalidOperation
-}
-
-func (o *IntOperation) EW(left Operand, right Operand) (bool, error) {
-	return false, ErrInvalidOperation
-}
-
 func (o *IntOperation) IN(left Operand, right Operand) (bool, error) {
 	leftVal, ok := left.(int)
 	if !ok {

diff --git a/parser/jsonquery_visitor_impl.go b/parser/jsonquery_visitor_impl.go
@@ -160,6 +160,11 @@ func (j *JsonQueryVisitorImpl) VisitCompareExp(ctx *CompareExpContext) interface
 	if err != nil {
 		switch err {
 		case ErrInvalidOperation:
+			// in case of invalid operation lets rather
+			// be conservative and return false because the rule doesn't even make
+			// sense. It can be argued that it would be false positive if we were
+			// to return true
+			j.setErr(err)
 			j.setDebugErr(
 				newDebugError(err, "Not a valid operation for datatypes").Set(ErrVals{
 					"operation":           ctx.op.GetTokenType(),

diff --git a/parser/parse_logical_test.go b/parser/parse_logical_test.go
@@ -16,6 +16,7 @@ func TestLogicalExpWithAnd(t *testing.T) {
 				"y": 2,
 			},
 			true,
+			false,
 		},
 		{
 			`x eq 1 and y gt 1`,
@@ -24,6 +25,7 @@ func TestLogicalExpWithAnd(t *testing.T) {
 				"y": 1,
 			},
 			false,
+			false,
 		},
 		{
 			`x eq 1 and not (y gt 1)`,
@@ -32,6 +34,7 @@ func TestLogicalExpWithAnd(t *testing.T) {
 				"y": 1,
 			},
 			true,
+			false,
 		},
 		{
 			`x eq 1 and not (y gt 1)`,
@@ -40,6 +43,7 @@ func TestLogicalExpWithAnd(t *testing.T) {
 				"y": 2,
 			},
 			false,
+			false,
 		},
 		{
 			`(x eq 1 and y gt 1) and z eq 3`,
@@ -49,6 +53,7 @@ func TestLogicalExpWithAnd(t *testing.T) {
 				"z": 3,
 			},
 			true,
+			false,
 		},
 		{
 			`(x eq 1 and y gt 1) and z eq 3 or a gt 4`,
@@ -58,6 +63,7 @@ func TestLogicalExpWithAnd(t *testing.T) {
 				"a": 5,
 			},
 			true,
+			false,
 		},
 		{
 			`(x eq 1 and y gt 1) and (z eq 3 or a gt 4)`,
@@ -67,6 +73,7 @@ func TestLogicalExpWithAnd(t *testing.T) {
 				"a": 5,
 			},
 			true,
+			false,
 		},
 	}