Changeset 9 for profile/src/test/java

Timestamp:

11/28/19 14:40:48 (5 years ago)

Author:

bart

Message:

Release 1.1.0

Location:

profile/src/test/java/geniusweb/profile/utilityspace

Files:

• DiscreteValueSetUtilitiesTest.java (modified) (3 diffs)
• LinearAdditiveTest.java (modified) (3 diffs)
• NumberValueSetUtilTest.java (modified) (1 diff)
• PartsUtilitiesTest.java (added)
• ProductOfValueTest.java (added)
• SumOfGroupsUtilitySpaceTest.java (added)

profile/src/test/java/geniusweb/profile/utilityspace/DiscreteValueSetUtilitiesTest.java

@@ -3 +3 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
@@ -81 +82 @@
         @Override
         public List<String> getGeneralTestStrings() {
-                return Arrays.asList("ValueSetUtilities\\{\"a\"=0.14\\}",
-                                "ValueSetUtilities\\{\"b\"=0.37\\}",
-                                "ValueSetUtilities\\{\"a\"=0.37\\}",
-                                "ValueSetUtilities\\{\"a\"=0.14, \"b\"=0.37\\}");
+                return Arrays.asList("DiscreteValueSetUtilities\\{\"a\"=0.14\\}",
+                                "DiscreteValueSetUtilities\\{\"b\"=0.37\\}",
+                                "DiscreteValueSetUtilities\\{\"a\"=0.37\\}",
+                                "DiscreteValueSetUtilities\\{\"a\"=0.14, \"b\"=0.37\\}");
         }
 
@@ -200 +201 @@
 
         }
+
+        @Test
+        public void testDeserializeAsDiscrete()
+                        throws JsonParseException, JsonMappingException, IOException {
+                // Check that DiscreteValueSetUtilities properly deserializes
+                // discreteutils.
+                String utilstring = "{\"discreteutils\": {\"valueUtilities\": {\"Party Tent\": 0.52,\"Your Dorm\": 0.23,\"Party Room\": 0.99,\"Ballroom\": 0.77}}}";
+                DiscreteValueSetUtilities valueutils = jackson.readValue(utilstring,
+                                DiscreteValueSetUtilities.class);
+                assertTrue(new BigDecimal("0.23").compareTo(
+                                valueutils.getUtility(new DiscreteValue("Your Dorm"))) == 0);
+
+        }
+
 }

profile/src/test/java/geniusweb/profile/utilityspace/LinearAdditiveTest.java

@@ -20 +20 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
 
 import geniusweb.issuevalue.Bid;
@@ -145 +144 @@
         public List<String> getGeneralTestStrings() {
                 return Arrays.asList(
-                                "LinearAdditive\\[\\{issue2=ValueSetUtilities\\{\"issue2value2\"=0.8, \"issue2value1\"=0.6\\}, issue1=ValueSetUtilities\\{\"issue1value1\"=0.3, \"issue1value2\"=0.2\\}\\},\\{issue2=0.6, issue1=0.4\\},Bid\\{issue2=\"issue2value1\", issue1=\"issue1value2\"\\}\\]",
-                                "LinearAdditive\\[\\{issue2=ValueSetUtilities\\{\"issue2value2\"=0.8, \"issue2value1\"=0.6\\}, issue1=ValueSetUtilities\\{\"issue1value1\"=0.3, \"issue1value2\"=0.2\\}\\},\\{issue2=0.7, issue1=0.3\\},Bid\\{issue2=\"issue2value1\", issue1=\"issue1value2\"\\}\\]",
-                                "LinearAdditive\\[\\{issue2=ValueSetUtilities\\{\"issue2value2\"=0.2, \"issue2value1\"=0.3\\}, issue1=ValueSetUtilities\\{\"issue1value1\"=0.6, \"issue1value2\"=0.8\\}\\},\\{issue2=0.6, issue1=0.4\\},Bid\\{issue2=\"issue2value1\", issue1=\"issue1value2\"\\}\\]",
-                                "LinearAdditive\\[\\{issue2=ValueSetUtilities\\{\"issue2value2\"=0.2, \"issue2value1\"=0.3\\}, issue1=ValueSetUtilities\\{\"issue1value1\"=0.6, \"issue1value2\"=0.8\\}\\},\\{issue2=0.6, issue1=0.4\\},Bid\\{issue2=\"issue2value1\", issue1=\"issue1value1\"\\}\\]");
+                                "LinearAdditive\\[\\{issue2=DiscreteValueSetUtilities\\{\"issue2value2\"=0.8, \"issue2value1\"=0.6\\}, issue1=DiscreteValueSetUtilities\\{\"issue1value1\"=0.3, \"issue1value2\"=0.2\\}\\},\\{issue2=0.6, issue1=0.4\\},Bid\\{issue2=\"issue2value1\", issue1=\"issue1value2\"\\}\\]",
+                                "LinearAdditive\\[\\{issue2=DiscreteValueSetUtilities\\{\"issue2value2\"=0.8, \"issue2value1\"=0.6\\}, issue1=DiscreteValueSetUtilities\\{\"issue1value1\"=0.3, \"issue1value2\"=0.2\\}\\},\\{issue2=0.7, issue1=0.3\\},Bid\\{issue2=\"issue2value1\", issue1=\"issue1value2\"\\}\\]",
+                                "LinearAdditive\\[\\{issue2=DiscreteValueSetUtilities\\{\"issue2value2\"=0.2, \"issue2value1\"=0.3\\}, issue1=DiscreteValueSetUtilities\\{\"issue1value1\"=0.6, \"issue1value2\"=0.8\\}\\},\\{issue2=0.6, issue1=0.4\\},Bid\\{issue2=\"issue2value1\", issue1=\"issue1value2\"\\}\\]",
+                                "LinearAdditive\\[\\{issue2=DiscreteValueSetUtilities\\{\"issue2value2\"=0.2, \"issue2value1\"=0.3\\}, issue1=DiscreteValueSetUtilities\\{\"issue1value1\"=0.6, \"issue1value2\"=0.8\\}\\},\\{issue2=0.6, issue1=0.4\\},Bid\\{issue2=\"issue2value1\", issue1=\"issue1value1\"\\}\\]");
         }
 
@@ -271 +270 @@
         }
 
-        @Test(expected = InvalidDefinitionException.class)
+        @Test
         public void loadFullWithJson() throws IOException {
                 String profile = new String(

profile/src/test/java/geniusweb/profile/utilityspace/NumberValueSetUtilTest.java

@@ -44 +44 @@
         @Override
         public List<String> getGeneralTestStrings() {
-                return Arrays.asList("NumberValUtility\\(12.5->0.5,18.5->0.9\\)",
-                                "NumberValUtility\\(12.5->0.6,18.5->0.9\\)",
-                                "NumberValUtility\\(12.5->0.5,18.4->0.9\\)");
+                return Arrays.asList("NumberValueSetUtilities\\(12.5->0.5,18.5->0.9\\)",
+                                "NumberValueSetUtilities\\(12.5->0.6,18.5->0.9\\)",
+                                "NumberValueSetUtilities\\(12.5->0.5,18.4->0.9\\)");
         }