Commit graph

119 commits

Author SHA1 Message Date
1cb847d6e9 Merge pull request #11 from kemitix/upgrade-spring-context-support-to-4.2.5
Upgrade to test with spring-context-support 4.2.5
2016-03-05 15:14:38 +00:00
516fd679c5 Merge pull request #8 from kemitix/upgrade-simple-java-mail-to-3.0.0
Upgrade to test with simple-java-mail 3.0.0
2016-03-05 15:14:27 +00:00
099e77de9a Merge pull request #9 from kemitix/upgrade-kemitix-parent-to-0.9.0
Upgrade kemitix-parent to 0.9.0
2016-03-05 15:14:07 +00:00
1a30f8a9d9 pom.xml: Upgrade to test with spring-context-support 4.2.5
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-03-05 15:09:20 +00:00
b30289aca2 pom.xml: Upgrade to test with simple-java-mail 3.0.0
In simple-java-mail the Email class has been moved into the 'email' package,
thus the Issue1Test had to be updated. This doesn't affect how
wiser-assertions is used.

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-03-05 15:07:59 +00:00
9c82829c5d pom.xml: Upgrade kemitix-parent to 0.9.0
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-03-05 14:58:11 +00:00
3d8f1c2f1c Merge branch release/0.3.1 into develop
Add support for Spring Mail's SimpleMailMessage [fixes #6]
Upgrade kemitix-parent to 0.7.1

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-02-16 23:11:31 +00:00
8d11da09e9 Merge branch release/0.3.1 into master
Add support for Spring Mail's SimpleMailMessage [fixes #6]
Upgrade kemitix-parent to 0.7.1

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-02-16 23:11:31 +00:00
86ec41b504 pom.xml: version set to 0.4.0-SNAPSHOT
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-02-16 23:11:31 +00:00
3e7d686f3c CHANGELOG
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-02-16 23:11:31 +00:00
02c78852af pom.xml: version set to 0.3.1
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-02-16 23:11:31 +00:00
2309ce04f0 Merge pull request #7 from kemitix/issue-6-unexpected-mimemessage-content-in-withcontentcontains
Fix Issue 6 Unexpected mimeMessage content in withContentContains
2016-02-16 23:06:35 +00:00
eff6e6c0b3 WiserAssertions.getMimeMessageBody: accept that content may be a String
Spring's SimpleMailMessage doesn't wrap it's email body in a mime content
type as it is just a 'simple' mail message.

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-02-16 22:55:38 +00:00
146f53e404 AbstractWiserTest: always create a new Session for each test
Otherwise properties are ignored on subsequent calls.

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-02-16 22:53:44 +00:00
06c48f4444 AbstractWiserTest: fix refactoring artifact and use constant directly
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-02-16 22:52:21 +00:00
a11b2fcdd4 Issue6Test: assert from, to and withSubject to match submitted issue
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-02-16 22:51:31 +00:00
311eda0299 Issue6Test: add regression test for issue 6
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-02-16 22:26:31 +00:00
850d9948ad Merge branch 'upgrade-kemitix-parent-to-0.7.1' into develop
* upgrade-kemitix-parent-to-0.7.1:
  pom.xml: Upgrade kemitix-parent to 0.7.1
