airship/airshipctl
Code Issues Proposed changes

Move MockDocument implementation to testutils

Browse Source 
Currently MockDocument implementation located under pkg/bootstrap/isogen
package, which is not relevant for it and makes it impossible to import
in other test packages. Also _test.go filename is not proper one for
this source file since it doesn't contain any unit tests inside.

Change-Id: I9b3f28df653637701f5d6fca4376da5a22f39658
Signed-off-by: Ruslan Aliev <raliev@mirantis.com>
Relates-To: #432
This commit is contained in:
Ruslan Aliev 2020-12-08 20:59:45 -06:00
parent d7ca864295
commit 94a17694ea
3 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/bootstrap/isogen/command_test.go
View File

@ -31,6 +31,7 @@ import (
"opendev.org/airship/airshipctl/pkg/log"
"opendev.org/airship/airshipctl/testutil"
testcontainer "opendev.org/airship/airshipctl/testutil/container"
testdoc "opendev.org/airship/airshipctl/testutil/document"
)
const testID = "TESTID"
@ -54,7 +55,7 @@ func TestBootstrapIso(t *testing.T) {
NetworkConfigFileName: "net-conf",
},
}
testDoc := &MockDocument{
testDoc := &testdoc.MockDocument{
MockAsYAML: func() ([]byte, error) { return []byte("TESTDOC"), nil },
}
testBuilder := &testcontainer.MockContainer{
@ -74,7 +75,7 @@ func TestBootstrapIso(t *testing.T) {
tests := []struct {
builder *testcontainer.MockContainer
cfg *api.ImageConfiguration
doc *MockDocument
doc *testdoc.MockDocument
debug bool
expectedOut []string
expectedErr error
@ -121,7 +122,7 @@ func TestBootstrapIso(t *testing.T) {
{
builder: testBuilder,
cfg: testCfg,
doc: &MockDocument{
doc: &testdoc.MockDocument{
MockAsYAML: func() ([]byte, error) { return nil, testErr },
},
debug: false,

3
pkg/bootstrap/isogen/executor_test.go
View File

@ -30,6 +30,7 @@ import (
"opendev.org/airship/airshipctl/pkg/phase/ifc"
"opendev.org/airship/airshipctl/testutil"
testcontainer "opendev.org/airship/airshipctl/testutil/container"
testdoc "opendev.org/airship/airshipctl/testutil/document"
)
var (
@ -93,7 +94,7 @@ func TestExecutorRun(t *testing.T) {
NetworkConfigFileName: "net-conf",
},
}
testDoc := &MockDocument{
testDoc := &testdoc.MockDocument{
MockAsYAML: func() ([]byte, error) { return []byte("TESTDOC"), nil },
}

25
pkg/bootstrap/isogen/mock_document_test.go → testutil/document/document.go
View File

@ -12,12 +12,13 @@
limitations under the License.
*/
package isogen
package document
import (
"k8s.io/apimachinery/pkg/runtime"
)
// MockDocument implements Document for unit test purposes
type MockDocument struct {
MockAnnotate func()
MockAsYAML func() ([]byte, error)
@ -43,90 +44,112 @@ type MockDocument struct {
MockGetFieldValue func() (interface{}, error)
}
// Annotate Document interface implementation for unit test purposes
func (md *MockDocument) Annotate(_ map[string]string) {
md.MockAnnotate()
}
// AsYAML Document interface implementation for unit test purposes
func (md *MockDocument) AsYAML() ([]byte, error) {
return md.MockAsYAML()
}
// GetAnnotations Document interface implementation for unit test purposes
func (md *MockDocument) GetAnnotations() map[string]string {
return md.MockGetAnnotations()
}
// GetBool Document interface implementation for unit test purposes
func (md *MockDocument) GetBool(_ string) (bool, error) {
return md.MockGetBool()
}
// GetFloat64 Document interface implementation for unit test purposes
func (md *MockDocument) GetFloat64(_ string) (float64, error) {
return md.MockGetFloat64()
}
// GetFieldValue Document interface implementation for unit test purposes
func (md *MockDocument) GetFieldValue(_ string) (interface{}, error) {
return md.MockGetFieldValue()
}
// GetGroup Document interface implementation for unit test purposes
func (md *MockDocument) GetGroup() string {
return md.MockGetGroup()
}
// GetInt64 Document interface implementation for unit test purposes
func (md *MockDocument) GetInt64(_ string) (int64, error) {
return md.MockGetInt64()
}
// GetKind Document interface implementation for unit test purposes
func (md *MockDocument) GetKind() string {
return md.MockGetKind()
}
// GetLabels Document interface implementation for unit test purposes
func (md *MockDocument) GetLabels() map[string]string {
return md.MockGetLabels()
}
// GetMap Document interface implementation for unit test purposes
func (md *MockDocument) GetMap(_ string) (map[string]interface{}, error) {
return md.MockGetMap()
}
// GetName Document interface implementation for unit test purposes
func (md *MockDocument) GetName() string {
return md.MockGetName()
}
// GetNamespace Document interface implementation for unit test purposes
func (md *MockDocument) GetNamespace() string {
return md.MockGetNamespace()
}
// GetSlice Document interface implementation for unit test purposes
func (md *MockDocument) GetSlice(_ string) ([]interface{}, error) {
return md.MockGetSlice()
}
// GetString Document interface implementation for unit test purposes
func (md *MockDocument) GetString(_ string) (string, error) {
return md.MockGetString()
}
// GetStringMap Document interface implementation for unit test purposes
func (md *MockDocument) GetStringMap(_ string) (map[string]string, error) {
return md.MockGetStringMap()
}
// GetStringSlice Document interface implementation for unit test purposes
func (md *MockDocument) GetStringSlice(_ string) ([]string, error) {
return md.MockGetStringSlice()
}
// GetVersion Document interface implementation for unit test purposes
func (md *MockDocument) GetVersion() string {
return md.MockGetVersion()
}
// Label Document interface implementation for unit test purposes
func (md *MockDocument) Label(_ map[string]string) {
md.MockLabel()
}
// MarshalJSON Document interface implementation for unit test purposes
func (md *MockDocument) MarshalJSON() ([]byte, error) {
return md.MockMarshalJSON()
}
// ToObject Document interface implementation for unit test purposes
func (md *MockDocument) ToObject(_ interface{}) error {
return md.MockToObject()
}
// ToAPIObject Document interface implementation for unit test purposes
func (md *MockDocument) ToAPIObject(obj runtime.Object, scheme *runtime.Scheme) error {
return md.MockToAPIObject()
}