Changeset 22 for events/src/test/java/actions/VoteTest.java

Timestamp:

09/22/20 16:26:36 (4 years ago)

Author:

bart

Message:

Minor fixes

File:

• events/src/test/java/actions/VoteTest.java (modified) (5 diffs)

events/src/test/java/actions/VoteTest.java

@@ -6 +6 @@
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -39 +38 @@
         private final static Value VALUE2 = new NumberValue("10");
         // issue 2 is NUMBER and thus serializes with leading '='
-        private final String votestring = "{\"vote\":{\"actor\":\"party1\",\"bid\":{\"issuevalues\":{\"issue2\":10,\"issue1\":\"value1\"}},\"minPower\":1}}";
+        private final String votestring = "{\"vote\":{\"actor\":\"party1\",\"bid\":{\"issuevalues\":{\"issue2\":10,\"issue1\":\"value1\"}},\"minPower\":1,\"maxPower\":2}}";
 
-        private static Vote vote1, vote1a, vote2, vote3, vote4;
+        private static Vote vote1, vote1a, vote2, vote3, vote4, vote5;
 
         static {
@@ -47 +46 @@
                 issuevalues.put(ISSUE2, VALUE2);
                 bid = new Bid(issuevalues);
-                vote1 = new Vote(id, bid, 1);
-                vote1a = new Vote(id, bid, 1);
+                vote1 = new Vote(id, bid, 1, 2);
+                vote1a = new Vote(id, bid, 1, 2);
 
-                vote2 = new Vote(id2, bid, 1);
+                vote2 = new Vote(id2, bid, 1, 2);
 
                 // values swapped, so different issuevalues.
@@ -56 +55 @@
                 issuevaluesb.put(ISSUE2, VALUE2);
                 bidb = new Bid(issuevaluesb);
-                vote3 = new Vote(id, bidb, 1);
+                vote3 = new Vote(id, bidb, 1, 2);
 
-                vote4 = new Vote(id, bid, 2);
+                vote4 = new Vote(id, bid, 2, 2);
+                vote5 = new Vote(id, bid, 1, 3);
 
         }
@@ -64 +64 @@
         @Override
         public List<List<Vote>> getGeneralTestData() {
-                List<List<Vote>> list = new LinkedList<>();
-                list.add(Arrays.asList(vote1, vote1a));
-                list.add(Arrays.asList(vote2));
-                list.add(Arrays.asList(vote3));
-                list.add(Arrays.asList(vote4));
-                return list;
+                return Arrays.asList(Arrays.asList(vote1, vote1a), Arrays.asList(vote2),
+                                Arrays.asList(vote3), Arrays.asList(vote4),
+                                Arrays.asList(vote5));
         }
 
         @Override
         public List<String> getGeneralTestStrings() {
-                return Arrays.asList("Vote.*party1.*issue2=10.*issue1=.value1.*1.*",
-                                "Vote.*party2.*issue2=10.*issue1=.value1.*1.*",
-                                "Vote.*party1.*issue2=10.*issue1=10.*1.*",
-                                "Vote.*party1.*issue2=10.*issue1=.value1.*2.*");
+                return Arrays.asList("Vote.*party1.*issue2=10.*issue1=.value1.*1.*2.*",
+                                "Vote.*party2.*issue2=10.*issue1=.value1.*1.*2.*",
+                                "Vote.*party1.*issue2=10.*issue1=10.*1.*2.*",
+                                "Vote.*party1.*issue2=10.*issue1=.value1.*2.*2.*",
+                                "Vote.*party1.*issue2=10.*issue1=.value1.*1.*3.*");
         }