<html><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">I've made a few changes to the ReplListener helper class that lives in the test harness. The ReplListener can now be constructed to eagerly listen for commands, and reconciliate these with expectations set in expect() so that commands seen between construction of the listener and calling expect() are also recorded and noted.<div><br></div><div>Enjoy!</div><div>Manik<br><div><br><div>Begin forwarded message:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div><div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; "><font face="Helvetica" size="3" color="#000000" style="font: 12.0px Helvetica; color: #000000"><b>From: </b></font><font face="Helvetica" size="3" style="font: 12.0px Helvetica"><a href="mailto:infinispan-commits@lists.jboss.org">infinispan-commits@lists.jboss.org</a></font></div><div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; "><font face="Helvetica" size="3" color="#000000" style="font: 12.0px Helvetica; color: #000000"><b>Date: </b></font><font face="Helvetica" size="3" style="font: 12.0px Helvetica">22 April 2009 10:51:08 BST</font></div><div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; "><font face="Helvetica" size="3" color="#000000" style="font: 12.0px Helvetica; color: #000000"><b>To: </b></font><font face="Helvetica" size="3" style="font: 12.0px Helvetica"><a href="mailto:infinispan-commits@lists.jboss.org">infinispan-commits@lists.jboss.org</a></font></div><div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; "><font face="Helvetica" size="3" color="#000000" style="font: 12.0px Helvetica; color: #000000"><b>Subject: </b></font><font face="Helvetica" size="3" style="font: 12.0px Helvetica"><b>[infinispan-commits] Infinispan SVN: r158 - trunk/core/src/test/java/org/infinispan/test.</b></font></div><div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; "><font face="Helvetica" size="3" color="#000000" style="font: 12.0px Helvetica; color: #000000"><b>Reply-To: </b></font><font face="Helvetica" size="3" style="font: 12.0px Helvetica"><a href="mailto:infinispan-commits@lists.jboss.org">infinispan-commits@lists.jboss.org</a></font></div><div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; min-height: 14px; "><br></div> </div><div>Author: <a href="mailto:manik.surtani@jboss.com">manik.surtani@jboss.com</a><br>Date: 2009-04-22 05:51:08 -0400 (Wed, 22 Apr 2009)<br>New Revision: 158<br><br>Modified:<br> trunk/core/src/test/java/org/infinispan/test/ReplListener.java<br>Log:<br>Ability to eagerly record commands<br><br>Modified: trunk/core/src/test/java/org/infinispan/test/ReplListener.java<br>===================================================================<br>--- trunk/core/src/test/java/org/infinispan/test/ReplListener.java<span class="Apple-tab-span" style="white-space:pre"> </span>2009-04-21 13:37:17 UTC (rev 157)<br>+++ trunk/core/src/test/java/org/infinispan/test/ReplListener.java<span class="Apple-tab-span" style="white-space:pre"> </span>2009-04-22 09:51:08 UTC (rev 158)<br>@@ -19,12 +19,37 @@<br> * attachReplicationListener(cache); r.expect(RemoveCommand.class); // ... r.waitForRPC(); </code><br> */<br> public class ReplListener {<br>- Cache c;<br>- Set<Class<? extends VisitableCommand>> expectedCommands;<br>+ Cache<?, ?> c;<br>+ volatile Set<Class<? extends VisitableCommand>> expectedCommands;<br>+ Set<Class<? extends VisitableCommand>> eagerCommands;<br>+ boolean recordCommandsEagerly;<br> CountDownLatch latch = new CountDownLatch(1);<br><br>- public ReplListener(Cache c) {<br>+ /**<br>+ * This listener atatches itself to a cache and when {@link #expect(Class[])} is invoked, will start checking for<br>+ * invocations of the command on the cache, waiting for all expected commands to be received in {@link<br>+ * #waitForRpc()}.<br>+ *<br>+ * @param c cache on which to attach listener<br>+ */<br>+ public ReplListener(Cache<?, ?> c) {<br>+ this(c, false);<br>+ }<br>+<br>+ /**<br>+ * As {@link #ReplListener(org.infinispan.Cache)} except that you can optionally configure whether command recording<br>+ * is eager (false by default).<br>+ * <p/><br>+ * If <tt>recordCommandsEagerly</tt> is true, then commands are recorded from the moment the listener is attached to<br>+ * the cache, even before {@link #expect(Class[])} is invoked. As such, when {@link #expect(Class[])} is called, the<br>+ * list of commands to wait for will take into account commands already seen thanks to eager recording.<br>+ *<br>+ * @param c cache on which to attach listener<br>+ * @param recordCommandsEagerly whether to record commands eagerly<br>+ */<br>+ public ReplListener(Cache<?, ?> c, boolean recordCommandsEagerly) {<br> this.c = c;<br>+ this.recordCommandsEagerly = recordCommandsEagerly;<br> this.c.getAdvancedCache().addInterceptor(new ReplListenerInterceptor(), 1);<br> }<br><br>@@ -70,6 +95,8 @@<br> this.expectedCommands = new HashSet<Class<? extends VisitableCommand>>();<br> }<br> this.expectedCommands.addAll(Arrays.asList(expectedCommands));<br>+<br>+ if (recordCommandsEagerly) this.expectedCommands.removeAll(eagerCommands);<br> }<br><br> /**<br>@@ -99,6 +126,10 @@<br> }<br> }<br><br>+ public Cache<?, ?> getCache() {<br>+ return c;<br>+ }<br>+<br> protected class ReplListenerInterceptor extends CommandInterceptor {<br> @Override<br> protected Object handleDefault(InvocationContext ctx, VisitableCommand cmd) throws Throwable {<br>@@ -124,7 +155,11 @@<br> expectedCommands.remove(cmd.getClass());<br> if (expectedCommands.isEmpty()) latch.countDown();<br> } else {<br>- System.out.println("Received unexpected command: " + cmd);<br>+ if (recordCommandsEagerly) {<br>+ eagerCommands.add(cmd.getClass());<br>+ } else {<br>+ System.out.println("Received unexpected command: " + cmd);<br>+ }<br> }<br> }<br> }<br><br>_______________________________________________<br>infinispan-commits mailing list<br><a href="mailto:infinispan-commits@lists.jboss.org">infinispan-commits@lists.jboss.org</a><br>https://lists.jboss.org/mailman/listinfo/infinispan-commits<br></div></blockquote></div><br><div apple-content-edited="true"> <span class="Apple-style-span" style="border-collapse: separate; color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: auto; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; -webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0; "><div style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><span class="Apple-style-span" style="border-collapse: separate; color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; -webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; "><div style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><div>--</div><div>Manik Surtani</div><div><a href="mailto:manik@jboss.org">manik@jboss.org</a></div><div>Lead, Infinispan</div><div>Lead, JBoss Cache</div><div><a href="http://www.infinispan.org">http://www.infinispan.org</a></div><div><a href="http://www.jbosscache.org">http://www.jbosscache.org</a></div><div><br></div></div></span><br class="Apple-interchange-newline"></div></span><br class="Apple-interchange-newline"> </div><br></div></body></html>