You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ab...@apache.org on 2013/08/02 16:57:58 UTC
[05/10] Remove async from gogrid
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/d4bf5112/providers/gogrid/src/test/java/org/jclouds/gogrid/services/GridServerAsyncClientTest.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/test/java/org/jclouds/gogrid/services/GridServerAsyncClientTest.java b/providers/gogrid/src/test/java/org/jclouds/gogrid/services/GridServerAsyncClientTest.java
deleted file mode 100644
index 23a9489..0000000
--- a/providers/gogrid/src/test/java/org/jclouds/gogrid/services/GridServerAsyncClientTest.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.gogrid.services;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.gogrid.domain.PowerCommand;
-import org.jclouds.gogrid.functions.ParseCredentialsFromJsonResponse;
-import org.jclouds.gogrid.functions.ParseOptionsFromJsonResponse;
-import org.jclouds.gogrid.options.GetServerListOptions;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code GridServerAsyncClient}
- *
- * @author Oleksiy Yarmula, Adrian Cole
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during surefire
-@Test(groups = "unit", testName = "GridServerAsyncClientTest")
-public class GridServerAsyncClientTest extends BaseGoGridAsyncClientTest<GridServerAsyncClient> {
-
- @Test
- public void testGetServerListWithOptions() throws NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(GridServerAsyncClient.class, "getServerList", GetServerListOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(
- new GetServerListOptions.Builder().onlySandboxServers()));
-
- assertRequestLineEquals(httpRequest,
- "GET https://api.gogrid.com/api/grid/server/list?v=1.6&isSandbox=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- httpRequest = (GeneratedHttpRequest) Iterables.getOnlyElement(httpRequest.getFilters()).filter(httpRequest);
-
- assertRequestLineEquals(httpRequest, "GET https://api.gogrid.com/api/grid/server/list?"
- + "v=1.6&isSandbox=true&sig=e9aafd0a5d4c69bb24536be4bce8a528&api_key=identity " + "HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
- }
-
- @Test
- public void testGetServersByName() throws NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(GridServerAsyncClient.class, "getServersByName", String[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("server1"));
-
- assertRequestLineEquals(httpRequest, "GET https://api.gogrid.com/api/grid/server/get?v=1.6&name=server1 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- httpRequest = (GeneratedHttpRequest) Iterables.getOnlyElement(httpRequest.getFilters()).filter(httpRequest);
-
- assertRequestLineEquals(httpRequest, "GET https://api.gogrid.com/api/grid/server/get?" + "v=1.6&name=server1&"
- + "sig=e9aafd0a5d4c69bb24536be4bce8a528&api_key=identity " + "HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
- }
-
- @Test
- public void testGetServersById() throws NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(GridServerAsyncClient.class, "getServersById", long[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(123L));
-
- assertRequestLineEquals(httpRequest, "GET https://api.gogrid.com/api/grid/server/get?v=1.6&id=123 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- httpRequest = (GeneratedHttpRequest) Iterables.getOnlyElement(httpRequest.getFilters()).filter(httpRequest);
-
- assertRequestLineEquals(httpRequest, "GET https://api.gogrid.com/api/grid/server/get?" + "v=1.6&id=123&"
- + "sig=e9aafd0a5d4c69bb24536be4bce8a528&api_key=identity " + "HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
- }
-
-
- @Test
- public void testPowerServer() throws NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(GridServerAsyncClient.class, "power", String.class, PowerCommand.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("PowerServer",
- PowerCommand.RESTART));
-
- assertRequestLineEquals(httpRequest, "GET https://api.gogrid.com/api/grid/server/power?v=1.6&"
- + "server=PowerServer&power=restart " + "HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, null);
-
- checkFilters(httpRequest);
- httpRequest = (GeneratedHttpRequest) Iterables.getOnlyElement(httpRequest.getFilters()).filter(httpRequest);
-
- assertRequestLineEquals(httpRequest, "GET https://api.gogrid.com/api/grid/server/power?v=1.6&"
- + "server=PowerServer&power=restart&" + "sig=e9aafd0a5d4c69bb24536be4bce8a528&api_key=identity " + "HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
- }
-
- @Test
- public void testDeleteByName() throws NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(GridServerAsyncClient.class, "deleteByName", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("PowerServer"));
-
- assertRequestLineEquals(httpRequest, "GET https://api.gogrid.com/api/grid/server/delete?v=1.6&"
- + "name=PowerServer " + "HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- httpRequest = (GeneratedHttpRequest) Iterables.getOnlyElement(httpRequest.getFilters()).filter(httpRequest);
-
- assertRequestLineEquals(httpRequest, "GET https://api.gogrid.com/api/grid/server/delete?v=1.6&"
- + "name=PowerServer&" + "sig=e9aafd0a5d4c69bb24536be4bce8a528&api_key=identity " + "HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
- }
-
- @Test
- public void testGetRamSizes() throws NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(GridServerAsyncClient.class, "getRamSizes");
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest, "GET https://api.gogrid.com/api/common/lookup/list?v=1.6&lookup=server.ram "
- + "HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseOptionsFromJsonResponse.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, null);
-
- checkFilters(httpRequest);
- httpRequest = (GeneratedHttpRequest) Iterables.getOnlyElement(httpRequest.getFilters()).filter(httpRequest);
-
- assertRequestLineEquals(httpRequest, "GET https://api.gogrid.com/api/common/lookup/list?v=1.6&lookup=server.ram&"
- + "sig=e9aafd0a5d4c69bb24536be4bce8a528&api_key=identity " + "HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
- }
-
- @Test
- public void testServerCredentials() throws NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(GridServerAsyncClient.class, "getServerCredentials", long.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(1));
-
- assertRequestLineEquals(httpRequest,
- "GET https://api.gogrid.com/api/support/grid/password/get?v=1.6&id=1 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseCredentialsFromJsonResponse.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, null);
- }
-
- @Test
- public void testTypes() throws NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(GridServerAsyncClient.class, "getTypes");
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET https://api.gogrid.com/api/common/lookup/list?v=1.6&lookup=server.type HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseOptionsFromJsonResponse.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, null);
- }
-
- @Test
- public void testEditServerDescription() throws NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(GridServerAsyncClient.class, "editServerDescription", long.class, String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(2, "newDesc"));
-
- assertRequestLineEquals(httpRequest, "GET https://api.gogrid.com/api/grid/server/edit?v=1.6&"
- + "id=2&description=newDesc HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, null);
-
- checkFilters(httpRequest);
- httpRequest = (GeneratedHttpRequest) Iterables.getOnlyElement(httpRequest.getFilters()).filter(httpRequest);
-
- assertRequestLineEquals(httpRequest, "GET https://api.gogrid.com/api/grid/server/edit?v=1.6&"
- + "id=2&description=newDesc&" + "sig=e9aafd0a5d4c69bb24536be4bce8a528&api_key=identity " + "HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
- }
-
- @Test
- public void testEditServerRam() throws NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(GridServerAsyncClient.class, "editServerRam", long.class, String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(2, "1GB"));
-
- assertRequestLineEquals(httpRequest, "GET https://api.gogrid.com/api/grid/server/edit?v=1.6&"
- + "id=2&server.ram=1GB HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, null);
-
- checkFilters(httpRequest);
- httpRequest = (GeneratedHttpRequest) Iterables.getOnlyElement(httpRequest.getFilters()).filter(httpRequest);
-
- assertRequestLineEquals(httpRequest, "GET https://api.gogrid.com/api/grid/server/edit?v=1.6&"
- + "id=2&server.ram=1GB&" + "sig=e9aafd0a5d4c69bb24536be4bce8a528&api_key=identity " + "HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
- }
-
- @Test
- public void testEditServerType() throws NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(GridServerAsyncClient.class, "editServerType", long.class, String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(2, "web"));
-
- assertRequestLineEquals(httpRequest, "GET https://api.gogrid.com/api/grid/server/edit?v=1.6&"
- + "id=2&server.type=web HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, null);
-
- checkFilters(httpRequest);
- httpRequest = (GeneratedHttpRequest) Iterables.getOnlyElement(httpRequest.getFilters()).filter(httpRequest);
-
- assertRequestLineEquals(httpRequest, "GET https://api.gogrid.com/api/grid/server/edit?v=1.6&"
- + "id=2&server.type=web&" + "sig=e9aafd0a5d4c69bb24536be4bce8a528&api_key=identity " + "HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/d4bf5112/providers/gogrid/src/test/java/org/jclouds/gogrid/services/GridServerClientExpectTest.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/test/java/org/jclouds/gogrid/services/GridServerClientExpectTest.java b/providers/gogrid/src/test/java/org/jclouds/gogrid/services/GridServerClientExpectTest.java
deleted file mode 100644
index e724512..0000000
--- a/providers/gogrid/src/test/java/org/jclouds/gogrid/services/GridServerClientExpectTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.gogrid.services;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
-
-import java.net.URI;
-
-import org.jclouds.gogrid.GoGridClient;
-import org.jclouds.gogrid.options.AddServerOptions;
-import org.jclouds.gogrid.options.GetServerListOptions;
-import org.jclouds.gogrid.parse.ParseServerListTest;
-import org.jclouds.gogrid.parse.ParseServerTest;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.rest.ResourceNotFoundException;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Adrian Cole
- */
-@Test(groups = "unit", testName = "GridServerClientExpectTest")
-public class GridServerClientExpectTest extends BaseGoGridRestClientExpectTest {
-
- HttpRequest addServer = HttpRequest.builder().method("GET")
- .endpoint("https://api.gogrid.com/api/grid/server/add")
- .addQueryParam("v", "1.6")
- .addQueryParam("name", "serverName")
- .addQueryParam("image", "img55")
- .addQueryParam("server.ram", "memory")
- .addQueryParam("ip", "127.0.0.1")
- .addQueryParam("sig", "e9aafd0a5d4c69bb24536be4bce8a528")
- .addQueryParam("api_key", "identity").build();
-
- public void testAddServerWhenResponseIs2xx() throws Exception {
- HttpResponse listGridServersResponse = HttpResponse.builder().statusCode(200).payload(
- payloadFromResourceWithContentType("/test_get_server_list.json", "application/json")).build();
-
- GoGridClient addServerWorked = requestSendsResponse(addServer, listGridServersResponse);
-
- assertEquals(addServerWorked.getServerServices().addServer("serverName", "img55", "memory", "127.0.0.1")
- .toString(), new ParseServerTest().expected().toString());
- }
-
- HttpRequest addServerOptions = HttpRequest.builder().method("GET")
- .endpoint("https://api.gogrid.com/api/grid/server/add")
- .addQueryParam("v", "1.6")
- .addQueryParam("name", "serverName")
- .addQueryParam("image", "img55")
- .addQueryParam("server.ram", "memory")
- .addQueryParam("ip", "127.0.0.1")
- .addQueryParam("isSandbox", "true")
- .addQueryParam("description", "fooy")
- .addQueryParam("sig", "e9aafd0a5d4c69bb24536be4bce8a528")
- .addQueryParam("api_key", "identity").build();
-
- public void testAddServerWithOptionsWhenResponseIs2xx() throws Exception {
- HttpResponse listGridServersResponse = HttpResponse.builder().statusCode(200).payload(
- payloadFromResourceWithContentType("/test_get_server_list.json", "application/json")).build();
-
- GoGridClient addServerWithOptionsWorked = requestSendsResponse(addServerOptions, listGridServersResponse);
-
- assertEquals(addServerWithOptionsWorked.getServerServices().addServer("serverName", "img55", "memory",
- "127.0.0.1", new AddServerOptions().asSandboxType().withDescription("fooy")).toString(),
- new ParseServerTest().expected().toString());
- }
-
- public void testGetServerListWhenResponseIs2xx() throws Exception {
- HttpRequest listGridServers = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://api.gogrid.com/api/grid/server/list?" + "v=1.6&"
- + "sig=e9aafd0a5d4c69bb24536be4bce8a528&api_key=identity")).build();
-
- HttpResponse listGridServersResponse = HttpResponse.builder().statusCode(200).payload(
- payloadFromResourceWithContentType("/test_get_server_list.json", "application/json")).build();
-
- GoGridClient clientWhenGridServersExist = requestSendsResponse(listGridServers, listGridServersResponse);
-
- assertEquals(clientWhenGridServersExist.getServerServices().getServerList().toString(), new ParseServerListTest()
- .expected().toString());
- }
-
- public void testGetServerListWhenReponseIs404IsEmpty() throws Exception {
- HttpRequest listGridServers = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://api.gogrid.com/api/grid/server/list?" + "v=1.6&"
- + "sig=e9aafd0a5d4c69bb24536be4bce8a528&api_key=identity")).build();
-
- HttpResponse listGridServersResponse = HttpResponse.builder().statusCode(404).payload(
- payloadFromResourceWithContentType("/test_error_handler.json", "application/json")).build();
-
- GoGridClient clientWhenNoGridServersExist = requestSendsResponse(listGridServers, listGridServersResponse);
-
- assertTrue(clientWhenNoGridServersExist.getServerServices().getServerList().isEmpty());
- }
-
- public void testGetServerListWithOptionsWhenResponseIs2xx() throws Exception {
- HttpRequest listGridServers = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://api.gogrid.com/api/grid/server/list?" + "v=1.6&isSandbox=true&"
- + "sig=e9aafd0a5d4c69bb24536be4bce8a528&api_key=identity")).build();
-
- HttpResponse listGridServersResponse = HttpResponse.builder().statusCode(200).payload(
- payloadFromResourceWithContentType("/test_get_server_list.json", "application/json")).build();
-
- GoGridClient clientWhenGridServersExist = requestSendsResponse(listGridServers, listGridServersResponse);
-
- assertEquals(clientWhenGridServersExist.getServerServices().getServerList(
- new GetServerListOptions.Builder().onlySandboxServers()).toString(), new ParseServerListTest()
- .expected().toString());
- }
-
- public void testGetServerCredentialsWhenNotFoundThrowsResourceNotFoundExceptionWithNiceMessage() throws Exception {
- HttpRequest listGridServers = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://api.gogrid.com/api/support/grid/password/get?" + "v=1.6&id=11&"
- + "sig=e9aafd0a5d4c69bb24536be4bce8a528&api_key=identity")).build();
-
- HttpResponse listGridServersResponse = HttpResponse.builder().statusCode(400).payload(
- payloadFromResourceWithContentType("/test_error_handler.json", "application/json")).build();
-
- GoGridClient clientWhenGridServersNotFound = requestSendsResponse(listGridServers, listGridServersResponse);
- try {
- clientWhenGridServersNotFound.getServerServices().getServerCredentials(11);
- fail("should have failed");
- } catch (ResourceNotFoundException e) {
- assertEquals(e.getMessage(), "No object found that matches your input criteria.");
- }
- }
-}