+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.argeo.security.json;
import java.io.StringWriter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.argeo.security.ArgeoUser;
-import org.argeo.security.BasicArgeoUser;
+import org.argeo.security.SimpleArgeoUser;
import org.argeo.security.UserNature;
import org.argeo.security.core.ArgeoUserDetails;
import org.argeo.security.nature.CoworkerNature;
import org.argeo.security.nature.SimpleUserNature;
+import org.argeo.server.json.JsonServerMapper;
import org.codehaus.jackson.JsonFactory;
import org.codehaus.jackson.JsonGenerator;
import org.codehaus.jackson.map.ObjectMapper;
ArgeoUserDetails argeoUserDetails = new ArgeoUserDetails("USER",
natures, "PASSWORD", roles);
- BasicArgeoUser argeoUser = new BasicArgeoUser(argeoUserDetails);
+ SimpleArgeoUser argeoUser = new SimpleArgeoUser(argeoUserDetails);
StringWriter writer = new StringWriter();
// BasicArgeoUser aud = objectMapper.readValue(audJo,
// BasicArgeoUser.class);
- ArgeoUserMapper aum = new ArgeoUserMapper();
- ArgeoUser aud = aum.parse(audJo);
+ JsonServerMapper mapper = JsonServerMapperTest.createJsonServerMapper();
+ ArgeoUser aud = (ArgeoUser) mapper.deserialize(audJo);
assertEquals(argeoUser.getUsername(), aud.getUsername());
assertEquals(argeoUser.getRoles().size(), aud.getRoles().size());