Skip to content

Commit 121677d

Browse files
Ben16Danny Joyce
andcommitted
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>
1 parent 218ea77 commit 121677d

4 files changed

Lines changed: 16 additions & 23 deletions

File tree

cmd/build/main_test.go

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package main
33
import (
44
"testing"
55

6+
. "github.com/onsi/gomega"
7+
68
"github.com/cloudfoundry/libcfbuildpack/build"
79
"github.com/cloudfoundry/libcfbuildpack/test"
810
"github.com/sclevine/spec"
@@ -16,14 +18,8 @@ func TestBuild(t *testing.T) {
1618
func testBuild(t *testing.T, _ spec.G, it spec.S) {
1719
it("always passes", func() {
1820
f := test.NewBuildFactory(t)
19-
20-
exitStatus, err := runBuild(f.Build)
21-
if err != nil {
22-
t.Fatal(err)
23-
}
24-
25-
if exitStatus != build.SuccessStatusCode {
26-
t.Errorf("os.Exit = %d, expected 0", exitStatus)
27-
}
21+
code, err := runBuild(f.Build)
22+
Expect(err).NotTo(HaveOccurred())
23+
Expect(code).To(Equal(build.SuccessStatusCode))
2824
})
2925
}

cmd/detect/main_test.go

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package main
33
import (
44
"testing"
55

6+
. "github.com/onsi/gomega"
7+
68
"github.com/cloudfoundry/libcfbuildpack/detect"
79
"github.com/cloudfoundry/libcfbuildpack/test"
810
"github.com/sclevine/spec"
@@ -16,14 +18,8 @@ func TestDetect(t *testing.T) {
1618
func testDetect(t *testing.T, _ spec.G, it spec.S) {
1719
it("always passes", func() {
1820
f := test.NewDetectFactory(t)
19-
20-
exitStatus, err := runDetect(f.Detect)
21-
if err != nil {
22-
t.Fatal(err)
23-
}
24-
25-
if exitStatus != detect.PassStatusCode {
26-
t.Errorf("os.Exit = %d, expected 0", exitStatus)
27-
}
21+
code, err := runDetect(f.Detect)
22+
Expect(err).NotTo(HaveOccurred())
23+
Expect(code).To(Equal(detect.PassStatusCode))
2824
})
2925
}

node/node.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@ type Contributor struct {
1414
layer layers.DependencyLayer
1515
}
1616

17-
func NewContributor(builder build.Build) (Contributor, bool, error) {
18-
plan, wantDependency := builder.BuildPlan[Dependency]
17+
func NewContributor(context build.Build) (Contributor, bool, error) {
18+
plan, wantDependency := context.BuildPlan[Dependency]
1919
if !wantDependency {
2020
return Contributor{}, false, nil
2121
}
2222

23-
deps, err := builder.Buildpack.Dependencies()
23+
deps, err := context.Buildpack.Dependencies()
2424
if err != nil {
2525
return Contributor{}, false, err
2626
}
2727

28-
dep, err := deps.Best(Dependency, plan.Version, builder.Stack)
28+
dep, err := deps.Best(Dependency, plan.Version, context.Stack)
2929
if err != nil {
3030
return Contributor{}, false, err
3131
}
3232

33-
contributor := Contributor{layer: builder.Layers.DependencyLayer(dep)}
33+
contributor := Contributor{layer: context.Layers.DependencyLayer(dep)}
3434

3535
if _, ok := plan.Metadata["build"]; ok {
3636
contributor.buildContribution = true

node/node_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ func testNode(t *testing.T, when spec.G, it spec.S) {
7979
Expect(err).NotTo(HaveOccurred())
8080

8181
layer := f.Build.Layers.Layer(Dependency)
82+
Expect(layer).To(test.HaveLayerMetadata(false, true, true))
8283
Expect(filepath.Join(layer.Root, "stub.txt")).To(BeARegularFile())
8384
Expect(layer).To(test.HaveOverrideSharedEnvironment("NODE_HOME", layer.Root))
8485
Expect(layer).To(test.HaveOverrideSharedEnvironment("NODE_HOME", layer.Root))

0 commit comments

Comments
 (0)