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

Timestamp:

06/11/20 16:34:40 (4 years ago)

Author:

bart

Message:

Update to version 1.41

Location:

protocol/src/test/java/geniusweb/protocol

Files:

• session/shaop/SHAOPStateTest.java (added)
• tournament/allpermutations/AllPermutationsSettingsTest.java (modified) (10 diffs)

protocol/src/test/java/geniusweb/protocol/tournament/allpermutations/AllPermutationsSettingsTest.java

@@ -32 +32 @@
         private final ObjectMapper jackson = new ObjectMapper();
 
-        private final String serialized = "{\"AllPermutationsSettings\":{\"teams\":[{\"Team\":[{\"partyref\":\"party1\",\"parameters\":{}}]},{\"Team\":[{\"partyref\":\"party2\",\"parameters\":{}}]}],\"profileslists\":[{\"ProfileList\":[\"profile1\"]},{\"ProfileList\":[\"profile2\"]},{\"ProfileList\":[\"profile3\"]}],\"reuseTeams\":false,\"teamsPerSession\":2,\"sessionsettings\":{\"SAOPSettings\":{\"participants\":[],\"deadline\":{\"deadlinetime\":{\"durationms\":10000}}}}}}";
+        private final String serialized = "{\"AllPermutationsSettings\":{\"teams\":[{\"Team\":[{\"partyref\":\"party1\",\"parameters\":{}}]},{\"Team\":[{\"partyref\":\"party2\",\"parameters\":{}}]}],\"profileslists\":[{\"ProfileList\":[\"profile1\"]},{\"ProfileList\":[\"profile2\"]},{\"ProfileList\":[\"profile3\"]}],\"reuseTeams\":false,\"teamsPerSession\":2,\"sessionsettings\":{\"SAOPSettings\":{\"participants\":[],\"deadline\":{\"deadlinetime\":{\"durationms\":10000}}}},\"numberTournaments\":1}}";
         private AllPermutationsSettings settings, settings1a, settings2, settings3,
-                        settings4;
+                        settings4, settings5;
 
         // use directly because there is some hard coding currently.
@@ -76 +76 @@
 
                 settings = new AllPermutationsSettings(parties, profiles, false, 2,
-                                saopsettings);
+                                saopsettings, 1);
 
                 settings1a = new AllPermutationsSettings(parties, profiles, false, 2,
-                                saopsettings);
+                                saopsettings, 1);
 
                 settings2 = new AllPermutationsSettings(Arrays.asList(partywithparams1,
                                 partywithparams2, partywithparams3), profiles, false, 2,
-                                saopsettings);
+                                saopsettings, 1);
 
                 settings3 = new AllPermutationsSettings(parties, profiles, true, 2,
-                                saopsettings);
+                                saopsettings, 1);
 
                 settings4 = new AllPermutationsSettings(parties,
                                 Arrays.asList(profiles1, profiles2, profiles3, profiles1),
-                                false, 2, saopsettings);
+                                false, 2, saopsettings, 1);
+
+                settings5 = new AllPermutationsSettings(parties, profiles, false, 2,
+                                saopsettings, 2);
 
         }
@@ -98 +101 @@
                 return Arrays.asList(Arrays.asList(settings, settings1a),
                                 Arrays.asList(settings2), Arrays.asList(settings3),
-                                Arrays.asList(settings4));
+                                Arrays.asList(settings4), Arrays.asList(settings5));
         }
 
@@ -104 +107 @@
         public List<String> getGeneralTestStrings() {
                 return Arrays.asList(
-                                "AllPermutationsSettings.*party1.*party2.*,false,.*profile1.*profile2.*profile3.*,2,SAOPSettings.*",
-                                "AllPermutationsSettings.*party1.*party2.*party3.*,false,.*profile1.*profile2.*profile3.*,2,SAOPSettings.*",
-                                "AllPermutationsSettings.*party1.*party2.*,true,.*profile1.*profile2.*profile3.*,2,SAOPSettings.*",
-                                "AllPermutationsSettings.*party1.*party2.*,false,.*profile1.*profile2.*profile3.*profile1.*,2,SAOPSettings.*");
+                                "AllPermutationsSettings.*party1.*party2.*,false,.*profile1.*profile2.*profile3.*,2,SAOPSettings.*1.*",
+                                "AllPermutationsSettings.*party1.*party2.*party3.*,false,.*profile1.*profile2.*profile3.*,2,SAOPSettings.*1.*",
+                                "AllPermutationsSettings.*party1.*party2.*,true,.*profile1.*profile2.*profile3.*,2,SAOPSettings.*1.*",
+                                "AllPermutationsSettings.*party1.*party2.*,false,.*profile1.*profile2.*profile3.*profile1.*,2,SAOPSettings.*1.*",
+                                "AllPermutationsSettings.*party1.*party2.*,false,.*profile1.*profile2.*profile3.*,2,SAOPSettings.*2.*");
         }
 
@@ -137 +141 @@
                 new AllPermutationsSettings(null,
                                 Arrays.asList(profiles1, profiles2, profiles3, profiles1), true,
-                                2, saopsettings);
+                                2, saopsettings, 1);
 
         }
@@ -145 +149 @@
                 new AllPermutationsSettings(Collections.emptyList(),
                                 Arrays.asList(profiles1, profiles2, profiles3, profiles1), true,
-                                2, saopsettings);
+                                2, saopsettings, 1);
 
         }
@@ -151 +155 @@
         @Test(expected = IllegalArgumentException.class)
         public void testNullProfiles() {
-                new AllPermutationsSettings(parties, null, true, 2, saopsettings);
+                new AllPermutationsSettings(parties, null, true, 2, saopsettings, 1);
 
         }
@@ -159 +163 @@
                 new AllPermutationsSettings(parties,
                                 Arrays.asList(profiles1, profiles2, profiles3, profiles1), true,
-                                4, saopsettings);
+                                4, saopsettings, 1);
 
         }
@@ -167 +171 @@
                 new AllPermutationsSettings(parties,
                                 Arrays.asList(profiles1, profiles2, profiles3, profiles1), true,
-                                4, null);
+                                4, null, 1);
 
         }
@@ -175 +179 @@
                 new AllPermutationsSettings(parties,
                                 Arrays.asList(profiles1, profiles2, profiles3, profiles1), true,
-                                1, saopsettings);
+                                1, saopsettings, 1);
 
         }