Changeset 18 for opponentmodel/src/test

Timestamp:

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

Author:

bart

Message:

Update to version 1.41

File:

• opponentmodel/src/test/java/geniusweb/profile/opponentmodel/FrequencyOppModelTest.java (modified) (8 diffs)

opponentmodel/src/test/java/geniusweb/profile/opponentmodel/FrequencyOppModelTest.java

@@ -3 +3 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
 
 import java.math.BigDecimal;
@@ -14 +15 @@
 import org.junit.Test;
 
+import geniusweb.actions.Offer;
+import geniusweb.actions.PartyId;
 import geniusweb.issuevalue.Bid;
 import geniusweb.issuevalue.DiscreteValue;
@@ -23 +26 @@
 import geniusweb.issuevalue.ValueSet;
 import geniusweb.opponentmodel.FrequencyOpponentModel;
+import geniusweb.progress.Progress;
 import tudelft.utilities.junit.GeneralTests;
 
@@ -32 +36 @@
         private static final DiscreteValue I1V2 = new DiscreteValue("i1v2");
         private static final DiscreteValue I1V2b = new DiscreteValue("i1v2b");
+        private static final Progress progress = mock(Progress.class);
+        private static final PartyId other = new PartyId("other");
 
         private static Domain domain, domain2, domain3;
@@ -85 +91 @@
                 oppModel2 = new FrequencyOpponentModel(domain2);
                 oppModel3 = new FrequencyOpponentModel(domain3);
-                oppModel4 = (FrequencyOpponentModel) oppModel3.update(bid1);
+                oppModel4 = oppModel3.with(new Offer(other, bid1), progress);
 
         }
@@ -106 +112 @@
 
         @Test(expected = NullPointerException.class)
-        public void smokeNullTest() {
+        public void smokeTestNull() {
                 new FrequencyOpponentModel(null);
         }
@@ -124 +130 @@
         @Test
         public void testUpdate() {
-                FrequencyOpponentModel oppModel = oppModel1.update(bid1);
+                FrequencyOpponentModel oppModel = oppModel1.with(new Offer(other, bid1),
+                                progress);
                 assertTrue(BigDecimal.ONE.compareTo(oppModel.getUtility(bid1)) == 0);
                 assertTrue(BigDecimal.ZERO.compareTo(oppModel.getUtility(bid3)) == 0);
@@ -135 +142 @@
                 // bid1 and bid2 both want I1V1. They differ on the number value.
                 // bid3 wants I1V2 but does have the number value from bid2
-                FrequencyOpponentModel oppModel = oppModel1.update(bid1).update(bid2);
+                FrequencyOpponentModel oppModel = oppModel1
+                                .with(new Offer(other, bid1), progress)
+                                .with(new Offer(other, bid2), progress);
                 assertTrue(new BigDecimal("0.75")
                                 .compareTo(oppModel.getUtility(bid1)) == 0);