move unit tests into 'testing' directories
diff --git a/openstack/utils/choose_version_test.go b/openstack/utils/testing/choose_version_test.go
similarity index 77%
rename from openstack/utils/choose_version_test.go
rename to openstack/utils/testing/choose_version_test.go
index 9f2f363..9c0119c 100644
--- a/openstack/utils/choose_version_test.go
+++ b/openstack/utils/testing/choose_version_test.go
@@ -1,4 +1,4 @@
-package utils
+package testing
import (
"fmt"
@@ -6,6 +6,7 @@
"testing"
"github.com/gophercloud/gophercloud"
+ "github.com/gophercloud/gophercloud/openstack/utils"
"github.com/gophercloud/gophercloud/testhelper"
)
@@ -41,14 +42,14 @@
defer testhelper.TeardownHTTP()
setupVersionHandler()
- v2 := &Version{ID: "v2.0", Priority: 2, Suffix: "blarg"}
- v3 := &Version{ID: "v3.0", Priority: 3, Suffix: "hargl"}
+ v2 := &utils.Version{ID: "v2.0", Priority: 2, Suffix: "blarg"}
+ v3 := &utils.Version{ID: "v3.0", Priority: 3, Suffix: "hargl"}
c := &gophercloud.ProviderClient{
IdentityBase: testhelper.Endpoint(),
IdentityEndpoint: "",
}
- v, endpoint, err := ChooseVersion(c, []*Version{v2, v3})
+ v, endpoint, err := utils.ChooseVersion(c, []*utils.Version{v2, v3})
if err != nil {
t.Fatalf("Unexpected error from ChooseVersion: %v", err)
@@ -69,14 +70,14 @@
defer testhelper.TeardownHTTP()
setupVersionHandler()
- v2 := &Version{ID: "v2.0", Priority: 2, Suffix: "nope"}
- v3 := &Version{ID: "v3.0", Priority: 3, Suffix: "northis"}
+ v2 := &utils.Version{ID: "v2.0", Priority: 2, Suffix: "nope"}
+ v3 := &utils.Version{ID: "v3.0", Priority: 3, Suffix: "northis"}
c := &gophercloud.ProviderClient{
IdentityBase: testhelper.Endpoint(),
IdentityEndpoint: testhelper.Endpoint() + "v2.0/",
}
- v, endpoint, err := ChooseVersion(c, []*Version{v2, v3})
+ v, endpoint, err := utils.ChooseVersion(c, []*utils.Version{v2, v3})
if err != nil {
t.Fatalf("Unexpected error from ChooseVersion: %v", err)
}
@@ -95,14 +96,14 @@
testhelper.SetupHTTP()
defer testhelper.TeardownHTTP()
- v2 := &Version{ID: "v2.0", Priority: 2, Suffix: "/v2.0/"}
- v3 := &Version{ID: "v3.0", Priority: 3, Suffix: "/v3.0/"}
+ v2 := &utils.Version{ID: "v2.0", Priority: 2, Suffix: "/v2.0/"}
+ v3 := &utils.Version{ID: "v3.0", Priority: 3, Suffix: "/v3.0/"}
c := &gophercloud.ProviderClient{
IdentityBase: testhelper.Endpoint(),
IdentityEndpoint: testhelper.Endpoint() + "v2.0/",
}
- v, endpoint, err := ChooseVersion(c, []*Version{v2, v3})
+ v, endpoint, err := utils.ChooseVersion(c, []*utils.Version{v2, v3})
if err != nil {
t.Fatalf("Unexpected error from ChooseVersion: %v", err)
}
diff --git a/openstack/utils/testing/doc.go b/openstack/utils/testing/doc.go
new file mode 100644
index 0000000..7603f83
--- /dev/null
+++ b/openstack/utils/testing/doc.go
@@ -0,0 +1 @@
+package testing