Changeset 8 for references/src

Timestamp:

09/30/19 15:37:05 (5 years ago)

Author:

bart

Message:

Added parameter support

Location:

references/src

Files:

• main/java/geniusweb/references/Parameters.java (added)
• main/java/geniusweb/references/PartyWithParameters.java (added)
• main/java/geniusweb/references/PartyWithProfile.java (modified) (2 diffs)
• test/java/geniusweb/references/PartiWithParamsTest.java (added)
• test/java/geniusweb/references/PartyWithProfileTest.java (modified) (6 diffs)

references/src/main/java/geniusweb/references/PartyWithProfile.java

@@ -8 +8 @@
 @JsonAutoDetect(fieldVisibility = Visibility.ANY, getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE)
 public class PartyWithProfile {
-        private final PartyRef party;
+        private final PartyWithParameters party;
         private final ProfileRef profile;
 
         @JsonCreator
-        public PartyWithProfile(@JsonProperty("party") PartyRef party,
+        public PartyWithProfile(@JsonProperty("party") PartyWithParameters party,
                         @JsonProperty("profile") ProfileRef profile) {
                 if (party == null || profile == null) {
@@ -22 +22 @@
         }
 
-        public PartyRef getParty() {
+        public PartyWithParameters getParty() {
                 return party;
 

references/src/test/java/geniusweb/references/PartyWithProfileTest.java

@@ -17 +17 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import geniusweb.references.PartyRef;
-import geniusweb.references.PartyWithProfile;
-import geniusweb.references.ProfileRef;
 import tudelft.utilities.junit.GeneralTests;
 
@@ -26 +23 @@
         private PartyRef party1, party1a, party2, party3;
         private ProfileRef profile1, profile2;
-        private PartyWithProfile partyprof1, partyprof1a, partyprof2, partyprof3;
-        private final String serialized = "{\"party\":\"ws:party1\",\"profile\":\"ws:profile1\"}";
+        private PartyWithProfile partyprof1, partyprof1a, partyprof2, partyprof3,
+                        partyprof4;
+        private final String serialized = "{\"party\":{\"partyref\":\"ws:party1\",\"parameters\":{}},\"profile\":\"ws:profile1\"}";
 
         @Before
@@ -39 +37 @@
                 profile2 = new ProfileRef(new URI("ws:profile2"));
 
-                partyprof1 = new PartyWithProfile(party1, profile1);
-                partyprof1a = new PartyWithProfile(party1, profile1);
-                partyprof2 = new PartyWithProfile(party2, profile1);
-                partyprof3 = new PartyWithProfile(party1, profile2);
+                Parameters settings1 = new Parameters();
+                Parameters settings2 = new Parameters();
+                settings2.put("a", 1);
+
+                PartyWithParameters party1withparams1 = new PartyWithParameters(party1,
+                                settings1);
+                PartyWithParameters party1withparams2 = new PartyWithParameters(party1,
+                                settings2);
+                PartyWithParameters party2withparams1 = new PartyWithParameters(party2,
+                                settings1);
+
+                partyprof1 = new PartyWithProfile(party1withparams1, profile1);
+                partyprof1a = new PartyWithProfile(party1withparams1, profile1);
+                partyprof2 = new PartyWithProfile(party2withparams1, profile1);
+                partyprof3 = new PartyWithProfile(party1withparams1, profile2);
+                partyprof4 = new PartyWithProfile(party1withparams2, profile1);
 
         }
@@ -49 +59 @@
         public List<List<PartyWithProfile>> getGeneralTestData() {
                 return Arrays.asList(Arrays.asList(partyprof1, partyprof1a),
-                                Arrays.asList(partyprof2), Arrays.asList(partyprof3));
+                                Arrays.asList(partyprof2), Arrays.asList(partyprof3),
+                                Arrays.asList(partyprof4));
         }
 
@@ -55 +66 @@
         public List<String> getGeneralTestStrings() {
                 return Arrays.asList(
-                                "PartyWithProfile.PartyRef.ws:party1.,ProfileRef.ws:profile1..",
-                                "PartyWithProfile.PartyRef.ws:party2.,ProfileRef.ws:profile1..",
-                                "PartyWithProfile.PartyRef.ws:party1.,ProfileRef.ws:profile2..");
+                                "PartyWithProfile.PartyRef.ws:party1.,ProfileRef.ws:profile1.*",
+                                "PartyWithProfile.PartyRef.ws:party2.,ProfileRef.ws:profile1.*",
+                                "PartyWithProfile.PartyRef.ws:party1.,ProfileRef.ws:profile2.*",
+                                "PartyWithProfile.PartyRef.ws:party1.\\{a=1\\},ProfileRef.ws:profile1.*");
         }
 
@@ -66 +78 @@
         @Test(expected = IllegalArgumentException.class)
         public void nullTest() throws URISyntaxException {
-                new PartyWithProfile((PartyRef) null, (ProfileRef) null);
+                new PartyWithProfile((PartyWithParameters) null, (ProfileRef) null);
         }