You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by st...@apache.org on 2015/10/29 15:13:06 UTC

svn commit: r1711265 - /sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatTest.java

Author: stefanegli
Date: Thu Oct 29 14:13:06 2015
New Revision: 1711265

URL: http://svn.apache.org/viewvc?rev=1711265&view=rev
Log:
SLING-5216 : changing the voting algorithm to use correct sorting by votingId not viewId, plus making the whole algorithm more straight forward and robust

Modified:
    sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatTest.java

Modified: sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatTest.java?rev=1711265&r1=1711264&r2=1711265&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatTest.java (original)
+++ sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatTest.java Thu Oct 29 14:13:06 2015
@@ -618,8 +618,8 @@ public class HeartbeatTest {
                 assertEquals(1, ongoingVotings.size());
                 VotingView ongoingVote = ongoingVotings.get(0);
                 assertFalse(ongoingVote.isWinning());
-                assertFalse(ongoingVote.hasVotedOrIsInitiator(slowMachine1.getSlingId()));
-                assertTrue(ongoingVote.hasVotedOrIsInitiator(slowMachine2.getSlingId()));
+                assertFalse(ongoingVote.hasVotedYes(slowMachine1.getSlingId()));
+                assertTrue(ongoingVote.hasVotedYes(slowMachine2.getSlingId()));
                 final Resource memberResource = ongoingVote.getResource().getChild("members").getChild(slowMachine2.getSlingId());
                 final ModifiableValueMap memberMap = memberResource.adaptTo(ModifiableValueMap.class);
                 Property vote = (Property) memberMap.get("vote");