Changeset 10 for exampleparties/humangui

Timestamp:

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

Author:

bart

Message:

Update 28 jan 2020

Location:

exampleparties/humangui/src

Files:

• main/java/geniusweb/exampleparties/humangui/HumanGui.java (modified) (3 diffs)
• test/java/geniusweb/exampleparties/humangui/BiddingInfoTest.java (modified) (3 diffs)
• test/java/geniusweb/exampleparties/humangui/HumanGuiTest.java (modified) (4 diffs)

exampleparties/humangui/src/main/java/geniusweb/exampleparties/humangui/HumanGui.java

@@ -2 +2 @@
 
 import java.awt.BorderLayout;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -23 +21 @@
 import geniusweb.profileconnection.ProfileConnectionFactory;
 import geniusweb.profileconnection.ProfileInterface;
-import geniusweb.references.ProtocolRef;
 import tudelft.utilities.logging.Reporter;
 
@@ -85 +82 @@
         @Override
         public Capabilities getCapabilities() {
-                try {
-                        return new Capabilities(new HashSet<>(
-                                        Arrays.asList(new ProtocolRef(new URI("SAOP")))));
-                } catch (URISyntaxException e) {
-                        getReporter().log(Level.SEVERE, "Failed to create capabilities URI",
-                                        e);
-                        return null;
-                }
+                return new Capabilities(new HashSet<>(Arrays.asList("SAOP")));
         }
 

exampleparties/humangui/src/test/java/geniusweb/exampleparties/humangui/BiddingInfoTest.java

@@ -32 +32 @@
 import geniusweb.party.inform.Settings;
 import geniusweb.profile.Profile;
-import geniusweb.profile.utilityspace.LinearAdditiveUtilitySpace;
+import geniusweb.profile.utilityspace.LinearAdditive;
 import geniusweb.profileconnection.ProfileConnectionFactory;
 import geniusweb.profileconnection.ProfileInterface;
@@ -61 +61 @@
         private final ProgressRounds progress = mock(ProgressRounds.class);
         private Settings settings;
-        private LinearAdditiveUtilitySpace profile, profile2;
+        private LinearAdditive profile, profile2;
         private final Parameters parameters = new Parameters();
         private Reporter reporter = mock(Reporter.class);
@@ -76 +76 @@
                 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);
                 String serialized2 = new String(Files.readAllBytes(Paths.get(PROFILE2)),
                                 StandardCharsets.UTF_8);
-                profile2 = (LinearAdditiveUtilitySpace) jackson.readValue(serialized2,
+                profile2 = (LinearAdditive) jackson.readValue(serialized2,
                                 Profile.class);
 

exampleparties/humangui/src/test/java/geniusweb/exampleparties/humangui/HumanGuiTest.java

@@ -34 +34 @@
 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.references.Parameters;
@@ -57 +57 @@
         private final ProgressRounds progress = mock(ProgressRounds.class);
         private Settings settings;
-        private LinearAdditiveUtilitySpace profile;
+        private LinearAdditive profile;
         private final Parameters parameters = new Parameters();
 
@@ -70 +70 @@
                 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);
 
         }
@@ -93 +92 @@
                 Capabilities capabilities = party.getCapabilities();
                 assertFalse("party does not define protocols",
-                                capabilities.getProtocols().isEmpty());
+                                capabilities.getBehaviours().isEmpty());
         }
 
         @Test
         public void testGetCapabilities() {
-                assertTrue(party.getCapabilities().getProtocols().contains(SAOP));
+                assertTrue(party.getCapabilities().getBehaviours().contains(SAOP));
         }