Changeset 10 for protocol/src/test/java/geniusweb

Timestamp:

01/28/20 10:19:54 (4 years ago)

Author:

bart

Message:

Update 28 jan 2020

Location:

protocol/src/test/java/geniusweb/protocol

Files:

• session/DefaultSessionStateTest.java (modified) (3 diffs)
• session/saop/SAOPSettingsTest.java (modified) (4 diffs)
• session/saop/SAOPStateTest.java (modified) (6 diffs)
• session/saop/SAOPTest.java (modified) (7 diffs)
• session/saop/SaopPartyWithProfileTest.java (added)
• session/shaop (added)
• session/shaop/SHAOPSettingsTest.java (added)
• tournament/allpermutations (added)
• tournament/allpermutations/AllPermutationsProtocolTest.java (added)
• tournament/allpermutations/AllPermutationsSettingsTest.java (added)
• tournament/allpermutations/AllPermutationsStateTest.java (added)

protocol/src/test/java/geniusweb/protocol/session/DefaultSessionStateTest.java

@@ -29 +29 @@
 import geniusweb.protocol.partyconnection.ProtocolToPartyConnections;
 import geniusweb.protocol.session.saop.SAOPSettings;
+import geniusweb.protocol.session.saop.SaopPartyWithProfile;
 import geniusweb.references.Parameters;
 import geniusweb.references.PartyRef;
@@ -39 +40 @@
         private final ObjectMapper jackson = new ObjectMapper();
         private DefaultSessionState1 state1, state1a, stateA, stateE, stateF;
+        // The 1 is because we are testing an instance, not the abstract class
         private String state1string = "{\"DefaultSessionState1\":{\"actions\":[],\"progress\":{\"time\":{\"duration\":1000,\"start\":1000}},\"settings\":{\"SAOPSettings\":{\"participants\":[{\"party\":{\"partyref\":\"party1\",\"parameters\":{}},\"profile\":\"profile1\"},{\"party\":{\"partyref\":\"party2\",\"parameters\":{}},\"profile\":\"profile2\"}],\"deadline\":{\"deadlinetime\":{\"durationms\":1000}}}},\"error\":null,\"partyprofiles\":{\"party1\":{\"party\":{\"partyref\":\"party1\",\"parameters\":{}},\"profile\":\"profile1\"}}}}";
         private ProgressTime progr;
@@ -58 +60 @@
                                 new PartyRef("party2"), new Parameters());
                 ProfileRef profile2 = new ProfileRef("profile2");
