Repository: jclouds
Updated Branches:
  refs/heads/master 0cf13c61e -> d83282ca5


http://git-wip-us.apache.org/repos/asf/jclouds/blob/d83282ca/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/FlavorApiExpectTest.java
----------------------------------------------------------------------
diff --git 
a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/FlavorApiExpectTest.java
 
b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/FlavorApiExpectTest.java
index dae8dd7..df6b0bc 100644
--- 
a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/FlavorApiExpectTest.java
+++ 
b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/FlavorApiExpectTest.java
@@ -17,8 +17,6 @@
 package org.jclouds.openstack.trove.v1.features;
 
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
 
 import java.net.URI;
 import java.util.Set;
@@ -49,19 +47,6 @@ public class FlavorApiExpectTest extends 
BaseTroveApiExpectTest {
       assertEquals(flavors.iterator().next().getRam(), 512);
    }
 
-   public void testListFlavorsFail() {
-      URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/flavors";);
-      FlavorApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().endpoint(endpoint).build(),
-            HttpResponse.builder().statusCode(404).build()
-      ).getFlavorApi("RegionOne");
-
-      Set<? extends Flavor> flavors = api.list().toSet();
-      assertTrue(flavors.isEmpty());
-   }
-
    public void testGetFlavor() {
       URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/flavors/1";);
       FlavorApi api = requestsSendResponses(
@@ -79,31 +64,20 @@ public class FlavorApiExpectTest extends 
BaseTroveApiExpectTest {
    }
 
    public void testGetFlavorByAccountId() {
-             URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/flavors/40806637803162";);
-             TroveApi troveApi = requestsSendResponses(
-               keystoneAuthWithUsernameAndPasswordAndTenantName,
-               responseWithKeystoneAccess,
-               authenticatedGET().endpoint(endpoint).build(),
-               
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/flavor_list.json")).build()
 );
-             FlavorApi api = troveApi.getFlavorApi("RegionOne");
-
-             Set<? extends Flavor> flavors = 
api.list(troveApi.getCurrentTenantId().get().getId() ).toSet();
-             Flavor flavor = flavors.iterator().next();
-             assertEquals(flavor.getName(), "512MB Instance");
-             assertEquals(flavor.getId(), 1);
-             assertEquals(flavor.getRam(), 512);
-             assertEquals(flavor.getLinks().size(), 2);
-          }
+      URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/flavors/40806637803162";);
+      TroveApi troveApi = requestsSendResponses(
+      keystoneAuthWithUsernameAndPasswordAndTenantName,
+      responseWithKeystoneAccess,
+      authenticatedGET().endpoint(endpoint).build(),
+      
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/flavor_list.json")).build()
 );
+      FlavorApi api = troveApi.getFlavorApi("RegionOne");
 
-   public void testGetFlavorFail() {
-      URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/flavors/12312";);
-      FlavorApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().endpoint(endpoint).build(),
-            HttpResponse.builder().statusCode(404).build()
-      ).getFlavorApi("RegionOne");
-
-      assertNull(api.get(12312));
+      Set<? extends Flavor> flavors = 
api.list(troveApi.getCurrentTenantId().get().getId() ).toSet();
+      Flavor flavor = flavors.iterator().next();
+      assertEquals(flavor.getName(), "512MB Instance");
+      assertEquals(flavor.getId(), 1);
+      assertEquals(flavor.getRam(), 512);
+      assertEquals(flavor.getLinks().size(), 2);
    }
+
 }

http://git-wip-us.apache.org/repos/asf/jclouds/blob/d83282ca/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/InstanceApiExpectTest.java
----------------------------------------------------------------------
diff --git 
a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/InstanceApiExpectTest.java
 
b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/InstanceApiExpectTest.java
index e7c2f04..2f79ba3 100644
--- 
a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/InstanceApiExpectTest.java
+++ 
b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/InstanceApiExpectTest.java
@@ -17,15 +17,16 @@
 package org.jclouds.openstack.trove.v1.features;
 
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
+
 import java.net.URI;
 import java.util.Set;
+
 import javax.ws.rs.core.MediaType;
