diff --git a/pom.xml b/pom.xml index feb6cd2d31ad85f4a3715223b1764a36df0f8db1..4ec1f5b1de7adf0e15deffa72c9c2a281391ef24 100644 --- a/pom.xml +++ b/pom.xml @@ -483,6 +483,7 @@ org.mockito mockito-all 2.0.2-beta + test diff --git a/src/test/java/org/genesys2/unit/AuthUserDetailsServiceTest.java b/src/test/java/org/genesys2/unit/AuthUserDetailsServiceTest.java index c8837c7aa2430a21382f8bcd450661c783e20c11..754998143dd6b1eb327d802fb9eaadbfee2b40ff 100644 --- a/src/test/java/org/genesys2/unit/AuthUserDetailsServiceTest.java +++ b/src/test/java/org/genesys2/unit/AuthUserDetailsServiceTest.java @@ -1,5 +1,7 @@ package org.genesys2.unit; +import static org.junit.Assert.assertTrue; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.genesys2.server.exception.UserException; @@ -27,72 +29,72 @@ import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import static org.junit.Assert.assertTrue; - @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = AuthUserDetailsServiceTest.Config.class, initializers = PropertyPlacholderInitializer.class) @ActiveProfiles("dev") -@DirtiesContext(classMode= DirtiesContext.ClassMode.AFTER_CLASS) +@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) public class AuthUserDetailsServiceTest { - private final Log LOG = LogFactory.getLog(AuthUserDetailsServiceTest.class); + private final Log LOG = LogFactory.getLog(AuthUserDetailsServiceTest.class); - @Import({JpaDataConfig.class, HazelcastConfig.class}) - @PropertySource({"classpath:application.properties", "classpath:spring/spring.properties"}) - public static class Config { + @Import({ JpaDataConfig.class, HazelcastConfig.class }) + @PropertySource({ "classpath:application.properties", "classpath:spring/spring.properties" }) + public static class Config { - @Bean - public UserDetailsService userDetailsService() { - return new AuthUserDetailsService(); - } + @Bean + public UserDetailsService userDetailsService() { + return new AuthUserDetailsService(); + } - @Bean - public UserService userService() { - return new UserServiceImpl(); - } + @Bean + public UserService userService() { + return new UserServiceImpl(); + } - @Bean - public CacheManager cacheManager() { - return new NoOpCacheManager(); - } - } + @Bean + public CacheManager cacheManager() { + return new NoOpCacheManager(); + } + } - @Autowired - private UserDetailsService userDetailsService; + @Autowired + private UserDetailsService userDetailsService; - @Autowired - private UserService userService; + @Autowired + private UserService userService; - @Autowired - private UserPersistence userPersistence; + @Autowired + private UserPersistence userPersistence; - @Test - public void loadUserByUsernameTest() { - LOG.info("Start test-method loadUserByUsernameTest"); + @Test + public void loadUserByUsernameTest() { + LOG.info("Start test-method loadUserByUsernameTest"); - User user = new User(); - user.setEmail("email@mail.com"); - user.setName("UserName"); - user.setPassword("UserPassword"); + User user = new User(); + user.setEmail("email@mail.com"); + user.setName("UserName"); + user.setPassword("UserPassword"); - try { - userService.addUser(user); - UserDetails userDetails = userDetailsService.loadUserByUsername(user.getEmail()); - assertTrue(userDetails != null); - assertTrue(userDetails.getPassword().equals(user.getPassword())); - } catch (UserException e) { - e.printStackTrace(); - } + try { + userService.addUser(user); + UserDetails userDetails = userDetailsService.loadUserByUsername(user.getEmail()); + assertTrue(userDetails != null); + assertTrue(userDetails.getPassword().equals(user.getPassword())); + userService.removeUser(user); + + } catch (UserException e) { + org.junit.Assert.fail(e.getMessage()); + } - LOG.info("Test loadUserByUsernameTest passed!"); - } + LOG.info("Test loadUserByUsernameTest passed!"); + } - @Test(expected = UsernameNotFoundException.class) - public void loadUserByUsernameTestUserNotFound() { - LOG.info("Start test-method loadUserByUsernameTestUserNotFound"); + @Test(expected = UsernameNotFoundException.class) + public void loadUserByUsernameTestUserNotFound() { + LOG.info("Start test-method loadUserByUsernameTestUserNotFound"); - assertTrue(null == userDetailsService.loadUserByUsername("WrongMail")); + assertTrue(null == userDetailsService.loadUserByUsername("WrongMail")); - LOG.info("Test loadUserByUsernameTestUserNotFound passed!"); - } + LOG.info("Test loadUserByUsernameTestUserNotFound passed!"); + } } diff --git a/src/test/java/org/genesys2/unit/ContentSanitizerTest.java b/src/test/java/org/genesys2/unit/ContentSanitizerTest.java index 0526f39c5974ae8e0622b339db620bc45f4a4d26..8df936cd6cbe99c9a46f08078d963225330739b2 100644 --- a/src/test/java/org/genesys2/unit/ContentSanitizerTest.java +++ b/src/test/java/org/genesys2/unit/ContentSanitizerTest.java @@ -31,6 +31,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Locale; import static org.junit.Assert.assertTrue; @@ -87,22 +88,9 @@ public class ContentSanitizerTest { String articleBody = "

Genesys account
Verify your email address

You can already use your Genesys account. We need to confirm your email account before granting you access to all Genesys features.

Verify {2}

Validation key: {3}

If you didn't make this request, click here to cancel.

Thanks,
Genesys team

"; String expectedBody = "

Genesys account
Verify your email address

You can already use your Genesys account. We need to confirm your email account before granting you access to all Genesys features.

Verify {2}

Validation key: {3}

If you didn't make this request, click here to cancel.

Thanks,
Genesys team

"; - Article article = new Article(); - article.setBody(articleBody); - - ClassPK classPK = new ClassPK(); - classPK.setClassName(Article.class.getName()); - classPkRepository.save(classPK); - - article.setClassPk(classPK); - article.setLang("en"); - article.setSlug("smtp.email-verification"); - - List
articles = new ArrayList<>(); - articles.add(article); - - contentService.save(articles); + contentService.createGlobalArticle("smtp.email-verification", Locale.ENGLISH, "Test title", articleBody); + contentSanitizer.sanitizeAll(); Article articleAfterSanitize = contentService.listArticles(new PageRequest(0, 10)).getContent().get(0); diff --git a/src/test/java/org/genesys2/unit/EmailVerificationServiceTest.java b/src/test/java/org/genesys2/unit/EmailVerificationServiceTest.java index eafbe3ccfc2bb2c34ad0bb70505ba7f11035b56d..da8e4c8ab396f0964154610eb152765c458a97db 100644 --- a/src/test/java/org/genesys2/unit/EmailVerificationServiceTest.java +++ b/src/test/java/org/genesys2/unit/EmailVerificationServiceTest.java @@ -210,10 +210,11 @@ public class EmailVerificationServiceTest { @Test public void sendPasswordResetEmailTest() { LOG.info("Start test-method sendPasswordResetEmailTest"); + User user=userService.listUsers(new PageRequest(0, 1)).getContent().get(0); - Mockito.doNothing().when(eMailService).sendMail("title for twoArticle", "

Tho BOdy of twoArticleTho BOdy of twoArticleTho BOdy of twoArticleTho BOdy of twoArticle