Add test for RegisterForContainerAgent;

juju · jujubot · Apr 21, 2021 · Apr 20, 2021 · Apr 21, 2021 · Apr 21, 2021
commit 7ba01e7e3c820d527170934da89005e7a3f21304
diff --git a/component/all/all.go b/component/all/all.go
@@ -15,13 +15,15 @@ import (
 	"github.com/juju/errors"
 )
 
-type component interface {
+// run "go generate" from the package directory.
+//go:generate go run github.com/golang/mock/mockgen -package all -destination component_mock.go github.com/juju/juju/component/all Component
+type Component interface {
 	registerForServer() error
 	registerForClient() error
 	registerForContainerAgent() error
 }
 
-var components = []component{
+var components = []Component{
 	&payloads{},
 	&resources{},
 }
@@ -40,10 +42,14 @@ func RegisterForServer() error {
 // RegisterForContainerAgent registers the parts of the components with the
 // Juju machinery for use as a agent (e.g. jujud, jujuc).
 func RegisterForContainerAgent() error {
-	components := []component{
+	components := []Component{
 		&resources{},
 	}
-	for _, c := range components {
+	return registerForContainerAgent(components)
+}
+
+func registerForContainerAgent(containerComponents []Component) error {
+	for _, c := range containerComponents {
 		if err := c.registerForContainerAgent(); err != nil {
 			return errors.Trace(err)
 		}

diff --git a/component/all/all_test.go b/component/all/all_test.go
@@ -0,0 +1,47 @@
+// Copyright 2021 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+// The all package facilitates the registration of Juju components into
+// the relevant machinery. It is intended as the one place in Juju where
+// the components (horizontal design layers) and the machinery
+// (vertical/architectural layers) intersect. This approach helps
+// alleviate interdependence between the components and the machinery.
+
+package all
+
+import (
+	"testing"
+
+	"github.com/golang/mock/gomock"
+	jc "github.com/juju/testing/checkers"
+	gc "gopkg.in/check.v1"
+
+	jujutesting "github.com/juju/juju/testing"
+)
+
+func Test(t *testing.T) {
+	gc.TestingT(t)
+}
+
+type allSuite struct {
+	jujutesting.BaseSuite
+}
+
+var _ = gc.Suite(&allSuite{})
+
+func (s *allSuite) TestRegisterForContainerAgent(c *gc.C) {
+	ctrl := gomock.NewController(c)
+	defer ctrl.Finish()
+
+	resources := NewMockComponent(ctrl)
+	components := []Component{
+		resources,
+	}
+
+	gomock.InOrder(
+		resources.EXPECT().registerForContainerAgent().Return(nil),
+	)
+
+	err := registerForContainerAgent(components)
+	c.Assert(err, jc.ErrorIsNil)
+}
diff --git a/component/all/component_mock.go b/component/all/component_mock.go