This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-notifications.git
commit e4e258567c9746098194a9e62584f3eec7a2132a Merge: 6b136f4 3dc6d31 Author: Ebenezer Graham <[email protected]> AuthorDate: Thu May 9 06:16:20 2019 +0400 Merge branch 'dev-merge' into permitted-feign-client-auth component-test/build.gradle | 7 ++ ...fication.java => AbstractNotificationTest.java} | 8 +- .../cn/notification/EmailApiDocumentation.java | 128 +++++++++++++++++++++ .../cn/notification/SmsApiDocumentation.java | 118 +++++++++++++++++++ .../fineract/cn/notification/TestEmailService.java | 2 +- .../fineract/cn/notification/TestSMSService.java | 3 +- 6 files changed, 259 insertions(+), 7 deletions(-) diff --cc component-test/build.gradle index 931282e,55f1d42..3998d6c --- a/component-test/build.gradle +++ b/component-test/build.gradle @@@ -48,17 -47,17 +48,24 @@@ dependencies [group: 'org.apache.fineract.cn', name: 'lang', version: versions.frameworklang], [group: 'org.springframework.boot', name: 'spring-boot-starter-test'], [group: 'org.springframework.restdocs', name: 'spring-restdocs-mockmvc'], - [group: 'junit', name: 'junit', version: '4.12'] + [group: 'junit', name: 'junit', version: versions.junit] ) } +asciidoctor { + sourceDir 'build/doc/asciidoc/' + outputDir 'build/doc/html5' + options backend: "html", doctype: "book" + attributes "source-highlighter": "highlightjs", + 'snippets': file('build/doc/generated-snippets/') +} + asciidoctor { + sourceDir 'build/doc/asciidoc/' + outputDir 'build/doc/html5' + options backend: "html", doctype: "book" + attributes "source-highlighter": "highlightjs", 'snippets': file('build/doc/generated-snippets/') + } + publishing { publications { mavenJava(MavenPublication) { diff --cc component-test/src/main/java/org/apache/fineract/cn/notification/TestEmailService.java index a30f8f7,2855f68..65adbc6 --- a/component-test/src/main/java/org/apache/fineract/cn/notification/TestEmailService.java +++ b/component-test/src/main/java/org/apache/fineract/cn/notification/TestEmailService.java @@@ -34,9 -32,9 +34,9 @@@ import org.junit.Assert import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; - public class TestEmailService extends TestNotification { + public class TestEmailService extends AbstractNotificationTest { - private final String configIdentifier = "Gmail"; + final EmailConfiguration emailConfiguration; @Autowired private NotificationService notificationService; @Autowired diff --cc component-test/src/main/java/org/apache/fineract/cn/notification/TestSMSService.java index 06af8c0,33536ed..315c79b --- a/component-test/src/main/java/org/apache/fineract/cn/notification/TestSMSService.java +++ b/component-test/src/main/java/org/apache/fineract/cn/notification/TestSMSService.java @@@ -34,15 -32,14 +33,15 @@@ import org.junit.Assert import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; - public class TestSMSService extends TestNotification { + public class TestSMSService extends AbstractNotificationTest { + final SMSConfiguration smsConfiguration; @Autowired private NotificationService notificationService; - + @Autowired + private SMSService smsService; @Autowired private NotificationManager notificationManager; - @Autowired private EventRecorder eventRecorder;
