Changeset 24 for exampleparties/simpleshaop

Timestamp:

10/06/20 13:12:20 (4 years ago)

Author:

bart

Message:

Fixes an issue with processing maxPower of a vote. Javadoc maven plugin now uses latest version.

Location:

exampleparties/simpleshaop

Files:

• pom.xml (modified) (4 diffs)
• src/main/java/geniusweb/exampleparties/simpleshaop/ShaopParty.java (modified) (1 diff)
• src/main/java/geniusweb/exampleparties/simpleshaop/SimpleLinearOrdering.java (modified) (5 diffs)
• src/test/java/geniusweb/exampleparties/simpleshaop/ShaopPartyTest.java (modified) (3 diffs)

exampleparties/simpleshaop/pom.xml

@@ -6 +6 @@
         <groupId>geniusweb.exampleparties</groupId>
         <artifactId>simpleshaop</artifactId>
-        <version>1.5.2</version> <!-- must equal ${geniusweb.version} -->
+        <version>1.5.3</version> <!-- must equal ${geniusweb.version} -->
         <packaging>jar</packaging>
 
@@ -17 +17 @@
                 <passwd>${env.ARTIFACTORY_PASS}</passwd>
                 <jackson-2-version>2.9.6</jackson-2-version>
-                <geniusweb.version>1.5.2</geniusweb.version>
+                <geniusweb.version>1.5.3</geniusweb.version>
         </properties>
 
@@ -188 +188 @@
                                 <groupId>org.apache.maven.plugins</groupId>
                                 <artifactId>maven-javadoc-plugin</artifactId>
-                                <version>2.10.1</version>
+                                <version>3.2.0</version>
                                 <executions>
                                         <execution>
@@ -195 +195 @@
                                                         <goal>jar</goal>
                                                 </goals>
-                                                <configuration>
-                                                        <additionalparam>${javadoc.opts}</additionalparam>
-                                                        <additionalparam>-Xdoclint:none</additionalparam>
-                                                </configuration>
                                         </execution>
                                 </executions>

exampleparties/simpleshaop/src/main/java/geniusweb/exampleparties/simpleshaop/ShaopParty.java

@@ -38 +38 @@
  * created.
  * <p>
- * <b>Requirement<b> the initial {@link PartialOrdering} must contain at least
+ * <b>Requirement</b> the initial {@link PartialOrdering} must contain at least
  * the bids with lowest utility and highest utility, and the proper comparison
  * info for these two bids.

exampleparties/simpleshaop/src/main/java/geniusweb/exampleparties/simpleshaop/SimpleLinearOrdering.java

@@ -21 +21 @@
 
         private final Domain domain;
-        private final List<Bid> bids; // worst bid first, best bid last.
+        /**
+         * List of bids. worst bid first, best bid last.
+         */
+        private final List<Bid> bids;
 
         SimpleLinearOrdering(Profile profile) {
@@ -29 +32 @@
         /**
          * 
-         * @param domain
+         * @param domain The {@link Domain}
          * @param bids   a list of bids, ordered from lowest to highest util. The
          *               first bid will have utility 0, the last utility 1. If only
@@ -67 +70 @@
         /**
          * 
-         * @param bid
+         * @param bid the {@link Bid}
          * @return true iff bid is contained in this ordering
          */
@@ -84 +87 @@
         /**
          * 
-         * @param profile
+         * @param profile the {@link Profile}
          * @return a list of bids in the profile sorted from low to high utility.
          */
@@ -108 +111 @@
 
         /**
-         * @param bid       a new bid to be inserted
+         * @param bid       a new {@link Bid} to be inserted
          * @param worseBids all bids that are worse than this bid.
-         * @return a SimpleLinearOrdering, updated with the given comparison. Thee
-         *         bid will be inserted after the first bid that is not worse than
-         *         bid.
+         * @return a {@link SimpleLinearOrdering}, updated with the given
+         *         comparison. Thee bid will be inserted after the first bid that is
+         *         not worse than bid.
          */
         public SimpleLinearOrdering with(Bid bid, List<Bid> worseBids) {

exampleparties/simpleshaop/src/test/java/geniusweb/exampleparties/simpleshaop/ShaopPartyTest.java

@@ -8 +8 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import java.io.IOException;
@@ -37 +38 @@
 import geniusweb.connection.ConnectionEnd;
 import geniusweb.inform.ActionDone;
+import geniusweb.inform.Agreements;
 import geniusweb.inform.Finished;
 import geniusweb.inform.Inform;
@@ -178 +180 @@
                 party.connect(connection);
                 party.notifyChange(settings);
-                party.notifyChange(new Finished(null));
+
+                Agreements agreements = mock(Agreements.class);
+                when(agreements.toString()).thenReturn("agree");
+                party.notifyChange(new Finished(agreements));
 
                 verify(reporter).log(eq(Level.INFO),
-                                eq("Final ourcome:Finished[null]"));
+                                eq("Final ourcome:Finished[agree]"));
         }