rombert commented on code in PR #79:
URL:
https://github.com/apache/sling-org-apache-sling-engine/pull/79#discussion_r3452075120
##########
src/test/java/org/apache/sling/engine/impl/RequestProcessorMBeanImplTest.java:
##########
@@ -132,58 +132,64 @@ public void test_statistics() throws
NotCompliantMBeanException {
// is reinitialized
bean.resetStatistics();
- // Simulate a single request
- final long durationValue = min + random.nextInt(max - min);
- final int callCountValue = min + random.nextInt(max - min);
- final int peakRecursionDepthValue = min + random.nextInt(max - min);
+ final RequestData firstRequestDataAfterReset =
Mockito.mock(RequestData.class, "firstRequestDataAfterReset");
+
Mockito.when(firstRequestDataAfterReset.getElapsedTimeMsec()).thenReturn(100L);
+
Mockito.when(firstRequestDataAfterReset.getServletCallCount()).thenReturn(10);
+
Mockito.when(firstRequestDataAfterReset.getPeakRecusionDepth()).thenReturn(5);
- final RequestData requestData = Mockito.mock(RequestData.class,
"requestDataAfterReset");
-
Mockito.when(requestData.getElapsedTimeMsec()).thenReturn(durationValue);
-
Mockito.when(requestData.getServletCallCount()).thenReturn(callCountValue);
-
Mockito.when(requestData.getPeakRecusionDepth()).thenReturn(peakRecursionDepthValue);
+ final RequestData secondRequestDataAfterReset =
Mockito.mock(RequestData.class, "secondRequestDataAfterReset");
+
Mockito.when(secondRequestDataAfterReset.getElapsedTimeMsec()).thenReturn(200L);
+
Mockito.when(secondRequestDataAfterReset.getServletCallCount()).thenReturn(20);
+
Mockito.when(secondRequestDataAfterReset.getPeakRecusionDepth()).thenReturn(15);
- bean.addRequestData(requestData);
+ bean.addRequestData(firstRequestDataAfterReset);
- // As only one request has been simulated since resetStatiscts: min,
max and mean statistics should be equals to
- // the request data
assertEquals("After resetStatistics Number of requests must be one",
1, bean.getRequestsCount());
- assertEquals("After resetStatistics Min Duration must be equal",
bean.getMinRequestDurationMsec(), (long)
- durationValue);
- assertEquals("After resetStatistics Max Duration must be equal",
bean.getMaxRequestDurationMsec(), (long)
- durationValue);
+ assertEquals("After resetStatistics Min Duration must be equal", 100L,
bean.getMinRequestDurationMsec());
+ assertEquals("After resetStatistics Max Duration must be equal", 100L,
bean.getMaxRequestDurationMsec());
+ assertEquals("After resetStatistics Mean Duration must be equal",
100.0, bean.getMeanRequestDurationMsec(), 0d);
assertEquals(
- "After resetStatistics Mean Duration must be equal",
Review Comment:
Any particular reason to change the assertion? If you think this is
worthwile adding you can do that but keep the existing one as well.
##########
src/test/java/org/apache/sling/engine/impl/RequestProcessorMBeanImplTest.java:
##########
@@ -132,58 +132,64 @@ public void test_statistics() throws
NotCompliantMBeanException {
// is reinitialized
bean.resetStatistics();
- // Simulate a single request
- final long durationValue = min + random.nextInt(max - min);
- final int callCountValue = min + random.nextInt(max - min);
- final int peakRecursionDepthValue = min + random.nextInt(max - min);
+ final RequestData firstRequestDataAfterReset =
Mockito.mock(RequestData.class, "firstRequestDataAfterReset");
+
Mockito.when(firstRequestDataAfterReset.getElapsedTimeMsec()).thenReturn(100L);
+
Mockito.when(firstRequestDataAfterReset.getServletCallCount()).thenReturn(10);
+
Mockito.when(firstRequestDataAfterReset.getPeakRecusionDepth()).thenReturn(5);
- final RequestData requestData = Mockito.mock(RequestData.class,
"requestDataAfterReset");
-
Mockito.when(requestData.getElapsedTimeMsec()).thenReturn(durationValue);
-
Mockito.when(requestData.getServletCallCount()).thenReturn(callCountValue);
-
Mockito.when(requestData.getPeakRecusionDepth()).thenReturn(peakRecursionDepthValue);
+ final RequestData secondRequestDataAfterReset =
Mockito.mock(RequestData.class, "secondRequestDataAfterReset");
+
Mockito.when(secondRequestDataAfterReset.getElapsedTimeMsec()).thenReturn(200L);
+
Mockito.when(secondRequestDataAfterReset.getServletCallCount()).thenReturn(20);
+
Mockito.when(secondRequestDataAfterReset.getPeakRecusionDepth()).thenReturn(15);
- bean.addRequestData(requestData);
+ bean.addRequestData(firstRequestDataAfterReset);
- // As only one request has been simulated since resetStatiscts: min,
max and mean statistics should be equals to
- // the request data
assertEquals("After resetStatistics Number of requests must be one",
1, bean.getRequestsCount());
- assertEquals("After resetStatistics Min Duration must be equal",
bean.getMinRequestDurationMsec(), (long)
- durationValue);
- assertEquals("After resetStatistics Max Duration must be equal",
bean.getMaxRequestDurationMsec(), (long)
- durationValue);
+ assertEquals("After resetStatistics Min Duration must be equal", 100L,
bean.getMinRequestDurationMsec());
+ assertEquals("After resetStatistics Max Duration must be equal", 100L,
bean.getMaxRequestDurationMsec());
+ assertEquals("After resetStatistics Mean Duration must be equal",
100.0, bean.getMeanRequestDurationMsec(), 0d);
assertEquals(
- "After resetStatistics Mean Duration must be equal",
- bean.getMeanRequestDurationMsec(),
- (double) durationValue,
+ "After resetStatistics Standard Deviation Duration must be
zero",
+ 0.0,
+ bean.getStandardDeviationDurationMsec(),
0d);
+ assertEquals("After resetStatistics Min Servlet Call Count must be
equal", 10, bean.getMinServletCallCount());
+ assertEquals("After resetStatistics Max Servlet Call Count must be
equal", 10, bean.getMaxServletCallCount());
+ assertEquals("After resetStatistics Mean Servlet Call Count", 10.0,
bean.getMeanServletCallCount(), 0d);
assertEquals(
- "After resetStatistics Min Servlet Call Count must be equal",
- bean.getMinServletCallCount(),
- callCountValue);
- assertEquals(
- "After resetStatistics Max Servlet Call Count must be equal",
- bean.getMaxServletCallCount(),
- callCountValue);
- assertEquals(
- "After resetStatistics Mean Servlet Call Count",
- bean.getMeanServletCallCount(),
- (double) callCountValue,
+ "After resetStatistics Standard Deviation Servlet Call Count
must be zero",
+ 0.0,
+ bean.getStandardDeviationServletCallCount(),
0d);
assertEquals(
- "After resetStatistics Min Peak Recursion Depth must be equal",
- bean.getMinPeakRecursionDepth(),
- peakRecursionDepthValue);
+ "After resetStatistics Min Peak Recursion Depth must be
equal", 5, bean.getMinPeakRecursionDepth());
assertEquals(
- "After resetStatistics Max Peak Recursion Depth must be equal",
- bean.getMinPeakRecursionDepth(),
- peakRecursionDepthValue);
+ "After resetStatistics Max Peak Recursion Depth must be
equal", 5, bean.getMaxPeakRecursionDepth());
+ assertEquals("After resetStatistics Mean Peak Recursion Depth", 5.0,
bean.getMeanPeakRecursionDepth(), 0d);
assertEquals(
- "After resetStatistics Mean Peak Recursion Depth",
- bean.getMeanPeakRecursionDepth(),
- (double) peakRecursionDepthValue,
+ "After resetStatistics Standard Deviation Peak Recursion Depth
must be zero",
+ 0.0,
+ bean.getStandardDeviationPeakRecursionDepth(),
0d);
+
+ bean.addRequestData(secondRequestDataAfterReset);
+
+ assertEquals("After resetStatistics Number of requests must be two",
2, bean.getRequestsCount());
Review Comment:
Please changes these assertions to say "After processing second request"
instead of "After reseStatistics" since it's more accurate.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
