Changeset 21 for party/src

Timestamp:

09/22/20 08:52:04 (4 years ago)

Author:

bart

Message:

Version 1.5.

Location:

party/src

Files:

• main/java/geniusweb/party/DefaultParty.java (modified) (1 diff)
• main/java/geniusweb/party/Party.java (modified) (1 diff)
• test/java/geniusweb/party/inform/ActionDoneTest.java (modified) (1 diff)
• test/java/geniusweb/party/inform/AgreementsTest.java (added)
• test/java/geniusweb/party/inform/FinishedTest.java (modified) (5 diffs)
• test/java/geniusweb/party/inform/OptInTest.java (added)
• test/java/geniusweb/party/inform/SettingsTest.java (modified) (1 diff)
• test/java/geniusweb/party/inform/VotingTest.java (added)
• test/java/geniusweb/party/inform/YourTurnTest.java (modified) (1 diff)

party/src/main/java/geniusweb/party/DefaultParty.java

@@ -3 +3 @@
 import geniusweb.actions.Action;
 import geniusweb.connection.ConnectionEnd;
-import geniusweb.party.inform.Inform;
+import geniusweb.inform.Inform;
 import tudelft.utilities.listener.Listener;
 import tudelft.utilities.logging.ReportToLogger;

party/src/main/java/geniusweb/party/Party.java

@@ -3 +3 @@
 import geniusweb.actions.Action;
 import geniusweb.connection.Connectable;
-import geniusweb.party.inform.Inform;
+import geniusweb.inform.Inform;
 
 /**

party/src/test/java/geniusweb/party/inform/ActionDoneTest.java

@@ -21 +21 @@
 import geniusweb.actions.Accept;
 import geniusweb.actions.PartyId;
+import geniusweb.inform.ActionDone;
+import geniusweb.inform.Inform;
 import geniusweb.issuevalue.Bid;
 import geniusweb.issuevalue.DiscreteValue;
 import geniusweb.issuevalue.NumberValue;
 import geniusweb.issuevalue.Value;
-import geniusweb.party.inform.ActionDone;
-import geniusweb.party.inform.Inform;
 import tudelft.utilities.junit.GeneralTests;
 

party/src/test/java/geniusweb/party/inform/FinishedTest.java

@@ -8 +8 @@
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -19 +20 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import geniusweb.actions.PartyId;
+import geniusweb.inform.Agreements;
+import geniusweb.inform.Finished;
+import geniusweb.inform.Inform;
 import geniusweb.issuevalue.Bid;
 import geniusweb.issuevalue.DiscreteValue;
 import geniusweb.issuevalue.NumberValue;
 import geniusweb.issuevalue.Value;
-import geniusweb.party.inform.Finished;
-import geniusweb.party.inform.Inform;
 import tudelft.utilities.junit.GeneralTests;
 
@@ -31 +34 @@
         private Finished finished1, finished1a, finished2, finished3;
 
-        private String asJson = "{\"Finished\":{\"agreedBid\":{\"issuevalues\":{\"issue3\":9012,\"issue2\":1,\"issue1\":\"b\"}}}}";
+        private String asJson = "{\"Finished\":{\"agreements\":{\"party2\":{\"issuevalues\":{\"issue3\":9012,\"issue2\":1,\"issue1\":\"b\"}},\"party1\":{\"issuevalues\":{\"issue3\":9012,\"issue2\":1,\"issue1\":\"b\"}}}}}";
+
+        private PartyId party1 = new PartyId("party1");
+        private PartyId party2 = new PartyId("party2");
 
         @Before
@@ -57 +63 @@
                 Bid bidc = new Bid(issuevaluesc);
 
-                finished1 = new Finished(bid);
-                finished1a = new Finished(bid);
-                finished2 = new Finished(bidb);
-                finished3 = new Finished(bidc);
+                Agreements agree = new Agreements().with(bid,
+                                new HashSet<>(Arrays.asList(party1, party2)));
+                Agreements agreeb = new Agreements().with(bidb,
+                                new HashSet<>(Arrays.asList(party1, party2)));
+                Agreements agreec = new Agreements().with(bidc,
+                                new HashSet<>(Arrays.asList(party1, party2)));
+
+                finished1 = new Finished(agree);
+                finished1a = new Finished(agree);
+                finished2 = new Finished(agreeb);
+                finished3 = new Finished(agreec);
         }
 
@@ -93 +106 @@
         public void testDeserialize()
                         throws JsonParseException, JsonMappingException, IOException {
+                // FIXME there seems a disturbing bug in this test,
+                // jackson seems to ignore the @JsonProperty annotation and therefore
+                // this test does not work in some cases.
                 ObjectMapper jackson = new ObjectMapper();
                 Finished p = (Finished) jackson.readValue(asJson, Inform.class);

party/src/test/java/geniusweb/party/inform/SettingsTest.java

@@ -21 +21 @@
 
 import geniusweb.actions.PartyId;
+import geniusweb.inform.Inform;
+import geniusweb.inform.Settings;
 import geniusweb.progress.ProgressRounds;
 import geniusweb.references.Parameters;

party/src/test/java/geniusweb/party/inform/YourTurnTest.java

@@ -16 +16 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import geniusweb.party.inform.Inform;
-import geniusweb.party.inform.YourTurn;
+import geniusweb.inform.Inform;
+import geniusweb.inform.YourTurn;
 import tudelft.utilities.junit.GeneralTests;