remove CR when neccessary

internal/testutils/strings.go

@@ -0,0 +1,15 @@
+package testutils
+
+import (
+	"runtime"
+	"strings"
+)
+
+// RemoveCR removes carriage return which is part of the character sequence
+// signifying new line on Windows.
+func RemoveCR(s string) string {
+	if runtime.GOOS == "windows" {
+		return strings.ReplaceAll(s, "\r", "")
+	}
+	return s
+}

manifest/object_test.go

@@ -7,6 +7,8 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/nobl9/nobl9-go/internal/testutils"
 )
 
 func TestFilterByKind(t *testing.T) {
@@ -109,7 +111,11 @@ func TestValidate(t *testing.T) {
 				project: "default"},
 		})
 		assert.Len(t, errs, 1)
-		assert.EqualError(t, errs[0], strings.ReplaceAll(expectedUniquenessConstraintMessage, "\n", "; "))
+		assert.EqualError(
+			t,
+			errs[0],
+			testutils.RemoveCR(strings.ReplaceAll(expectedUniquenessConstraintMessage, "\n", "; ")),
+		)
 	})
 }
 

manifest/v1alpha/errors_test.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/nobl9/govy/pkg/govy"
 
+	"github.com/nobl9/nobl9-go/internal/testutils"
 	"github.com/nobl9/nobl9-go/manifest"
 )
 
@@ -93,5 +94,5 @@ func expectedErrorOutput(t *testing.T, name string) string {
 	t.Helper()
 	data, err := errorsTestData.ReadFile(path.Join("test_data", "errors", name))
 	require.NoError(t, err)
-	return string(data)
+	return testutils.RemoveCR(string(data))
 }

manifest/v1alpha/parser/parser_test.go

@@ -11,6 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/nobl9/nobl9-go/internal/testutils"
 	"github.com/nobl9/nobl9-go/manifest"
 	"github.com/nobl9/nobl9-go/manifest/v1alpha"
 	"github.com/nobl9/nobl9-go/manifest/v1alpha/alertmethod"
@@ -152,7 +153,7 @@ func readParserTestFile(t *testing.T, filename string) ([]byte, manifest.ObjectF
 	require.NoError(t, err)
 	format, err := manifest.ParseObjectFormat(filepath.Ext(filename)[1:])
 	require.NoError(t, err)
-	return data, format
+	return []byte(testutils.RemoveCR(string(data))), format
 }
 
 func validAlertPolicy() alertpolicy.AlertPolicy {

sdk/encode_test.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	"github.com/nobl9/nobl9-go/internal/testutils"
 	"github.com/nobl9/nobl9-go/manifest"
 	"github.com/nobl9/nobl9-go/manifest/v1alpha"
 	v1alphaProject "github.com/nobl9/nobl9-go/manifest/v1alpha/project"
@@ -48,14 +49,14 @@ func TestEncodeObjects(t *testing.T) {
 		buf := &bytes.Buffer{}
 		err := EncodeObjects(objects, buf, manifest.ObjectFormatJSON)
 		assert.NoError(t, err)
-		assert.Equal(t, expectedObjectsJSON, buf.String())
+		assert.Equal(t, testutils.RemoveCR(expectedObjectsJSON), buf.String())
 	})
 
 	t.Run("YAML format", func(t *testing.T) {
 		buf := &bytes.Buffer{}
 		err := EncodeObjects(objects, buf, manifest.ObjectFormatYAML)
 		assert.NoError(t, err)
-		assert.Equal(t, expectedObjectsYAML, buf.String())
+		assert.Equal(t, testutils.RemoveCR(expectedObjectsYAML), buf.String())
 	})
 
 	t.Run("Unsupported format", func(t *testing.T) {
@@ -86,14 +87,14 @@ func TestEncodeObject(t *testing.T) {
 		buf := &bytes.Buffer{}
 		err := EncodeObject(object, buf, manifest.ObjectFormatJSON)
 		assert.NoError(t, err)
-		assert.Equal(t, expectedObjectJSON, buf.String())
+		assert.Equal(t, testutils.RemoveCR(expectedObjectJSON), buf.String())
 	})
 
 	t.Run("YAML format", func(t *testing.T) {
 		buf := &bytes.Buffer{}
 		err := EncodeObject(object, buf, manifest.ObjectFormatYAML)
 		assert.NoError(t, err)
-		assert.Equal(t, expectedObjectYAML, buf.String())
+		assert.Equal(t, testutils.RemoveCR(expectedObjectYAML), buf.String())
 	})
 
 	t.Run("Unsupported format", func(t *testing.T) {
@@ -134,14 +135,14 @@ func TestPrintObjects(t *testing.T) {
 		buf := &bytes.Buffer{}
 		err := PrintObjects(objects, buf, manifest.ObjectFormatJSON)
 		assert.NoError(t, err)
-		assert.Equal(t, expectedObjectsJSON, buf.String())
+		assert.Equal(t, testutils.RemoveCR(expectedObjectsJSON), buf.String())
 	})
 
 	t.Run("YAML format", func(t *testing.T) {
 		buf := &bytes.Buffer{}
 		err := PrintObjects(objects, buf, manifest.ObjectFormatYAML)
 		assert.NoError(t, err)
-		assert.Equal(t, expectedObjectsYAML, buf.String())
+		assert.Equal(t, testutils.RemoveCR(expectedObjectsYAML), buf.String())
 	})
 
 	t.Run("Unsupported format", func(t *testing.T) {
@@ -166,14 +167,14 @@ func TestPrintObject(t *testing.T) {
 		buf := &bytes.Buffer{}
 		err := PrintObject(object, buf, manifest.ObjectFormatJSON)
 		assert.NoError(t, err)
-		assert.Equal(t, expectedObjectJSON, buf.String())
+		assert.Equal(t, testutils.RemoveCR(expectedObjectJSON), buf.String())
 	})
 
 	t.Run("YAML format", func(t *testing.T) {
 		buf := &bytes.Buffer{}
 		err := PrintObject(object, buf, manifest.ObjectFormatYAML)
 		assert.NoError(t, err)
-		assert.Equal(t, expectedObjectYAML, buf.String())
+		assert.Equal(t, testutils.RemoveCR(expectedObjectYAML), buf.String())
 	})
 
 	t.Run("Unsupported format", func(t *testing.T) {

sdk/http_errors_test.go

@@ -12,6 +12,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/nobl9/nobl9-go/internal/testutils"
 )
 
 func TestHTTPError(t *testing.T) {
@@ -216,7 +218,7 @@ func TestHTTPError(t *testing.T) {
   - error2
   - error3 (source: '$.data')
   - error4 (source: '$.data[1].name', value: 'value')`
-		assert.EqualError(t, err, expectedMessage)
+		assert.Equal(t, testutils.RemoveCR(err.Error()), expectedMessage)
 	})
 	t.Run("failed to read JSON", func(t *testing.T) {
 		t.Parallel()
@@ -279,7 +281,7 @@ func TestAPIErrors_Error(t *testing.T) {
 - error2
 - error3 (source: '$.data')
 - error4 (source: '$.data[1].name', value: 'value')`
-	assert.EqualError(t, apiErrors, expectedMessage)
+	assert.Equal(t, testutils.RemoveCR(apiErrors.Error()), expectedMessage)
 }
 
 type mockReadCloser struct{ err error }