2016-02-16 21:42:54 +00:00
6b7ea83051 pom.xml: Upgrade kemitix-parent to 0.7.1
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-02-16 21:42:27 +00:00
cbb3b12832 Merge branch release/0.3.0 into master
Add support for nested multi-part emails [jonjo-manywho] [#1]

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-01-25 13:28:47 +00:00
209c33df01 Merge branch release/0.3.0 into develop
Add support for nested multi-part emails [jonjo-manywho] [#1]

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-01-25 13:28:47 +00:00
b9c6226245 pom.xml: version set to 0.4.0-SNAPSHOT
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-01-25 13:28:47 +00:00
78738e83ed CHANGELOG
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-01-25 13:28:46 +00:00
b7b5e1d74f pom.xml: version set to 0.3.0
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-01-25 13:28:46 +00:00
e9adcbb872 Merge pull request #5 from kemitix/issue-1-nested-multipart-mails
Issue #1: Add support for nested multipart messages
2016-01-25 13:24:53 +00:00
04870102a2 Normalise formatting (comments and white space only).
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-01-25 13:20:31 +00:00
6b866a0ddd Merge pull request #4 from jonjo-manywho/issue-1-nested-multipart-mails
Issue #1: Add support for nested multipart messages
2016-01-25 13:09:07 +00:00
Jonjo McKay
d624902cfd Issue #1: Add support for nested multipart messages 2016-01-25 13:03:42 +00:00
4f8fbe50c5 Merge pull request #3 from kemitix/switch-to-kemitix-parent
Switch to kemitix-parent as parent pom
2016-01-25 12:26:08 +00:00
8aa0f2c1c5 checkstyle.xml: updated to be slightly less strict
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-01-25 12:16:57 +00:00
911c0dd3b3 WiserAssertionsTest: fix line wrapping
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-01-25 12:11:42 +00:00
ebba0760c4 pom.xml: switch parent to kemitix-parent
Need to specify versions for junit and mockito-core ourselves now.
2016-01-25 12:11:21 +00:00
986daedfb1 Issue1Test: add draft test for nested multipart messages
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-01-25 11:54:28 +00:00
262283d628 Refactor common elements of testing to AbstractWiserTest
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2016-01-25 11:53:37 +00:00
Paul Campbell
7b9f291be1 Merge branch release/0.2.0 into master
4d01349 Add tests with improved conversion of MIME Multipart messages to string
d72ca46 Apply Checkstyle formatting (modified sun_checks) rules and add javadoc

Signed-off-by: Paul Campbell <paulcampbell@fife.ac.uk>
2015-10-22 09:40:44 +01:00
Paul Campbell
c1acc0480b Merge branch release/0.2.0 into develop
4d01349 Add tests with improved conversion of MIME Multipart messages to string
d72ca46 Apply Checkstyle formatting (modified sun_checks) rules and add javadoc

Signed-off-by: Paul Campbell <paulcampbell@fife.ac.uk>
2015-10-22 09:40:44 +01:00
Paul Campbell
eb43104c44 CHANGELOG
Signed-off-by: Paul Campbell <paulcampbell@fife.ac.uk>
2015-10-22 09:40:44 +01:00
Paul Campbell
7e4ec09f35 pom.xml: version set to 0.3.0-SNAPSHOT
Signed-off-by: Paul Campbell <paulcampbell@fife.ac.uk>
2015-10-22 09:40:44 +01:00
Paul Campbell
992d1b3a23 pom.xml: version set to 0.2.0
Signed-off-by: Paul Campbell <paulcampbell@fife.ac.uk>
2015-10-22 09:40:44 +01:00
Paul Campbell
7f1093db3b CHANGELOG: added
Signed-off-by: Paul Campbell <paulcampbell@fife.ac.uk>
2015-10-22 09:38:04 +01:00
4d01349528 Merge branch 'feature/add-tests' into develop 2015-10-21 23:03:58 +01:00
bee688fe9f WiserAssertionsTest: added
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2015-10-21 23:03:46 +01:00
1215fe8fa9 pom.xml: add junit and mockito-core dependencies for testing
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2015-10-21 23:03:36 +01:00
9cd5b0c69c pom.xml: Upgrade kemitix-spring-parent to 1.2.1
This gives us:

* Build is no longer platform dependent
* Upgrade maven plugins: surefire, surefire-report and failsafe to 2.19
* Upgrade maven plugin checkstyle to 2.17

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2015-10-21 23:03:12 +01:00
14cc99fd88 WiserAssertions: improve conversion of mime Multipart message to string
Previously the message was written to an output stream. Headers and mime
boundaries included. Assertions which use this method are looking at the
content of the message, rather than the wrappings.

Now we just look at the content of the multiparts.

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
2015-10-21 23:01:45 +01:00
5fe7ec7cc4 .travis.yml: specify oraclejdk8 for CI testing 2015-10-21 22:55:36 +01:00
Paul Campbell
45affed46e .travis.yml: add travis config
Signed-off-by: Paul Campbell <paulcampbell@fife.ac.uk>
2015-10-16 15:49:06 +01:00
d72ca46684 Merged #1 "Apply Checkstyle" 2015-10-16 15:47:41 +01:00
Paul Campbell
794d37e72c WiserAssertions: avoid using default characterset
Signed-off-by: Paul Campbell <paulcampbell@fife.ac.uk>
2015-10-16 15:46:57 +01:00
Paul Campbell
c305cd4371 WiserAssertions: convert messageBody content without using casting
Signed-off-by: Paul Campbell <paulcampbell@fife.ac.uk>
2015-10-16 15:46:57 +01:00