Pre-registry all functions

core/mapper/exprmapper/exprmapper.go

@@ -9,11 +9,18 @@ import (
 
 	"reflect"
 
+	"github.com/TIBCOSoftware/flogo-lib/core/data"
 	"github.com/TIBCOSoftware/flogo-lib/core/mapper/exprmapper/expression"
-	"github.com/TIBCOSoftware/flogo-lib/core/mapper/exprmapper/ref"
 	"github.com/TIBCOSoftware/flogo-lib/core/mapper/exprmapper/json"
-	"github.com/TIBCOSoftware/flogo-lib/core/data"
+	"github.com/TIBCOSoftware/flogo-lib/core/mapper/exprmapper/ref"
 	"github.com/TIBCOSoftware/flogo-lib/logger"
+
+	//Pre registry all function for now
+	_ "github.com/TIBCOSoftware/flogo-lib/core/mapper/exprmapper/function/number/random"
+	_ "github.com/TIBCOSoftware/flogo-lib/core/mapper/exprmapper/function/string/concat"
+	_ "github.com/TIBCOSoftware/flogo-lib/core/mapper/exprmapper/function/string/equals"
+	_ "github.com/TIBCOSoftware/flogo-lib/core/mapper/exprmapper/function/string/equalsignorecase"
+	_ "github.com/TIBCOSoftware/flogo-lib/core/mapper/exprmapper/function/string/length"
 )
 
 var log = logger.GetLogger("mapper")
@@ -178,7 +185,6 @@ func SetAttribute(fieldName string, value interface{}, outputScope data.Scope) e
 	return nil
 }
 
-
 func RemovePrefixInput(str string) string {
 	if str != "" && strings.HasPrefix(str, MAP_TO_INPUT) {
 		//Remove $INPUT for mapTo
@@ -190,4 +196,3 @@ func RemovePrefixInput(str string) string {
 	}
 	return str
 }
-

core/mapper/exprmapper/function/string/equals/equals.go

@@ -1,8 +1,6 @@
 package equals
 
 import (
-	"strings"
-
 	"github.com/TIBCOSoftware/flogo-lib/core/mapper/exprmapper/expression/function"
 	"github.com/TIBCOSoftware/flogo-lib/logger"
 )
@@ -23,10 +21,7 @@ func (s *Equals) GetName() string {
 func (s *Equals) GetCategory() string {
 	return "string"
 }
-func (s *Equals) Eval(str, str2 string, ignoreCase bool) bool {
-	log.Debugf(`Reports whether "%s" equels "%s" with ignore case %s`, str, str2, ignoreCase)
-	if ignoreCase {
-		return strings.EqualFold(str, str2)
-	}
+func (s *Equals) Eval(str, str2 string) bool {
+	log.Debugf(`Reports whether "%s" equals "%s" `, str, str2)
 	return str == str2
 }

core/mapper/exprmapper/function/string/equals/equals_test.go

@@ -11,28 +11,18 @@ import (
 var s = &Equals{}
 
 func TestStaticFunc_Starts_with(t *testing.T) {
-	final1 := s.Eval("TIBCO FLOGO", "TIBCO", true)
+	final1 := s.Eval("TIBCO FLOGO", "TIBCO")
 	fmt.Println(final1)
 	assert.Equal(t, false, final1)
 
-	final2 := s.Eval("TIBCO", "tibco", true)
+	final2 := s.Eval("TIBCO", "tibco")
 	fmt.Println(final2)
-	assert.Equal(t, true, final2)
+	assert.Equal(t, false, final2)
 
 }
 
 func TestExpression(t *testing.T) {
-	fun, err := expression.NewFunctionExpression(`string.equals("TIBCO FLOGO", "TIBCO FLOGO", false)`).GetFunction()
-	assert.Nil(t, err)
-	assert.NotNil(t, fun)
-	v, err := fun.Eval()
-	assert.Nil(t, err)
-	assert.NotNil(t, v)
-	assert.Equal(t, true, v[0])
-}
-
-func TestExpressionIgnoreCase(t *testing.T) {
-	fun, err := expression.NewFunctionExpression(`string.equals("TIBCO flogo", "TIBCO FLOGO", true)`).GetFunction()
+	fun, err := expression.NewFunctionExpression(`string.equals("TIBCO FLOGO", "TIBCO FLOGO")`).GetFunction()
 	assert.Nil(t, err)
 	assert.NotNil(t, fun)
 	v, err := fun.Eval()

core/mapper/exprmapper/function/string/equalsignorecase/equalsignorecase.go

@@ -0,0 +1,29 @@
+package equalsignorecase
+
+import (
+	"strings"
+
+	"github.com/TIBCOSoftware/flogo-lib/core/mapper/exprmapper/expression/function"
+	"github.com/TIBCOSoftware/flogo-lib/logger"
+)
+
+var log = logger.GetLogger("equalsIgnoreCase-function")
+
+type EqualsIgnoreCase struct {
+}
+
+func init() {
+	function.Registry(&EqualsIgnoreCase{})
+}
+
+func (s *EqualsIgnoreCase) GetName() string {
+	return "equalsIgnoreCase"
+}
+
+func (s *EqualsIgnoreCase) GetCategory() string {
+	return "string"
+}
+func (s *EqualsIgnoreCase) Eval(str, str2 string) bool {
+	log.Debugf(`Reports whether "%s" equels "%s" with ignore case`, str, str2)
+	return strings.EqualFold(str, str2)
+}

core/mapper/exprmapper/function/string/equalsignorecase/equalsignorecase_test.go

@@ -0,0 +1,42 @@
+package equalsignorecase
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/TIBCOSoftware/flogo-lib/core/mapper/exprmapper/expression"
+	"github.com/stretchr/testify/assert"
+)
+
+var s = &EqualsIgnoreCase{}
+
+func TestStaticFunc_Starts_with(t *testing.T) {
+	final1 := s.Eval("TIBCO FLOGO", "TIBCO")
+	fmt.Println(final1)
+	assert.Equal(t, false, final1)
+
+	final2 := s.Eval("TIBCO", "tibco")
+	fmt.Println(final2)
+	assert.Equal(t, true, final2)
+
+}
+
+func TestExpression(t *testing.T) {
+	fun, err := expression.NewFunctionExpression(`string.equalsIgnoreCase("TIBCO FLOGO", "TIBCO FLOGO")`).GetFunction()
+	assert.Nil(t, err)
+	assert.NotNil(t, fun)
+	v, err := fun.Eval()
+	assert.Nil(t, err)
+	assert.NotNil(t, v)
+	assert.Equal(t, true, v[0])
+}
+
+func TestExpressionIgnoreCase(t *testing.T) {
+	fun, err := expression.NewFunctionExpression(`string.equalsIgnoreCase("TIBCO flogo", "TIBCO FLOGO")`).GetFunction()
+	assert.Nil(t, err)
+	assert.NotNil(t, fun)
+	v, err := fun.Eval()
+	assert.Nil(t, err)
+	assert.NotNil(t, v)
+	assert.Equal(t, true, v[0])
+}