remove urls_test.go files
diff --git a/openstack/blockstorage/v1/apiversions/urls_test.go b/openstack/blockstorage/v1/apiversions/urls_test.go
deleted file mode 100644
index 9dd995c..0000000
--- a/openstack/blockstorage/v1/apiversions/urls_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package apiversions
-
-import (
- "testing"
-
- "github.com/gophercloud/gophercloud"
- th "github.com/gophercloud/gophercloud/testhelper"
-)
-
-const endpoint = "http://localhost:57909/"
-
-func endpointClient() *gophercloud.ServiceClient {
- return &gophercloud.ServiceClient{Endpoint: endpoint}
-}
-
-func TestGetURL(t *testing.T) {
- actual := getURL(endpointClient(), "v1")
- expected := endpoint + "v1/"
- th.AssertEquals(t, expected, actual)
-}
-
-func TestListURL(t *testing.T) {
- actual := listURL(endpointClient())
- expected := endpoint
- th.AssertEquals(t, expected, actual)
-}
diff --git a/openstack/blockstorage/v1/snapshots/urls_test.go b/openstack/blockstorage/v1/snapshots/urls_test.go
deleted file mode 100644
index a5d4fcf..0000000
--- a/openstack/blockstorage/v1/snapshots/urls_test.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package snapshots
-
-import (
- "testing"
-
- "github.com/gophercloud/gophercloud"
- th "github.com/gophercloud/gophercloud/testhelper"
-)
-
-const endpoint = "http://localhost:57909"
-
-func endpointClient() *gophercloud.ServiceClient {
- return &gophercloud.ServiceClient{Endpoint: endpoint}
-}
-
-func TestCreateURL(t *testing.T) {
- actual := createURL(endpointClient())
- expected := endpoint + "snapshots"
- th.AssertEquals(t, expected, actual)
-}
-
-func TestDeleteURL(t *testing.T) {
- actual := deleteURL(endpointClient(), "foo")
- expected := endpoint + "snapshots/foo"
- th.AssertEquals(t, expected, actual)
-}
-
-func TestGetURL(t *testing.T) {
- actual := getURL(endpointClient(), "foo")
- expected := endpoint + "snapshots/foo"
- th.AssertEquals(t, expected, actual)
-}
-
-func TestListURL(t *testing.T) {
- actual := listURL(endpointClient())
- expected := endpoint + "snapshots"
- th.AssertEquals(t, expected, actual)
-}
-
-func TestMetadataURL(t *testing.T) {
- actual := metadataURL(endpointClient(), "foo")
- expected := endpoint + "snapshots/foo/metadata"
- th.AssertEquals(t, expected, actual)
-}
-
-func TestUpdateMetadataURL(t *testing.T) {
- actual := updateMetadataURL(endpointClient(), "foo")
- expected := endpoint + "snapshots/foo/metadata"
- th.AssertEquals(t, expected, actual)
-}
diff --git a/openstack/blockstorage/v1/volumes/urls_test.go b/openstack/blockstorage/v1/volumes/urls_test.go
deleted file mode 100644
index 16b14cb..0000000
--- a/openstack/blockstorage/v1/volumes/urls_test.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package volumes
-
-import (
- "testing"
-
- "github.com/gophercloud/gophercloud"
- th "github.com/gophercloud/gophercloud/testhelper"
-)
-
-const endpoint = "http://localhost:57909"
-
-func endpointClient() *gophercloud.ServiceClient {
- return &gophercloud.ServiceClient{Endpoint: endpoint}
-}
-
-func TestCreateURL(t *testing.T) {
- actual := createURL(endpointClient())
- expected := endpoint + "volumes"
- th.AssertEquals(t, expected, actual)
-}
-
-func TestListURL(t *testing.T) {
- actual := listURL(endpointClient())
- expected := endpoint + "volumes"
- th.AssertEquals(t, expected, actual)
-}
-
-func TestDeleteURL(t *testing.T) {
- actual := deleteURL(endpointClient(), "foo")
- expected := endpoint + "volumes/foo"
- th.AssertEquals(t, expected, actual)
-}
-
-func TestGetURL(t *testing.T) {
- actual := getURL(endpointClient(), "foo")
- expected := endpoint + "volumes/foo"
- th.AssertEquals(t, expected, actual)
-}
-
-func TestUpdateURL(t *testing.T) {
- actual := updateURL(endpointClient(), "foo")
- expected := endpoint + "volumes/foo"
- th.AssertEquals(t, expected, actual)
-}
diff --git a/openstack/blockstorage/v1/volumetypes/urls_test.go b/openstack/blockstorage/v1/volumetypes/urls_test.go
deleted file mode 100644
index 39c4a9f..0000000
--- a/openstack/blockstorage/v1/volumetypes/urls_test.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package volumetypes
-
-import (
- "testing"
-
- "github.com/gophercloud/gophercloud"
- th "github.com/gophercloud/gophercloud/testhelper"
-)
-
-const endpoint = "http://localhost:57909"
-
-func endpointClient() *gophercloud.ServiceClient {
- return &gophercloud.ServiceClient{Endpoint: endpoint}
-}
-
-func TestListURL(t *testing.T) {
- actual := listURL(endpointClient())
- expected := endpoint + "types"
- th.AssertEquals(t, expected, actual)
-}
-
-func TestCreateURL(t *testing.T) {
- actual := createURL(endpointClient())
- expected := endpoint + "types"
- th.AssertEquals(t, expected, actual)
-}
-
-func TestGetURL(t *testing.T) {
- actual := getURL(endpointClient(), "foo")
- expected := endpoint + "types/foo"
- th.AssertEquals(t, expected, actual)
-}
-
-func TestDeleteURL(t *testing.T) {
- actual := deleteURL(endpointClient(), "foo")
- expected := endpoint + "types/foo"
- th.AssertEquals(t, expected, actual)
-}
diff --git a/openstack/common/extensions/urls_test.go b/openstack/common/extensions/urls_test.go
deleted file mode 100755
index 7ddfdf2..0000000
--- a/openstack/common/extensions/urls_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package extensions
-
-import (
- "testing"
-
- "github.com/gophercloud/gophercloud"
- th "github.com/gophercloud/gophercloud/testhelper"
-)
-
-const endpoint = "http://localhost:57909/"
-
-func endpointClient() *gophercloud.ServiceClient {
- return &gophercloud.ServiceClient{Endpoint: endpoint}
-}
-
-func TestExtensionURL(t *testing.T) {
- actual := ExtensionURL(endpointClient(), "agent")
- expected := endpoint + "extensions/agent"
- th.AssertEquals(t, expected, actual)
-}
-
-func TestListExtensionURL(t *testing.T) {
- actual := ListExtensionURL(endpointClient())
- expected := endpoint + "extensions"
- th.AssertEquals(t, expected, actual)
-}
diff --git a/openstack/compute/v2/extensions/bootfromvolume/urls_test.go b/openstack/compute/v2/extensions/bootfromvolume/urls_test.go
deleted file mode 100644
index 93d829b..0000000
--- a/openstack/compute/v2/extensions/bootfromvolume/urls_test.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package bootfromvolume
-
-import (
- "testing"
-
- th "github.com/gophercloud/gophercloud/testhelper"
- "github.com/gophercloud/gophercloud/testhelper/client"
-)
-
-func TestCreateURL(t *testing.T) {
- th.SetupHTTP()
- defer th.TeardownHTTP()
- c := client.ServiceClient()
-
- th.CheckEquals(t, c.Endpoint+"os-volumes_boot", createURL(c))
-}
diff --git a/openstack/compute/v2/extensions/floatingips/urls_test.go b/openstack/compute/v2/extensions/floatingips/urls_test.go
deleted file mode 100644
index ff1489e..0000000
--- a/openstack/compute/v2/extensions/floatingips/urls_test.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package floatingips
-
-import (
- "testing"
-
- th "github.com/gophercloud/gophercloud/testhelper"
- "github.com/gophercloud/gophercloud/testhelper/client"
-)
-
-func TestListURL(t *testing.T) {
- th.SetupHTTP()
- defer th.TeardownHTTP()
- c := client.ServiceClient()
-
- th.CheckEquals(t, c.Endpoint+"os-floating-ips", listURL(c))
-}
-
-func TestCreateURL(t *testing.T) {
- th.SetupHTTP()
- defer th.TeardownHTTP()
- c := client.ServiceClient()
-
- th.CheckEquals(t, c.Endpoint+"os-floating-ips", createURL(c))
-}
-
-func TestGetURL(t *testing.T) {
- th.SetupHTTP()
- defer th.TeardownHTTP()
- c := client.ServiceClient()
- id := "1"
-
- th.CheckEquals(t, c.Endpoint+"os-floating-ips/"+id, getURL(c, id))
-}
-
-func TestDeleteURL(t *testing.T) {
- th.SetupHTTP()
- defer th.TeardownHTTP()
- c := client.ServiceClient()
- id := "1"
-
- th.CheckEquals(t, c.Endpoint+"os-floating-ips/"+id, deleteURL(c, id))
-}
-
-func TestAssociateURL(t *testing.T) {
- th.SetupHTTP()
- defer th.TeardownHTTP()
- c := client.ServiceClient()
- serverId := "4d8c3732-a248-40ed-bebc-539a6ffd25c0"
-
- th.CheckEquals(t, c.Endpoint+"servers/"+serverId+"/action", associateURL(c, serverId))
-}
-
-func TestDisassociateURL(t *testing.T) {
- th.SetupHTTP()
- defer th.TeardownHTTP()
- c := client.ServiceClient()
- serverId := "4d8c3732-a248-40ed-bebc-539a6ffd25c0"
-
- th.CheckEquals(t, c.Endpoint+"servers/"+serverId+"/action", disassociateURL(c, serverId))
-}
diff --git a/openstack/compute/v2/extensions/keypairs/urls_test.go b/openstack/compute/v2/extensions/keypairs/urls_test.go
deleted file mode 100644
index b2e33e3..0000000
--- a/openstack/compute/v2/extensions/keypairs/urls_test.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package keypairs
-
-import (
- "testing"
-
- th "github.com/gophercloud/gophercloud/testhelper"
- "github.com/gophercloud/gophercloud/testhelper/client"
-)
-
-func TestListURL(t *testing.T) {
- th.SetupHTTP()
- defer th.TeardownHTTP()
- c := client.ServiceClient()
-
- th.CheckEquals(t, c.Endpoint+"os-keypairs", listURL(c))
-}
-
-func TestCreateURL(t *testing.T) {
- th.SetupHTTP()
- defer th.TeardownHTTP()
- c := client.ServiceClient()
-
- th.CheckEquals(t, c.Endpoint+"os-keypairs", createURL(c))
-}
-
-func TestGetURL(t *testing.T) {
- th.SetupHTTP()
- defer th.TeardownHTTP()
- c := client.ServiceClient()
-
- th.CheckEquals(t, c.Endpoint+"os-keypairs/wat", getURL(c, "wat"))
-}
-
-func TestDeleteURL(t *testing.T) {
- th.SetupHTTP()
- defer th.TeardownHTTP()
- c := client.ServiceClient()
-
- th.CheckEquals(t, c.Endpoint+"os-keypairs/wat", deleteURL(c, "wat"))
-}
diff --git a/openstack/compute/v2/extensions/networks/urls_test.go b/openstack/compute/v2/extensions/networks/urls_test.go
deleted file mode 100644
index d235a4d..0000000
--- a/openstack/compute/v2/extensions/networks/urls_test.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package networks
-
-import (
- "testing"
-
- th "github.com/gophercloud/gophercloud/testhelper"
- "github.com/gophercloud/gophercloud/testhelper/client"
-)
-
-func TestListURL(t *testing.T) {
- th.SetupHTTP()
- defer th.TeardownHTTP()
- c := client.ServiceClient()
-
- th.CheckEquals(t, c.Endpoint+"os-networks", listURL(c))
-}
-
-func TestGetURL(t *testing.T) {
- th.SetupHTTP()
- defer th.TeardownHTTP()
- c := client.ServiceClient()
- id := "1"
-
- th.CheckEquals(t, c.Endpoint+"os-networks/"+id, getURL(c, id))
-}
diff --git a/openstack/compute/v2/extensions/servergroups/urls_test.go b/openstack/compute/v2/extensions/servergroups/urls_test.go
deleted file mode 100644
index b61978d..0000000
--- a/openstack/compute/v2/extensions/servergroups/urls_test.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package servergroups
-
-import (
- "testing"
-
- th "github.com/gophercloud/gophercloud/testhelper"
- "github.com/gophercloud/gophercloud/testhelper/client"
-)
-
-func TestListURL(t *testing.T) {
- th.SetupHTTP()
- defer th.TeardownHTTP()
- c := client.ServiceClient()
-
- th.CheckEquals(t, c.Endpoint+"os-server-groups", listURL(c))
-}
-
-func TestCreateURL(t *testing.T) {
- th.SetupHTTP()
- defer th.TeardownHTTP()
- c := client.ServiceClient()
-
- th.CheckEquals(t, c.Endpoint+"os-server-groups", createURL(c))
-}
-
-func TestGetURL(t *testing.T) {
- th.SetupHTTP()
- defer th.TeardownHTTP()
- c := client.ServiceClient()
- id := "1"
-
- th.CheckEquals(t, c.Endpoint+"os-server-groups/"+id, getURL(c, id))
-}
-
-func TestDeleteURL(t *testing.T) {
- th.SetupHTTP()
- defer th.TeardownHTTP()
- c := client.ServiceClient()
- id := "1"
-
- th.CheckEquals(t, c.Endpoint+"os-server-groups/"+id, deleteURL(c, id))
-}
diff --git a/openstack/compute/v2/extensions/tenantnetworks/urls_test.go b/openstack/compute/v2/extensions/tenantnetworks/urls_test.go
deleted file mode 100644
index 8152f2f..0000000
--- a/openstack/compute/v2/extensions/tenantnetworks/urls_test.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package tenantnetworks
-
-import (
- "testing"
-
- th "github.com/gophercloud/gophercloud/testhelper"
- "github.com/gophercloud/gophercloud/testhelper/client"
-)
-
-func TestListURL(t *testing.T) {
- th.SetupHTTP()
- defer th.TeardownHTTP()
- c := client.ServiceClient()
-
- th.CheckEquals(t, c.Endpoint+"os-tenant-networks", listURL(c))
-}
-
-func TestGetURL(t *testing.T) {
- th.SetupHTTP()
- defer th.TeardownHTTP()
- c := client.ServiceClient()
- id := "1"
-
- th.CheckEquals(t, c.Endpoint+"os-tenant-networks/"+id, getURL(c, id))
-}
diff --git a/openstack/compute/v2/extensions/volumeattach/urls_test.go b/openstack/compute/v2/extensions/volumeattach/urls_test.go
deleted file mode 100644
index 7ccf3b0..0000000
--- a/openstack/compute/v2/extensions/volumeattach/urls_test.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package volumeattach
-
-import (
- "testing"
-
- th "github.com/gophercloud/gophercloud/testhelper"
- "github.com/gophercloud/gophercloud/testhelper/client"
-)
-
-func TestListURL(t *testing.T) {
- th.SetupHTTP()
- defer th.TeardownHTTP()
- c := client.ServiceClient()
- serverId := "4d8c3732-a248-40ed-bebc-539a6ffd25c0"
-
- th.CheckEquals(t, c.Endpoint+"servers/"+serverId+"/os-volume_attachments", listURL(c, serverId))
-}
-
-func TestCreateURL(t *testing.T) {
- th.SetupHTTP()
- defer th.TeardownHTTP()
- c := client.ServiceClient()
- serverId := "4d8c3732-a248-40ed-bebc-539a6ffd25c0"
-
- th.CheckEquals(t, c.Endpoint+"servers/"+serverId+"/os-volume_attachments", createURL(c, serverId))
-}
-
-func TestGetURL(t *testing.T) {
- th.SetupHTTP()
- defer th.TeardownHTTP()
- c := client.ServiceClient()
- serverId := "4d8c3732-a248-40ed-bebc-539a6ffd25c0"
- aId := "a26887c6-c47b-4654-abb5-dfadf7d3f804"
-
- th.CheckEquals(t, c.Endpoint+"servers/"+serverId+"/os-volume_attachments/"+aId, getURL(c, serverId, aId))
-}
-
-func TestDeleteURL(t *testing.T) {
- th.SetupHTTP()
- defer th.TeardownHTTP()
- c := client.ServiceClient()
- serverId := "4d8c3732-a248-40ed-bebc-539a6ffd25c0"
- aId := "a26887c6-c47b-4654-abb5-dfadf7d3f804"
-
- th.CheckEquals(t, c.Endpoint+"servers/"+serverId+"/os-volume_attachments/"+aId, deleteURL(c, serverId, aId))
-}
diff --git a/openstack/compute/v2/flavors/urls_test.go b/openstack/compute/v2/flavors/urls_test.go
deleted file mode 100644
index aca434c..0000000
--- a/openstack/compute/v2/flavors/urls_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package flavors
-
-import (
- "testing"
-
- "github.com/gophercloud/gophercloud"
- th "github.com/gophercloud/gophercloud/testhelper"
-)
-
-const endpoint = "http://localhost:57909/"
-
-func endpointClient() *gophercloud.ServiceClient {
- return &gophercloud.ServiceClient{Endpoint: endpoint}
-}
-
-func TestGetURL(t *testing.T) {
- actual := getURL(endpointClient(), "foo")
- expected := endpoint + "flavors/foo"
- th.CheckEquals(t, expected, actual)
-}
-
-func TestListURL(t *testing.T) {
- actual := listURL(endpointClient())
- expected := endpoint + "flavors/detail"
- th.CheckEquals(t, expected, actual)
-}
diff --git a/openstack/compute/v2/images/urls_test.go b/openstack/compute/v2/images/urls_test.go
deleted file mode 100644
index 2f7b100..0000000
--- a/openstack/compute/v2/images/urls_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package images
-
-import (
- "testing"
-
- "github.com/gophercloud/gophercloud"
- th "github.com/gophercloud/gophercloud/testhelper"
-)
-
-const endpoint = "http://localhost:57909/"
-
-func endpointClient() *gophercloud.ServiceClient {
- return &gophercloud.ServiceClient{Endpoint: endpoint}
-}
-
-func TestGetURL(t *testing.T) {
- actual := getURL(endpointClient(), "foo")
- expected := endpoint + "images/foo"
- th.CheckEquals(t, expected, actual)
-}
-
-func TestListDetailURL(t *testing.T) {
- actual := listDetailURL(endpointClient())
- expected := endpoint + "images/detail"
- th.CheckEquals(t, expected, actual)
-}
diff --git a/openstack/compute/v2/servers/urls_test.go b/openstack/compute/v2/servers/urls_test.go
deleted file mode 100644
index 816f3fd..0000000
--- a/openstack/compute/v2/servers/urls_test.go
+++ /dev/null
@@ -1,68 +0,0 @@
-package servers
-
-import (
- "testing"
-
- "github.com/gophercloud/gophercloud"
- th "github.com/gophercloud/gophercloud/testhelper"
-)
-
-const endpoint = "http://localhost:57909"
-
-func endpointClient() *gophercloud.ServiceClient {
- return &gophercloud.ServiceClient{Endpoint: endpoint}
-}
-
-func TestCreateURL(t *testing.T) {
- actual := createURL(endpointClient())
- expected := endpoint + "servers"
- th.CheckEquals(t, expected, actual)
-}
-
-func TestListURL(t *testing.T) {
- actual := listURL(endpointClient())
- expected := endpoint + "servers"
- th.CheckEquals(t, expected, actual)
-}
-
-func TestListDetailURL(t *testing.T) {
- actual := listDetailURL(endpointClient())
- expected := endpoint + "servers/detail"
- th.CheckEquals(t, expected, actual)
-}
-
-func TestDeleteURL(t *testing.T) {
- actual := deleteURL(endpointClient(), "foo")
- expected := endpoint + "servers/foo"
- th.CheckEquals(t, expected, actual)
-}
-
-func TestGetURL(t *testing.T) {
- actual := getURL(endpointClient(), "foo")
- expected := endpoint + "servers/foo"
- th.CheckEquals(t, expected, actual)
-}
-
-func TestUpdateURL(t *testing.T) {
- actual := updateURL(endpointClient(), "foo")
- expected := endpoint + "servers/foo"
- th.CheckEquals(t, expected, actual)
-}
-
-func TestActionURL(t *testing.T) {
- actual := actionURL(endpointClient(), "foo")
- expected := endpoint + "servers/foo/action"
- th.CheckEquals(t, expected, actual)
-}
-
-func TestMetadatumURL(t *testing.T) {
- actual := metadatumURL(endpointClient(), "foo", "bar")
- expected := endpoint + "servers/foo/metadata/bar"
- th.CheckEquals(t, expected, actual)
-}
-
-func TestMetadataURL(t *testing.T) {
- actual := metadataURL(endpointClient(), "foo")
- expected := endpoint + "servers/foo/metadata"
- th.CheckEquals(t, expected, actual)
-}
diff --git a/openstack/identity/v3/endpoints/urls_test.go b/openstack/identity/v3/endpoints/urls_test.go
deleted file mode 100644
index 7d2b94f..0000000
--- a/openstack/identity/v3/endpoints/urls_test.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package endpoints
-
-import (
- "testing"
-
- "github.com/gophercloud/gophercloud"
-)
-
-func TestGetListURL(t *testing.T) {
- client := gophercloud.ServiceClient{Endpoint: "http://localhost:5000/v3/"}
- url := listURL(&client)
- if url != "http://localhost:5000/v3/endpoints" {
- t.Errorf("Unexpected list URL generated: [%s]", url)
- }
-}
-
-func TestGetEndpointURL(t *testing.T) {
- client := gophercloud.ServiceClient{Endpoint: "http://localhost:5000/v3/"}
- url := endpointURL(&client, "1234")
- if url != "http://localhost:5000/v3/endpoints/1234" {
- t.Errorf("Unexpected service URL generated: [%s]", url)
- }
-}
diff --git a/openstack/identity/v3/roles/urls_test.go b/openstack/identity/v3/roles/urls_test.go
deleted file mode 100644
index bf51f34..0000000
--- a/openstack/identity/v3/roles/urls_test.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package roles
-
-import (
- "testing"
-
- "github.com/gophercloud/gophercloud"
-)
-
-func TestListAssignmentsURL(t *testing.T) {
- client := gophercloud.ServiceClient{Endpoint: "http://localhost:5000/v3/"}
- url := listAssignmentsURL(&client)
- if url != "http://localhost:5000/v3/role_assignments" {
- t.Errorf("Unexpected list URL generated: [%s]", url)
- }
-}
diff --git a/openstack/identity/v3/services/urls_test.go b/openstack/identity/v3/services/urls_test.go
deleted file mode 100644
index 5ab7c70..0000000
--- a/openstack/identity/v3/services/urls_test.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package services
-
-import (
- "testing"
-
- "github.com/gophercloud/gophercloud"
-)
-
-func TestListURL(t *testing.T) {
- client := gophercloud.ServiceClient{Endpoint: "http://localhost:5000/v3/"}
- url := listURL(&client)
- if url != "http://localhost:5000/v3/services" {
- t.Errorf("Unexpected list URL generated: [%s]", url)
- }
-}
-
-func TestServiceURL(t *testing.T) {
- client := gophercloud.ServiceClient{Endpoint: "http://localhost:5000/v3/"}
- url := serviceURL(&client, "1234")
- if url != "http://localhost:5000/v3/services/1234" {
- t.Errorf("Unexpected service URL generated: [%s]", url)
- }
-}
diff --git a/openstack/identity/v3/tokens/urls_test.go b/openstack/identity/v3/tokens/urls_test.go
deleted file mode 100644
index bc919ea..0000000
--- a/openstack/identity/v3/tokens/urls_test.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package tokens
-
-import (
- "testing"
-
- "github.com/gophercloud/gophercloud"
- "github.com/gophercloud/gophercloud/testhelper"
-)
-
-func TestTokenURL(t *testing.T) {
- testhelper.SetupHTTP()
- defer testhelper.TeardownHTTP()
-
- client := gophercloud.ServiceClient{Endpoint: testhelper.Endpoint()}
-
- expected := testhelper.Endpoint() + "auth/tokens"
- actual := tokenURL(&client)
- if actual != expected {
- t.Errorf("Expected URL %s, but was %s", expected, actual)
- }
-}
diff --git a/openstack/networking/v2/apiversions/urls_test.go b/openstack/networking/v2/apiversions/urls_test.go
deleted file mode 100644
index 485a25f..0000000
--- a/openstack/networking/v2/apiversions/urls_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package apiversions
-
-import (
- "testing"
-
- "github.com/gophercloud/gophercloud"
- th "github.com/gophercloud/gophercloud/testhelper"
-)
-
-const endpoint = "http://localhost:57909/"
-
-func endpointClient() *gophercloud.ServiceClient {
- return &gophercloud.ServiceClient{Endpoint: endpoint}
-}
-
-func TestAPIVersionsURL(t *testing.T) {
- actual := apiVersionsURL(endpointClient())
- expected := endpoint
- th.AssertEquals(t, expected, actual)
-}
-
-func TestAPIInfoURL(t *testing.T) {
- actual := apiInfoURL(endpointClient(), "v2.0")
- expected := endpoint + "v2.0/"
- th.AssertEquals(t, expected, actual)
-}
diff --git a/openstack/networking/v2/networks/urls_test.go b/openstack/networking/v2/networks/urls_test.go
deleted file mode 100644
index 309a1a5..0000000
--- a/openstack/networking/v2/networks/urls_test.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package networks
-
-import (
- "testing"
-
- "github.com/gophercloud/gophercloud"
- th "github.com/gophercloud/gophercloud/testhelper"
-)
-
-const endpoint = "http://localhost:57909/"
-
-func endpointClient() *gophercloud.ServiceClient {
- return &gophercloud.ServiceClient{Endpoint: endpoint, ResourceBase: endpoint + "v2.0/"}
-}
-
-func TestGetURL(t *testing.T) {
- actual := getURL(endpointClient(), "foo")
- expected := endpoint + "v2.0/networks/foo"
- th.AssertEquals(t, expected, actual)
-}
-
-func TestCreateURL(t *testing.T) {
- actual := createURL(endpointClient())
- expected := endpoint + "v2.0/networks"
- th.AssertEquals(t, expected, actual)
-}
-
-func TestListURL(t *testing.T) {
- actual := createURL(endpointClient())
- expected := endpoint + "v2.0/networks"
- th.AssertEquals(t, expected, actual)
-}
-
-func TestDeleteURL(t *testing.T) {
- actual := deleteURL(endpointClient(), "foo")
- expected := endpoint + "v2.0/networks/foo"
- th.AssertEquals(t, expected, actual)
-}
diff --git a/openstack/networking/v2/ports/urls_test.go b/openstack/networking/v2/ports/urls_test.go
deleted file mode 100644
index 1ce7403..0000000
--- a/openstack/networking/v2/ports/urls_test.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package ports
-
-import (
- "testing"
-
- "github.com/gophercloud/gophercloud"
- th "github.com/gophercloud/gophercloud/testhelper"
-)
-
-const endpoint = "http://localhost:57909/"
-
-func endpointClient() *gophercloud.ServiceClient {
- return &gophercloud.ServiceClient{Endpoint: endpoint, ResourceBase: endpoint + "v2.0/"}
-}
-
-func TestListURL(t *testing.T) {
- actual := listURL(endpointClient())
- expected := endpoint + "v2.0/ports"
- th.AssertEquals(t, expected, actual)
-}
-
-func TestGetURL(t *testing.T) {
- actual := getURL(endpointClient(), "foo")
- expected := endpoint + "v2.0/ports/foo"
- th.AssertEquals(t, expected, actual)
-}
-
-func TestCreateURL(t *testing.T) {
- actual := createURL(endpointClient())
- expected := endpoint + "v2.0/ports"
- th.AssertEquals(t, expected, actual)
-}
-
-func TestUpdateURL(t *testing.T) {
- actual := updateURL(endpointClient(), "foo")
- expected := endpoint + "v2.0/ports/foo"
- th.AssertEquals(t, expected, actual)
-}
-
-func TestDeleteURL(t *testing.T) {
- actual := deleteURL(endpointClient(), "foo")
- expected := endpoint + "v2.0/ports/foo"
- th.AssertEquals(t, expected, actual)
-}
diff --git a/openstack/networking/v2/subnets/urls_test.go b/openstack/networking/v2/subnets/urls_test.go
deleted file mode 100644
index d33762f..0000000
--- a/openstack/networking/v2/subnets/urls_test.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package subnets
-
-import (
- "testing"
-
- "github.com/gophercloud/gophercloud"
- th "github.com/gophercloud/gophercloud/testhelper"
-)
-
-const endpoint = "http://localhost:57909/"
-
-func endpointClient() *gophercloud.ServiceClient {
- return &gophercloud.ServiceClient{Endpoint: endpoint, ResourceBase: endpoint + "v2.0/"}
-}
-
-func TestListURL(t *testing.T) {
- actual := listURL(endpointClient())
- expected := endpoint + "v2.0/subnets"
- th.AssertEquals(t, expected, actual)
-}
-
-func TestGetURL(t *testing.T) {
- actual := getURL(endpointClient(), "foo")
- expected := endpoint + "v2.0/subnets/foo"
- th.AssertEquals(t, expected, actual)
-}
-
-func TestCreateURL(t *testing.T) {
- actual := createURL(endpointClient())
- expected := endpoint + "v2.0/subnets"
- th.AssertEquals(t, expected, actual)
-}
-
-func TestUpdateURL(t *testing.T) {
- actual := updateURL(endpointClient(), "foo")
- expected := endpoint + "v2.0/subnets/foo"
- th.AssertEquals(t, expected, actual)
-}
-
-func TestDeleteURL(t *testing.T) {
- actual := deleteURL(endpointClient(), "foo")
- expected := endpoint + "v2.0/subnets/foo"
- th.AssertEquals(t, expected, actual)
-}
diff --git a/openstack/objectstorage/v1/accounts/urls_test.go b/openstack/objectstorage/v1/accounts/urls_test.go
deleted file mode 100644
index 5055c78..0000000
--- a/openstack/objectstorage/v1/accounts/urls_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package accounts
-
-import (
- "testing"
-
- "github.com/gophercloud/gophercloud"
- th "github.com/gophercloud/gophercloud/testhelper"
-)
-
-const endpoint = "http://localhost:57909/"
-
-func endpointClient() *gophercloud.ServiceClient {
- return &gophercloud.ServiceClient{Endpoint: endpoint}
-}
-
-func TestGetURL(t *testing.T) {
- actual := getURL(endpointClient())
- expected := endpoint
- th.CheckEquals(t, expected, actual)
-}
-
-func TestUpdateURL(t *testing.T) {
- actual := updateURL(endpointClient())
- expected := endpoint
- th.CheckEquals(t, expected, actual)
-}
diff --git a/openstack/objectstorage/v1/containers/urls_test.go b/openstack/objectstorage/v1/containers/urls_test.go
deleted file mode 100644
index 7d81a33..0000000
--- a/openstack/objectstorage/v1/containers/urls_test.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package containers
-
-import (
- "github.com/gophercloud/gophercloud"
- th "github.com/gophercloud/gophercloud/testhelper"
- "testing"
-)
-
-const endpoint = "http://localhost:57909/"
-
-func endpointClient() *gophercloud.ServiceClient {
- return &gophercloud.ServiceClient{Endpoint: endpoint}
-}
-
-func TestListURL(t *testing.T) {
- actual := listURL(endpointClient())
- expected := endpoint
- th.CheckEquals(t, expected, actual)
-}
-
-func TestCreateURL(t *testing.T) {
- actual := createURL(endpointClient(), "foo")
- expected := endpoint + "foo"
- th.CheckEquals(t, expected, actual)
-}
-
-func TestGetURL(t *testing.T) {
- actual := getURL(endpointClient(), "foo")
- expected := endpoint + "foo"
- th.CheckEquals(t, expected, actual)
-}
-
-func TestDeleteURL(t *testing.T) {
- actual := deleteURL(endpointClient(), "foo")
- expected := endpoint + "foo"
- th.CheckEquals(t, expected, actual)
-}
-
-func TestUpdateURL(t *testing.T) {
- actual := updateURL(endpointClient(), "foo")
- expected := endpoint + "foo"
- th.CheckEquals(t, expected, actual)
-}
diff --git a/openstack/objectstorage/v1/objects/urls_test.go b/openstack/objectstorage/v1/objects/urls_test.go
deleted file mode 100644
index dc5fac5..0000000
--- a/openstack/objectstorage/v1/objects/urls_test.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package objects
-
-import (
- "testing"
-
- "github.com/gophercloud/gophercloud"
- th "github.com/gophercloud/gophercloud/testhelper"
-)
-
-const endpoint = "http://localhost:57909/"
-
-func endpointClient() *gophercloud.ServiceClient {
- return &gophercloud.ServiceClient{Endpoint: endpoint}
-}
-
-func TestListURL(t *testing.T) {
- actual := listURL(endpointClient(), "foo")
- expected := endpoint + "foo"
- th.CheckEquals(t, expected, actual)
-}
-
-func TestCopyURL(t *testing.T) {
- actual := copyURL(endpointClient(), "foo", "bar")
- expected := endpoint + "foo/bar"
- th.CheckEquals(t, expected, actual)
-}
-
-func TestCreateURL(t *testing.T) {
- actual := createURL(endpointClient(), "foo", "bar")
- expected := endpoint + "foo/bar"
- th.CheckEquals(t, expected, actual)
-}
-
-func TestGetURL(t *testing.T) {
- actual := getURL(endpointClient(), "foo", "bar")
- expected := endpoint + "foo/bar"
- th.CheckEquals(t, expected, actual)
-}
-
-func TestDeleteURL(t *testing.T) {
- actual := deleteURL(endpointClient(), "foo", "bar")
- expected := endpoint + "foo/bar"
- th.CheckEquals(t, expected, actual)
-}
-
-func TestDownloadURL(t *testing.T) {
- actual := downloadURL(endpointClient(), "foo", "bar")
- expected := endpoint + "foo/bar"
- th.CheckEquals(t, expected, actual)
-}
-
-func TestUpdateURL(t *testing.T) {
- actual := updateURL(endpointClient(), "foo", "bar")
- expected := endpoint + "foo/bar"
- th.CheckEquals(t, expected, actual)
-}