-                List<PartyWithProfile> participants = Arrays.asList(
-                                new PartyWithProfile(party1ref, profile1),
-                                new PartyWithProfile(party2ref, profile2));
+                List<SaopPartyWithProfile> participants = Arrays.asList(
+                                new SaopPartyWithProfile(party1ref, profile1),
+                                new SaopPartyWithProfile(party2ref, profile2));
                 SessionSettings settings = new SAOPSettings(participants, deadline);
                 ProtocolException e = new ProtocolException("test protocol error",

protocol/src/test/java/geniusweb/protocol/session/saop/SAOPSettingsTest.java

@@ -23 +23 @@
 import geniusweb.references.PartyRef;
 import geniusweb.references.PartyWithParameters;
-import geniusweb.references.PartyWithProfile;
 import geniusweb.references.ProfileRef;
 import tudelft.utilities.junit.GeneralTests;
@@ -30 +29 @@
 public class SAOPSettingsTest extends GeneralTests<SAOPSettings> {
 
-        private PartyWithProfile partyprof1 = mock(PartyWithProfile.class);
-        private PartyWithProfile partyprof2 = mock(PartyWithProfile.class);
-        private PartyWithProfile partyprof3 = mock(PartyWithProfile.class);
-        private List<PartyWithProfile> participants2 = Arrays.asList(partyprof1,
+        private SaopPartyWithProfile partyprof1 = mock(SaopPartyWithProfile.class);
+        private SaopPartyWithProfile partyprof2 = mock(SaopPartyWithProfile.class);
+        private SaopPartyWithProfile partyprof3 = mock(SaopPartyWithProfile.class);
+        private List<SaopPartyWithProfile> participants2 = Arrays.asList(partyprof1,
                         partyprof2);
-        private List<PartyWithProfile> participants3 = Arrays.asList(partyprof1,
+        private List<SaopPartyWithProfile> participants3 = Arrays.asList(partyprof1,
                         partyprof2, partyprof3);
 
@@ -67 +66 @@
                                 new PartyRef("http://party2"), new Parameters());
                 ProfileRef profile2 = new ProfileRef("http://profile2");
-                PartyWithProfile partywithprof1 = new PartyWithProfile(party1,
+                SaopPartyWithProfile partywithprof1 = new SaopPartyWithProfile(party1,
                                 profile1);
-                PartyWithProfile partywithprof2 = new PartyWithProfile(party2,
+                SaopPartyWithProfile partywithprof2 = new SaopPartyWithProfile(party2,
                                 profile2);
-                List<PartyWithProfile> participants = Arrays.asList(partywithprof1,
+                List<SaopPartyWithProfile> participants = Arrays.asList(partywithprof1,
                                 partywithprof2);
 
@@ -141 +140 @@
                 SAOPSettings saop = new SAOPSettings(participants2, deadline);
                 SessionSettings saop2 = saop.with(partyprof3);
-                assertEquals(3, saop2.getParticipants().size());
+                assertEquals(3, saop2.getTeams().size());
         }
 

protocol/src/test/java/geniusweb/protocol/session/saop/SAOPStateTest.java

@@ -27 +27 @@
 import geniusweb.progress.ProgressTime;
 import geniusweb.protocol.ProtocolException;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConn;
 import geniusweb.protocol.partyconnection.ProtocolToPartyConnections;
-import geniusweb.protocol.partyconnection.ProtocolToPartyConn;
 import geniusweb.protocol.session.SessionSettings;
 import tudelft.utilities.junit.GeneralTests;
@@ -220 +220 @@
         }
 
-        @Test
+        @Test(expected = IllegalArgumentException.class)
         public void withWrongActionTest() {
                 // wrong because action has actor null which does not match party1
                 SAOPState state = state1.with(party1, action);
-                assertEquals(1, state.getActions().size());
-                assertEquals(action, state.getActions().get(0));
-                assertTrue(state.isFinal(NOW));
-                assertEquals(
-                                "geniusweb.protocol.ProtocolException: party1:act contains wrong credentials: act1",
-                                state.getError().toString());
-        }
-
-        @Test
+//              assertEquals(1, state.getActions().size());
+//              assertEquals(action, state.getActions().get(0));
+//              assertTrue(state.isFinal(NOW));
+        }
+
+        @Test(expected = IllegalArgumentException.class)
         public void withActionTest() {
                 when(action.getActor()).thenReturn(party1);
-                SAOPState state = state1.with(party1, action);
-                assertEquals(1, state.getActions().size());
-                assertEquals(action, state.getActions().get(0));
+                state1.with(party1, action);
         }
 
@@ -265 +260 @@
         }
 
-        @Test
+        @Test(expected = IllegalArgumentException.class)
         public void RefuseImmediateAccept() {
                 Accept nullaccept = new Accept(party1, null);
                 SAOPState state = state1.with(party1, nullaccept);
-                assertTrue(state.isFinal(NOW));
-                assertEquals(
-                                "geniusweb.protocol.ProtocolException: party1:Accept without a recent offer",
-                                state.getError().toString());
-        }
-
-        @Test
+        }
+
+        @Test(expected = IllegalArgumentException.class)
         public void RefuseNotMyTurn() {
                 List<Action> actions = Arrays.asList(offer1);
@@ -281 +272 @@
                                 settings, null, null);
 
-                state = state.with(party1, offer1);
-                assertTrue(state.isFinal(NOW));
-                assertEquals(
-                                "geniusweb.protocol.ProtocolException: party1:Party does not have the turn ",
-                                state.getError().toString());
-        }
-
-        @Test
+                state.with(party1, offer1);
+//              assertTrue(state.isFinal(NOW));
+//              assertEquals(
+//                              "geniusweb.protocol.ProtocolException: party1:Party does not have the turn ",
+//                              state.getError().toString());
+        }
+
+        @Test(expected = IllegalArgumentException.class)
         public void RefuseNullAccept() {
                 List<Action> actions = Arrays.asList(offer1);
@@ -297 +288 @@
                 state = state.with(party2, nullaccept);
                 assertTrue(state.isFinal(NOW));
-                assertTrue(state.getError().toString().matches(
-                                ".*party2.*Party accepts a bid differing from the last offer.*"));
-        }
-
-        @Test
+        }
+
+        @Test(expected = IllegalArgumentException.class)
         public void RefuseNullAction() {
                 List<Action> actions = Arrays.asList(offer1);
@@ -308 +297 @@
 
                 state = state.with(party2, null);
-                assertEquals(
-                                "geniusweb.protocol.ProtocolException: party2:action is null",
-                                state.getError().toString());
         }
 

