X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Ftest%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fjson%2FArgeoUserJsonTest.java;fp=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Ftest%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fjson%2FArgeoUserJsonTest.java;h=4e9f8ebc8bc5d4e1e6c4f8c8234870bb2982733c;hb=79d37fb873ba8ebaafe64c924f53bc9c76ea6d8c;hp=c48a9b889510d4de54d0d1b242b2c73c02b1f2c3;hpb=e3258bd13570aa493052f919b7328c2c09edb9f2;p=lgpl%2Fargeo-commons.git diff --git a/security/runtime/org.argeo.security.core/src/test/java/org/argeo/security/json/ArgeoUserJsonTest.java b/security/runtime/org.argeo.security.core/src/test/java/org/argeo/security/json/ArgeoUserJsonTest.java index c48a9b889..4e9f8ebc8 100644 --- a/security/runtime/org.argeo.security.core/src/test/java/org/argeo/security/json/ArgeoUserJsonTest.java +++ b/security/runtime/org.argeo.security.core/src/test/java/org/argeo/security/json/ArgeoUserJsonTest.java @@ -17,8 +17,8 @@ package org.argeo.security.json; import java.io.StringWriter; -import java.util.ArrayList; -import java.util.List; +import java.util.HashMap; +import java.util.Map; import junit.framework.TestCase; @@ -44,16 +44,14 @@ public class ArgeoUserJsonTest extends TestCase { private static Log log = LogFactory.getLog(ArgeoUserJsonTest.class); public void testMapper() throws Exception { - List natures = new ArrayList(); - + Map natures = new HashMap(); SimpleUserNature sun = new SimpleUserNature(); sun.setFirstName("Mickey"); sun.setEmail("username@domain.com"); - natures.add(sun); - + natures.put("simple",sun); CoworkerNature cwn = new CoworkerNature(); cwn.setMobile("+123456789"); - natures.add(cwn); + natures.put("coworker",cwn); GrantedAuthority[] roles = { new GrantedAuthorityImpl("ROLE1"), new GrantedAuthorityImpl("ROLE2") }; @@ -105,17 +103,17 @@ public class ArgeoUserJsonTest extends TestCase { } public void testSeriDeserialize() { - List natures = new ArrayList(); + Map natures = new HashMap(); JSONArray naturesJo = new JSONArray(); SimpleUserNature sun = new SimpleUserNature(); sun.setEmail("username@domain.com"); - natures.add(sun); + natures.put("simple",sun); naturesJo.put(new JSONObject(sun)); CoworkerNature cwn = new CoworkerNature(); cwn.setMobile("+123456789"); - natures.add(cwn); + natures.put("coworker",cwn); naturesJo.put(new JSONObject(cwn)); GrantedAuthority[] roles = { new GrantedAuthorityImpl("ROLE1"),