From 17afabef6b658b266744e32362cad0c26ad9543e Mon Sep 17 00:00:00 2001 From: grey Date: Mon, 21 Jul 2014 17:15:26 -0700 Subject: [PATCH] Fixed issue and added onto previous test so that the issue can be tested. --- .../cassandra/ManagementServiceImpl.java | 13 ++++++----- .../usergrid/management/EmailFlowIT.java | 22 ++++++++++++------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java index 7c2cff958f..ddd1f88fd7 100644 --- a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java +++ b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java @@ -31,6 +31,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; + +import org.apache.commons.codec.digest.DigestUtils; +import org.apache.commons.lang.text.StrSubstitutor; +import org.apache.shiro.UnavailableSecurityManagerException; + import org.apache.usergrid.locking.Lock; import org.apache.usergrid.locking.LockManager; import org.apache.usergrid.management.AccountCreationProps; @@ -91,10 +96,6 @@ import org.apache.usergrid.utils.StringUtils; import org.apache.usergrid.utils.UUIDUtils; -import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.lang.text.StrSubstitutor; -import org.apache.shiro.UnavailableSecurityManagerException; - import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; @@ -2256,8 +2257,8 @@ public void sendSysAdminNewAdminActivatedNotificationEmail( UserInfo user ) thro public void sendAdminUserConfirmedAwaitingActivationEmail( UserInfo user ) throws Exception { - sendAdminUserEmail( user, "User Account Confirmed", - properties.getProperty( PROPERTIES_EMAIL_ADMIN_CONFIRMED_AWAITING_ACTIVATION ) ); + sendAdminUserEmail(user, "User Account Confirmed", + emailMsg( hashMap("confirmed_email",user.getEmail() ),PROPERTIES_EMAIL_ADMIN_CONFIRMED_AWAITING_ACTIVATION ) ); } diff --git a/stack/services/src/test/java/org/apache/usergrid/management/EmailFlowIT.java b/stack/services/src/test/java/org/apache/usergrid/management/EmailFlowIT.java index b4a7023d00..ab4b34c913 100644 --- a/stack/services/src/test/java/org/apache/usergrid/management/EmailFlowIT.java +++ b/stack/services/src/test/java/org/apache/usergrid/management/EmailFlowIT.java @@ -35,6 +35,10 @@ import org.jvnet.mock_javamail.Mailbox; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.text.StrSubstitutor; + import org.apache.usergrid.ServiceITSetup; import org.apache.usergrid.ServiceITSetupImpl; import org.apache.usergrid.cassandra.CassandraResource; @@ -46,15 +50,7 @@ import org.apache.usergrid.persistence.entities.Application; import org.apache.usergrid.persistence.entities.User; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.text.StrSubstitutor; - import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertTrue; import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_USERS_REQUIRE_CONFIRMATION; import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_ACTIVATED; import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_CONFIRMATION; @@ -76,6 +72,11 @@ import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_USER_ACTIVATION_URL; import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_USER_CONFIRMATION_URL; import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_USER_RESETPW_URL; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertTrue; /** @@ -165,6 +166,11 @@ public void testCreateOrganizationAndAdminWithConfirmationAndActivation() throws assertEquals( ActivationState.CONFIRMED_AWAITING_ACTIVATION, state ); confirmation = user_inbox.get( 1 ); + String body = ( ( MimeMultipart ) confirmation.getContent() ).getBodyPart( 0 ).getContent().toString(); + Boolean subbedEmailed = StringUtils.contains( body, "$" ); + + assertFalse( subbedEmailed ); + assertEquals( "User Account Confirmed", confirmation.getSubject() ); List sysadmin_inbox = Mailbox.get( "sysadmin-2@mockserver.com" );