From ddd00a20de591127ae8b030ef9f6ea5ea892971b Mon Sep 17 00:00:00 2001
From: Jeremy Daggett <jeremy.daggett@rackspace.com>
Date: Fri, 22 Aug 2014 20:19:27 -0700
Subject: [PATCH] Added assertion for versioned OpenStack extension APIs.
 Required for the Neutron v2 API.

---
 .../v2_0/internal/BaseOpenStackMockTest.java  | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/internal/BaseOpenStackMockTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/internal/BaseOpenStackMockTest.java
index da62c3689e..1ec2c620cb 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/internal/BaseOpenStackMockTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/internal/BaseOpenStackMockTest.java
@@ -133,7 +133,7 @@ public class BaseOpenStackMockTest<A extends Closeable> {
 
    /**
     * Get a string from a resource
-    * 
+    *
     * @param resourceName
     *           The name of the resource.
     * @return The content of the resource
@@ -157,14 +157,23 @@ public class BaseOpenStackMockTest<A extends Closeable> {
          Throwables.propagate(e);
       }
    }
-   
+
    /**
-    * Ensures server received authentication request.
+    * Ensures server received an extensions request. Most OpenStack APIs that expose an {@link ExtensionApi}
+    * should use this method.
     */
    public void assertExtensions(MockWebServer server) {
+      assertExtensions(server, "");
+   }
+
+   /**
+    * Ensures server received a <i>versioned</i> extensions request. This is necessary for testing APIs whose version
+    * is not included in the Endpoint's {@link Endpoint#getPublicURL() publicURL}.
+    */
+   public void assertExtensions(MockWebServer server, String path) {
       assertTrue(server.getRequestCount() >= 1);
       try {
-         assertEquals(server.takeRequest().getRequestLine(), "GET /extensions HTTP/1.1");
+         assertEquals(server.takeRequest().getRequestLine(), "GET " + path + "/extensions HTTP/1.1");
       } catch (InterruptedException e) {
          Throwables.propagate(e);
       }
@@ -172,7 +181,7 @@ public class BaseOpenStackMockTest<A extends Closeable> {
 
    /**
     * Ensures the request has a json header.
-    * 
+    *
     * @param request
     * @see RecordedRequest
     */
@@ -182,7 +191,7 @@ public class BaseOpenStackMockTest<A extends Closeable> {
 
    /**
     * Ensures the request has a json header for the proper REST methods.
-    * 
+    *
     * @param request
     * @param method
     *           The request method (such as GET).
@@ -198,7 +207,7 @@ public class BaseOpenStackMockTest<A extends Closeable> {
    /**
     * Ensures the request is json and has the same contents as the resource
     * file provided.
-    * 
+    *
     * @param request
     * @param method
     *           The request method (such as GET).