switch to string compare function in test (#128)

open-component-model · Oct 3, 2022 · 92a7f9d · 92a7f9d
1 parent c5654dc
commit 92a7f9d
Show file tree

Hide file tree

Showing 22 changed files with 239 additions and 228 deletions.
diff --git a/cmds/ocm/commands/misccmds/credentials/get/cmd_test.go b/cmds/ocm/commands/misccmds/credentials/get/cmd_test.go
@@ -20,6 +20,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+	. "github.com/open-component-model/ocm/pkg/testutils"
 
 	"github.com/open-component-model/ocm/pkg/common"
 	"github.com/open-component-model/ocm/pkg/contexts/credentials"
@@ -64,11 +65,11 @@ var _ = Describe("Test Environment", func() {
 	It("get unknown type with partial matcher", func() {
 		buf := bytes.NewBuffer(nil)
 		Expect(env.CatchOutput(buf).Execute("get", "credentials", credentials.CONSUMER_ATTR_TYPE+"=test", identity.ID_HOSTNAME+"=ghcr.io")).To(Succeed())
-		Expect("\n" + buf.String()).To(Equal(`
+		ExpectTrimmedStringEqual(buf.String(), `
 ATTRIBUTE VALUE
 pass      testpass
 user      testuser
-`))
+`)
 	})
 	It("fail with partial matcher", func() {
 		buf := bytes.NewBuffer(nil)
@@ -80,10 +81,10 @@ user      testuser
 	It("get oci type with oci matcher", func() {
 		buf := bytes.NewBuffer(nil)
 		Expect(env.CatchOutput(buf).Execute("get", "credentials", credentials.CONSUMER_ATTR_TYPE+"="+identity.CONSUMER_TYPE, identity.ID_HOSTNAME+"=ghcr.io", identity.ID_PATHPREFIX+"=a/b")).To(Succeed())
-		Expect("\n" + buf.String()).To(Equal(`
+		ExpectTrimmedStringEqual(buf.String(), `
 ATTRIBUTE VALUE
 password  testpass
 username  testuser
-`))
+`)
 	})
 })
diff --git a/cmds/ocm/commands/misccmds/rsakeypair/cmd_test.go b/cmds/ocm/commands/misccmds/rsakeypair/cmd_test.go
@@ -20,6 +20,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+	. "github.com/open-component-model/ocm/pkg/testutils"
 
 	"github.com/opencontainers/go-digest"
 
@@ -43,9 +44,9 @@ var _ = Describe("Test Environment", func() {
 
 		buf := bytes.NewBuffer(nil)
 		Expect(env.CatchOutput(buf).Execute("create", "rsakeypair", "key.priv")).To(Succeed())
-		Expect("\n" + buf.String()).To(Equal(`
+		ExpectTrimmedStringEqual(buf.String(), `
 created rsa key pair key.priv[key.pub]
-`))
+`)
 		priv, err := env.ReadFile("key.priv")
 		Expect(err).To(Succeed())
 		pub, err := env.ReadFile("key.pub")
@@ -66,9 +67,9 @@ created rsa key pair key.priv[key.pub]
 
 		buf := bytes.NewBuffer(nil)
 		Expect(env.CatchOutput(buf).Execute("create", "rsakeypair", "key.priv", "CN=mandelsoft")).To(Succeed())
-		Expect("\n" + buf.String()).To(Equal(`
+		ExpectTrimmedStringEqual(buf.String(), `
 created rsa key pair key.priv[key.cert]
-`))
+`)
 		priv, err := env.ReadFile("key.priv")
 		Expect(err).To(Succeed())
 		pub, err := env.ReadFile("key.cert")

diff --git a/cmds/ocm/commands/ocicmds/artefacts/download/cmd_test.go b/cmds/ocm/commands/ocicmds/artefacts/download/cmd_test.go
@@ -20,6 +20,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+	. "github.com/open-component-model/ocm/pkg/testutils"
 
 	"github.com/open-component-model/ocm/pkg/common/accessio"
 	"github.com/open-component-model/ocm/pkg/contexts/oci/grammar"
@@ -59,10 +60,10 @@ var _ = Describe("Test Environment", func() {
 
 		buf := bytes.NewBuffer(nil)
 		Expect(env.CatchOutput(buf).Execute("download", "artefact", "-O", OUT, "-r", ARCH, NS+grammar.TagSeparator+VERSION)).To(Succeed())
-		Expect("\n" + buf.String()).To(Equal(
+		ExpectTrimmedStringEqual(buf.String(),
 			`
 /tmp/res: downloaded
-`))
+`)
 		Expect(env.DirExists(OUT)).To(BeTrue())
 		Expect(env.ReadFile(OUT + "/" + artefactset.ArtefactSetDescriptorFileName)).To(Equal([]byte("{\"schemaVersion\":2,\"mediaType\":\"application/vnd.oci.image.index.v1+json\",\"manifests\":[{\"mediaType\":\"application/vnd.oci.image.manifest.v1+json\",\"digest\":\"sha256:2c3e2c59e0ac9c99864bf0a9f9727c09f21a66080f9f9b03b36a2dad3cce6ff9\",\"size\":342,\"annotations\":{\"cloud.gardener.ocm/tags\":\"v1\"}}],\"annotations\":{\"cloud.gardener.ocm/main\":\"sha256:2c3e2c59e0ac9c99864bf0a9f9727c09f21a66080f9f9b03b36a2dad3cce6ff9\"}}")))
 	})

diff --git a/cmds/ocm/commands/ocicmds/artefacts/get/cmd_test.go b/cmds/ocm/commands/ocicmds/artefacts/get/cmd_test.go
@@ -20,8 +20,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/open-component-model/ocm/cmds/ocm/testhelper"
-
-	"github.com/sirupsen/logrus"
+	. "github.com/open-component-model/ocm/pkg/testutils"
 
 	"github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/common/handlers/artefacthdlr"
 	"github.com/open-component-model/ocm/pkg/common/accessio"
@@ -100,69 +99,69 @@ var _ = Describe("Test Environment", func() {
 
 			buf := bytes.NewBuffer(nil)
 			Expect(env.CatchOutput(buf).Execute("get", "artefact", ARCH+"//"+NS1+":"+VERSION1)).To(Succeed())
-			Expect("\n" + buf.String()).To(Equal(
+			ExpectTrimmedStringEqual(buf.String(),
 				`
 REGISTRY REPOSITORY      KIND     TAG DIGEST
 /tmp/ctf mandelsoft/test manifest v1  sha256:2c3e2c59e0ac9c99864bf0a9f9727c09f21a66080f9f9b03b36a2dad3cce6ff9
-`))
+`)
 		})
 		It("get all artefacts in namespace", func() {
 
 			buf := bytes.NewBuffer(nil)
 			Expect(env.CatchOutput(buf).Execute("get", "artefact", ARCH+"//"+NS1)).To(Succeed())
-			Expect("\n" + buf.String()).To(Equal(
+			ExpectTrimmedStringEqual(buf.String(),
 				`
 REGISTRY REPOSITORY      KIND     TAG DIGEST
 /tmp/ctf mandelsoft/test manifest v1  sha256:2c3e2c59e0ac9c99864bf0a9f9727c09f21a66080f9f9b03b36a2dad3cce6ff9
 /tmp/ctf mandelsoft/test manifest v2  sha256:60b245b3de64c43b18489e9c3cf177402f9bd18ab62f8cc6653e2fc2e3a5fc39
-`))
+`)
 		})
 
 		It("get all artefacts in other namespace", func() {
 			buf := bytes.NewBuffer(nil)
 			Expect(env.CatchOutput(buf).Execute("get", "artefact", ARCH+"//"+NS2)).To(Succeed())
-			Expect("\n" + buf.String()).To(Equal(
+			ExpectTrimmedStringEqual(buf.String(),
 				`
 REGISTRY REPOSITORY       KIND     TAG DIGEST
 /tmp/ctf mandelsoft/index index    v1  sha256:d6c3ddc587296fd09f56d2f4c8482f05575306a64705b06fae1d5695cb88d627
 /tmp/ctf mandelsoft/index manifest v2  sha256:e51c2165e00ec22eba0b6d18fe7b136491edce1fa4d286549fb35bd5538c03df
-`))
+`)
 		})
 
 		It("get closure of all artefacts in other namespace", func() {
 			buf := bytes.NewBuffer(nil)
 			Expect(env.CatchOutput(buf).Execute("get", "artefact", "-c", ARCH+"//"+NS2)).To(Succeed())
-			Expect("\n" + buf.String()).To(Equal(
+			ExpectTrimmedStringEqual(buf.String(),
 				`
 REFERENCEPATH                                                           REGISTRY REPOSITORY       KIND     TAG DIGEST
                                                                         /tmp/ctf mandelsoft/index index    v1  sha256:d6c3ddc587296fd09f56d2f4c8482f05575306a64705b06fae1d5695cb88d627
 sha256:d6c3ddc587296fd09f56d2f4c8482f05575306a64705b06fae1d5695cb88d627 /tmp/ctf mandelsoft/index manifest -   sha256:2c3e2c59e0ac9c99864bf0a9f9727c09f21a66080f9f9b03b36a2dad3cce6ff9
 sha256:d6c3ddc587296fd09f56d2f4c8482f05575306a64705b06fae1d5695cb88d627 /tmp/ctf mandelsoft/index manifest -   sha256:60b245b3de64c43b18489e9c3cf177402f9bd18ab62f8cc6653e2fc2e3a5fc39
                                                                         /tmp/ctf mandelsoft/index manifest v2  sha256:e51c2165e00ec22eba0b6d18fe7b136491edce1fa4d286549fb35bd5538c03df
-`))
+`)
 		})
 		It("get tree of all tagged artefacts in other namespace", func() {
 			buf := bytes.NewBuffer(nil)
 			Expect(env.CatchOutput(buf).Execute("get", "artefact", "-o", "tree", ARCH+"//"+NS2)).To(Succeed())
-			Expect("\n" + buf.String()).To(Equal(
+			ExpectTrimmedStringEqual(buf.String(),
 				`
 NESTING REGISTRY REPOSITORY       KIND     TAG DIGEST
 ├─      /tmp/ctf mandelsoft/index index    v1  sha256:d6c3ddc587296fd09f56d2f4c8482f05575306a64705b06fae1d5695cb88d627
 └─      /tmp/ctf mandelsoft/index manifest v2  sha256:e51c2165e00ec22eba0b6d18fe7b136491edce1fa4d286549fb35bd5538c03df
-`))
+`)
 		})
 
 		It("get tree of all artefacts in other namespace", func() {
 			buf := bytes.NewBuffer(nil)
 			Expect(env.CatchOutput(buf).Execute("get", "artefact", "-c", "-o", "tree", ARCH+"//"+NS2)).To(Succeed())
-			Expect("\n" + buf.String()).To(Equal(
+			ExpectTrimmedStringEqual(buf.String(),
 				`
 NESTING     REGISTRY REPOSITORY       KIND     TAG DIGEST
 ├─ ⊗        /tmp/ctf mandelsoft/index index    v1  sha256:d6c3ddc587296fd09f56d2f4c8482f05575306a64705b06fae1d5695cb88d627
 │  ├─       /tmp/ctf mandelsoft/index manifest -   sha256:2c3e2c59e0ac9c99864bf0a9f9727c09f21a66080f9f9b03b36a2dad3cce6ff9
 │  └─       /tmp/ctf mandelsoft/index manifest -   sha256:60b245b3de64c43b18489e9c3cf177402f9bd18ab62f8cc6653e2fc2e3a5fc39
 └─          /tmp/ctf mandelsoft/index manifest v2  sha256:e51c2165e00ec22eba0b6d18fe7b136491edce1fa4d286549fb35bd5538c03df
-`))
+`)
 		})
 	})
 
@@ -246,40 +245,36 @@ NESTING     REGISTRY REPOSITORY       KIND     TAG DIGEST
 		It("get single artefact and attachment", func() {
 			buf := bytes.NewBuffer(nil)
 			Expect(env.CatchOutput(buf).Execute("get", "artefact", "-a", ARCH+"//"+NS2+":"+VERSION1)).To(Succeed())
-			logrus.Infof("%s\n", buf.String())
-			Expect("\n" + buf.String()).To(Equal(
-				`
+			ExpectTrimmedStringEqual(buf.String(), `
 REGISTRY REPOSITORY       KIND     TAG                                                                          DIGEST
 /tmp/ctf mandelsoft/index index    v1                                                                           sha256:d6c3ddc587296fd09f56d2f4c8482f05575306a64705b06fae1d5695cb88d627
 /tmp/ctf mandelsoft/index manifest sha256-d6c3ddc587296fd09f56d2f4c8482f05575306a64705b06fae1d5695cb88d627.test sha256:439d433cd85eac706b86e39d3d9dbbd5f1ff19acd1bcb7aa3549f5d7b11777d9
-`))
+`)
 		})
 
 		It("get single artefact attachment tree", func() {
 			buf := bytes.NewBuffer(nil)
 			Expect(env.CatchOutput(buf).Execute("get", "artefact", "-a", "-o", "tree", ARCH+"//"+NS2+":"+VERSION1)).To(Succeed())
-			logrus.Infof("%s\n", buf.String())
-			Expect("\n" + buf.String()).To(Equal(
+			ExpectTrimmedStringEqual(buf.String(),
 				`
 NESTING        REGISTRY REPOSITORY       KIND     TAG                                                                          DIGEST
 └─ ⊗           /tmp/ctf mandelsoft/index index    v1                                                                           sha256:d6c3ddc587296fd09f56d2f4c8482f05575306a64705b06fae1d5695cb88d627
    └─ test     /tmp/ctf mandelsoft/index manifest sha256-d6c3ddc587296fd09f56d2f4c8482f05575306a64705b06fae1d5695cb88d627.test sha256:439d433cd85eac706b86e39d3d9dbbd5f1ff19acd1bcb7aa3549f5d7b11777d9
-`))
+`)
 		})
 
 		It("get single artefact attachment tree with closure", func() {
 			buf := bytes.NewBuffer(nil)
 			Expect(env.CatchOutput(buf).Execute("get", "artefact", "-a", "-c", "-o", "tree", ARCH+"//"+NS2+":"+VERSION1)).To(Succeed())
-			logrus.Debug(buf.String())
-			Expect("\n" + buf.String()).To(Equal(
+			ExpectTrimmedStringEqual(buf.String(),
 				`
 NESTING             REGISTRY REPOSITORY       KIND     TAG                                                                          DIGEST
 └─ ⊗                /tmp/ctf mandelsoft/index index    v1                                                                           sha256:d6c3ddc587296fd09f56d2f4c8482f05575306a64705b06fae1d5695cb88d627
    ├─ test          /tmp/ctf mandelsoft/index manifest sha256-d6c3ddc587296fd09f56d2f4c8482f05575306a64705b06fae1d5695cb88d627.test sha256:439d433cd85eac706b86e39d3d9dbbd5f1ff19acd1bcb7aa3549f5d7b11777d9
    ├─ ⊗             /tmp/ctf mandelsoft/index manifest -                                                                            sha256:2c3e2c59e0ac9c99864bf0a9f9727c09f21a66080f9f9b03b36a2dad3cce6ff9
    │  └─ test       /tmp/ctf mandelsoft/index manifest sha256-2c3e2c59e0ac9c99864bf0a9f9727c09f21a66080f9f9b03b36a2dad3cce6ff9.test sha256:efbfe2c665fc93690911d74e8e7dcf7fb01524545c7b87cb14d5febf1613eaba
    └─               /tmp/ctf mandelsoft/index manifest -                                                                            sha256:60b245b3de64c43b18489e9c3cf177402f9bd18ab62f8cc6653e2fc2e3a5fc39
-`))
+`)
 		})
 
 	})

diff --git a/cmds/ocm/commands/ocicmds/artefacts/transfer/cmd_test.go b/cmds/ocm/commands/ocicmds/artefacts/transfer/cmd_test.go
@@ -20,6 +20,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+	. "github.com/open-component-model/ocm/pkg/testutils"
 
 	"github.com/open-component-model/ocm/pkg/common/accessio"
 	"github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf"
@@ -59,11 +60,11 @@ var _ = Describe("Test Environment", func() {
 
 		buf := bytes.NewBuffer(nil)
 		Expect(env.CatchOutput(buf).Execute("transfer", "artefact", ARCH+"//"+NS+":"+VERSION, "directory::"+OUT)).To(Succeed())
-		Expect("\n" + buf.String()).To(Equal(
+		ExpectTrimmedStringEqual(buf.String(),
 			`
-copying /tmp/ctf//mandelsoft/test:v1 to directory::` + OUT + `//mandelsoft/test:v1...
+copying /tmp/ctf//mandelsoft/test:v1 to directory::`+OUT+`//mandelsoft/test:v1...
 copied 1 from 1 artefact(s) and 1 repositories
-`))
+`)
 		Expect(env.ReadFile(OUT + "/" + ctf.ArtefactIndexFileName)).To(Equal([]byte("{\"schemaVersion\":1,\"artefacts\":[{\"repository\":\"mandelsoft/test\",\"tag\":\"v1\",\"digest\":\"sha256:2c3e2c59e0ac9c99864bf0a9f9727c09f21a66080f9f9b03b36a2dad3cce6ff9\"}]}")))
 	})
 
@@ -83,11 +84,11 @@ copied 1 from 1 artefact(s) and 1 repositories
 
 		buf := bytes.NewBuffer(nil)
 		Expect(env.CatchOutput(buf).Execute("transfer", "artefact", ARCH+"//"+NS+":"+VERSION, "directory::"+OUT+"//changed")).To(Succeed())
-		Expect("\n" + buf.String()).To(Equal(
+		ExpectTrimmedStringEqual(buf.String(),
 			`
-copying /tmp/ctf//mandelsoft/test:v1 to directory::` + OUT + `//changed:v1...
+copying /tmp/ctf//mandelsoft/test:v1 to directory::`+OUT+`//changed:v1...
 copied 1 from 1 artefact(s) and 1 repositories
-`))
+`)
 		Expect(env.ReadFile(OUT + "/" + ctf.ArtefactIndexFileName)).To(Equal([]byte("{\"schemaVersion\":1,\"artefacts\":[{\"repository\":\"changed\",\"tag\":\"v1\",\"digest\":\"sha256:2c3e2c59e0ac9c99864bf0a9f9727c09f21a66080f9f9b03b36a2dad3cce6ff9\"}]}")))
 	})
 
@@ -107,11 +108,11 @@ copied 1 from 1 artefact(s) and 1 repositories
 
 		buf := bytes.NewBuffer(nil)
 		Expect(env.CatchOutput(buf).Execute("transfer", "artefact", "-R", ARCH+"//"+NS+":"+VERSION, "directory::"+OUT+"//sub")).To(Succeed())
-		Expect("\n" + buf.String()).To(Equal(
+		ExpectTrimmedStringEqual(buf.String(),
 			`
-copying /tmp/ctf//mandelsoft/test:v1 to directory::` + OUT + `//sub/mandelsoft/test:v1...
+copying /tmp/ctf//mandelsoft/test:v1 to directory::`+OUT+`//sub/mandelsoft/test:v1...
 copied 1 from 1 artefact(s) and 1 repositories
-`))
+`)
 		Expect(env.ReadFile(OUT + "/" + ctf.ArtefactIndexFileName)).To(Equal([]byte("{\"schemaVersion\":1,\"artefacts\":[{\"repository\":\"sub/mandelsoft/test\",\"tag\":\"v1\",\"digest\":\"sha256:2c3e2c59e0ac9c99864bf0a9f9727c09f21a66080f9f9b03b36a2dad3cce6ff9\"}]}")))
 	})
 
@@ -129,11 +130,11 @@ copied 1 from 1 artefact(s) and 1 repositories
 
 		buf := bytes.NewBuffer(nil)
 		Expect(env.CatchOutput(buf).Execute("transfer", "artefact", ARCH, "directory::"+OUT+"//"+NS)).To(Succeed())
-		Expect("\n" + buf.String()).To(Equal(
+		ExpectTrimmedStringEqual(buf.String(),
 			`
-copying ArtefactSet::/tmp/ctf//:v1 to directory::` + OUT + `//mandelsoft/test:v1...
+copying ArtefactSet::/tmp/ctf//:v1 to directory::`+OUT+`//mandelsoft/test:v1...
 copied 1 from 1 artefact(s) and 1 repositories
-`))
+`)
 		Expect(env.ReadFile(OUT + "/" + ctf.ArtefactIndexFileName)).To(Equal([]byte("{\"schemaVersion\":1,\"artefacts\":[{\"repository\":\"mandelsoft/test\",\"tag\":\"v1\",\"digest\":\"sha256:2c3e2c59e0ac9c99864bf0a9f9727c09f21a66080f9f9b03b36a2dad3cce6ff9\"}]}")))
 	})
 })
diff --git a/cmds/ocm/commands/ocicmds/tags/show/cmd_test.go b/cmds/ocm/commands/ocicmds/tags/show/cmd_test.go
@@ -20,6 +20,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+	. "github.com/open-component-model/ocm/pkg/testutils"
 
 	"github.com/open-component-model/ocm/pkg/common/accessio"
 	"github.com/open-component-model/ocm/pkg/mime"
@@ -87,46 +88,46 @@ var _ = Describe("Show OCI Tags", func() {
 	It("lists tags", func() {
 		buf := bytes.NewBuffer(nil)
 		Expect(env.CatchOutput(buf).Execute("oci", "tags", "show", "--repo", ARCH, NAMESAPCE)).To(Succeed())
-		Expect("\n" + buf.String()).To(Equal(`
+		ExpectTrimmedStringEqual(buf.String(), `
 sometag
 v1.3
 v1.3.1
 v1.3.2
 v1.3.2-beta.1
 v1.4
 v2.0
-`))
+`)
 	})
 
 	It("lists tags for same artefact", func() {
 		buf := bytes.NewBuffer(nil)
 		Expect(env.CatchOutput(buf).Execute("oci", "tags", "show", "--repo", ARCH, NAMESAPCE+":"+V13)).To(Succeed())
-		Expect("\n" + buf.String()).To(Equal(`
+		ExpectTrimmedStringEqual(buf.String(), `
 sometag
 v1.3
 v1.3.1
-`))
+`)
 	})
 
 	It("lists semver tags", func() {
 		buf := bytes.NewBuffer(nil)
 		Expect(env.CatchOutput(buf).Execute("oci", "tags", "show", "--semver", "--repo", ARCH, NAMESAPCE)).To(Succeed())
-		Expect("\n" + buf.String()).To(Equal(`
+		ExpectTrimmedStringEqual(buf.String(), `
 v1.3
 v1.3.1
 v1.3.2-beta.1
 v1.3.2
 v1.4
 v2.0
-`))
+`)
 	})
 
 	It("lists semver tags for same artefact", func() {
 		buf := bytes.NewBuffer(nil)
 		Expect(env.CatchOutput(buf).Execute("oci", "tags", "show", "--semver", "--repo", ARCH, NAMESAPCE+":"+V13)).To(Succeed())
-		Expect("\n" + buf.String()).To(Equal(`
+		ExpectTrimmedStringEqual(buf.String(), `
 v1.3
 v1.3.1
-`))
+`)
 	})
 })
diff --git a/cmds/ocm/commands/ocmcmds/components/download/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/download/cmd_test.go
@@ -20,6 +20,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+	. "github.com/open-component-model/ocm/pkg/testutils"
 
 	"github.com/mandelsoft/vfs/pkg/vfs"
 
@@ -61,10 +62,10 @@ var _ = Describe("Download Component Version", func() {
 
 		buf := bytes.NewBuffer(nil)
 		Expect(env.CatchOutput(buf).Execute("download", "component", "-O", OUT, "-r", ARCH, COMPONENT+grammar.VersionSeparator+VERSION)).To(Succeed())
-		Expect("\n" + buf.String()).To(Equal(
+		ExpectTrimmedStringEqual(buf.String(),
 			`
 /tmp/res: downloaded
-`))
+`)
 		Expect(env.DirExists(OUT)).To(BeTrue())
 		Expect(env.ReadFile(vfs.Join(env, OUT, comparch.BlobsDirectoryName, "sha256.810ff2fb242a5dee4220f2cb0e6a519891fb67f2f828a6cab4ef8894633b1f50"))).To(Equal([]byte("testdata")))