From a7aac88763d49b9364fccacdd343f550ce298ee1 Mon Sep 17 00:00:00 2001 From: Yao Zhao Date: Wed, 30 Sep 2020 02:14:14 -0700 Subject: [PATCH 1/2] Fixed failed testcases --- .../emf/model/MetricDirectiveTest.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/test/java/software/amazon/cloudwatchlogs/emf/model/MetricDirectiveTest.java b/src/test/java/software/amazon/cloudwatchlogs/emf/model/MetricDirectiveTest.java index 43b8f085..73a65775 100644 --- a/src/test/java/software/amazon/cloudwatchlogs/emf/model/MetricDirectiveTest.java +++ b/src/test/java/software/amazon/cloudwatchlogs/emf/model/MetricDirectiveTest.java @@ -19,12 +19,14 @@ import static org.junit.Assert.assertEquals; import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; import java.util.Arrays; import org.junit.Test; public class MetricDirectiveTest { - private ObjectMapper objectMapper = new ObjectMapper(); + private ObjectMapper objectMapper = + new ObjectMapper().configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true); @Test public void testDefaultNamespace() throws JsonProcessingException { @@ -33,7 +35,7 @@ public void testDefaultNamespace() throws JsonProcessingException { assertEquals( serializedMetricDirective, - "{\"Namespace\":\"aws-embedded-metrics\",\"Metrics\":[],\"Dimensions\":[[]]}"); + "{\"Dimensions\":[[]],\"Metrics\":[],\"Namespace\":\"aws-embedded-metrics\"}"); } @Test @@ -45,7 +47,7 @@ public void testSetNamespace() throws JsonProcessingException { assertEquals( serializedMetricDirective, - "{\"Namespace\":\"test-lambda-metrics\",\"Metrics\":[],\"Dimensions\":[[]]}"); + "{\"Dimensions\":[[]],\"Metrics\":[],\"Namespace\":\"test-lambda-metrics\"}"); } @Test @@ -57,7 +59,7 @@ public void testPutMetric() throws JsonProcessingException { assertEquals( serializedMetricDirective, - "{\"Namespace\":\"aws-embedded-metrics\",\"Metrics\":[{\"Name\":\"Time\",\"Unit\":\"None\"}],\"Dimensions\":[[]]}"); + "{\"Dimensions\":[[]],\"Metrics\":[{\"Name\":\"Time\",\"Unit\":\"None\"}],\"Namespace\":\"aws-embedded-metrics\"}"); } @Test @@ -95,7 +97,7 @@ public void testPutDimensions() throws JsonProcessingException { assertEquals( serializedMetricDirective, - "{\"Namespace\":\"aws-embedded-metrics\",\"Metrics\":[],\"Dimensions\":[[\"Region\",\"Instance\"]]}"); + "{\"Dimensions\":[[\"Region\",\"Instance\"]],\"Metrics\":[],\"Namespace\":\"aws-embedded-metrics\"}"); } @Test @@ -108,7 +110,7 @@ public void testPutMultipleDimensionSets() throws JsonProcessingException { assertEquals( serializedMetricDirective, - "{\"Namespace\":\"aws-embedded-metrics\",\"Metrics\":[],\"Dimensions\":[[\"Region\"],[\"Instance\"]]}"); + "{\"Dimensions\":[[\"Region\"],[\"Instance\"]],\"Metrics\":[],\"Namespace\":\"aws-embedded-metrics\"}"); } @Test @@ -122,6 +124,6 @@ public void testPutDimensionsWhenDefaultDimensionsDefined() throws JsonProcessin assertEquals( serializedMetricDirective, - "{\"Namespace\":\"aws-embedded-metrics\",\"Metrics\":[],\"Dimensions\":[[\"Version\",\"Region\"],[\"Version\",\"Instance\"]]}"); + "{\"Dimensions\":[[\"Version\",\"Region\"],[\"Version\",\"Instance\"]],\"Metrics\":[],\"Namespace\":\"aws-embedded-metrics\"}"); } } From ce4bab814c88195d0aa64b1de1db4300f4159212 Mon Sep 17 00:00:00 2001 From: Yao Zhao Date: Wed, 30 Sep 2020 02:17:33 -0700 Subject: [PATCH 2/2] Bump up the reversion --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 827d85bd..346bf2f4 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ allprojects { targetCompatibility = '1.8' } - version = '1.0.0' + version = '1.0.1' } java {