Use the date service to parse dates
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/f086c050 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/f086c050 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/f086c050 Branch: refs/heads/master Commit: f086c050f9061fc0de62b3eafcf9df90fdcb9d8c Parents: b2cc647 Author: Ignasi Barrera <[email protected]> Authored: Wed Jun 28 09:29:52 2017 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Wed Jun 28 09:29:52 2017 +0200 ---------------------------------------------------------------------- .../azurecompute/arm/features/MetricsApiMockTest.java | 11 ++++------- .../arm/internal/BaseAzureComputeApiMockTest.java | 3 +++ 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/f086c050/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/MetricsApiMockTest.java ---------------------------------------------------------------------- diff --git a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/MetricsApiMockTest.java b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/MetricsApiMockTest.java index c6e30c1..2001d19 100644 --- a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/MetricsApiMockTest.java +++ b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/MetricsApiMockTest.java @@ -19,9 +19,7 @@ package org.jclouds.azurecompute.arm.features; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import java.text.ParsePosition; -import java.text.SimpleDateFormat; -import java.util.Locale; +import java.util.Date; import org.jclouds.azurecompute.arm.domain.Metric; import org.jclouds.azurecompute.arm.domain.MetricData; @@ -41,11 +39,10 @@ public class MetricsApiMockTest extends BaseAzureComputeApiMockTest { public void testList() throws Exception { server.enqueue(jsonResponse("/metrics.json")); - final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US); final MetricsApi metricsApi = api.getMetricsApi(resourceId); - assertEquals(metricsApi.list(filter), ImmutableList.of(Metric.create(ImmutableList.of(MetricData - .create(dateFormat.parse("2017-06-01T07:14:00", new ParsePosition(0)), null, - Double.valueOf(0.295), null, null, null)), + Date timestamp = dateService.iso8601DateOrSecondsDateParse("2017-06-01T11:14:00Z"); + assertEquals(metricsApi.list(filter), ImmutableList.of(Metric.create( + ImmutableList.of(MetricData.create(timestamp, null, Double.valueOf(0.295), null, null, null)), "/subscriptions/SUBSCRIPTIONID/resourceGroups/myresourcegroup/providers" + "/Microsoft.Compute/virtualMachines/myvm/providers/Microsoft.Insights/metrics/Percentage CPU", MetricName.create("Percentage CPU", "Percentage CPU"), "Microsoft.Insights/metrics", "Percent"))); http://git-wip-us.apache.org/repos/asf/jclouds/blob/f086c050/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/BaseAzureComputeApiMockTest.java ---------------------------------------------------------------------- diff --git a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/BaseAzureComputeApiMockTest.java b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/BaseAzureComputeApiMockTest.java index dc4ad28..f704e5f 100644 --- a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/BaseAzureComputeApiMockTest.java +++ b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/BaseAzureComputeApiMockTest.java @@ -28,6 +28,7 @@ import org.jclouds.ContextBuilder; import org.jclouds.azurecompute.arm.AzureComputeApi; import org.jclouds.azurecompute.arm.AzureComputeProviderMetadata; import org.jclouds.concurrent.config.ExecutorServiceModule; +import org.jclouds.date.DateService; import org.jclouds.rest.ApiContext; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -52,6 +53,7 @@ public class BaseAzureComputeApiMockTest { protected MockWebServer server; protected AzureComputeApi api; protected ApiContext<AzureComputeApi> context; + protected DateService dateService; // So that we can ignore formatting. private final JsonParser parser = new JsonParser(); @@ -68,6 +70,7 @@ public class BaseAzureComputeApiMockTest { .overrides(setupProperties()) .build(); api = context.getApi(); + dateService = context.utils().injector().getInstance(DateService.class); } protected Properties setupProperties() {
