From b0f99c471af39b35558ed4480cbfd70a23c1ad37 Mon Sep 17 00:00:00 2001
From: adragusin <adrian.dragusin@itsyscom.com>
Date: Wed, 18 Dec 2019 15:15:21 +0200
Subject: [PATCH] Updated tests in utils

---
 utils/dataconverter_test.go |  6 +++++-
 utils/dateseries.go         |  2 +-
 utils/dateseries_test.go    | 25 +++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/utils/dataconverter_test.go b/utils/dataconverter_test.go
index 7a47411c2..f0a8206b9 100644
--- a/utils/dataconverter_test.go
+++ b/utils/dataconverter_test.go
@@ -547,9 +547,13 @@ func TestPhoneNumberConverter(t *testing.T) {
 	} else if !reflect.DeepEqual(nil, rcv) {
 		t.Errorf("Expecting: %+v, received: %+v", nil, rcv)
 	}
+	eLc := &PhoneNumberConverter{CountryCode: "9786679", Format: phonenumbers.NATIONAL}
+	if _, err := eLc.Convert("8976wedf"); err == nil || err.Error() != "invalid country code" {
+		t.Errorf("Expecting: 'invalid country code', received: %+v", err)
+	}
 
 	// US/National
-	eLc := &PhoneNumberConverter{CountryCode: "US", Format: phonenumbers.NATIONAL}
+	eLc = &PhoneNumberConverter{CountryCode: "US", Format: phonenumbers.NATIONAL}
 	d, err := NewDataConverter("*libphonenumber:US")
 	if err != nil {
 		t.Error(err)
diff --git a/utils/dateseries.go b/utils/dateseries.go
index e447dba7e..d598ec1d8 100644
--- a/utils/dateseries.go
+++ b/utils/dateseries.go
@@ -62,7 +62,7 @@ func (ys Years) Contains(year int) (result bool) {
 // Parse Years elements from string separated by sep.
 func (ys *Years) Parse(input, sep string) {
 	switch input {
-	case "*any", "":
+	case META_ANY, "":
 		*ys = []int{}
 	default:
 		elements := strings.Split(input, sep)
diff --git a/utils/dateseries_test.go b/utils/dateseries_test.go
index 54d12ef03..b6c30ae8c 100644
--- a/utils/dateseries_test.go
+++ b/utils/dateseries_test.go
@@ -68,6 +68,31 @@ func TestYearsLess(t *testing.T) {
 	}
 }
 
+func TestYearsContains(t *testing.T) {
+	ys := &Years{2019, 2010, 2020, 2005, 2018, 2007}
+	if rcv := ys.Contains(2019); !rcv {
+		t.Errorf("Expecting true received: %+v", rcv)
+	}
+	if rcv := ys.Contains(1989); rcv {
+		t.Errorf("Expecting false received: %+v", rcv)
+	}
+}
+
+func TestYearsParse(t *testing.T) {
+	ys := &Years{}
+	eOut := &Years{}
+	ys.Parse(META_ANY, EmptyString)
+	if !reflect.DeepEqual(eOut, ys) {
+		t.Errorf("Expecting %+v received: %+v", eOut, ys)
+	}
+	ys = &Years{2019, 2010, 2020, 2005, 2018, 2007}
+	eOut = &Years{2019, 2010, 2020, 2005, 2018, 2007, 2010, 2011, 2012, 2013}
+	ys.Parse("2010,2011,2012,2013", ",")
+	if !reflect.DeepEqual(eOut, ys) {
+		t.Errorf("Expecting %+v received: %+v", eOut, ys)
+	}
+}
+
 func TestDateseriesMonthStoreRestoreJson(t *testing.T) {
 	m := Months{5, 6, 7, 8}
 	r, _ := json.Marshal(m)