You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by gh...@apache.org on 2017/05/08 08:39:10 UTC
svn commit: r1794296 -
/sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/it/HealthCheckServletIT.java
Author: ghenzler
Date: Mon May 8 08:39:10 2017
New Revision: 1794296
URL: http://svn.apache.org/viewvc?rev=1794296&view=rev
Log:
SLING-6834 IT fix
Modified:
sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/it/HealthCheckServletIT.java
Modified: sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/it/HealthCheckServletIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/it/HealthCheckServletIT.java?rev=1794296&r1=1794295&r2=1794296&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/it/HealthCheckServletIT.java (original)
+++ sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/it/HealthCheckServletIT.java Mon May 8 08:39:10 2017
@@ -109,10 +109,11 @@ public class HealthCheckServletIT {
Thread.sleep(50L);
}
- assertEquals("After adding configuration, expecting five servlets from " + packagePrefix, 6, countServletServices(packagePrefix));
+ int expectedServletCount = 6;
+ assertEquals("After adding configuration, expecting six servlets from " + packagePrefix, expectedServletCount, countServletServices(packagePrefix));
final List<String> paths = httpService.getPaths();
- assertEquals("Expecting six new servlet registration", pathsBefore + 6, paths.size());
- assertEquals("Expecting the HC servlet to be registered at " + path, path, paths.get(paths.size() - 6));
+ assertEquals("Expecting six new servlet registration", pathsBefore + expectedServletCount, paths.size());
+ assertEquals("Expecting the HC servlet to be registered at " + path, path, paths.get(paths.size() - 6)); // paths list is longer, use last entries in list
assertEquals("Expecting the HTML HC servlet to be registered at " + path + ".html", path + ".html", paths.get(paths.size() - 5));
assertEquals("Expecting the JSON HC servlet to be registered at " + path + ".json", path + ".json", paths.get(paths.size() - 4));
assertEquals("Expecting the JSONP HC servlet to be registered at " + path + ".jsonp", path + ".jsonp", paths.get(paths.size() - 3));