+
 import org.jclouds.http.HttpResponse;
 import org.jclouds.openstack.trove.v1.domain.Instance;
 import org.jclouds.openstack.trove.v1.internal.BaseTroveApiExpectTest;
-import org.jclouds.rest.ResourceNotFoundException;
 import org.testng.annotations.Test;
 
 /**
@@ -51,22 +52,6 @@ public class InstanceApiExpectTest extends 
BaseTroveApiExpectTest {
         assertEquals(instance.getName(), "json_rack_instance");  
     }
     
-    @Test(expectedExceptions = ResourceNotFoundException.class)
-    public void testCreateInstanceFail() {
-        URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances";);
-        InstanceApi api = requestsSendResponses(
-                keystoneAuthWithUsernameAndPasswordAndTenantName,
-                responseWithKeystoneAccess,
-                authenticatedGET().endpoint(endpoint) // bad naming 
convention, you should not be able to change the method to POST
-                .method("POST")
-                
.payload(payloadFromResourceWithContentType("/instance_create_request.json", 
MediaType.APPLICATION_JSON))
-                .build(),
-                
HttpResponse.builder().statusCode(404).payload(payloadFromResource("/instance_create.json")).build()
 // response
-                ).getInstanceApi("RegionOne");
-
-        api.create("1", 2, "json_rack_instance");
-    }
-    
     public void testDeleteInstance() {
         URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/098653ba-218b-47ce-936a-e0b749101f81";);
         InstanceApi api = requestsSendResponses(
@@ -79,19 +64,6 @@ public class InstanceApiExpectTest extends 
BaseTroveApiExpectTest {
         assertTrue( api.delete("098653ba-218b-47ce-936a-e0b749101f81") );
     }
     
-    public void testDeleteInstanceFail() {
-        URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/098653ba-218b-47ce-936a-e0b749101f81";);
-        InstanceApi api = requestsSendResponses(
-                keystoneAuthWithUsernameAndPasswordAndTenantName,
-                responseWithKeystoneAccess,
-                authenticatedGET().endpoint(endpoint).method("DELETE").build(),
-                HttpResponse.builder().statusCode(404).build() // response
-                ).getInstanceApi("RegionOne");
-
-        assertTrue( !api.delete("098653ba-218b-47ce-936a-e0b749101f81") );
-    }
-
-   
    public void testListInstances() {
       URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances";);
       InstanceApi api = requestsSendResponses(
@@ -106,19 +78,6 @@ public class InstanceApiExpectTest extends 
BaseTroveApiExpectTest {
       assertEquals(instances.iterator().next().getSize(), 2);
    }
 
-   public void testListInstancesFail() {
-      URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances";);
-      InstanceApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().endpoint(endpoint).build(),
-            HttpResponse.builder().statusCode(404).build()
-      ).getInstanceApi("RegionOne");
-
-      Set<? extends Instance> instances = api.list().toSet();
-      assertTrue(instances.isEmpty());
-   }   
-
    public void testGetInstance() {
       URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/44b277eb-39be-4921-be31-3d61b43651d7";);
       InstanceApi api = requestsSendResponses(
@@ -135,18 +94,6 @@ public class InstanceApiExpectTest extends 
BaseTroveApiExpectTest {
       assertEquals(instance.getHostname(), 
"e09ad9a3f73309469cf1f43d11e79549caf9acf2.rackspaceclouddb.com");
    }
    
-   public void testGetInstanceFail() {
-      URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/12312";);
-      InstanceApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().endpoint(endpoint).build(),
-            HttpResponse.builder().statusCode(404).build()
-      ).getInstanceApi("RegionOne");
-
-      assertNull(api.get("12312"));
-   }  
-   
    public void testEnableRootOnInstance() {
        URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/44b277eb-39be-4921-be31-3d61b43651d7/root";);
        InstanceApi api = requestsSendResponses(
@@ -160,19 +107,6 @@ public class InstanceApiExpectTest extends 
BaseTroveApiExpectTest {
        assertEquals(password, "12345");
     }
    
-   public void testEnableRootOnInstanceFail() {
-       URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/44b277eb-39be-4921-be31-3d61b43651d7/root";);
-       InstanceApi api = requestsSendResponses(
-             keystoneAuthWithUsernameAndPasswordAndTenantName,
-             responseWithKeystoneAccess,
-             authenticatedGET().method("POST").endpoint(endpoint).build(),
-             
HttpResponse.builder().statusCode(404).payload(payloadFromResource("/instance_root.json")).build()
-       ).getInstanceApi("RegionOne");
-
-       String password = 
api.enableRoot("44b277eb-39be-4921-be31-3d61b43651d7");
-       assertEquals(password, null);
-    }
-   
    public void testIsRootInstance() {
        URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/44b277eb-39be-4921-be31-3d61b43651d7/root";);
        InstanceApi api = requestsSendResponses(
@@ -199,17 +133,4 @@ public class InstanceApiExpectTest extends 
BaseTroveApiExpectTest {
        assertEquals(rooted.booleanValue(), false);
     }
    
-   @Test(expectedExceptions = ResourceNotFoundException.class)  
-   public void testIsRootInstanceFail() {
-       URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/44b277eb-39be-4921-be31-3d61b43651d7/root";);
-       InstanceApi api = requestsSendResponses(
-             keystoneAuthWithUsernameAndPasswordAndTenantName,
-             responseWithKeystoneAccess,
-             authenticatedGET().endpoint(endpoint).build(),
-             
HttpResponse.builder().statusCode(404).payload(payloadFromResource("/instance_is_rooted.json")).build()
-       ).getInstanceApi("RegionOne");
-
-       Boolean rooted = api.isRooted("44b277eb-39be-4921-be31-3d61b43651d7");
-       assertNull(rooted);
-    }
 }

http://git-wip-us.apache.org/repos/asf/jclouds/blob/d83282ca/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiExpectTest.java
----------------------------------------------------------------------
diff --git 
a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiExpectTest.java
 
b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiExpectTest.java
index 59a5a20..e1845c9 100644
--- 
a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiExpectTest.java
+++ 
b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiExpectTest.java
@@ -17,9 +17,7 @@
 package org.jclouds.openstack.trove.v1.features;
 
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.assertFalse;
 
 import java.net.URI;
 import java.util.List;
@@ -30,6 +28,7 @@ import javax.ws.rs.core.MediaType;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.openstack.trove.v1.domain.User;
 import org.jclouds.openstack.trove.v1.internal.BaseTroveApiExpectTest;
+import org.jclouds.rest.ResourceNotFoundException;
 import org.testng.annotations.Test;
 import org.testng.collections.Lists;
 
@@ -55,26 +54,9 @@ public class UserApiExpectTest extends 
BaseTroveApiExpectTest {
             HttpResponse.builder().statusCode(202).build() // response
             ).getUserApi("RegionOne", "instanceId-1234-5678");
 
-      boolean result = api.create("dbuser1", "password", "databaseA");
-      assertTrue(result);
+      api.create("dbuser1", "password", "databaseA");
    }
 
-   public void testCreateUserSimpleFail() {
-      URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users";);
-      UserApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().endpoint(endpoint) // bad naming convention, 
you should not be able to change the method to POST
-            .method("POST")
-            
.payload(payloadFromResourceWithContentType("/user_create_simple_request.json", 
MediaType.APPLICATION_JSON))
-            .build(),
-            HttpResponse.builder().statusCode(404).build() // response
-            ).getUserApi("RegionOne", "instanceId-1234-5678");
-
-      boolean result = api.create("dbuser1", "password", "databaseA");
-      assertFalse(result);
-   }
-   
    public void testCreateUserSimpleWithHost() {
       URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users";);
       UserApi api = requestsSendResponses(
@@ -87,26 +69,9 @@ public class UserApiExpectTest extends 
BaseTroveApiExpectTest {
             HttpResponse.builder().statusCode(202).build() // response
             ).getUserApi("RegionOne", "instanceId-1234-5678");
 
-      boolean result = api.create("dbuser1", "password", "192.168.64.64", 
"databaseA");
-      assertTrue(result);
+      api.create("dbuser1", "password", "192.168.64.64", "databaseA");
    }
    
-   public void testCreateUserSimpleWithHostFail() {
-      URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users";);
-      UserApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().endpoint(endpoint) // bad naming convention, 
you should not be able to change the method to POST
-            .method("POST")
-            
.payload(payloadFromResourceWithContentType("/user_create_with_host_simple_request.json",
 MediaType.APPLICATION_JSON))
-            .build(),
-            HttpResponse.builder().statusCode(404).build() // response
-            ).getUserApi("RegionOne", "instanceId-1234-5678");
-
-      boolean result = api.create("dbuser1", "password", "192.168.64.64", 
"databaseA");
-      assertFalse(result);
-   }
-
    public void testCreateUser() {
       URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users";);
       UserApi api = requestsSendResponses(
@@ -135,10 +100,10 @@ public class UserApiExpectTest extends 
BaseTroveApiExpectTest {
       users.add(user2);
       users.add(user3);
       
-      boolean result = 
api.create(ImmutableSortedSet.<User>naturalOrder().addAll(users).build());
-      assertTrue(result);
+      
api.create(ImmutableSortedSet.<User>naturalOrder().addAll(users).build());
    }
 
+   @Test(expectedExceptions = ResourceNotFoundException.class)
    public void testCreateUserFail() {
       URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users";);
       UserApi api = requestsSendResponses(
@@ -167,8 +132,7 @@ public class UserApiExpectTest extends 
BaseTroveApiExpectTest {
       users.add(user2);
       users.add(user3);
       
-      boolean result = api.create( 
ImmutableSortedSet.<User>naturalOrder().addAll(users).build());
-      assertFalse(result);
+      api.create( 
ImmutableSortedSet.<User>naturalOrder().addAll(users).build());
    }
 
    public void testGrantUserSimple() {
@@ -183,24 +147,7 @@ public class UserApiExpectTest extends 
BaseTroveApiExpectTest {
             HttpResponse.builder().statusCode(202).build() // response
             ).getUserApi("RegionOne", "instanceId-1234-5678");
 
-      boolean result = api.grant("dbuser1", "databaseZ");
-      assertTrue(result);
-   }
-
-   public void testGrantUserSimpleFail() {
-      URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1/databases";);
-      UserApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().endpoint(endpoint) // bad naming convention, 
you should not be able to change the method to POST
-            .method("PUT")
-            
.payload(payloadFromResourceWithContentType("/user_grant_simple_request.json", 
MediaType.APPLICATION_JSON))
-            .build(),
-            HttpResponse.builder().statusCode(404).build() // response
-            ).getUserApi("RegionOne", "instanceId-1234-5678");
-
-      boolean result = api.grant("dbuser1", "databaseZ");
-      assertFalse(result);
+      api.grant("dbuser1", "databaseZ");
    }
 
    public void testGrantUser() {
@@ -219,30 +166,9 @@ public class UserApiExpectTest extends 
BaseTroveApiExpectTest {
       databases.add( "databaseC" );
       databases.add( "databaseD" );
       
-      boolean result = api.grant("dbuser1", databases);
-      assertTrue(result);
+      api.grant("dbuser1", databases);
    }
 
-   public void testGrantUserFail() {
-      URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1/databases";);
-      UserApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().endpoint(endpoint) // bad naming convention, 
you should not be able to change the method to POST
-            .method("PUT")
-            
.payload(payloadFromResourceWithContentType("/user_grant_request.json", 
MediaType.APPLICATION_JSON))
-            .build(),
-            HttpResponse.builder().statusCode(404).build() // response
-            ).getUserApi("RegionOne", "instanceId-1234-5678");
-
-      List<String> databases = Lists.newArrayList();
-      databases.add( "databaseC" );
-      databases.add( "databaseD" );
-      
-      boolean result = api.grant("dbuser1", databases);
-      assertFalse(result);
-   }
-   
    public void testRevokeUser() {
       URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1/databases/databaseA";);
       UserApi api = requestsSendResponses(
@@ -261,24 +187,6 @@ public class UserApiExpectTest extends 
BaseTroveApiExpectTest {
       assertTrue(result);
    }
    
-   public void testRevokeUserFail() {
-      URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1/databases/databaseA";);
-      UserApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().endpoint(endpoint) // bad naming convention, 
you should not be able to change the method to POST
-            .method("DELETE")
-            .build(),
-            HttpResponse.builder().statusCode(404).build() // response
-            ).getUserApi("RegionOne", "instanceId-1234-5678");
-
-      Set<String> databases = Sets.newHashSet();
-      databases.add( "database" );
-      databases.add( "database" );
-      boolean result = api.revoke("dbuser1", "databaseA");
-      assertFalse(result);
-   }
-   
    public void testDeleteUser() {
       URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1";);
       UserApi api = requestsSendResponses(
@@ -297,24 +205,6 @@ public class UserApiExpectTest extends 
BaseTroveApiExpectTest {
       assertTrue(result);
    }
    
-   public void testDeleteUserFail() {
-      URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1";);
-      UserApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().endpoint(endpoint) // bad naming convention, 
you should not be able to change the method to POST
-            .method("DELETE")
-            .build(),
-            HttpResponse.builder().statusCode(404).build() // response
-            ).getUserApi("RegionOne", "instanceId-1234-5678");
-
-      Set<String> databases = Sets.newHashSet();
-      databases.add( "database" );
-      databases.add( "database" );
-      boolean result = api.delete("dbuser1");
-      assertFalse(result);
-   }
-   
    public void testListUsers() {
       URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users";);
       UserApi api = requestsSendResponses(
@@ -330,19 +220,6 @@ public class UserApiExpectTest extends 
BaseTroveApiExpectTest {
       assertEquals(users.iterator().next().getName(), "dbuser1");
    }
    
-   public void testListUsersFail() {
-      URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users";);
-      UserApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().endpoint(endpoint).build(),
-            
HttpResponse.builder().statusCode(404).payload(payloadFromResource("/trove_user_list.json")).build()
-      ).getUserApi("RegionOne", "instanceId-1234-5678");
-
-      Set<User> users = api.list().toSet();
-      assertTrue(users.isEmpty());
-   }
-   
    public void testUserGetDatabaseList() {
       URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1/databases";);
       UserApi api = requestsSendResponses(
@@ -357,19 +234,6 @@ public class UserApiExpectTest extends 
BaseTroveApiExpectTest {
       assertEquals(databases.iterator().next(), "databaseA");
    }
    
-   public void testUserGetDatabaseListFail() {
-      URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1/databases";);
-      UserApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().endpoint(endpoint).build(),
-            
HttpResponse.builder().statusCode(404).payload(payloadFromResource("/user_list_access.json")).build()
-      ).getUserApi("RegionOne", "instanceId-1234-5678");
-
-      Set<String> databases = api.getDatabaseList("dbuser1").toSet();
-      assertTrue(databases.isEmpty());
-   }
-   
    public void testGetUser() {
       URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/exampleuser";);
       UserApi api = requestsSendResponses(
@@ -386,19 +250,6 @@ public class UserApiExpectTest extends 
BaseTroveApiExpectTest {
       assertEquals(user.getDatabases().iterator().next(), "databaseA");
    }
    
-   public void testGetUserFail() {
-      URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/exampleuser";);
-      UserApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().endpoint(endpoint).build(),
-            
HttpResponse.builder().statusCode(404).payload(payloadFromResource("/user_get.json")).build()
-      ).getUserApi("RegionOne", "instanceId-1234-5678");
-
-      User user = api.get("exampleuser");
-      assertNull(user);
-   }
-   
    public void testGetUserWithHostname() {
       URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/example%2euser%40192%2e168%2e64%2e64";);
       UserApi api = requestsSendResponses(
@@ -416,16 +267,4 @@ public class UserApiExpectTest extends 
BaseTroveApiExpectTest {
       assertEquals(user.getDatabases().iterator().next(), "databaseA");
    }
    
-   public void testGetUserWithHostnameFail() {
-      URI endpoint = 
URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/example%2euser%40192%2e168%2e64%2e64";);
-      UserApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().endpoint(endpoint).build(),
-            
HttpResponse.builder().statusCode(404).payload(payloadFromResource("/user_get_withhost.json")).build()
-      ).getUserApi("RegionOne", "instanceId-1234-5678");
-
-      User user = api.get("example.user", "192.168.64.64");
-      assertNull(user);
-   }
 }

Reply via email to