From 3286926d2ec11445f76cd170e4c2fcff597a0754 Mon Sep 17 00:00:00 2001
From: Fabrice Bacchella <fbacchella@spamcop.net>
Date: Tue, 26 May 2015 04:48:40 -0400
Subject: [PATCH] Two slight improvement for custom UserService: - try userRealm as a file only if class is not found, other exeptions are real error - log userService only after setup, for better logging, as it can use gitblit.properties for custom .toString
---
src/test/java/com/gitblit/tests/MailTest.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/MailTest.java b/src/test/java/com/gitblit/tests/MailTest.java
index 05d55a2..0224e84 100644
--- a/src/test/java/com/gitblit/tests/MailTest.java
+++ b/src/test/java/com/gitblit/tests/MailTest.java
@@ -15,24 +15,26 @@
*/
package com.gitblit.tests;
-import static org.junit.Assert.assertTrue;
-
import javax.mail.Message;
import org.junit.Test;
import com.gitblit.FileSettings;
-import com.gitblit.MailExecutor;
+import com.gitblit.Keys;
+import com.gitblit.models.Mailing;
+import com.gitblit.service.MailService;
-public class MailTest {
+public class MailTest extends GitblitUnitTest {
@Test
public void testSendMail() throws Exception {
FileSettings settings = new FileSettings("mailtest.properties");
- MailExecutor mail = new MailExecutor(settings);
- Message message = mail.createMessageForAdministrators();
+ MailService mail = new MailService(settings);
+ Mailing mailing = Mailing.newPlain();
+ mailing.setRecipients(settings.getStrings(Keys.mail.adminAddresses));
+ Message message = mail.createMessage(mailing);
message.setSubject("Test");
- message.setText("this is a test");
+ message.setText("Lägger till andra stycket i ny fil. UTF-8 encoded");
mail.queue(message);
mail.run();
--
Gitblit v1.9.1