Minor refactoring and unit test. (#46)

* Minor refactoring and unit test.

* go fmt

* Shorthand declaration syntax.

* Added build tags.

* Fix testify usage.

* Separated test suites in the same package.

* Fix test suite stuff.

* Test bad time input also.

Author: Gal Topper

pkg/tsdbctl/add.go

@@ -28,7 +28,6 @@ import (
 	"github.com/v3io/v3io-tsdb/pkg/tsdb"
 	"github.com/v3io/v3io-tsdb/pkg/utils"
 	"io"
-	"math"
 	"os"
 	"sort"
 	"strconv"
@@ -268,20 +267,13 @@ func strToTV(tarr, varr string) ([]int64, []float64, error) {
 		return nil, nil, errors.New("time and value arrays must have the same number of elements")
 	}
 
-	tarray := []int64{}
-	varray := []float64{}
+	var tarray []int64
+	var varray []float64
 
 	for i := 0; i < len(vlist); i++ {
-
-		var v float64
-		var err error
-		if vlist[i] == "NaN" {
-			v = math.NaN()
-		} else {
-			v, err = strconv.ParseFloat(vlist[i], 64)
-			if err != nil {
-				return nil, nil, errors.Wrap(err, "not a valid float value")
-			}
+		v, err := strconv.ParseFloat(vlist[i], 64)
+		if err != nil {
+			return nil, nil, errors.WithStack(err)
 		}
 
 		varray = append(varray, v)

pkg/tsdbctl/add_test.go

@@ -0,0 +1,74 @@
+// +build unit
+
+/*
+Copyright 2018 Iguazio Systems Ltd.
+
+Licensed under the Apache License, Version 2.0 (the "License") with
+an addition restriction as set forth herein. You may not use this
+file except in compliance with the License. You may obtain a copy of
+the License at http://www.apache.org/licenses/LICENSE-2.0.
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied. See the License for the specific language governing
+permissions and limitations under the License.
+
+In addition, you may not use the software for any purposes that are
+illegal under applicable law, and the grant of the foregoing license
+under the Apache 2.0 license is conditioned upon your compliance with
+such restriction.
+*/
+
+package tsdbctl
+
+import (
+	"github.com/stretchr/testify/suite"
+	"math"
+	"testing"
+)
+
+type testAddSuite struct {
+	suite.Suite
+}
+
+func (suite *testAddSuite) TestStrToTV() {
+
+	ts, vs, err := strToTV("1533814796000,1533894796000", "10.1,202")
+
+	suite.Require().Nil(err)
+	suite.Require().Equal(ts, []int64{1533814796000, 1533894796000})
+	suite.Require().Equal(vs, []float64{10.1, 202})
+}
+
+func (suite *testAddSuite) TestStrToTVSpecialValues() {
+
+	ts, vs, err := strToTV("1533814796000,1533894796000,1533899796000", "NaN,Inf,-Inf")
+
+	suite.Require().Nil(err)
+	suite.Require().Equal(ts, []int64{1533814796000, 1533894796000, 1533899796000})
+	suite.Require().True(math.IsNaN(vs[0])) // NaN != NaN, so we have to check this explicitly
+	suite.Require().Equal(vs[1:], []float64{math.Inf(1), math.Inf(-1)})
+}
+
+func (suite *testAddSuite) TestStrToTVInvalidValue() {
+
+	ts, vs, err := strToTV("1533814796000,1533894796000,1533899796000", "1.2,5,z")
+
+	suite.Require().Nil(ts)
+	suite.Require().Nil(vs)
+	suite.Require().Error(err)
+}
+
+func (suite *testAddSuite) TestStrToTVInvalidTime() {
+
+	ts, vs, err := strToTV("1533814796000,1533894796000,abc", "1.2,5,5.1")
+
+	suite.Require().Nil(ts)
+	suite.Require().Nil(vs)
+	suite.Require().Error(err)
+}
+
+func TestAddSuite(t *testing.T) {
+	suite.Run(t, new(testAddSuite))
+}

pkg/tsdbctl/tsdbctl_test.go

@@ -1,3 +1,5 @@
+// +build unit
+
 /*
 Copyright 2018 Iguazio Systems Ltd.
 
@@ -26,11 +28,11 @@ import (
 	"testing"
 )
 
-type testSuite struct {
+type testTsdbctlSuite struct {
 	suite.Suite
 }
 
-func (suite *testSuite) TestPopulateConfigWithTenant() {
+func (suite *testTsdbctlSuite) TestPopulateConfigWithTenant() {
 	rc := RootCommandeer{v3ioPath: "Vel@Odar:p455w0rd@localhost:80123/123"}
 	cfg := &config.V3ioConfig{
 		Path: "/x/y/z",
@@ -55,6 +57,6 @@ func (suite *testSuite) TestPopulateConfigWithTenant() {
 	suite.Require().Equal(expectedRc, rc)
 }
 
-func TestBuilderSuite(t *testing.T) {
-	suite.Run(t, new(testSuite))
+func TestTsdbctlSuite(t *testing.T) {
+	suite.Run(t, new(testTsdbctlSuite))
 }