Small clean up

- Rename builder to context
- Use gomega in all tests
- Add metadata check to modules_test

[#162218003]

Co-authored-by: Danny Joyce <djoyce@pivotal.io>

Author: Ben16

cmd/build/main_test.go

@@ -3,6 +3,8 @@ package main
 import (
 	"testing"
 
+	. "github.com/onsi/gomega"
+
 	"github.com/cloudfoundry/libcfbuildpack/build"
 	"github.com/cloudfoundry/libcfbuildpack/test"
 	"github.com/sclevine/spec"
@@ -16,14 +18,8 @@ func TestBuild(t *testing.T) {
 func testBuild(t *testing.T, _ spec.G, it spec.S) {
 	it("always passes", func() {
 		f := test.NewBuildFactory(t)
-
-		exitStatus, err := runBuild(f.Build)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if exitStatus != build.SuccessStatusCode {
-			t.Errorf("os.Exit = %d, expected 0", exitStatus)
-		}
+		code, err := runBuild(f.Build)
+		Expect(err).NotTo(HaveOccurred())
+		Expect(code).To(Equal(build.SuccessStatusCode))
 	})
 }

cmd/detect/main_test.go

@@ -3,6 +3,8 @@ package main
 import (
 	"testing"
 
+	. "github.com/onsi/gomega"
+
 	"github.com/cloudfoundry/libcfbuildpack/detect"
 	"github.com/cloudfoundry/libcfbuildpack/test"
 	"github.com/sclevine/spec"
@@ -16,14 +18,8 @@ func TestDetect(t *testing.T) {
 func testDetect(t *testing.T, _ spec.G, it spec.S) {
 	it("always passes", func() {
 		f := test.NewDetectFactory(t)
-
-		exitStatus, err := runDetect(f.Detect)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if exitStatus != detect.PassStatusCode {
-			t.Errorf("os.Exit = %d, expected 0", exitStatus)
-		}
+		code, err := runDetect(f.Detect)
+		Expect(err).NotTo(HaveOccurred())
+		Expect(code).To(Equal(detect.PassStatusCode))
 	})
 }

node/node.go

@@ -14,23 +14,23 @@ type Contributor struct {
 	layer              layers.DependencyLayer
 }
 
-func NewContributor(builder build.Build) (Contributor, bool, error) {
-	plan, wantDependency := builder.BuildPlan[Dependency]
+func NewContributor(context build.Build) (Contributor, bool, error) {
+	plan, wantDependency := context.BuildPlan[Dependency]
 	if !wantDependency {
 		return Contributor{}, false, nil
 	}
 
-	deps, err := builder.Buildpack.Dependencies()
+	deps, err := context.Buildpack.Dependencies()
 	if err != nil {
 		return Contributor{}, false, err
 	}
 
-	dep, err := deps.Best(Dependency, plan.Version, builder.Stack)
+	dep, err := deps.Best(Dependency, plan.Version, context.Stack)
 	if err != nil {
 		return Contributor{}, false, err
 	}
 
-	contributor := Contributor{layer: builder.Layers.DependencyLayer(dep)}
+	contributor := Contributor{layer: context.Layers.DependencyLayer(dep)}
 
 	if _, ok := plan.Metadata["build"]; ok {
 		contributor.buildContribution = true

node/node_test.go

@@ -79,6 +79,7 @@ func testNode(t *testing.T, when spec.G, it spec.S) {
 			Expect(err).NotTo(HaveOccurred())
 
 			layer := f.Build.Layers.Layer(Dependency)
+			Expect(layer).To(test.HaveLayerMetadata(false, true, true))
 			Expect(filepath.Join(layer.Root, "stub.txt")).To(BeARegularFile())
 			Expect(layer).To(test.HaveOverrideSharedEnvironment("NODE_HOME", layer.Root))
 			Expect(layer).To(test.HaveOverrideSharedEnvironment("NODE_HOME", layer.Root))