Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Genesys Backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
45
Issues
45
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Genesys PGR
Genesys Backend
Commits
3591b05a
Commit
3591b05a
authored
Apr 24, 2015
by
Alexander Basov
Committed by
Matija Obreza
Apr 30, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Start testing EmailVerification Test
parent
5fe4d46d
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
213 additions
and
4 deletions
+213
-4
pom.xml
pom.xml
+11
-0
src/test/java/org/genesys2/unit/DescriptorServiceTest.java
src/test/java/org/genesys2/unit/DescriptorServiceTest.java
+1
-1
src/test/java/org/genesys2/unit/EmailVerificationServiceTest.java
.../java/org/genesys2/unit/EmailVerificationServiceTest.java
+196
-0
src/test/java/org/genesys2/unit/TeamServiceTest.java
src/test/java/org/genesys2/unit/TeamServiceTest.java
+1
-1
src/test/java/org/genesys2/unit/TokenVerificationServiceTest.java
.../java/org/genesys2/unit/TokenVerificationServiceTest.java
+1
-1
src/test/java/org/genesys2/unit/UserServiceTest.java
src/test/java/org/genesys2/unit/UserServiceTest.java
+1
-1
src/test/resources/spring/spring.properties
src/test/resources/spring/spring.properties
+2
-0
No files found.
pom.xml
View file @
3591b05a
...
...
@@ -479,6 +479,17 @@
<artifactId>
pgr-ontology-model
</artifactId>
<version>
0.7.1-SNAPSHOT
</version>
</dependency>
<dependency>
<groupId>
org.mockito
</groupId>
<artifactId>
mockito-all
</artifactId>
<version>
2.0.2-beta
</version>
</dependency>
<dependency>
<groupId>
org.easymock
</groupId>
<artifactId>
easymock
</artifactId>
<version>
3.3.1
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
<build>
...
...
src/test/java/org/genesys2/unit/DescriptorServiceTest.java
View file @
3591b05a
...
...
@@ -64,7 +64,7 @@ public class DescriptorServiceTest {
}
@After
public
void
tear
D
own
(){
public
void
tear
d
own
(){
descriptorRepository
.
deleteAll
();
}
...
...
src/test/java/org/genesys2/unit/EmailVerificationServiceTest.java
0 → 100644
View file @
3591b05a
package
org.genesys2.unit
;
import
org.apache.commons.logging.Log
;
import
org.apache.commons.logging.LogFactory
;
import
org.apache.velocity.app.VelocityEngine
;
import
org.easymock.EasyMock
;
import
org.genesys2.server.exception.UserException
;
import
org.genesys2.server.model.impl.Article
;
import
org.genesys2.server.model.impl.ClassPK
;
import
org.genesys2.server.model.impl.User
;
import
org.genesys2.server.model.impl.VerificationToken
;
import
org.genesys2.server.persistence.domain.ClassPKRepository
;
import
org.genesys2.server.service.*
;
import
org.genesys2.server.service.impl.*
;
import
org.genesys2.server.test.JpaDataConfig
;
import
org.genesys2.server.test.PropertyPlacholderInitializer
;
import
org.genesys2.spring.config.HazelcastConfig
;
import
org.junit.After
;
import
org.junit.Before
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.mockito.Mockito
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.cache.CacheManager
;
import
org.springframework.cache.support.NoOpCacheManager
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Import
;
import
org.springframework.context.annotation.PropertySource
;
import
org.springframework.data.domain.PageRequest
;
import
org.springframework.mail.javamail.JavaMailSender
;
import
org.springframework.mail.javamail.JavaMailSenderImpl
;
import
org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor
;
import
org.springframework.test.context.ActiveProfiles
;
import
org.springframework.test.context.ContextConfiguration
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Locale
;
@RunWith
(
SpringJUnit4ClassRunner
.
class
)
@ContextConfiguration
(
classes
=
EmailVerificationServiceTest
.
Config
.
class
,
initializers
=
PropertyPlacholderInitializer
.
class
)
@ActiveProfiles
(
"dev"
)
public
class
EmailVerificationServiceTest
{
private
final
Log
LOG
=
LogFactory
.
getLog
(
EmailVerificationServiceTest
.
class
);
@Import
({
JpaDataConfig
.
class
,
HazelcastConfig
.
class
})
@PropertySource
({
"classpath:application.properties"
,
"classpath:spring/spring.properties"
})
public
static
class
Config
{
@Bean
public
EMailVerificationService
emailVerificationService
()
{
return
new
EMailVerificationServiceImpl
();
}
@Bean
public
EMailService
eMailService
()
{
return
Mockito
.
mock
(
EMailServiceImpl
.
class
);
}
@Bean
public
TokenVerificationService
tokenVerificationService
()
{
return
Mockito
.
mock
(
TokenVerificationServiceImpl
.
class
);
}
@Bean
public
UserService
userService
()
{
return
Mockito
.
mock
(
UserServiceImpl
.
class
);
}
@Bean
public
ContentService
contentService
()
{
return
Mockito
.
mock
(
ContentServiceImpl
.
class
);
}
@Bean
public
CacheManager
cacheManager
()
{
return
new
NoOpCacheManager
();
}
@Bean
public
JavaMailSender
javaMailSender
()
{
return
new
JavaMailSenderImpl
();
}
@Bean
public
ThreadPoolTaskExecutor
threadPoolTaskExecutor
()
{
return
new
ThreadPoolTaskExecutor
();
}
@Bean
public
HtmlSanitizer
htmlSanitizer
()
{
return
new
OWASPSanitizer
();
}
@Bean
public
VelocityEngine
velocityEngine
()
{
return
new
VelocityEngine
();
}
}
@Autowired
private
EMailVerificationService
emailVerificationService
;
@Autowired
private
TokenVerificationService
tokenVerificationService
;
@Autowired
private
ContentService
contentService
;
@Autowired
private
EMailService
eMailService
;
@Autowired
private
UserService
userService
;
@Autowired
private
ClassPKRepository
classPkRepository
;
private
Article
article
;
private
User
user
;
private
VerificationToken
verificationToken
;
@Before
public
void
setUp
()
{
LOG
.
info
(
"set up"
);
user
=
new
User
();
user
.
setName
(
"Name 1"
);
user
.
setPassword
(
"password of user"
);
user
.
setEmail
(
"salexandrbasov@gmail.com"
);
user
.
setUuid
(
"Uuid"
);
verificationToken
=
new
VerificationToken
();
verificationToken
.
setUuid
(
"tokenUuid"
);
verificationToken
.
setKey
(
"tokenKey"
);
article
=
new
Article
();
article
.
setTitle
(
"articleTitle"
);
article
.
setBody
(
"body article"
);
article
.
setSlug
(
"smtp.email-verification"
);
article
.
setLang
(
"en"
);
LOG
.
info
(
"finish set up"
);
}
@After
public
void
teardown
()
{
Mockito
.
validateMockitoUsage
();
// Mockito.reset(eMailService, tokenVerificationService, contentService, userService);
}
// @Test
// public void sendVerificationEmailTest() {
// LOG.info("Start test-method sendVerificationEmailTest");
//
// Mockito.when(contentService.getGlobalArticle("smtp.email-verification", Locale.ENGLISH)).thenReturn(article);
// Mockito.when(tokenVerificationService.generateToken("email-verification", user.getUuid())).thenReturn(verificationToken);
//
// Mockito.doNothing().when(eMailService).sendMail(article.getTitle(), article.getBody(), user.getEmail());
//
// emailVerificationService.sendVerificationEmail(user);
//
// Mockito.verify(eMailService).sendMail(article.getTitle(), article.getBody(), user.getEmail());
//
// LOG.info("Test sendVerificationEmailTest passed!");
// }
//
// @Test
// public void sendPasswordResetEmailTest() {
// LOG.info("Start test-method sendPasswordResetEmailTest");
//
// Mockito.when(tokenVerificationService.generateToken("email-password", user.getUuid())).thenReturn(verificationToken);
// Mockito.when(contentService.getGlobalArticle("smtp.email-password", Locale.ENGLISH)).thenReturn(article);
//
// Mockito.doNothing().when(eMailService).sendMail(article.getTitle(), article.getBody(), user.getEmail());
//
// emailVerificationService.sendPasswordResetEmail(user);
//
// Mockito.verify(eMailService).sendMail(article.getTitle(), article.getBody(), user.getEmail());
//
// LOG.info("Test sendPasswordResetEmailTest passed!");
// }
@Test
public
void
cancelValidationTest
()
throws
TokenVerificationService
.
NoSuchVerificationTokenException
{
LOG
.
info
(
"Start test-method cancelValidationTest"
);
Mockito
.
doNothing
().
when
(
tokenVerificationService
).
cancel
(
verificationToken
.
getUuid
());
emailVerificationService
.
cancelValidation
(
verificationToken
.
getUuid
());
Mockito
.
verify
(
tokenVerificationService
).
cancel
(
verificationToken
.
getUuid
());
LOG
.
info
(
"Test cancelValidationTest passed!"
);
}
}
src/test/java/org/genesys2/unit/TeamServiceTest.java
View file @
3591b05a
...
...
@@ -174,7 +174,7 @@ public class TeamServiceTest {
}
@After
public
void
tear
D
own
()
throws
UserException
{
public
void
tear
d
own
()
throws
UserException
{
teamRepository
.
deleteAll
();
userService
.
removeUser
(
userService
.
getUserByEmail
(
user
.
getEmail
()));
...
...
src/test/java/org/genesys2/unit/TokenVerificationServiceTest.java
View file @
3591b05a
...
...
@@ -71,7 +71,7 @@ public class TokenVerificationServiceTest {
}
@After
public
void
afterEachMethod
()
{
public
void
teardown
()
{
if
(
isAnyTokensExists
())
{
tokenRepository
.
delete
(
tokenRepository
.
findAll
().
get
(
0
).
getId
());
...
...
src/test/java/org/genesys2/unit/UserServiceTest.java
View file @
3591b05a
...
...
@@ -85,7 +85,7 @@ public class UserServiceTest {
}
@After
public
void
afterEachTest
()
{
public
void
teardown
()
{
try
{
if
(
userService
.
exists
(
email
))
{
...
...
src/test/resources/spring/spring.properties
View file @
3591b05a
...
...
@@ -61,6 +61,8 @@ auto.createContent=false
scheduler.tokens.cleanup.hours
=
1
# Mail configuration
mail.host
=
localhost
mail.port
=
25
mail.user.from
=
test@localhost
mail.requests.to
=
test@localhost
mail.async
=
true
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment