From 3d5cac17540ff935c1763112723408a784171074 Mon Sep 17 00:00:00 2001 From: valentinbujdoso Date: Wed, 3 Apr 2019 18:32:42 +0200 Subject: [PATCH 01/12] The assurances of the voter can be obtained from a cast vote if canupdate is true #242 --- .../rulez/demokracia/pdengine/CastVote.java | 9 ++++++-- .../demokracia/pdengine/IVoteManager.java | 2 ++ .../pdengine/SessionFactoryManager.java | 8 +++++++ .../org/rulez/demokracia/pdengine/User.java | 5 ++++ .../demokracia/pdengine/VoteRegistry.java | 3 ++- .../rulez/demokracia/pdengine/Voteable.java | 10 ++++++-- .../pdengine/dataobjects/CastVoteEntity.java | 1 + .../demokracia/pdengine/CastVoteTest.java | 18 +++++++++------ .../pdengine/UnimplementedTests.java | 23 +++++++++++++++---- 9 files changed, 62 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/rulez/demokracia/pdengine/CastVote.java b/src/main/java/org/rulez/demokracia/pdengine/CastVote.java index 21bfed16..e3defed8 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/CastVote.java +++ b/src/main/java/org/rulez/demokracia/pdengine/CastVote.java @@ -13,7 +13,12 @@ public CastVote(final String proxyId, final List preferences) { super(); this.proxyId = proxyId; this.preferences = new ArrayList<>(preferences); - secretId = RandomUtils.createRandomKey(); + this.secretId = RandomUtils.createRandomKey(); + } + + public CastVote(final String proxyId, final List preferences, List assurances) { + this(proxyId, preferences); + this.assurances = assurances; } @Override @@ -23,6 +28,6 @@ public List getPreferences() { @Override public List getAssurances() { - throw new UnsupportedOperationException(); + return assurances; } } diff --git a/src/main/java/org/rulez/demokracia/pdengine/IVoteManager.java b/src/main/java/org/rulez/demokracia/pdengine/IVoteManager.java index db23fe95..70054cef 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/IVoteManager.java +++ b/src/main/java/org/rulez/demokracia/pdengine/IVoteManager.java @@ -41,6 +41,8 @@ VoteAdminInfo createVote(final String voteName, final Set neededAssuranc String getWsUserName(); boolean hasAssurance(final String role); + + User getWsUser(String proxyId); void modifyVote(final VoteAdminInfo voteAdminInfo, final String voteName); diff --git a/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java b/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java index fe1b38fe..d5c21957 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java +++ b/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java @@ -1,5 +1,7 @@ package org.rulez.demokracia.pdengine; +import java.util.List; + import javax.xml.ws.WebServiceContext; import org.hibernate.Session; @@ -26,5 +28,11 @@ public String getWsUserName() { public boolean hasAssurance(final String role) { return getWsContext().isUserInRole(role); } + + public User getWsUser(String proxyId) { + User user = new User(proxyId); + user.assurances.add("TestAssurances"); + return user; + } } \ No newline at end of file diff --git a/src/main/java/org/rulez/demokracia/pdengine/User.java b/src/main/java/org/rulez/demokracia/pdengine/User.java index bec0d055..a1165468 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/User.java +++ b/src/main/java/org/rulez/demokracia/pdengine/User.java @@ -1,6 +1,7 @@ package org.rulez.demokracia.pdengine; import java.util.ArrayList; +import java.util.List; import javax.persistence.Entity; @@ -16,5 +17,9 @@ public User(final String proxyId) { this.proxyId = proxyId; assurances = new ArrayList<>(); } + + public List getAssurances() { + return assurances; + } } diff --git a/src/main/java/org/rulez/demokracia/pdengine/VoteRegistry.java b/src/main/java/org/rulez/demokracia/pdengine/VoteRegistry.java index c6ba1fdb..b375dd71 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/VoteRegistry.java +++ b/src/main/java/org/rulez/demokracia/pdengine/VoteRegistry.java @@ -62,7 +62,8 @@ public CastVote castVote(final String voteId, final String ballot, final List theVote) { + CastVote castVote = new CastVote(proxyId, theVote); + getVotesCast().add(castVote); + return castVote; + } + + default CastVote addCastVote(final String proxyId, final List theVote, final List assurances) { Iterator 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; } diff --git a/src/main/java/org/rulez/demokracia/pdengine/dataobjects/CastVoteEntity.java b/src/main/java/org/rulez/demokracia/pdengine/dataobjects/CastVoteEntity.java index 6356929a..45eb2a10 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/dataobjects/CastVoteEntity.java +++ b/src/main/java/org/rulez/demokracia/pdengine/dataobjects/CastVoteEntity.java @@ -13,5 +13,6 @@ public class CastVoteEntity extends BaseEntity { public List preferences; public String proxyId; public String secretId; + public List assurances; } diff --git a/src/test/java/org/rulez/demokracia/pdengine/CastVoteTest.java b/src/test/java/org/rulez/demokracia/pdengine/CastVoteTest.java index 5ed9177c..7fa545d1 100644 --- a/src/test/java/org/rulez/demokracia/pdengine/CastVoteTest.java +++ b/src/test/java/org/rulez/demokracia/pdengine/CastVoteTest.java @@ -12,35 +12,39 @@ 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 theCastVote = new ArrayList<>(); CastVote castVote = new CastVote(TEST_USER_NAME, theCastVote); List 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 theCastVote = new ArrayList<>(); theCastVote.add(new RankedChoice("1", 1)); CastVote castVote = new CastVote(TEST_USER_NAME, theCastVote); List 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_canpdate_is_true() { + vote.parameters.canUpdate = true; + CastVote castVote = voteManager.castVote(adminInfo.voteId, ballot, theCastVote); + assertEquals("TestAssurances", castVote.assurances.get(0)); + } } diff --git a/src/test/java/org/rulez/demokracia/pdengine/UnimplementedTests.java b/src/test/java/org/rulez/demokracia/pdengine/UnimplementedTests.java index 0e0ab92a..b5b0df5b 100644 --- a/src/test/java/org/rulez/demokracia/pdengine/UnimplementedTests.java +++ b/src/test/java/org/rulez/demokracia/pdengine/UnimplementedTests.java @@ -1,19 +1,32 @@ package org.rulez.demokracia.pdengine; +import static org.junit.Assert.assertTrue; + import java.util.ArrayList; +import java.util.List; import org.junit.Test; import org.rulez.demokracia.pdengine.annotations.TestedBehaviour; import org.rulez.demokracia.pdengine.annotations.TestedFeature; import org.rulez.demokracia.pdengine.annotations.TestedOperation; -import org.rulez.demokracia.testhelpers.ThrowableTester; +import org.rulez.demokracia.pdengine.testhelpers.CreatedDefaultChoice; @TestedFeature("Unimplemented") @TestedOperation("Unimplemented") @TestedBehaviour("Unimplemented") -public class UnimplementedTests extends ThrowableTester { - +public class UnimplementedTests extends CreatedDefaultChoice { + + @Test + public void a() { + CastVote castVote = new CastVote("test_user_in_ws_context", new ArrayList<>(), new ArrayList<>()); + List assurances = castVote.getAssurances(); + assertTrue(assurances.isEmpty()); + } + @Test - public void the_getAssurances_method_is_not_implemented_yet() { - assertUnimplemented(() -> new CastVote("proxyId", new ArrayList<>()).getAssurances()); + public void b() { + List assurances = new ArrayList (); + assurances.add("TestAssurance"); + CastVote castVote = new CastVote("test_user_in_ws_context", new ArrayList<>(), assurances); + assertTrue(castVote.getAssurances().contains("TestAssurance")); } } From 5d730c0b5660e5c9fb8790a38cea8ca13cd10b47 Mon Sep 17 00:00:00 2001 From: valentinbujdoso Date: Wed, 3 Apr 2019 20:47:33 +0200 Subject: [PATCH 02/12] fix --- src/main/java/org/rulez/demokracia/pdengine/CastVote.java | 2 +- .../org/rulez/demokracia/pdengine/SessionFactoryManager.java | 4 +--- .../org/rulez/demokracia/pdengine/UnimplementedTests.java | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/rulez/demokracia/pdengine/CastVote.java b/src/main/java/org/rulez/demokracia/pdengine/CastVote.java index e3defed8..627eadcd 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/CastVote.java +++ b/src/main/java/org/rulez/demokracia/pdengine/CastVote.java @@ -16,7 +16,7 @@ public CastVote(final String proxyId, final List preferences) { this.secretId = RandomUtils.createRandomKey(); } - public CastVote(final String proxyId, final List preferences, List assurances) { + public CastVote(final String proxyId, final List preferences, final List assurances) { this(proxyId, preferences); this.assurances = assurances; } diff --git a/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java b/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java index d5c21957..b5aff01a 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java +++ b/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java @@ -1,7 +1,5 @@ package org.rulez.demokracia.pdengine; -import java.util.List; - import javax.xml.ws.WebServiceContext; import org.hibernate.Session; @@ -29,7 +27,7 @@ public boolean hasAssurance(final String role) { return getWsContext().isUserInRole(role); } - public User getWsUser(String proxyId) { + public User getWsUser(final String proxyId) { User user = new User(proxyId); user.assurances.add("TestAssurances"); return user; diff --git a/src/test/java/org/rulez/demokracia/pdengine/UnimplementedTests.java b/src/test/java/org/rulez/demokracia/pdengine/UnimplementedTests.java index b5b0df5b..249ee9fd 100644 --- a/src/test/java/org/rulez/demokracia/pdengine/UnimplementedTests.java +++ b/src/test/java/org/rulez/demokracia/pdengine/UnimplementedTests.java @@ -16,14 +16,14 @@ public class UnimplementedTests extends CreatedDefaultChoice { @Test - public void a() { + public void the_empty_assurances_can_be_obtained() { CastVote castVote = new CastVote("test_user_in_ws_context", new ArrayList<>(), new ArrayList<>()); List assurances = castVote.getAssurances(); assertTrue(assurances.isEmpty()); } @Test - public void b() { + public void the_not_empty_assurances_can_be_obtained() { List assurances = new ArrayList (); assurances.add("TestAssurance"); CastVote castVote = new CastVote("test_user_in_ws_context", new ArrayList<>(), assurances); From c911c65668eab18919b9d7580ca940f6934d76f5 Mon Sep 17 00:00:00 2001 From: Valentin Bujdoso Date: Thu, 4 Apr 2019 16:48:42 +0200 Subject: [PATCH 03/12] Fix tests --- .../demokracia/pdengine/CastVoteTest.java | 13 +++++++++++- .../pdengine/UnimplementedTests.java | 20 +++++-------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/test/java/org/rulez/demokracia/pdengine/CastVoteTest.java b/src/test/java/org/rulez/demokracia/pdengine/CastVoteTest.java index 7fa545d1..d724f17a 100644 --- a/src/test/java/org/rulez/demokracia/pdengine/CastVoteTest.java +++ b/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; @@ -42,9 +43,19 @@ public void the_preferences_can_be_obtained_when_they_contain_choices() { @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_canpdate_is_true() { + 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("TestAssurances", 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); + System.out.println("castVote: " + castVote); + List assurances = castVote.getAssurances(); + assertTrue(assurances == null); + } } diff --git a/src/test/java/org/rulez/demokracia/pdengine/UnimplementedTests.java b/src/test/java/org/rulez/demokracia/pdengine/UnimplementedTests.java index 249ee9fd..429c9af9 100644 --- a/src/test/java/org/rulez/demokracia/pdengine/UnimplementedTests.java +++ b/src/test/java/org/rulez/demokracia/pdengine/UnimplementedTests.java @@ -14,19 +14,9 @@ @TestedOperation("Unimplemented") @TestedBehaviour("Unimplemented") public class UnimplementedTests extends CreatedDefaultChoice { - - @Test - public void the_empty_assurances_can_be_obtained() { - CastVote castVote = new CastVote("test_user_in_ws_context", new ArrayList<>(), new ArrayList<>()); - List assurances = castVote.getAssurances(); - assertTrue(assurances.isEmpty()); - } - - @Test - public void the_not_empty_assurances_can_be_obtained() { - List assurances = new ArrayList (); - assurances.add("TestAssurance"); - CastVote castVote = new CastVote("test_user_in_ws_context", new ArrayList<>(), assurances); - assertTrue(castVote.getAssurances().contains("TestAssurance")); - } + +// @Test +// public void the_calculateWinners_method_is_not_implemented_yet() { +// assertUnimplemented(() -> new WinnerCalculatorImpl().calculateWinners(null)); +// } } From 925ebecdf335be12633c431f960748b816c00796 Mon Sep 17 00:00:00 2001 From: Valentin Bujdoso Date: Thu, 4 Apr 2019 17:18:37 +0200 Subject: [PATCH 04/12] Fix --- .../pdengine/FakeADAAssuranceProvider.java | 17 +++++++++++++++++ .../pdengine/SessionFactoryManager.java | 8 ++++---- .../rulez/demokracia/pdengine/VoteRegistry.java | 2 +- .../demokracia/pdengine/UnimplementedTests.java | 10 ++++------ 4 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 src/main/java/org/rulez/demokracia/pdengine/FakeADAAssuranceProvider.java diff --git a/src/main/java/org/rulez/demokracia/pdengine/FakeADAAssuranceProvider.java b/src/main/java/org/rulez/demokracia/pdengine/FakeADAAssuranceProvider.java new file mode 100644 index 00000000..2d060f4a --- /dev/null +++ b/src/main/java/org/rulez/demokracia/pdengine/FakeADAAssuranceProvider.java @@ -0,0 +1,17 @@ +package org.rulez.demokracia.pdengine; + +import java.util.ArrayList; +import java.util.List; + +public class FakeADAAssuranceProvider { + + public FakeADAAssuranceProvider() { + } + + public List getassurancesFor(String proxyId) { + List assurances = new ArrayList(); + assurances.add("TestAssurances"); + + return assurances; + } +} diff --git a/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java b/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java index b5aff01a..4bb29755 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java +++ b/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java @@ -1,5 +1,7 @@ package org.rulez.demokracia.pdengine; +import java.util.List; + import javax.xml.ws.WebServiceContext; import org.hibernate.Session; @@ -27,10 +29,8 @@ public boolean hasAssurance(final String role) { return getWsContext().isUserInRole(role); } - public User getWsUser(final String proxyId) { - User user = new User(proxyId); - user.assurances.add("TestAssurances"); - return user; + public List getAssurances() { + return new FakeADAAssuranceProvider().getassurancesFor(getWsUserName()); } } \ No newline at end of file diff --git a/src/main/java/org/rulez/demokracia/pdengine/VoteRegistry.java b/src/main/java/org/rulez/demokracia/pdengine/VoteRegistry.java index b375dd71..a77e2af3 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/VoteRegistry.java +++ b/src/main/java/org/rulez/demokracia/pdengine/VoteRegistry.java @@ -63,7 +63,7 @@ public CastVote castVote(final String voteId, final String ballot, final List new WinnerCalculatorImpl().calculateWinners(null)); +// public void the_getAssurances_method_is_not_implemented_yet() { +// assertUnimplemented(() -> new CastVote("proxyId", new ArrayList<>()).getAssurances()); // } } From 8978c949f0c84856c9129b7e09c13cefdf6fd4ce Mon Sep 17 00:00:00 2001 From: Valentin Bujdoso Date: Thu, 4 Apr 2019 17:26:19 +0200 Subject: [PATCH 05/12] Fix --- src/main/java/org/rulez/demokracia/pdengine/IVoteManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/rulez/demokracia/pdengine/IVoteManager.java b/src/main/java/org/rulez/demokracia/pdengine/IVoteManager.java index 70054cef..ee0b7a83 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/IVoteManager.java +++ b/src/main/java/org/rulez/demokracia/pdengine/IVoteManager.java @@ -42,7 +42,7 @@ VoteAdminInfo createVote(final String voteName, final Set neededAssuranc boolean hasAssurance(final String role); - User getWsUser(String proxyId); + List getAssurances(); void modifyVote(final VoteAdminInfo voteAdminInfo, final String voteName); From 3d5b3495b53f985a2226c182ff3c58d6e78ff880 Mon Sep 17 00:00:00 2001 From: valentinbujdoso Date: Fri, 5 Apr 2019 18:39:29 +0200 Subject: [PATCH 06/12] fix --- .../rulez/demokracia/pdengine/SessionFactoryManager.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java b/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java index 4bb29755..d07337cd 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java +++ b/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java @@ -9,12 +9,14 @@ public class SessionFactoryManager { protected Session session; + private FakeADAAssuranceProvider fakeADAAssuranceProvider; private final WebServiceContext wsContext; public SessionFactoryManager(final WebServiceContext wsContext) { super(); this.wsContext = wsContext; session = DBSessionManagerUtils.getDBSession(); + fakeADAAssuranceProvider = new FakeADAAssuranceProvider(); } public WebServiceContext getWsContext() { @@ -29,8 +31,12 @@ public boolean hasAssurance(final String role) { return getWsContext().isUserInRole(role); } + public FakeADAAssuranceProvider getFakeADAAssuranceProvider() { + return fakeADAAssuranceProvider; + } + public List getAssurances() { - return new FakeADAAssuranceProvider().getassurancesFor(getWsUserName()); + return getFakeADAAssuranceProvider().getassurancesFor(getWsUserName()); } } \ No newline at end of file From 405fb07c74d93367ef614d8fbd5f9cfd46654f01 Mon Sep 17 00:00:00 2001 From: valentinbujdoso Date: Sun, 7 Apr 2019 20:18:25 +0200 Subject: [PATCH 07/12] Fix --- .../pdengine/ADAAssuranceProvider.java | 7 +++++ .../pdengine/FakeADAAssuranceProvider.java | 26 ++++++++++++++----- .../pdengine/SessionFactoryManager.java | 8 +++--- .../demokracia/pdengine/CastVoteTest.java | 1 - .../pdengine/UnimplementedTests.java | 20 -------------- 5 files changed, 30 insertions(+), 32 deletions(-) create mode 100644 src/main/java/org/rulez/demokracia/pdengine/ADAAssuranceProvider.java delete mode 100644 src/test/java/org/rulez/demokracia/pdengine/UnimplementedTests.java diff --git a/src/main/java/org/rulez/demokracia/pdengine/ADAAssuranceProvider.java b/src/main/java/org/rulez/demokracia/pdengine/ADAAssuranceProvider.java new file mode 100644 index 00000000..6056fed3 --- /dev/null +++ b/src/main/java/org/rulez/demokracia/pdengine/ADAAssuranceProvider.java @@ -0,0 +1,7 @@ +package org.rulez.demokracia.pdengine; + +import java.util.List; + +public interface ADAAssuranceProvider { + public List getassurancesFor(String proxyId); +} diff --git a/src/main/java/org/rulez/demokracia/pdengine/FakeADAAssuranceProvider.java b/src/main/java/org/rulez/demokracia/pdengine/FakeADAAssuranceProvider.java index 2d060f4a..36aaa959 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/FakeADAAssuranceProvider.java +++ b/src/main/java/org/rulez/demokracia/pdengine/FakeADAAssuranceProvider.java @@ -1,17 +1,29 @@ package org.rulez.demokracia.pdengine; -import java.util.ArrayList; import java.util.List; -public class FakeADAAssuranceProvider { +public class FakeADAAssuranceProvider implements ADAAssuranceProvider{ + private ADAAssuranceProvider assuranceProvider; - public FakeADAAssuranceProvider() { + public FakeADAAssuranceProvider(FakeADAAssuranceProvider adaAssuranceProvider) { + setAssuranceProvider(adaAssuranceProvider); } public List getassurancesFor(String proxyId) { - List assurances = new ArrayList(); - assurances.add("TestAssurances"); - - return assurances; + return getUser(proxyId).getAssurances(); + } + + private User getUser(String proxyId) { + User user = new User(proxyId); + user.assurances.add("TestAssurances"); + return user; + } + + public ADAAssuranceProvider getAssuranceProvider() { + return assuranceProvider; + } + + public void setAssuranceProvider(ADAAssuranceProvider assuranceProvider) { + this.assuranceProvider = assuranceProvider; } } diff --git a/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java b/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java index d07337cd..a66d9c8b 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java +++ b/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java @@ -9,14 +9,14 @@ public class SessionFactoryManager { protected Session session; - private FakeADAAssuranceProvider fakeADAAssuranceProvider; + private ADAAssuranceProvider adaAssuranceProvider; private final WebServiceContext wsContext; public SessionFactoryManager(final WebServiceContext wsContext) { super(); this.wsContext = wsContext; session = DBSessionManagerUtils.getDBSession(); - fakeADAAssuranceProvider = new FakeADAAssuranceProvider(); + adaAssuranceProvider = new FakeADAAssuranceProvider(null); } public WebServiceContext getWsContext() { @@ -31,8 +31,8 @@ public boolean hasAssurance(final String role) { return getWsContext().isUserInRole(role); } - public FakeADAAssuranceProvider getFakeADAAssuranceProvider() { - return fakeADAAssuranceProvider; + public ADAAssuranceProvider getFakeADAAssuranceProvider() { + return adaAssuranceProvider; } public List getAssurances() { diff --git a/src/test/java/org/rulez/demokracia/pdengine/CastVoteTest.java b/src/test/java/org/rulez/demokracia/pdengine/CastVoteTest.java index d724f17a..1662610d 100644 --- a/src/test/java/org/rulez/demokracia/pdengine/CastVoteTest.java +++ b/src/test/java/org/rulez/demokracia/pdengine/CastVoteTest.java @@ -54,7 +54,6 @@ public void the_assurances_of_the_voter_can_be_obtained_from_a_cast_vote_if_canu 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); - System.out.println("castVote: " + castVote); List assurances = castVote.getAssurances(); assertTrue(assurances == null); } diff --git a/src/test/java/org/rulez/demokracia/pdengine/UnimplementedTests.java b/src/test/java/org/rulez/demokracia/pdengine/UnimplementedTests.java deleted file mode 100644 index 2e5b6866..00000000 --- a/src/test/java/org/rulez/demokracia/pdengine/UnimplementedTests.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.rulez.demokracia.pdengine; - -import java.util.ArrayList; - -import org.junit.Test; -import org.rulez.demokracia.pdengine.annotations.TestedBehaviour; -import org.rulez.demokracia.pdengine.annotations.TestedFeature; -import org.rulez.demokracia.pdengine.annotations.TestedOperation; -import org.rulez.demokracia.testhelpers.ThrowableTester; - -@TestedFeature("Unimplemented") -@TestedOperation("Unimplemented") -@TestedBehaviour("Unimplemented") -public class UnimplementedTests extends ThrowableTester { - -// @Test -// public void the_getAssurances_method_is_not_implemented_yet() { -// assertUnimplemented(() -> new CastVote("proxyId", new ArrayList<>()).getAssurances()); -// } -} From 731fcdaa8f2822b5591111208072622ca5e9a7f6 Mon Sep 17 00:00:00 2001 From: valentinbujdoso Date: Sun, 7 Apr 2019 20:56:41 +0200 Subject: [PATCH 08/12] Fix --- .../pdengine/ADAAssuranceProvider.java | 2 +- .../pdengine/FakeADAAssuranceProvider.java | 17 +++++------------ .../pdengine/SessionFactoryManager.java | 2 +- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/rulez/demokracia/pdengine/ADAAssuranceProvider.java b/src/main/java/org/rulez/demokracia/pdengine/ADAAssuranceProvider.java index 6056fed3..49bcc75d 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/ADAAssuranceProvider.java +++ b/src/main/java/org/rulez/demokracia/pdengine/ADAAssuranceProvider.java @@ -3,5 +3,5 @@ import java.util.List; public interface ADAAssuranceProvider { - public List getassurancesFor(String proxyId); + List getassurancesFor(String proxyId); } diff --git a/src/main/java/org/rulez/demokracia/pdengine/FakeADAAssuranceProvider.java b/src/main/java/org/rulez/demokracia/pdengine/FakeADAAssuranceProvider.java index 36aaa959..a26f94ed 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/FakeADAAssuranceProvider.java +++ b/src/main/java/org/rulez/demokracia/pdengine/FakeADAAssuranceProvider.java @@ -5,25 +5,18 @@ public class FakeADAAssuranceProvider implements ADAAssuranceProvider{ private ADAAssuranceProvider assuranceProvider; - public FakeADAAssuranceProvider(FakeADAAssuranceProvider adaAssuranceProvider) { - setAssuranceProvider(adaAssuranceProvider); + public FakeADAAssuranceProvider(final FakeADAAssuranceProvider adaAssuranceProvider) { + assuranceProvider = adaAssuranceProvider; } - public List getassurancesFor(String proxyId) { + @Override + public List getassurancesFor(final String proxyId) { return getUser(proxyId).getAssurances(); } - private User getUser(String proxyId) { + private User getUser(final String proxyId) { User user = new User(proxyId); user.assurances.add("TestAssurances"); return user; } - - public ADAAssuranceProvider getAssuranceProvider() { - return assuranceProvider; - } - - public void setAssuranceProvider(ADAAssuranceProvider assuranceProvider) { - this.assuranceProvider = assuranceProvider; - } } diff --git a/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java b/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java index a66d9c8b..f5d6b0e5 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java +++ b/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java @@ -9,7 +9,7 @@ public class SessionFactoryManager { protected Session session; - private ADAAssuranceProvider adaAssuranceProvider; + private final ADAAssuranceProvider adaAssuranceProvider; private final WebServiceContext wsContext; public SessionFactoryManager(final WebServiceContext wsContext) { From c2da5df35a3e3f7ef30e1bfa903bbed017c99dda Mon Sep 17 00:00:00 2001 From: Valentin Bujdoso Date: Mon, 8 Apr 2019 22:14:35 +0200 Subject: [PATCH 09/12] Fix --- .../pdengine/ADAAssuranceManager.java | 17 ++++++++++++++ .../pdengine/ADAAssuranceProvider.java | 7 ------ .../demokracia/pdengine/AssuranceManager.java | 7 ++++++ .../pdengine/FakeADAAssuranceProvider.java | 22 ------------------- .../demokracia/pdengine/IVoteManager.java | 12 ++++++---- .../pdengine/SessionFactoryManager.java | 12 ---------- .../demokracia/pdengine/VoteManagerUtils.java | 4 ++-- .../demokracia/pdengine/VoteRegistry.java | 11 +++++++++- .../servlet/VoteManagerInterface.java | 2 +- .../demokracia/pdengine/CastVoteTest.java | 2 +- .../demokracia/pdengine/SessionTest.java | 4 ++-- .../CreatedDefaultVoteRegistry.java | 8 +++++-- 12 files changed, 54 insertions(+), 54 deletions(-) create mode 100644 src/main/java/org/rulez/demokracia/pdengine/ADAAssuranceManager.java delete mode 100644 src/main/java/org/rulez/demokracia/pdengine/ADAAssuranceProvider.java create mode 100644 src/main/java/org/rulez/demokracia/pdengine/AssuranceManager.java delete mode 100644 src/main/java/org/rulez/demokracia/pdengine/FakeADAAssuranceProvider.java diff --git a/src/main/java/org/rulez/demokracia/pdengine/ADAAssuranceManager.java b/src/main/java/org/rulez/demokracia/pdengine/ADAAssuranceManager.java new file mode 100644 index 00000000..6679c8b9 --- /dev/null +++ b/src/main/java/org/rulez/demokracia/pdengine/ADAAssuranceManager.java @@ -0,0 +1,17 @@ +package org.rulez.demokracia.pdengine; + +import java.util.List; + +public class ADAAssuranceManager implements AssuranceManager{ + + @Override + public List getAssurances(final String proxyId) { + return getUser(proxyId).getAssurances(); + } + + private User getUser(final String proxyId) { + User user = new User(proxyId); + user.assurances.add("TestAssurances"); + return user; + } +} diff --git a/src/main/java/org/rulez/demokracia/pdengine/ADAAssuranceProvider.java b/src/main/java/org/rulez/demokracia/pdengine/ADAAssuranceProvider.java deleted file mode 100644 index 49bcc75d..00000000 --- a/src/main/java/org/rulez/demokracia/pdengine/ADAAssuranceProvider.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.rulez.demokracia.pdengine; - -import java.util.List; - -public interface ADAAssuranceProvider { - List getassurancesFor(String proxyId); -} diff --git a/src/main/java/org/rulez/demokracia/pdengine/AssuranceManager.java b/src/main/java/org/rulez/demokracia/pdengine/AssuranceManager.java new file mode 100644 index 00000000..e9f6cf08 --- /dev/null +++ b/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 getAssurances(String proxyId); +} diff --git a/src/main/java/org/rulez/demokracia/pdengine/FakeADAAssuranceProvider.java b/src/main/java/org/rulez/demokracia/pdengine/FakeADAAssuranceProvider.java deleted file mode 100644 index a26f94ed..00000000 --- a/src/main/java/org/rulez/demokracia/pdengine/FakeADAAssuranceProvider.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.rulez.demokracia.pdengine; - -import java.util.List; - -public class FakeADAAssuranceProvider implements ADAAssuranceProvider{ - private ADAAssuranceProvider assuranceProvider; - - public FakeADAAssuranceProvider(final FakeADAAssuranceProvider adaAssuranceProvider) { - assuranceProvider = adaAssuranceProvider; - } - - @Override - public List getassurancesFor(final String proxyId) { - return getUser(proxyId).getAssurances(); - } - - private User getUser(final String proxyId) { - User user = new User(proxyId); - user.assurances.add("TestAssurances"); - return user; - } -} diff --git a/src/main/java/org/rulez/demokracia/pdengine/IVoteManager.java b/src/main/java/org/rulez/demokracia/pdengine/IVoteManager.java index ee0b7a83..5ba9bc4c 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/IVoteManager.java +++ b/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(); @@ -41,8 +41,6 @@ VoteAdminInfo createVote(final String voteName, final Set neededAssuranc String getWsUserName(); boolean hasAssurance(final String role); - - List getAssurances(); void modifyVote(final VoteAdminInfo voteAdminInfo, final String voteName); @@ -51,5 +49,11 @@ VoteAdminInfo createVote(final String voteName, final Set neededAssuranc JsonObject showVote(final VoteAdminInfo adminInfo); void setVoteParameters(final VoteAdminInfo adminInfo, final VoteParameters voteParameters); + + List getAssurances(); + + static AssuranceManager getAssuranceManager() { + return new ADAAssuranceManager(); + } } \ No newline at end of file diff --git a/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java b/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java index f5d6b0e5..fe1b38fe 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java +++ b/src/main/java/org/rulez/demokracia/pdengine/SessionFactoryManager.java @@ -1,7 +1,5 @@ package org.rulez.demokracia.pdengine; -import java.util.List; - import javax.xml.ws.WebServiceContext; import org.hibernate.Session; @@ -9,14 +7,12 @@ public class SessionFactoryManager { protected Session session; - private final ADAAssuranceProvider adaAssuranceProvider; private final WebServiceContext wsContext; public SessionFactoryManager(final WebServiceContext wsContext) { super(); this.wsContext = wsContext; session = DBSessionManagerUtils.getDBSession(); - adaAssuranceProvider = new FakeADAAssuranceProvider(null); } public WebServiceContext getWsContext() { @@ -30,13 +26,5 @@ public String getWsUserName() { public boolean hasAssurance(final String role) { return getWsContext().isUserInRole(role); } - - public ADAAssuranceProvider getFakeADAAssuranceProvider() { - return adaAssuranceProvider; - } - - public List getAssurances() { - return getFakeADAAssuranceProvider().getassurancesFor(getWsUserName()); - } } \ No newline at end of file diff --git a/src/main/java/org/rulez/demokracia/pdengine/VoteManagerUtils.java b/src/main/java/org/rulez/demokracia/pdengine/VoteManagerUtils.java index d38f56ba..ef6c2b6d 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/VoteManagerUtils.java +++ b/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, AssuranceManager assuranceManager) { if(!registry.containsKey(wsContext)) { - registry.put(wsContext, new VoteRegistry(wsContext)); + registry.put(wsContext, new VoteRegistry(wsContext, assuranceManager)); } return registry.get(wsContext); } diff --git a/src/main/java/org/rulez/demokracia/pdengine/VoteRegistry.java b/src/main/java/org/rulez/demokracia/pdengine/VoteRegistry.java index a77e2af3..12307b41 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/VoteRegistry.java +++ b/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 AssuranceManager assuranceManager; + + public VoteRegistry(final WebServiceContext wsContext, AssuranceManager assuranceManager) { super(wsContext); + this.assuranceManager = assuranceManager; } @Override @@ -208,5 +211,11 @@ public void setVoteParameters(final VoteAdminInfo adminInfo, final VoteParameter throw new ReportedException("Illegal minEndorsements", Integer.toString(voteParameters.minEndorsements)); } } + + @Override + public List getAssurances() { + String wsUserName = this.getWsUserName(); + return assuranceManager.getAssurances(wsUserName); + } } diff --git a/src/main/java/org/rulez/demokracia/pdengine/servlet/VoteManagerInterface.java b/src/main/java/org/rulez/demokracia/pdengine/servlet/VoteManagerInterface.java index 9ab5b682..1c133144 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/servlet/VoteManagerInterface.java +++ b/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, diff --git a/src/test/java/org/rulez/demokracia/pdengine/CastVoteTest.java b/src/test/java/org/rulez/demokracia/pdengine/CastVoteTest.java index 1662610d..c0e60479 100644 --- a/src/test/java/org/rulez/demokracia/pdengine/CastVoteTest.java +++ b/src/test/java/org/rulez/demokracia/pdengine/CastVoteTest.java @@ -46,7 +46,7 @@ public void the_preferences_can_be_obtained_when_they_contain_choices() { 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("TestAssurances", castVote.assurances.get(0)); + assertEquals("magyar", castVote.assurances.get(0)); } @TestedBehaviour("The assurances of the voter can be obtained from a cast vote if canupdateis true") diff --git a/src/test/java/org/rulez/demokracia/pdengine/SessionTest.java b/src/test/java/org/rulez/demokracia/pdengine/SessionTest.java index a55c43be..57bdfa84 100644 --- a/src/test/java/org/rulez/demokracia/pdengine/SessionTest.java +++ b/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); } diff --git a/src/test/java/org/rulez/demokracia/pdengine/testhelpers/CreatedDefaultVoteRegistry.java b/src/test/java/org/rulez/demokracia/pdengine/testhelpers/CreatedDefaultVoteRegistry.java index 3181b203..dd18bd75 100644 --- a/src/test/java/org/rulez/demokracia/pdengine/testhelpers/CreatedDefaultVoteRegistry.java +++ b/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 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() { From 906ed54d2b3e0480a4892852732d306189d44ac4 Mon Sep 17 00:00:00 2001 From: Valentin Bujdoso Date: Mon, 8 Apr 2019 22:30:16 +0200 Subject: [PATCH 10/12] Fix --- .../org/rulez/demokracia/pdengine/ADAAssuranceManager.java | 7 +------ src/main/java/org/rulez/demokracia/pdengine/User.java | 5 ----- .../org/rulez/demokracia/pdengine/VoteManagerUtils.java | 2 +- .../java/org/rulez/demokracia/pdengine/VoteRegistry.java | 4 ++-- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/rulez/demokracia/pdengine/ADAAssuranceManager.java b/src/main/java/org/rulez/demokracia/pdengine/ADAAssuranceManager.java index 6679c8b9..bd565f5d 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/ADAAssuranceManager.java +++ b/src/main/java/org/rulez/demokracia/pdengine/ADAAssuranceManager.java @@ -6,12 +6,7 @@ public class ADAAssuranceManager implements AssuranceManager{ @Override public List getAssurances(final String proxyId) { - return getUser(proxyId).getAssurances(); + throw new UnsupportedOperationException(); } - private User getUser(final String proxyId) { - User user = new User(proxyId); - user.assurances.add("TestAssurances"); - return user; - } } diff --git a/src/main/java/org/rulez/demokracia/pdengine/User.java b/src/main/java/org/rulez/demokracia/pdengine/User.java index a1165468..bec0d055 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/User.java +++ b/src/main/java/org/rulez/demokracia/pdengine/User.java @@ -1,7 +1,6 @@ package org.rulez.demokracia.pdengine; import java.util.ArrayList; -import java.util.List; import javax.persistence.Entity; @@ -17,9 +16,5 @@ public User(final String proxyId) { this.proxyId = proxyId; assurances = new ArrayList<>(); } - - public List getAssurances() { - return assurances; - } } diff --git a/src/main/java/org/rulez/demokracia/pdengine/VoteManagerUtils.java b/src/main/java/org/rulez/demokracia/pdengine/VoteManagerUtils.java index ef6c2b6d..50053102 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/VoteManagerUtils.java +++ b/src/main/java/org/rulez/demokracia/pdengine/VoteManagerUtils.java @@ -12,7 +12,7 @@ final public class VoteManagerUtils { private VoteManagerUtils() { } - public static IVoteManager getVoteManager(final WebServiceContext wsContext, AssuranceManager assuranceManager) { + public static IVoteManager getVoteManager(final WebServiceContext wsContext, final AssuranceManager assuranceManager) { if(!registry.containsKey(wsContext)) { registry.put(wsContext, new VoteRegistry(wsContext, assuranceManager)); } diff --git a/src/main/java/org/rulez/demokracia/pdengine/VoteRegistry.java b/src/main/java/org/rulez/demokracia/pdengine/VoteRegistry.java index 12307b41..30dcabf1 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/VoteRegistry.java +++ b/src/main/java/org/rulez/demokracia/pdengine/VoteRegistry.java @@ -11,9 +11,9 @@ import com.google.gson.JsonObject; public class VoteRegistry extends ChoiceManager implements IVoteManager { - private AssuranceManager assuranceManager; + final private AssuranceManager assuranceManager; - public VoteRegistry(final WebServiceContext wsContext, AssuranceManager assuranceManager) { + public VoteRegistry(final WebServiceContext wsContext, final AssuranceManager assuranceManager) { super(wsContext); this.assuranceManager = assuranceManager; } From 73d6727a7c60a70241b233d8397b86e1fb083762 Mon Sep 17 00:00:00 2001 From: Valentin Bujdoso Date: Mon, 8 Apr 2019 22:48:04 +0200 Subject: [PATCH 11/12] Kill mutant --- src/main/java/org/rulez/demokracia/pdengine/VoteRegistry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/rulez/demokracia/pdengine/VoteRegistry.java b/src/main/java/org/rulez/demokracia/pdengine/VoteRegistry.java index 30dcabf1..91bed00a 100644 --- a/src/main/java/org/rulez/demokracia/pdengine/VoteRegistry.java +++ b/src/main/java/org/rulez/demokracia/pdengine/VoteRegistry.java @@ -11,7 +11,7 @@ import com.google.gson.JsonObject; public class VoteRegistry extends ChoiceManager implements IVoteManager { - final private AssuranceManager assuranceManager; + private final AssuranceManager assuranceManager; public VoteRegistry(final WebServiceContext wsContext, final AssuranceManager assuranceManager) { super(wsContext); From cba82d99481814cde5404f2868ea8668f4fc223d Mon Sep 17 00:00:00 2001 From: Valentin Bujdoso Date: Sun, 14 Apr 2019 20:05:07 +0200 Subject: [PATCH 12/12] Fix --- .../pdengine/UnimplementedTests.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 src/test/java/org/rulez/demokracia/pdengine/UnimplementedTests.java diff --git a/src/test/java/org/rulez/demokracia/pdengine/UnimplementedTests.java b/src/test/java/org/rulez/demokracia/pdengine/UnimplementedTests.java new file mode 100644 index 00000000..95c58b10 --- /dev/null +++ b/src/test/java/org/rulez/demokracia/pdengine/UnimplementedTests.java @@ -0,0 +1,25 @@ +package org.rulez.demokracia.pdengine; + +import static org.junit.Assert.*; + +import java.util.List; + +import org.junit.Before; +import org.junit.Test; +import org.rulez.demokracia.pdengine.annotations.TestedBehaviour; +import org.rulez.demokracia.pdengine.annotations.TestedFeature; +import org.rulez.demokracia.pdengine.annotations.TestedOperation; +import org.rulez.demokracia.pdengine.testhelpers.CreatedDefaultChoice; +import org.rulez.demokracia.testhelpers.ThrowableTester; + +@TestedFeature("Supporting functionality") +@TestedOperation("User") +@TestedBehaviour("the user has a proxy id") +public class UnimplementedTests extends ThrowableTester { + + @Test + public void a() { + ADAAssuranceManager a = new ADAAssuranceManager(); + assertUnimplemented(() -> a.getAssurances("UnImplementedTest")); + } +}