diff --git a/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/internal/BaseCloudWatchAsyncApiExpectTest.java b/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/internal/BaseCloudWatchAsyncApiExpectTest.java deleted file mode 100644 index d549de7dfa..0000000000 --- a/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/internal/BaseCloudWatchAsyncApiExpectTest.java +++ /dev/null @@ -1,38 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.jclouds.cloudwatch.internal; - -import java.util.Properties; - -import org.jclouds.cloudwatch.CloudWatchAsyncApi; -import org.jclouds.http.HttpRequest; -import org.jclouds.http.HttpResponse; - -import com.google.common.base.Function; -import com.google.inject.Module; - -/** - * - * @author Adrian Cole - */ -public class BaseCloudWatchAsyncApiExpectTest extends BaseCloudWatchExpectTest { - public CloudWatchAsyncApi createClient(Function fn, Module module, Properties props) { - return createInjector(fn, module, props).getInstance(CloudWatchAsyncApi.class); - } -} diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPAsyncApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPAsyncApiExpectTest.java deleted file mode 100644 index 19f9d2da5a..0000000000 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPAsyncApiExpectTest.java +++ /dev/null @@ -1,197 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.jclouds.openstack.nova.v2_0.extensions; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; - -import org.jclouds.http.HttpRequest; -import org.jclouds.http.HttpResponse; -import org.jclouds.openstack.nova.v2_0.NovaAsyncApi; -import org.jclouds.openstack.nova.v2_0.internal.BaseNovaAsyncApiExpectTest; -import org.jclouds.openstack.nova.v2_0.parse.ParseFloatingIPListTest; -import org.jclouds.openstack.nova.v2_0.parse.ParseFloatingIPTest; -import org.testng.annotations.Test; - -import com.google.common.collect.ImmutableSet; - -/** - * Tests annotation parsing of {@code FloatingIPAsyncApi} - * - * @author Michael Arnold - */ -@Test(groups = "unit", testName = "FloatingIPAsyncApiExpectTest") -public class FloatingIPAsyncApiExpectTest extends BaseNovaAsyncApiExpectTest { - - public void testWhenNamespaceInExtensionsListFloatingIpPresent() throws Exception { - - NovaAsyncApi apiWhenExtensionNotInList = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse); - - assertEquals(apiWhenExtensionNotInList.getConfiguredZones(), ImmutableSet.of("az-1.region-a.geo-1", "az-2.region-a.geo-1", "az-3.region-a.geo-1")); - - assertTrue(apiWhenExtensionNotInList.getFloatingIPExtensionForZone("az-1.region-a.geo-1").isPresent()); - - } - - public void testWhenNamespaceNotInExtensionsListFloatingIpNotPresent() throws Exception { - - NovaAsyncApi apiWhenExtensionNotInList = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, unmatchedExtensionsOfNovaResponse); - - assertEquals(apiWhenExtensionNotInList.getConfiguredZones(), ImmutableSet.of("az-1.region-a.geo-1", "az-2.region-a.geo-1", "az-3.region-a.geo-1")); - - assertFalse(apiWhenExtensionNotInList.getFloatingIPExtensionForZone("az-1.region-a.geo-1").isPresent()); - - } - - public void testListFloatingIPsWhenResponseIs2xx() throws Exception { - HttpRequest list = HttpRequest - .builder() - .method("GET") - .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-floating-ips") - .addHeader("Accept", "application/json") - .addHeader("X-Auth-Token", authToken).build(); - - HttpResponse listResponse = HttpResponse.builder().statusCode(200) - .payload(payloadFromResource("/floatingip_list.json")).build(); - - NovaAsyncApi apiWhenFloatingIPsExist = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, list, listResponse); - - assertEquals(apiWhenFloatingIPsExist.getConfiguredZones(), ImmutableSet.of("az-1.region-a.geo-1", "az-2.region-a.geo-1", "az-3.region-a.geo-1")); - - assertEquals(apiWhenFloatingIPsExist.getFloatingIPExtensionForZone("az-1.region-a.geo-1").get().list().get() - .toString(), new ParseFloatingIPListTest().expected().toString()); - } - - public void testListFloatingIPsWhenResponseIs404() throws Exception { - HttpRequest list = HttpRequest - .builder() - .method("GET") - .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-floating-ips") - .addHeader("Accept", "application/json") - .addHeader("X-Auth-Token", authToken).build(); - - HttpResponse listResponse = HttpResponse.builder().statusCode(404).build(); - - NovaAsyncApi apiWhenNoServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, list, listResponse); - - assertTrue(apiWhenNoServersExist.getFloatingIPExtensionForZone("az-1.region-a.geo-1").get().list().get() - .isEmpty()); - } - - public void testGetFloatingIPWhenResponseIs2xx() throws Exception { - HttpRequest get = HttpRequest - .builder() - .method("GET") - .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-floating-ips/1") - .addHeader("Accept", "application/json") - .addHeader("X-Auth-Token", authToken).build(); - - HttpResponse getResponse = HttpResponse.builder().statusCode(200) - .payload(payloadFromResource("/floatingip_details.json")).build(); - - NovaAsyncApi apiWhenFloatingIPsExist = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, get, getResponse); - - assertEquals(apiWhenFloatingIPsExist.getFloatingIPExtensionForZone("az-1.region-a.geo-1").get().get("1").get() - .toString(), new ParseFloatingIPTest().expected().toString()); - } - - public void testGetFloatingIPWhenResponseIs404() throws Exception { - HttpRequest get = HttpRequest - .builder() - .method("GET") - .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-floating-ips/1") - .addHeader("Accept", "application/json") - .addHeader("X-Auth-Token", authToken).build(); - - HttpResponse getResponse = HttpResponse.builder().statusCode(404).build(); - - NovaAsyncApi apiWhenNoServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, get, getResponse); - - assertNull(apiWhenNoServersExist.getFloatingIPExtensionForZone("az-1.region-a.geo-1").get().get("1").get()); - } - - public void testAllocateWhenResponseIs2xx() throws Exception { - HttpRequest createFloatingIP = HttpRequest - .builder() - .method("POST") - .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-floating-ips") - .addHeader("Accept", "application/json") - .addHeader("X-Auth-Token", authToken) - .payload(payloadFromStringWithContentType("{}", "application/json")).build(); - - HttpResponse createFloatingIPResponse = HttpResponse.builder().statusCode(200) - .payload(payloadFromResource("/floatingip_details.json")).build(); - - NovaAsyncApi apiWhenFloatingIPsExist = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, createFloatingIP, - createFloatingIPResponse); - - assertEquals(apiWhenFloatingIPsExist.getFloatingIPExtensionForZone("az-1.region-a.geo-1").get().create().get() - .toString(), new ParseFloatingIPTest().expected().toString()); - - } - - public void testAllocateWhenResponseIs404() throws Exception { - HttpRequest createFloatingIP = HttpRequest - .builder() - .method("POST") - .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-floating-ips") - .addHeader("Accept", "application/json") - .addHeader("X-Auth-Token", authToken) - .payload(payloadFromStringWithContentType("{}", "application/json")).build(); - - HttpResponse createFloatingIPResponse = HttpResponse.builder().statusCode(404).build(); - - NovaAsyncApi apiWhenNoServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, createFloatingIP, - createFloatingIPResponse); - - assertNull(apiWhenNoServersExist.getFloatingIPExtensionForZone("az-1.region-a.geo-1").get().create().get()); - } - - public void testAllocateWithPoolNameWhenResponseIs2xx() throws Exception { - HttpRequest createFloatingIP = HttpRequest - .builder() - .method("POST") - .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-floating-ips") - .addHeader("Accept", "application/json") - .addHeader("X-Auth-Token", authToken) - .payload(payloadFromStringWithContentType("{\"pool\":\"myPool\"}", "application/json")).build(); - - HttpResponse createFloatingIPResponse = HttpResponse.builder().statusCode(200) - .payload(payloadFromResource("/floatingip_details.json")).build(); - - NovaAsyncApi apiWhenFloatingIPsExist = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, createFloatingIP, - createFloatingIPResponse); - - assertEquals(apiWhenFloatingIPsExist.getFloatingIPExtensionForZone("az-1.region-a.geo-1").get().allocateFromPool("myPool") - .get() - .toString(), new ParseFloatingIPTest().expected().toString()); - } - -} diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaAsyncApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaAsyncApiExpectTest.java deleted file mode 100644 index 182dfb8945..0000000000 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaAsyncApiExpectTest.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.jclouds.openstack.nova.v2_0.internal; - -import java.util.Properties; - -import org.jclouds.http.HttpRequest; -import org.jclouds.http.HttpResponse; -import org.jclouds.openstack.nova.v2_0.NovaAsyncApi; - -import com.google.common.base.Function; -import com.google.inject.Module; - -/** - * Base class for writing KeyStone Rest Api Expect tests - * - * @author Adrian Cole - */ -public class BaseNovaAsyncApiExpectTest extends BaseNovaExpectTest { - public NovaAsyncApi createClient(Function fn, Module module, Properties props) { - return createInjector(fn, module, props).getInstance(NovaAsyncApi.class); - } -} diff --git a/apis/sts/src/test/java/org/jclouds/sts/internal/BaseSTSAsyncApiExpectTest.java b/apis/sts/src/test/java/org/jclouds/sts/internal/BaseSTSAsyncApiExpectTest.java deleted file mode 100644 index e466fee86c..0000000000 --- a/apis/sts/src/test/java/org/jclouds/sts/internal/BaseSTSAsyncApiExpectTest.java +++ /dev/null @@ -1,38 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.jclouds.sts.internal; - -import java.util.Properties; - -import org.jclouds.http.HttpRequest; -import org.jclouds.http.HttpResponse; -import org.jclouds.sts.STSAsyncApi; - -import com.google.common.base.Function; -import com.google.inject.Module; - -/** - * - * @author Adrian Cole - */ -public class BaseSTSAsyncApiExpectTest extends BaseSTSExpectTest { - public STSAsyncApi createApi(Function fn, Module module, Properties props) { - return createInjector(fn, module, props).getInstance(STSAsyncApi.class); - } -}