protocol/src/test/java/geniusweb/protocol/session/saop/SAOPTest.java

@@ -20 +20 @@
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.junit.Test;
@@ -39 +40 @@
 import geniusweb.progress.Progress;
 import geniusweb.protocol.ProtocolException;
-import geniusweb.protocol.partyconnection.ProtocolToPartyConnections;
 import geniusweb.protocol.partyconnection.ProtocolToPartyConn;
 import geniusweb.protocol.partyconnection.ProtocolToPartyConnFactory;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConnections;
+import geniusweb.protocol.session.TeamOfPartiesAndProfiles;
 import geniusweb.references.Parameters;
 import geniusweb.references.PartyRef;
@@ -73 +75 @@
         private final PartyRef party2ref = mock(PartyRef.class);
         private final SAOPSettings settings = mock(SAOPSettings.class);
-        private final PartyWithProfile party1 = mock(PartyWithProfile.class);
-        private final PartyWithProfile party2 = mock(PartyWithProfile.class);
+        private final SaopPartyWithProfile team1 = mock(SaopPartyWithProfile.class);
+        private final SaopPartyWithProfile team2 = mock(SaopPartyWithProfile.class);
         private SAOP saop;
         private ProtocolToPartyConnFactory factory;
@@ -80 +82 @@
         private ProtocolToPartyConn conn1 = mock(ProtocolToPartyConn.class),
                         conn2 = mock(ProtocolToPartyConn.class);
-        private Map<PartyId, PartyWithProfile> partyprofiles;
+        private Map<PartyId, SaopPartyWithProfile> partyprofiles;
         private Progress progress = mock(Progress.class);
         private ProfileRef profile1;
@@ -101 +103 @@
                         throws URISyntaxException, IOException, NoResourcesNowException {
                 SAOP = new ProtocolRef("SAOP");
-                when(party1.getParty()).thenReturn(partywithparam1);
-                when(party2.getParty()).thenReturn(partywithparam2);
+                when(team1.getParty()).thenReturn(partywithparam1);
+                when(team2.getParty()).thenReturn(partywithparam2);
+                when(team1.getAllParties()).thenReturn(Arrays.asList(team1));
+                when(team2.getAllParties()).thenReturn(Arrays.asList(team2));
 
                 partyprofiles = new HashMap<>();
-                partyprofiles.put(PARTY1ID, party1);
-                partyprofiles.put(PARTY2ID, party2);
+                partyprofiles.put(PARTY1ID, team1);
+                partyprofiles.put(PARTY2ID, team2);
 
                 when(deadlinetime.getDuration()).thenReturn(1000l);
 
-                List<PartyWithProfile> participants = new ArrayList<>();
-                participants.add(party1);
-                participants.add(party2);
-                when(settings.getParticipants()).thenReturn(participants);
+                List<TeamOfPartiesAndProfiles> teams = new ArrayList<>();
+                teams.add(team1);
+                teams.add(team2);
+                when(settings.getTeams()).thenReturn(teams);
+                when(settings.getAllParties()).thenReturn(Arrays.asList(team1, team2));
                 when(settings.getDeadline()).thenReturn(deadlinetime);
 
@@ -126 +131 @@
 
                 profile1 = mock(ProfileRef.class);
-                when(party1.getProfile()).thenReturn(profile1);
+                when(team1.getProfile()).thenReturn(profile1);
                 profile2 = mock(ProfileRef.class);
-                when(party2.getProfile()).thenReturn(profile2);
+                when(team2.getProfile()).thenReturn(profile2);
 
                 mockState(connectedstate, "connected state");
@@ -157 +162 @@
                 when(state.getSettings()).thenReturn(settings);
                 when(state.getConnections()).thenReturn(connectionswithparties);
-                when(state.getPartyProfiles()).thenReturn(partyprofiles);
+                when(state.getPartyProfiles())
+                                .thenReturn(partyprofiles.entrySet().stream().collect(
+                                                Collectors.toMap(e -> e.getKey(), e -> e.getValue())));
                 when(state.getProgress()).thenReturn(progress);
                 when(state.with(any(ProtocolToPartyConn.class),