Identity Acceptance Test Cleanup (#49)
diff --git a/acceptance/openstack/identity/v2/extension_test.go b/acceptance/openstack/identity/v2/extension_test.go
index 23627dc..3e526f1 100644
--- a/acceptance/openstack/identity/v2/extension_test.go
+++ b/acceptance/openstack/identity/v2/extension_test.go
@@ -5,42 +5,42 @@
import (
"testing"
- extensions2 "github.com/gophercloud/gophercloud/openstack/identity/v2/extensions"
- "github.com/gophercloud/gophercloud/pagination"
- th "github.com/gophercloud/gophercloud/testhelper"
+ "github.com/gophercloud/gophercloud/acceptance/clients"
+ "github.com/gophercloud/gophercloud/acceptance/openstack"
+ "github.com/gophercloud/gophercloud/openstack/identity/v2/extensions"
)
-func TestEnumerateExtensions(t *testing.T) {
- service := authenticatedClient(t)
+func TestExtensionsList(t *testing.T) {
+ client, err := clients.NewIdentityV2Client()
+ if err != nil {
+ t.Fatalf("Unable to create an identity client: %v", err)
+ }
- t.Logf("Extensions available on this identity endpoint:")
- count := 0
- err := extensions2.List(service).EachPage(func(page pagination.Page) (bool, error) {
- t.Logf("--- Page %02d ---", count)
+ allPages, err := extensions.List(client).AllPages()
+ if err != nil {
+ t.Fatalf("Unable to list extensions: %v", err)
+ }
- extensions, err := extensions2.ExtractExtensions(page)
- th.AssertNoErr(t, err)
+ allExtensions, err := extensions.ExtractExtensions(allPages)
+ if err != nil {
+ t.Fatalf("Unable to extract extensions: %v", err)
+ }
- for i, ext := range extensions {
- t.Logf("[%02d] name=[%s] namespace=[%s]", i, ext.Name, ext.Namespace)
- t.Logf(" alias=[%s] updated=[%s]", ext.Alias, ext.Updated)
- t.Logf(" description=[%s]", ext.Description)
- }
-
- count++
- return true, nil
- })
- th.AssertNoErr(t, err)
+ for _, extension := range allExtensions {
+ openstack.PrintExtension(t, &extension)
+ }
}
-func TestGetExtension(t *testing.T) {
- service := authenticatedClient(t)
+func TestExtensionsGet(t *testing.T) {
+ client, err := clients.NewIdentityV2Client()
+ if err != nil {
+ t.Fatalf("Unable to create an identity client: %v", err)
+ }
- ext, err := extensions2.Get(service, "OS-KSCRUD").Extract()
- th.AssertNoErr(t, err)
+ extension, err := extensions.Get(client, "OS-KSCRUD").Extract()
+ if err != nil {
+ t.Fatalf("Unable to get extension OS-KSCRUD: %v", err)
+ }
- th.CheckEquals(t, "OpenStack Keystone User CRUD", ext.Name)
- th.CheckEquals(t, "http://docs.openstack.org/identity/api/ext/OS-KSCRUD/v1.0", ext.Namespace)
- th.CheckEquals(t, "OS-KSCRUD", ext.Alias)
- th.CheckEquals(t, "OpenStack extensions to Keystone v2.0 API enabling User Operations.", ext.Description)
+ openstack.PrintExtension(t, extension)
}