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=0000000000000000000000000000000000000000;hb=ed7bc12c0c7bc20d032c8486ae6279086111765a;hp=13db4c5bba62721533bccfe96248dc1246cb3317;hpb=187bb52148318b72491ab0c95b388c710b1ed6a5;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
deleted file mode 100644
index 13db4c5bb..000000000
--- a/security/runtime/org.argeo.security.core/src/test/java/org/argeo/security/json/ArgeoUserJsonTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * 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 java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.security.ArgeoUser;
-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;
-import org.springframework.security.GrantedAuthority;
-import org.springframework.security.GrantedAuthorityImpl;
-
-import com.springsource.json.writer.JSONArray;
-import com.springsource.json.writer.JSONObject;
-
-public class ArgeoUserJsonTest extends TestCase {
-	private static Log log = LogFactory.getLog(ArgeoUserJsonTest.class);
-
-	public void testMapper() throws Exception {
-//		Map<String, UserNature> natures = new HashMap<String, UserNature>();
-//		SimpleUserNature sun = new SimpleUserNature();
-//		sun.setFirstName("Mickey");
-//		sun.setEmail("username@domain.com");
-//		natures.put("simple",sun);
-//		CoworkerNature cwn = new CoworkerNature();
-//		cwn.setMobile("+123456789");
-//		natures.put("coworker",cwn);
-//
-//		GrantedAuthority[] roles = { new GrantedAuthorityImpl("ROLE1"),
-//				new GrantedAuthorityImpl("ROLE2") };
-//		ArgeoUserDetails argeoUserDetails = new ArgeoUserDetails("USER",
-//				natures, "PASSWORD", roles);
-//
-//		SimpleArgeoUser argeoUser = new SimpleArgeoUser(argeoUserDetails);
-//
-//		StringWriter writer = new StringWriter();
-//
-//		JsonFactory jsonFactory = new JsonFactory();
-//		JsonGenerator jsonGenerator = jsonFactory.createJsonGenerator(writer);
-//		jsonGenerator.useDefaultPrettyPrinter();
-//
-//		ObjectMapper objectMapper = new ObjectMapper();
-//
-//		objectMapper.writeValue(jsonGenerator, argeoUser);
-//		String audJo = writer.toString();
-//
-//		log.info("audJo:\n" + audJo);
-//
-//		// BasicArgeoUser aud = objectMapper.readValue(audJo,
-//		// BasicArgeoUser.class);
-//
-//		JsonServerMapper mapper = JsonServerMapperTest.createJsonServerMapper();
-//		ArgeoUser aud = (ArgeoUser) mapper.deserialize(audJo);
-//
-//		assertEquals(argeoUser.getUsername(), aud.getUsername());
-//		assertEquals(argeoUser.getRoles().size(), aud.getRoles().size());
-//		assertEquals(argeoUser.getUserNatures().size(), aud.getUserNatures()
-//				.size());
-//
-//		assertSimpleUserNature((SimpleUserNature) argeoUser.getUserNatures()
-//				.get(0), (SimpleUserNature) aud.getUserNatures().get(0));
-//		assertCoworkerNature(
-//				(CoworkerNature) argeoUser.getUserNatures().get(1),
-//				(CoworkerNature) aud.getUserNatures().get(1));
-
-	}
-
-	public static void assertSimpleUserNature(SimpleUserNature expected,
-			SimpleUserNature reached) {
-		assertEquals(expected.getEmail(), reached.getEmail());
-	}
-
-	public static void assertCoworkerNature(CoworkerNature expected,
-			CoworkerNature reached) {
-		assertEquals(expected.getMobile(), reached.getMobile());
-	}
-
-	public void testSeriDeserialize() {
-//		Map<String, UserNature> natures = new HashMap<String, UserNature>();
-//		JSONArray naturesJo = new JSONArray();
-//
-//		SimpleUserNature sun = new SimpleUserNature();
-//		sun.setEmail("username@domain.com");
-//		natures.put("simple",sun);
-//		naturesJo.put(new JSONObject(sun));
-//
-//		CoworkerNature cwn = new CoworkerNature();
-//		cwn.setMobile("+123456789");
-//		natures.put("coworker",cwn);
-//		naturesJo.put(new JSONObject(cwn));
-//
-//		GrantedAuthority[] roles = { new GrantedAuthorityImpl("ROLE1"),
-//				new GrantedAuthorityImpl("ROLE1") };
-//		ArgeoUserDetails argeoUserDetails = new ArgeoUserDetails("USER",
-//				natures, "PASSWORD", roles);
-//
-//		JSONObject argeoUserDetailsJo = new JSONObject(argeoUserDetails);
-//		argeoUserDetailsJo.put("userNatures", naturesJo);
-//
-//		log.info("argeoUserDetailsJo=" + argeoUserDetailsJo.toString(2));
-
-		// JSONParser jsonParser = new JSONParser();
-		// ArgeoUserDetails argeoUserDetails = JSONParser
-	}
-}