/ - Diff - D-Net - D-Net project tracking tool

     import static org.junit.Assert.*;
     import java.util.ArrayList;
     import java.util.List;
     import org.apache.commons.codec.digest.DigestUtils;
     import org.junit.Test;
     import org.junit.runner.RunWith;
-...
     import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
     import eu.dnetlib.goldoa.domain.PersonManagerException;
     import eu.dnetlib.goldoa.domain.Role;
     import eu.dnetlib.goldoa.domain.User;
     import eu.dnetlib.goldoa.domain.UserRole;
     import eu.dnetlib.goldoa.service.UserManagerImpl;
-...
     	@Test
         @Transactional
        // @Rollback(true)
         @Rollback(true)
     	public void registerUser() {
     		 User user = new User();
     		 user.setEmail("pkanakakis@di.uoa.gr");
     		 user.setPassword(DigestUtils.md5Hex("1q2w3e4r").toString());
     		User user = new User();
     		user.setEmail("pkanakakis@di.uoa.gr");
     		user.setPassword(DigestUtils.md5Hex("1q2w3e4r").toString());
     		 try {
     		try {
     			um.register(user);
     		 } catch (PersonManagerException e) {
     		} catch (PersonManagerException e) {
     			e.printStackTrace();
+    		 }
+    		}
     		um.activateUser(user.getEmail());
     		User sys_user = null;
     		try {
-...
     		} catch (PersonManagerException e) {
     			e.printStackTrace();
+    		}
     		System.out.println(sys_user);
     		assertEquals(user,sys_user);
     		assertEquals(user,sys_user);
+    	}
     	/*@Test
     	@Test
         @Transactional
         @Rollback(true)
     	public void test() {
     		 //User user = new User();
     	public void checkRoles() {
     		User user = new User();
     		user.setEmail("pkanakakis@di.uoa.gr");
     		user.setPassword(DigestUtils.md5Hex("1q2w3e4r").toString());
     		Role role = new Role("1", "moderator");
     		List<UserRole> userRoles = new ArrayList<>();
     		UserRole userRole = new UserRole();
     		userRole.setRole(role);
     		userRole.setUser(user);
     		userRole.setApproved(false);
     		userRoles.add(userRole);
     		user.setUserRole(userRoles);
     		try {
     			um.register(user);
     		} catch (PersonManagerException e) {
     			e.printStackTrace();
+    		}
     		um.activateUser(user.getEmail());
+    	}
     */
+    }

     	<context:annotation-config/>
     	<context:property-placeholder location="classpath:applicationContext-goldoa-service.properties" />
     	<context:component-scan base-package="eu.dnetlib.goldoa.*" />
     	<!-- <context:component-scan base-package="eu.dnetlib.goldoa.service" />
     	<context:component-scan base-package="eu.dnetlib.goldoa.service" />
     	<context:component-scan base-package="eu.dnetlib.goldoa.service.utils" />
     	<context:component-scan base-package="eu.dnetlib.goldoa.service.dao" />
     	<context:component-scan base-package="eu.dnetlib.goldoa.domain" /> -->
     	<context:component-scan base-package="eu.dnetlib.goldoa.domain" />
     	<aop:aspectj-autoproxy proxy-target-class="true" />
     	<tx:annotation-driven transaction-manager="txManager"/>
         <bean id="txManager" class="org.springframework.orm.hibernate4.HibernateTransactionManager">
     		<property name="sessionFactory" ref="sessionFactory"/>
     	</bean>
     	<bean id="executorService" class="java.util.concurrent.Executors" factory-method="newCachedThreadPool" destroy-method="shutdown" />
     <!--
         <bean id="contactManager" class="eu.dnetlib.goldoa.service.ContactManagerImpl">
             <property name="contactEmail" value="${goldoa.contactEmail}" />

+    	}
     	public boolean verifyLogin(String email, String password) {
     		List users = createEntityCriteria().add(Restrictions.eq("email", email))
     				.add(Restrictions.eq("password", DigestUtils.md5Hex(password))).list();
     		System.out.println(users.size());
     		List users = createEntityCriteria().add(Restrictions.eq("email", email)).list();
     		//		.add(Restrictions.eq("password", DigestUtils.md5Hex(password))).list();
     		if(users.size() != 0)
     			return true;
     		return false;
+    	}
     	public boolean verifyToken(final String email, final String token) {
     //		private static final String GET_PERSON_TOKEN = "select 1 from person p join account_action ac "
     //				+ "on ac.user=p.id where p.email=? and ac.token=?";
     		/*return new JdbcTemplate(dataSource).query(GET_PERSON_TOKEN, new Object[]{email, token}, new int[]{Types.VARCHAR, Types.VARCHAR}, new RowMapper<Object>() {
-...
     	public void saveProjectCoordinators(final String email, final List<ProjectCoordinator> projectCoordinators) {
     		User user = (User) createEntityCriteria().add(Restrictions.eq("email", email)).list().get(0);
     		//user.setProjectCoordinators(projectCoordinators);
     		user.setProjectCoordinators(projectCoordinators);
     		persist(user);
+    	}
     	public void saveUserRoles(final String email, final List<UserRole> roles) {
     		User user = getUserByEmail(email);
     		user.setRole(roles);
     //		persist(user);
     		persist(user);
+    	}
     	/**
-...
     	 * @param affiliations
     	 */
     	public void saveAffiliations(final User user, final List<Affiliation> affiliations) {
     	//	user.setAffiliations(affiliations);
     		user.setAffiliations(affiliations);
     		persist(user);
     //		new JdbcTemplate(dataSource).batchUpdate(INSERT_AFFILIATION, new BatchPreparedStatementSetter() {
     //			@Override
     //			public void setValues(PreparedStatement ps, int i) throws SQLException {

     		if (userDAO.verifyLogin(email, password)) {
     			User user = getByEmail(email);
     			if (user.isActive())
     				return user;
     			else
-...
+    	}
     	@Override
     	public void activateUser(String userId) {
     		userDAO.activateUser(userId);
     	public void activateUser(String email) {
     		userDAO.activateUser(email);
+    	}
     	@Override

     	@Id
     	@ManyToOne
         @JoinColumn(name = "user_email")
         @JoinColumn(name = "email")
         private User user;
     	@Id

Project

General

Profile

D-Net

Revision 45085

Added by Panagiotis Kanakakis over 7 years ago