Changeset 2 for issuevalue

Timestamp:

08/28/19 11:35:52 (5 years ago)

Author:

bart

Message:

Added new parties : linear, hardliner, conceder, boulware

Location:

issuevalue

Files:

• pom.xml (modified) (1 diff)
• src/test/java/geniusweb/issuevalue/DomainTest.java (modified) (8 diffs)
• src/test/java/geniusweb/issuevalue/NumberValueSetTest.java (modified) (2 diffs)

issuevalue/pom.xml

@@ -92 +92 @@
                         <groupId>tudelft.utilities</groupId>
                         <artifactId>immutablelist</artifactId>
-                        <version>1.0.0</version>
+                        <version>1.0.1</version>
                 </dependency>
 

issuevalue/src/test/java/geniusweb/issuevalue/DomainTest.java

@@ -21 +21 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import geniusweb.issuevalue.Bid;
-import geniusweb.issuevalue.DiscreteValue;
-import geniusweb.issuevalue.DiscreteValueSet;
-import geniusweb.issuevalue.Domain;
-import geniusweb.issuevalue.NumberValue;
-import geniusweb.issuevalue.NumberValueSet;
-import geniusweb.issuevalue.ValueSet;
 import tudelft.utilities.junit.GeneralTests;
 
@@ -38 +31 @@
         private static final String ISSUE3 = "issue3";
         private static final ObjectMapper jackson = new ObjectMapper();
-        private static final String domainstring = "{\"name\":\"testdomain\",\"issuesValues\":{\"issue2\":{\"range\":[\"2\",\"3\",\"0.22\"]},\"issue1\":{\"values\":[\"i1v1\",\"i1v2\"]}}}";
+        private static final String domainstring = "{\"name\":\"testdomain\",\"issuesValues\":{\"issue2\":{\"range\":[2,3,0.22]},\"issue1\":{\"values\":[\"i1v1\",\"i1v2\"]}}}";
 
-        private static final String jobsstring = "{\"name\":\"jobs\","
-                        + "\"issuesValues\":{"
-                        + "\"lease car\":{\"values\":[\"yes\",\"no\"]},"
-                        + "\"permanent contract\":{\"values\":[\"yes\",\"no\"]},"
+        private static final String jobsstring = "{\"name\":\"jobs\"," + "\"issuesValues\":{"
+                        + "\"lease car\":{\"values\":[\"yes\",\"no\"]}," + "\"permanent contract\":{\"values\":[\"yes\",\"no\"]},"
                         + "\"career development opportunities\":{\"values\":[\"low\",\"medium\",\"high\"]},"
                         + "\"fte\":{\"values\":[\"0.6\",\"0.8\",\"1.0\"]},"
@@ -73 +64 @@
                 Map<String, ValueSet> issues1 = new HashMap<>();
                 issues1.put(ISSUE1, values1);
-                issues1.put(ISSUE2, new NumberValueSet(BigDecimal.ONE, TWO,
-                                new BigDecimal("0.22")));
+                issues1.put(ISSUE2, new NumberValueSet(BigDecimal.ONE, TWO, new BigDecimal("0.22")));
                 domain3 = new Domain(DOMAINNAME, issues1);
 
@@ -81 +71 @@
         @Override
         public List<List<Domain>> getGeneralTestData() {
-                return Arrays.asList(Arrays.asList(domain, domain1),
-                                Arrays.asList(domain2), Arrays.asList(domain3));
+                return Arrays.asList(Arrays.asList(domain, domain1), Arrays.asList(domain2), Arrays.asList(domain3));
         }
 
         @Override
         public List<String> getGeneralTestStrings() {
-                return Arrays.asList("Domain.*testdomain.*", "Domain.*testdomain1.*",
-                                "Domain.*testdomain.*");
+                return Arrays.asList("Domain.*testdomain.*", "Domain.*testdomain1.*", "Domain.*testdomain.*");
         }
 
@@ -109 +97 @@
                 System.out.println(jobsstring);
                 Domain jobsdomain = jackson.readValue(jobsstring, Domain.class);
-                assertEquals(new HashSet<>(Arrays.asList("lease car",
-                                "permanent contract", "career development opportunities", "fte",
-                                "salary", "work from home")), jobsdomain.getIssues());
+                assertEquals(new HashSet<>(Arrays.asList("lease car", "permanent contract", "career development opportunities",
+                                "fte", "salary", "work from home")), jobsdomain.getIssues());
 
         }
@@ -134 +121 @@
         public void testIsCompleteNoIssuesDefined() {
                 Bid bid = mock(Bid.class);
-                assertThat(domain.isComplete(bid), new PatternMatch(
-                                "Issues in bid .* do not match issues in domain .*"));
+                assertThat(domain.isComplete(bid), new PatternMatch("Issues in bid .* do not match issues in domain .*"));
         }
 
@@ -154 +140 @@
                 // THREE is NOT a possible value in the NumberValueSet.
                 when(bid.getValue(ISSUE2)).thenReturn(new NumberValue(THREE));
-                assertThat(domain.isComplete(bid),
-                                new PatternMatch("bid issue issue2 has illegal value 3"));
+                assertThat(domain.isComplete(bid), new PatternMatch("bid issue issue2 has illegal value 3"));
         }
 
@@ -167 +152 @@
                 // THREE is NOT a possible value in the NumberValueSet.
                 when(bid.getValue(ISSUE2)).thenReturn(new NumberValue(THREE));
-                assertThat(domain.isComplete(bid), new PatternMatch(
-                                "Issues in bid .* do not match issues in domain .*"));
+                assertThat(domain.isComplete(bid), new PatternMatch("Issues in bid .* do not match issues in domain .*"));
         }
 

issuevalue/src/test/java/geniusweb/issuevalue/NumberValueSetTest.java

@@ -16 +16 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import geniusweb.issuevalue.NumberValue;
-import geniusweb.issuevalue.NumberValueSet;
-import geniusweb.issuevalue.ValueSet;
 import tudelft.utilities.immutablelist.Range;
 
@@ -33 +30 @@
                         new BigDecimal("0.1"));
 
-        private final String asString = "{\"range\":[\"12.2\",\"12.6\",\"0.3\"]}";
+        private final String asString = "{\"range\":[12.2,12.6,0.3]}";
         private final static NumberValueSet bigset = new NumberValueSet(BigDecimal.ZERO, BigDecimal.TEN,
                         new BigDecimal("0.00003"));