The assurances of the voter can be obtained from a cast vote if canup…

src/main/java/org/rulez/demokracia/pdengine/ADAAssuranceManager.java

@@ -0,0 +1,12 @@
+package org.rulez.demokracia.pdengine;
+
+import java.util.List;
+
+public class ADAAssuranceManager implements AssuranceManager{
+
+	@Override
+	public List<String> getAssurances(final String proxyId) {
+		throw new UnsupportedOperationException();
+	}
+
+}

src/main/java/org/rulez/demokracia/pdengine/AssuranceManager.java

@@ -0,0 +1,7 @@
+package org.rulez.demokracia.pdengine;
+
+import java.util.List;
+
+public interface AssuranceManager {
+	List<String> getAssurances(String proxyId);
+}

src/main/java/org/rulez/demokracia/pdengine/CastVote.java

@@ -13,7 +13,12 @@ public CastVote(final String proxyId, final List<RankedChoice> preferences) {
 		super();
 		this.proxyId = proxyId;
 		this.preferences = new ArrayList<>(preferences);
-		secretId = RandomUtils.createRandomKey();
+		this.secretId = RandomUtils.createRandomKey();
+	}
+
+	public CastVote(final String proxyId, final List<RankedChoice> preferences, final List<String> assurances) {
+		this(proxyId, preferences);
+		this.assurances = assurances;
 	}
 
 	@Override
@@ -23,6 +28,6 @@ public List<RankedChoice> getPreferences() {
 
 	@Override
 	public List<String> getAssurances() {
-		throw new UnsupportedOperationException();
+		return assurances;
 	}
 }

src/main/java/org/rulez/demokracia/pdengine/IVoteManager.java

@@ -13,8 +13,8 @@
 
 public interface IVoteManager {
 
-	static IVoteManager getVoteManager(final WebServiceContext wsContext) {
-		return VoteManagerUtils.getVoteManager(wsContext);
+	static IVoteManager getVoteManager(final WebServiceContext wsContext, AssuranceManager assuranceManager) {
+		return VoteManagerUtils.getVoteManager(wsContext, assuranceManager);
 	}
 
 	WebServiceContext getWsContext();
@@ -49,5 +49,11 @@ VoteAdminInfo createVote(final String voteName, final Set<String> neededAssuranc
 	JsonObject showVote(final VoteAdminInfo adminInfo);
 
 	void setVoteParameters(final VoteAdminInfo adminInfo, final VoteParameters voteParameters);
+
+	List<String> getAssurances();
+
+	static AssuranceManager getAssuranceManager() {
+		return new ADAAssuranceManager();
+	}
 
 }

src/main/java/org/rulez/demokracia/pdengine/VoteManagerUtils.java

@@ -12,9 +12,9 @@ final public class VoteManagerUtils {
 	private VoteManagerUtils() {
 	}
 
-	public static IVoteManager getVoteManager(final WebServiceContext wsContext) {
+	public static IVoteManager getVoteManager(final WebServiceContext wsContext, final AssuranceManager assuranceManager) {
 		if(!registry.containsKey(wsContext)) {
-			registry.put(wsContext, new VoteRegistry(wsContext));
+			registry.put(wsContext, new VoteRegistry(wsContext, assuranceManager));
 		}
 		return registry.get(wsContext);
 	}

src/main/java/org/rulez/demokracia/pdengine/VoteRegistry.java

@@ -11,8 +11,11 @@
 import com.google.gson.JsonObject;
 
 public class VoteRegistry extends ChoiceManager implements IVoteManager {
-	public VoteRegistry(final WebServiceContext wsContext) {
+	private final AssuranceManager assuranceManager;
+
+	public VoteRegistry(final WebServiceContext wsContext, final AssuranceManager assuranceManager) {
 		super(wsContext);
+		this.assuranceManager = assuranceManager;
 	}
 
 	@Override
@@ -62,7 +65,8 @@ public CastVote castVote(final String voteId, final String ballot, final List<Ra
 		CastVote receipt;
 
 		if (vote.getParameters().canUpdate) {
-			receipt = vote.addCastVote(getWsUserName(), theVote);
+			String proxyId = getWsUserName();
+			receipt = vote.addCastVote(proxyId, theVote, getAssurances());
 		} else {
 			receipt = vote.addCastVote(null, theVote);
 		}
@@ -207,5 +211,11 @@ public void setVoteParameters(final VoteAdminInfo adminInfo, final VoteParameter
 			throw new ReportedException("Illegal minEndorsements", Integer.toString(voteParameters.minEndorsements));
 		}
 	}
+
+	@Override
+	public List<String> getAssurances() {
+		String wsUserName = this.getWsUserName();
+		return assuranceManager.getAssurances(wsUserName);
+	}
 }
 

src/main/java/org/rulez/demokracia/pdengine/Voteable.java

@@ -6,16 +6,22 @@
 public interface Voteable extends VoteInterface {
 
 	default CastVote addCastVote(final String proxyId, final List<RankedChoice> theVote) {
+		CastVote castVote = new CastVote(proxyId, theVote);
+		getVotesCast().add(castVote);
+		return castVote;
+	}
+
+	default CastVote addCastVote(final String proxyId, final List<RankedChoice> theVote, final List<String> assurances) {
 		Iterator<CastVote> listIterator = getVotesCast().iterator();
 		while (listIterator.hasNext()) {
 			CastVote element = listIterator.next();
 
-			if (element.proxyId != null && element.proxyId.equals(proxyId)) {
+			if (element.proxyId.equals(proxyId)) {
 				listIterator.remove();
 			}
 		}
 
-		CastVote castVote = new CastVote(proxyId, theVote);
+		CastVote castVote = new CastVote(proxyId, theVote, assurances);
 		getVotesCast().add(castVote);
 		return castVote;
 	}

src/main/java/org/rulez/demokracia/pdengine/dataobjects/CastVoteEntity.java

@@ -13,5 +13,6 @@ public class CastVoteEntity extends BaseEntity {
 	public List<RankedChoice> preferences;
 	public String proxyId;
 	public String secretId;
+	public List<String> assurances;
 
 }

src/main/java/org/rulez/demokracia/pdengine/servlet/VoteManagerInterface.java

@@ -35,7 +35,7 @@ public class VoteManagerInterface {
 	public Response createVote(final CreateVoteRequest request) {
 		VoteAdminInfo adminInfo;
 		try {
-			adminInfo = IVoteManager.getVoteManager(wsContext).createVote(
+			adminInfo = IVoteManager.getVoteManager(wsContext, IVoteManager.getAssuranceManager()).createVote(
 					request.voteName,
 					request.neededAssurances,
 					request.countedAssurances,

src/test/java/org/rulez/demokracia/pdengine/CastVoteTest.java

@@ -1,6 +1,7 @@
 package org.rulez.demokracia.pdengine;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -12,35 +13,48 @@
 import org.rulez.demokracia.pdengine.annotations.TestedOperation;
 import org.rulez.demokracia.pdengine.testhelpers.CreatedDefaultChoice;
 
+@TestedFeature("Supporting functionality")
+@TestedOperation("CastVote")
 public class CastVoteTest extends CreatedDefaultChoice {
 
 	@Override
 	@Before
 	public void setUp() {
 		super.setUp();
+		initializeVoteCastTest();
 	}
 
-	@TestedFeature("Supporting functionality")
-	@TestedOperation("CastVote")
 	@TestedBehaviour("The preferences described by a cast vote can be obtained")
 	@Test
 	public void the_preferences_can_be_obtained_when_they_are_empty() {
-		List<RankedChoice> theCastVote = new ArrayList<>();
 		CastVote castVote = new CastVote(TEST_USER_NAME, theCastVote);
 		List<RankedChoice> preferences = castVote.getPreferences();
 		assertEquals(new ArrayList<>(), preferences);
 	}
-
-	@TestedFeature("Supporting functionality")
-	@TestedOperation("CastVote")
+
 	@TestedBehaviour("The preferences described by a cast vote can be obtained")
 	@Test
 	public void the_preferences_can_be_obtained_when_they_contain_choices() {
-		List<RankedChoice> theCastVote = new ArrayList<>();
 		theCastVote.add(new RankedChoice("1", 1));
 		CastVote castVote = new CastVote(TEST_USER_NAME, theCastVote);
 		List<RankedChoice> preferences = castVote.getPreferences();
 		assertEquals(theCastVote, preferences);
 	}
 
+	@TestedBehaviour("The assurances of the voter can be obtained from a cast vote if canupdateis true")
+	@Test
+	public void the_assurances_of_the_voter_can_be_obtained_from_a_cast_vote_if_canupdate_is_true() {
+		vote.parameters.canUpdate = true;
+		CastVote castVote = voteManager.castVote(adminInfo.voteId, ballot, theCastVote);
+		assertEquals("magyar", castVote.assurances.get(0));
+	}
+
+	@TestedBehaviour("The assurances of the voter can be obtained from a cast vote if canupdateis true")
+	@Test
+	public void the_assurances_of_the_voter_is_null_if_canupdate_is_false() {
+		vote.parameters.canUpdate = false;
+		CastVote castVote = voteManager.castVote(adminInfo.voteId, ballot, theCastVote);
+		List<String> assurances = castVote.getAssurances();
+		assertTrue(assurances == null);
+	}
 }

src/test/java/org/rulez/demokracia/pdengine/SessionTest.java

@@ -42,8 +42,8 @@ public void you_get_the_same_hibernate_session_by_calling_getDBSession_on_DBSess
 	@Test
 	public void two_voteManagers_for_the_same_session_context_are_the_same() {
 		WebServiceContext wsContext = mock(WebServiceContext.class);
-		IVoteManager voteManager1 = IVoteManager.getVoteManager(wsContext);
-		IVoteManager voteManager2 = IVoteManager.getVoteManager(wsContext);
+		IVoteManager voteManager1 = IVoteManager.getVoteManager(wsContext, fakeAssuranceManager);
+		IVoteManager voteManager2 = IVoteManager.getVoteManager(wsContext, fakeAssuranceManager);
 		assertEquals(voteManager1, voteManager2);
 	}
 

src/test/java/org/rulez/demokracia/pdengine/testhelpers/CreatedDefaultVoteRegistry.java

@@ -11,6 +11,7 @@
 import javax.xml.ws.WebServiceContext;
 
 import org.junit.Before;
+import org.rulez.demokracia.pdengine.AssuranceManager;
 import org.rulez.demokracia.pdengine.IVoteManager;
 import org.rulez.demokracia.pdengine.Vote;
 import org.rulez.demokracia.pdengine.dataobjects.VoteAdminInfo;
@@ -28,11 +29,14 @@ public class CreatedDefaultVoteRegistry extends ThrowableTester{
 	protected Set<String> countedAssurances;
 	protected boolean isPrivate;
 	protected int minEndorsements;
+	protected AssuranceManager fakeAssuranceManager;
 
 	@Before
 	public void setUp() {
 		WebServiceContext wsContext = setupMockWsContext();
-		voteManager = IVoteManager.getVoteManager(wsContext);
+		fakeAssuranceManager = mock(AssuranceManager.class);
+		when(fakeAssuranceManager.getAssurances(TEST_USER_NAME)).thenReturn(Arrays.asList("magyar", "német"));
+		voteManager = IVoteManager.getVoteManager(wsContext, fakeAssuranceManager);
 		neededAssurances = new HashSet<>();
 		countedAssurances = new HashSet<>();
 		isPrivate = true;
@@ -55,7 +59,7 @@ private WebServiceContext setupMockWsContext() {
 	public void setupUnauthenticatedMockWsContext() {
 		WebServiceContext wsContext = mock(WebServiceContext.class);
 		when(wsContext.getUserPrincipal()).thenReturn(null);
-		voteManager = IVoteManager.getVoteManager(wsContext);
+		voteManager = IVoteManager.getVoteManager(wsContext, fakeAssuranceManager);
 	}
 
 	protected VoteAdminInfo createAVote() {