You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by ol...@apache.org on 2014/02/21 02:14:13 UTC
svn commit: r1570410 -
/incubator/sirona/trunk/agent/performance/web/src/test/java/org/apache/sirona/test/web/JspMonitoringTest.java
Author: olamy
Date: Fri Feb 21 01:14:13 2014
New Revision: 1570410
URL: http://svn.apache.org/r1570410
Log:
do not rely on order in this test
Modified:
incubator/sirona/trunk/agent/performance/web/src/test/java/org/apache/sirona/test/web/JspMonitoringTest.java
Modified: incubator/sirona/trunk/agent/performance/web/src/test/java/org/apache/sirona/test/web/JspMonitoringTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/performance/web/src/test/java/org/apache/sirona/test/web/JspMonitoringTest.java?rev=1570410&r1=1570409&r2=1570410&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/performance/web/src/test/java/org/apache/sirona/test/web/JspMonitoringTest.java (original)
+++ incubator/sirona/trunk/agent/performance/web/src/test/java/org/apache/sirona/test/web/JspMonitoringTest.java Fri Feb 21 01:14:13 2014
@@ -46,6 +46,7 @@ import java.net.URL;
import static org.apache.sirona.test.web.Clients.newClient;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
@RunWith(Arquillian.class)
public class JspMonitoringTest {
@@ -115,10 +116,18 @@ public class JspMonitoringTest {
assertEquals("Hello", newClient().getPage(testUrl + "?ignoredQuery=yes&ofcourse=itis").getWebResponse().getContentAsString());
assertFalse(Repository.INSTANCE.counters().isEmpty());
- final Counter counter = Repository.INSTANCE.counters().iterator().next();
- assertEquals(Role.JSP, counter.getKey().getRole());
- assertEquals(url.getPath() + "test.jsp", counter.getKey().getName());
- assertEquals(3, counter.getHits());
+
+ boolean jspCounterFound = false;
+
+ for (Counter counter : Repository.INSTANCE.counters()) {
+ if (counter.getKey().getRole().equals( Role.JSP )){
+ assertEquals(url.getPath() + "test.jsp", counter.getKey().getName());
+ assertEquals(3, counter.getHits());
+ jspCounterFound = true;
+ }
+ }
+ assertTrue("Jsp counter not found", jspCounterFound );
+
}
public static class RedirectServlet extends HttpServlet {