Merge pull request #103 from CJSCommonPlatform/dev/artemis-healthcheck

Upgrade framework and event-store versions and enhance HealthcheckIT …
CJSCommonPlatform · Nov 11, 2022 · 22445f0 · 22445f0
2 parents 5acb27d + 70005df
commit 22445f0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,7 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 - Bumped the base version of the project to 11.0.0 to match the framework libraries and show java 11 change  
 - Handled the move to the new Cloudsmith.io maven repository
 - Updated slf4j/log4j bridge jar from slf4j-log4j12 to slf4j-reload4j
+- Added Artemis healthcheck
 
 ### Added
 - Added support for feature toggling with an integration test showing it working

diff --git a/...e/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/HealthcheckIT.java b/...e/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/HealthcheckIT.java
@@ -2,6 +2,7 @@
 
 import static com.jayway.jsonassert.JsonAssert.with;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.hasItems;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static uk.gov.justice.services.example.cakeshop.it.params.CakeShopUris.HEALTHCHECK_URI;
 
@@ -31,9 +32,12 @@ public void shouldSuccessfullyCallHealthcheckServlet() throws Exception {
                 .get();
 
         final String healthcheckJson = response.readEntity(String.class);
-        LOGGER.info(healthcheckJson);
+        LOGGER.info("HealthcheckJSON: " + healthcheckJson);
 
         assertThat(response.getStatus(), is(200));
-        with(healthcheckJson).assertThat("$.allHealthchecksPassed", is(true));
+        with(healthcheckJson)
+                .assertThat("$.allHealthchecksPassed", is(true))
+                .assertThat("$.healthcheckRunDetails[*].healthcheckName", hasItems("system-database-healthcheck",
+                        "artemis-healthcheck", "event-store-healthcheck", "view-store-healthcheck", "file-store-healthcheck"));
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -35,8 +35,8 @@
         <wildfly.maven.plugin.version>3.2.0.Final</wildfly.maven.plugin.version>
 
         <framework-libraries.version>11.0.0-M23</framework-libraries.version>
-        <framework.version>11.0.0-M22</framework.version>
-        <event-store.version>11.0.0-M24</event-store.version>
+        <framework.version>11.0.0-M23</framework.version>
+        <event-store.version>11.0.0-M25</event-store.version>
     </properties>
 
     <dependencyManagement>