mirror of https://github.com/apache/jclouds.git
Issue 695: Fixed ComputePoolResourceSummaryListJAXBParsingTest so it tests the correct thing
This commit is contained in:
parent
3e4531f347
commit
58fdef2fa8
|
@ -0,0 +1,138 @@
|
|||
/**
|
||||
* 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.tmrk.enterprisecloud.xml;
|
||||
|
||||
import com.google.common.base.Function;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.google.common.collect.Iterables;
|
||||
import com.google.inject.AbstractModule;
|
||||
import com.google.inject.Module;
|
||||
import com.google.inject.Provides;
|
||||
import org.jclouds.crypto.Crypto;
|
||||
import org.jclouds.date.internal.SimpleDateFormatDateService;
|
||||
import org.jclouds.http.HttpRequest;
|
||||
import org.jclouds.http.HttpResponse;
|
||||
import org.jclouds.http.functions.ParseSax;
|
||||
import org.jclouds.http.functions.ParseXMLWithJAXB;
|
||||
import org.jclouds.logging.config.NullLoggingModule;
|
||||
import org.jclouds.rest.AuthorizationException;
|
||||
import org.jclouds.rest.BaseRestClientTest;
|
||||
import org.jclouds.rest.RestContextSpec;
|
||||
import org.jclouds.rest.internal.RestAnnotationProcessor;
|
||||
import org.jclouds.tmrk.enterprisecloud.domain.Link;
|
||||
import org.jclouds.tmrk.enterprisecloud.domain.resource.ComputePoolCpuUsage;
|
||||
import org.jclouds.tmrk.enterprisecloud.domain.resource.ComputePoolCpuUsageDetailSummaryEntry;
|
||||
import org.jclouds.tmrk.enterprisecloud.domain.resource.CpuUsageDetails;
|
||||
import org.jclouds.tmrk.enterprisecloud.features.ResourceAsyncClient;
|
||||
import org.testng.annotations.BeforeClass;
|
||||
import org.testng.annotations.BeforeMethod;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
import javax.inject.Named;
|
||||
import java.io.InputStream;
|
||||
import java.lang.reflect.Method;
|
||||
import java.net.URI;
|
||||
import java.util.Set;
|
||||
|
||||
import static org.jclouds.io.Payloads.newInputStreamPayload;
|
||||
import static org.jclouds.rest.RestContextFactory.contextSpec;
|
||||
import static org.jclouds.rest.RestContextFactory.createContextBuilder;
|
||||
import static org.testng.Assert.assertEquals;
|
||||
import static org.testng.Assert.assertNotNull;
|
||||
|
||||
/**
|
||||
* Tests behavior of JAXB parsing for ComputePoolCpuUsage
|
||||
*
|
||||
* @author Jason King
|
||||
*/
|
||||
@Test(groups = "unit", testName = "ComputePoolCpuUsageJAXBParsingTest")
|
||||
public class ComputePoolCpuUsageJAXBParsingTest extends BaseRestClientTest {
|
||||
|
||||
private SimpleDateFormatDateService dateService;
|
||||
@BeforeMethod
|
||||
public void setUp() {
|
||||
dateService = new SimpleDateFormatDateService();
|
||||
}
|
||||
|
||||
@BeforeClass
|
||||
void setupFactory() {
|
||||
RestContextSpec<String, Integer> contextSpec = contextSpec("test", "http://localhost:9999", "1", "", "userfoo",
|
||||
"credentialFoo", String.class, Integer.class,
|
||||
ImmutableSet.<Module>of(new MockModule(), new NullLoggingModule(), new AbstractModule() {
|
||||
|
||||
@Override
|
||||
protected void configure() {
|
||||
}
|
||||
|
||||
@SuppressWarnings("unused")
|
||||
@Provides
|
||||
@Named("exception")
|
||||
Set<String> exception() {
|
||||
throw new AuthorizationException();
|
||||
}
|
||||
|
||||
}));
|
||||
|
||||
injector = createContextBuilder(contextSpec).buildInjector();
|
||||
parserFactory = injector.getInstance(ParseSax.Factory.class);
|
||||
crypto = injector.getInstance(Crypto.class);
|
||||
}
|
||||
|
||||
public void testParseWithJAXB() throws Exception {
|
||||
|
||||
Method method = ResourceAsyncClient.class.getMethod("getComputePoolCpuUsage", URI.class);
|
||||
HttpRequest request = factory(ResourceAsyncClient.class).createRequest(method,new URI("/1"));
|
||||
assertResponseParserClassEquals(method, request, ParseXMLWithJAXB.class);
|
||||
|
||||
Function<HttpResponse, ComputePoolCpuUsage> parser = (Function<HttpResponse, ComputePoolCpuUsage>) RestAnnotationProcessor
|
||||
.createResponseParser(parserFactory, injector, method, request);
|
||||
|
||||
InputStream is = getClass().getResourceAsStream("/computePoolsCpuUsage.xml");
|
||||
ComputePoolCpuUsage cpuUsage = parser.apply(new HttpResponse(200, "ok", newInputStreamPayload(is)));
|
||||
|
||||
assertLinks(cpuUsage.getLinks());
|
||||
assertEquals(cpuUsage.getStartTime(), dateService.iso8601DateParse("2011-12-05T09:45:00.0Z"));
|
||||
assertEquals(cpuUsage.getEndTime(), dateService.iso8601DateParse("2011-12-06T09:45:00.0Z"));
|
||||
assertDetails(cpuUsage.getDetails());
|
||||
}
|
||||
|
||||
private void assertLinks(Set<Link> links) {
|
||||
assertEquals(links.size(),2);
|
||||
Link link = Iterables.get(links, 0);
|
||||
assertEquals(link.getName(),"Default Compute Pool");
|
||||
assertEquals(link.getRelationship(), Link.Relationship.UP);
|
||||
|
||||
Link link2 = Iterables.get(links, 1);
|
||||
assertEquals(link2.getHref(), URI.create("/cloudapi/ecloud/computepools/89/usage/cpu/details?time=2011-12-05t09%3a45%3a00z"));
|
||||
assertEquals(link2.getType(), "application/vnd.tmrk.cloud.computePoolCpuUsageDetail");
|
||||
assertEquals(link2.getRelationship(), Link.Relationship.DOWN);
|
||||
}
|
||||
|
||||
private void assertDetails(CpuUsageDetails details) {
|
||||
assertEquals(details.getEntries().size(), 7);
|
||||
for(ComputePoolCpuUsageDetailSummaryEntry entry: details.getEntries()) {
|
||||
assertDetail(entry);
|
||||
}
|
||||
}
|
||||
|
||||
private void assertDetail(ComputePoolCpuUsageDetailSummaryEntry entry) {
|
||||
assertNotNull(entry.getTime());
|
||||
assertNotNull(entry.getValue());
|
||||
}
|
||||
}
|
|
@ -90,7 +90,7 @@ public class ComputePoolResourceSummaryJAXBParsingTest extends BaseRestClientTes
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testParseLocationWithJAXB() throws Exception {
|
||||
public void testParseWithJAXB() throws Exception {
|
||||
Method method = ResourceAsyncClient.class.getMethod("getResourceSummary",URI.class);
|
||||
HttpRequest request = factory(ResourceAsyncClient.class).createRequest(method, new URI("/1"));
|
||||
assertResponseParserClassEquals(method, request, ParseXMLWithJAXB.class);
|
||||
|
|
|
@ -36,9 +36,7 @@ import org.jclouds.rest.BaseRestClientTest;
|
|||
import org.jclouds.rest.RestContextSpec;
|
||||
import org.jclouds.rest.internal.RestAnnotationProcessor;
|
||||
import org.jclouds.tmrk.enterprisecloud.domain.Link;
|
||||
import org.jclouds.tmrk.enterprisecloud.domain.resource.ComputePoolCpuUsage;
|
||||
import org.jclouds.tmrk.enterprisecloud.domain.resource.ComputePoolCpuUsageDetailSummaryEntry;
|
||||
import org.jclouds.tmrk.enterprisecloud.domain.resource.CpuUsageDetails;
|
||||
import org.jclouds.tmrk.enterprisecloud.domain.resource.ComputePoolResourceSummaryList;
|
||||
import org.jclouds.tmrk.enterprisecloud.features.ResourceAsyncClient;
|
||||
import org.testng.annotations.BeforeClass;
|
||||
import org.testng.annotations.BeforeMethod;
|
||||
|
@ -54,7 +52,6 @@ import static org.jclouds.io.Payloads.newInputStreamPayload;
|
|||
import static org.jclouds.rest.RestContextFactory.contextSpec;
|
||||
import static org.jclouds.rest.RestContextFactory.createContextBuilder;
|
||||
import static org.testng.Assert.assertEquals;
|
||||
import static org.testng.Assert.assertNotNull;
|
||||
|
||||
/**
|
||||
* Tests behavior of JAXB parsing for ComputePoolResourceSummaryList
|
||||
|
@ -94,45 +91,27 @@ public class ComputePoolResourceSummaryListJAXBParsingTest extends BaseRestClien
|
|||
crypto = injector.getInstance(Crypto.class);
|
||||
}
|
||||
|
||||
public void testParseTemplates() throws Exception {
|
||||
public void testParseWithJAXB() throws Exception {
|
||||
|
||||
Method method = ResourceAsyncClient.class.getMethod("getComputePoolCpuUsage", URI.class);
|
||||
Method method = ResourceAsyncClient.class.getMethod("getResourceSummaries", URI.class);
|
||||
HttpRequest request = factory(ResourceAsyncClient.class).createRequest(method,new URI("/1"));
|
||||
assertResponseParserClassEquals(method, request, ParseXMLWithJAXB.class);
|
||||
|
||||
Function<HttpResponse, ComputePoolCpuUsage> parser = (Function<HttpResponse, ComputePoolCpuUsage>) RestAnnotationProcessor
|
||||
Function<HttpResponse, ComputePoolResourceSummaryList> parser = (Function<HttpResponse, ComputePoolResourceSummaryList>) RestAnnotationProcessor
|
||||
.createResponseParser(parserFactory, injector, method, request);
|
||||
|
||||
InputStream is = getClass().getResourceAsStream("/computePoolsCpuUsage.xml");
|
||||
ComputePoolCpuUsage cpuUsage = parser.apply(new HttpResponse(200, "ok", newInputStreamPayload(is)));
|
||||
InputStream is = getClass().getResourceAsStream("/computePoolResourceSummaryList.xml");
|
||||
ComputePoolResourceSummaryList list = parser.apply(new HttpResponse(200, "ok", newInputStreamPayload(is)));
|
||||
|
||||
assertLinks(cpuUsage.getLinks());
|
||||
assertEquals(cpuUsage.getStartTime(), dateService.iso8601DateParse("2011-12-05T09:45:00.0Z"));
|
||||
assertEquals(cpuUsage.getEndTime(), dateService.iso8601DateParse("2011-12-06T09:45:00.0Z"));
|
||||
assertDetails(cpuUsage.getDetails());
|
||||
assertLinks(list.getLinks());
|
||||
// ComputePoolResourceSummary details are tested separately.
|
||||
assertEquals(list.getComputePoolResourceSummaries().size(),1);
|
||||
}
|
||||
|
||||
private void assertLinks(Set<Link> links) {
|
||||
assertEquals(links.size(),2);
|
||||
Link link = Iterables.get(links, 0);
|
||||
assertEquals(link.getName(),"Default Compute Pool");
|
||||
assertEquals(links.size(),1);
|
||||
Link link = Iterables.getOnlyElement(links);
|
||||
assertEquals(link.getName(),"Beta Environment 01");
|
||||
assertEquals(link.getRelationship(), Link.Relationship.UP);
|
||||
|
||||
Link link2 = Iterables.get(links, 1);
|
||||
assertEquals(link2.getHref(), URI.create("/cloudapi/ecloud/computepools/89/usage/cpu/details?time=2011-12-05t09%3a45%3a00z"));
|
||||
assertEquals(link2.getType(), "application/vnd.tmrk.cloud.computePoolCpuUsageDetail");
|
||||
assertEquals(link2.getRelationship(), Link.Relationship.DOWN);
|
||||
}
|
||||
|
||||
private void assertDetails(CpuUsageDetails details) {
|
||||
assertEquals(details.getEntries().size(), 7);
|
||||
for(ComputePoolCpuUsageDetailSummaryEntry entry: details.getEntries()) {
|
||||
assertDetail(entry);
|
||||
}
|
||||
}
|
||||
|
||||
private void assertDetail(ComputePoolCpuUsageDetailSummaryEntry entry) {
|
||||
assertNotNull(entry.getTime());
|
||||
assertNotNull(entry.getValue());
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue