zombies killed

Author: magwas

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

@@ -1,5 +1,7 @@
 package org.rulez.demokracia.pdengine;
 
+import static org.junit.Assert.assertEquals;
+
 import org.junit.Test;
 import org.rulez.demokracia.pdengine.annotations.TestedBehaviour;
 import org.rulez.demokracia.pdengine.annotations.TestedFeature;
@@ -50,7 +52,18 @@ public void if_adminKey_is_user_and_canAddin_is_true_then_the_user_who_added_the
 			() -> voteManager.getChoice(voteId, choiceId)
 		).assertMessageIs("Illegal choiceId");
 	}
-	
+
+	@TestedBehaviour("if \"user\" is used as adminKey, then the user must be the one who added the choice and canAddIn be true")
+	@Test
+	public void deleteChoice_return_an_OK_if_the_choice_is_deleted() {
+		String voteId = adminInfo.voteId;
+		Vote vote = voteManager.getVote(voteId);
+		vote.canAddin = true;
+		String choiceId = voteManager.addChoice(new VoteAdminInfo(adminInfo.voteId, USER), CHOICE1, TEST_USER_NAME);
+		String r = voteManager.deleteChoice(new VoteAdminInfo(voteId, USER), choiceId);
+		assertEquals("OK",r);
+	}
+
 	@TestedBehaviour("if the vote has ballots issued, the choice cannot be deleted")
 	@Test
 	public void if_the_vote_has_issued_ballots_then_the_choice_cannot_be_deleted() {

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

@@ -1,6 +1,7 @@
 package org.rulez.demokracia.pdengine;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -59,6 +60,13 @@ public void the_choices_attribute_contains_the_choices_of_the_vote() {
 
 		assertEquals(result.getJSONArray("choices").toString(), jsonArray.toString());
 	}
+	@Test
+	public void the_initiator_of_the_choice_is_in_the_json() {
+		JSONArray jsonArray = vote.createChoicesJson(vote.choices);
+		JSONObject firstChoice = (JSONObject) jsonArray.get(0);
+		String initiatorInJson = (String) firstChoice.get("initiator");
+		assertEquals("user", initiatorInJson);
+	}
 
 	@Test
 	public void the_canEndorse_attribute_contains_whether_the_voters_endorse_choices_of_the_vote() {

src/test/java/org/rulez/demokracia/types/MatrixKeyTest.java

@@ -24,13 +24,13 @@ public void columnKey_should_be_in_keyCollection_for_setElement() {
 	@Test
 	public void rowKey_should_be_in_keyCollection_for_getElement() {
 		updateMatrixWithNewKey(columnKey);
-		assertSetElementFailsWith(columnKey,rowKey, "Invalid row key");
+		assertGetElementFailsWith(columnKey,rowKey, "Invalid row key");
 	}
 
 	@Test
 	public void columnKey_should_be_in_keyCollection_for_getElement() {
 		updateMatrixWithNewKey(rowKey);
-		assertSetElementFailsWith(columnKey,rowKey, "Invalid column key");
+		assertGetElementFailsWith(columnKey,rowKey, "Invalid column key");
 	}
 
 	@Test
@@ -67,4 +67,12 @@ private void assertSetElementFailsWith(final String columnKey, final String rowK
 				})
 			.assertException(IllegalArgumentException.class).assertMessageIs(message);
 	}
+
+	private void assertGetElementFailsWith(final String columnKey, final String rowKey, final String message) {
+		assertThrows(
+				() -> {
+					theMatrix.getElement(columnKey, rowKey);
+				})
+			.assertException(IllegalArgumentException.class).assertMessageIs(message);
+	}
 }