Changeset 10 for protocol/src/test/java/geniusweb/protocol/session/saop/SAOPTest.java

Timestamp:

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

Author:

bart

Message:

Update 28 jan 2020

File:

• protocol/src/test/java/geniusweb/protocol/session/saop/SAOPTest.java (modified) (7 diffs)

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),