Changeset 10 for exampleparties/randompartypy/src

Timestamp:

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

Author:

bart

Message:

Update 28 jan 2020

Location:

exampleparties/randompartypy/src

Files:

• main/resources/RandomParty.py (modified) (1 diff)
• test/java/geniusweb/exampleparties/randompartypy/RandomPartyTest.java (modified) (6 diffs)

exampleparties/randompartypy/src/main/resources/RandomParty.py

@@ -65 +65 @@
         # Override
         def getCapabilities(self): # -> Capabilities
-                try:
-                        return Capabilities(HashSet([ ProtocolRef(URI("SAOP"))]))
-                except:
-                        getReporter().log(Level.SEVERE, "Failed to create capabilities URI",e);
-                return None
+                        return Capabilities(HashSet([ "SAOP"]))
 
         # Override

exampleparties/randompartypy/src/test/java/geniusweb/exampleparties/randompartypy/RandomPartyTest.java

@@ -39 +39 @@
 import geniusweb.party.inform.YourTurn;
 import geniusweb.profile.Profile;
-import geniusweb.profile.utilityspace.LinearAdditiveUtilitySpace;
+import geniusweb.profile.utilityspace.LinearAdditive;
 import geniusweb.progress.ProgressRounds;
 import geniusweb.pythonadapter.PythonPartyAdapter;
@@ -51 +51 @@
 
         private static final String PROFILE = "src/test/resources/testprofile.json";
-        private static final ProtocolRef SAOP = new ProtocolRef("SAOP");
+        private static final String SAOP = "SAOP";
         private static final PartyId otherparty = new PartyId("other");
         private final static ObjectMapper jackson = new ObjectMapper();
@@ -62 +62 @@
         private final Parameters parameters = new Parameters();
 
-        private LinearAdditiveUtilitySpace profile; // the real profile
+        private LinearAdditive profile; // the real profile
 
         @Before
@@ -80 +80 @@
                 String serialized = new String(Files.readAllBytes(Paths.get(PROFILE)),
                                 StandardCharsets.UTF_8);
-                profile = (LinearAdditiveUtilitySpace) jackson.readValue(serialized,
-                                Profile.class);
+                profile = (LinearAdditive) jackson.readValue(serialized, Profile.class);
 
         }
@@ -98 +97 @@
                 Capabilities capabilities = party.getCapabilities();
                 assertFalse("party does not define protocols",
-                                capabilities.getProtocols().isEmpty());
+                                capabilities.getBehaviours().isEmpty());
         }
 
@@ -167 +166 @@
         @Test
         public void testGetCapabilities() {
-                assertTrue(party.getCapabilities().getProtocols().contains(SAOP));
+                assertTrue(party.getCapabilities().getBehaviours().contains(SAOP));
         }