Remove internal/test pkg

compose/decoder/decoder_test.go

@@ -9,7 +9,7 @@ import (
 	"io"
 	"testing"
 
-	"github.com/cortezaproject/corteza-server/internal/test"
+	"github.com/stretchr/testify/require"
 )
 
 func makeReadSeeker(c string) io.ReadSeeker {
@@ -28,12 +28,12 @@ func TestEntryCount(t *testing.T) {
 		fr := NewFlatReader(csv.NewReader(rs), rs)
 
 		c, err := fr.EntryCount()
-		test.Assert(t,
+		require.True(t,
 			c == 1,
 			fmt.Sprintf("Invalid number of entries determines; found %d, expected %d", c, 1),
 		)
 
-		test.Assert(t,
+		require.True(t,
 			err == nil,
 			"Returned with error",
 		)
@@ -44,12 +44,12 @@ func TestEntryCount(t *testing.T) {
 		sd := NewStructuredDecoder(json.NewDecoder(rs), rs)
 
 		c, err := sd.EntryCount()
-		test.Assert(t,
+		require.True(t,
 			c == 1,
 			fmt.Sprintf("Invalid number of entries determines; found %d, expected %d", c, 1),
 		)
 
-		test.Assert(t,
+		require.True(t,
 			err == nil,
 			"Returned with error",
 		)
@@ -66,7 +66,7 @@ func TestGet(t *testing.T) {
 		err := fr.get(func(f []string) error {
 			return errors.New("called")
 		})
-		test.Assert(t,
+		require.True(t,
 			err != nil,
 			"Error should be returned to indicate that get did read",
 		)
@@ -74,7 +74,7 @@ func TestGet(t *testing.T) {
 		err = fr.get(func(f []string) error {
 			return errors.New("called")
 		})
-		test.Assert(t,
+		require.True(t,
 			err == nil,
 			"Error should NOT be returned to indicate that get didn't read",
 		)
@@ -87,7 +87,7 @@ func TestGet(t *testing.T) {
 		err := sd.get(func(f map[string]interface{}) error {
 			return errors.New("called")
 		})
-		test.Assert(t,
+		require.True(t,
 			err != nil,
 			"Error should be returned to indicate that get did read",
 		)
@@ -95,7 +95,7 @@ func TestGet(t *testing.T) {
 		err = sd.get(func(f map[string]interface{}) error {
 			return errors.New("called")
 		})
-		test.Assert(t,
+		require.True(t,
 			err == nil,
 			"Error should NOT be returned to indicate that get didn't read",
 		)
@@ -113,12 +113,12 @@ func TestWalk(t *testing.T) {
 			return nil
 		})
 
-		test.Assert(t,
+		require.True(t,
 			i == 2,
 			"Invalid number of reads",
 		)
 
-		test.Assert(t,
+		require.True(t,
 			err == nil,
 			"Returned with error",
 		)
@@ -134,12 +134,12 @@ func TestWalk(t *testing.T) {
 			return nil
 		})
 
-		test.Assert(t,
+		require.True(t,
 			i == 1,
 			"Invalid number of reads",
 		)
 
-		test.Assert(t,
+		require.True(t,
 			err == nil,
 			"Returned with error",
 		)
@@ -152,14 +152,14 @@ func TestHeader(t *testing.T) {
 		fr := NewFlatReader(csv.NewReader(rs), rs)
 
 		h := fr.Header()
-		test.Assert(t,
+		require.True(t,
 			len(h) == 3,
 			"Invalid number of header fields",
 		)
 
 		expect := [...]string{"f1", "f2", "ID"}
 		for i, h := range h {
-			test.Assert(t,
+			require.True(t,
 				h == expect[i],
 				"Invalid header value",
 			)
@@ -171,7 +171,7 @@ func TestHeader(t *testing.T) {
 		sd := NewStructuredDecoder(json.NewDecoder(rs), rs)
 
 		h := sd.Header()
-		test.Assert(t,
+		require.True(t,
 			len(h) == 3,
 			"Invalid number of header fields",
 		)

compose/decoder/record_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/cortezaproject/corteza-server/compose/types"
-	"github.com/cortezaproject/corteza-server/internal/test"
+	"github.com/stretchr/testify/require"
 )
 
 func TestMapify(t *testing.T) {
@@ -19,12 +19,12 @@ func TestMapify(t *testing.T) {
 		var v []string
 		v = append(v, "v1")
 
-		test.Assert(t,
+		require.True(t,
 			mapify(h, v) == nil,
 			"Value should be nil",
 		)
 
-		test.Assert(t,
+		require.True(t,
 			mapify(v, h) == nil,
 			"Value should be nil",
 		)
@@ -38,12 +38,12 @@ func TestMapify(t *testing.T) {
 		v = append(v, "v1", "v2")
 
 		mpd := mapify(h, v)
-		test.Assert(t,
+		require.True(t,
 			len(mpd) == 2,
 			fmt.Sprintf("Invalid length %d; should be %d", len(mpd), 2),
 		)
 
-		test.Assert(t,
+		require.True(t,
 			mpd["h1"] == "v1" && mpd["h2"] == "v2",
 			"Invalid values",
 		)
@@ -56,17 +56,17 @@ func TestSetSystemField(t *testing.T) {
 		name := "recordID"
 		value := "123"
 		is, err := setSystemField(r, name, value)
-		test.Assert(t,
+		require.True(t,
 			err == nil,
 			"Returned with error",
 		)
 
-		test.Assert(t,
+		require.True(t,
 			is,
 			"Couldn't determine it's a system field",
 		)
 
-		test.Assert(t,
+		require.True(t,
 			r.ID == 123,
 			fmt.Sprintf("Determined value (%d) not valid; should be %s", r.ID, value),
 		)
@@ -77,12 +77,12 @@ func TestSetSystemField(t *testing.T) {
 		name := "customField"
 		value := "123"
 		is, err := setSystemField(r, name, value)
-		test.Assert(t,
+		require.True(t,
 			err == nil,
 			"Returned with error",
 		)
 
-		test.Assert(t,
+		require.True(t,
 			!is,
 			"Couldn't determine it's not a system field",
 		)
@@ -100,12 +100,12 @@ func TestRecords(t *testing.T) {
 		row := 0
 		fr.Records(testFields, func(mod *types.Record) error {
 			row++
-			test.Assert(t,
+			require.True(t,
 				len(mod.Values) == 2,
 				"Not enough values",
 			)
 
-			test.Assert(t,
+			require.True(t,
 				mod.ID == uint64(row),
 				"Not enough values",
 			)
@@ -119,12 +119,12 @@ func TestRecords(t *testing.T) {
 		row := 0
 		sd.Records(testFields, func(mod *types.Record) error {
 			row++
-			test.Assert(t,
+			require.True(t,
 				len(mod.Values) == 2,
 				"Not enough values",
 			)
 
-			test.Assert(t,
+			require.True(t,
 				mod.ID == uint64(row),
 				"Not enough values",
 			)