From 9a4f48708e4e5bd160cdb7bcc5a86624d5a38c12 Mon Sep 17 00:00:00 2001 From: Janne Valkealahti Date: Sun, 29 Oct 2017 15:55:24 +0000 Subject: [PATCH] Fix combatibility with boot 2.x - Change test runtime deps for RedisRule not to fail. - Fix metrics tests to align changes in boot's new micrometrics. - Fixes #410 - Fixes #418 --- spring-statemachine-data/build.gradle | 2 ++ .../src/test/java/demo/monitoring/MonitoringTests.java | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/spring-statemachine-data/build.gradle b/spring-statemachine-data/build.gradle index 44135ffe..e1ce251f 100644 --- a/spring-statemachine-data/build.gradle +++ b/spring-statemachine-data/build.gradle @@ -24,6 +24,8 @@ project('spring-statemachine-data-redis') { optional "org.eclipse.persistence:javax.persistence" testCompile project(path:":spring-statemachine-data-common", configuration:"testArtifacts") testCompile "org.springframework.boot:spring-boot-starter-test" + testRuntime "org.apache.commons:commons-pool2" + testRuntime "redis.clients:jedis" testRuntime "org.springframework.boot:spring-boot-starter-data-redis" testRuntime "org.springframework.boot:spring-boot-starter-web" } diff --git a/spring-statemachine-samples/monitoring/src/test/java/demo/monitoring/MonitoringTests.java b/spring-statemachine-samples/monitoring/src/test/java/demo/monitoring/MonitoringTests.java index 0cc14206..3d57cffc 100644 --- a/spring-statemachine-samples/monitoring/src/test/java/demo/monitoring/MonitoringTests.java +++ b/spring-statemachine-samples/monitoring/src/test/java/demo/monitoring/MonitoringTests.java @@ -16,6 +16,7 @@ package demo.monitoring; import static org.hamcrest.CoreMatchers.hasItems; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsInAnyOrder; @@ -84,9 +85,12 @@ public class MonitoringTests { perform(get("/application/metrics")). andExpect(jsonPath("$.names", hasItems("ssm.transition.duration", "ssm.transition.transit"))); mvc. - perform(get("/application/metrics/ssm.transition.duration")). - andDo(print()). - andExpect(jsonPath("$['ssmTransitionDuration.transitionname.INITIAL_S1']", notNullValue())); + perform(get("/application/metrics/ssm.transition.transit")). + andDo(print()). + andExpect(jsonPath("$.name", is("ssm.transition.transit"))). + andExpect(jsonPath("$.measurements[0].value", is(2.0))). + andExpect(jsonPath("$.availableTags[0].tag", is("transitionName"))). + andExpect(jsonPath("$.availableTags[0].values", hasItems("EXTERNAL_S1_S2","INITIAL_S1"))); } @Test