Tests adjusted
diff --git a/mailExport/sonar-project.properties b/mailExport/sonar-project.properties
index bf0f871..9662071 100644
--- a/mailExport/sonar-project.properties
+++ b/mailExport/sonar-project.properties
@@ -26,7 +26,7 @@
sonar.exclusions=**/model/*.java,**/viewmodel/*.java, **/emails/emailTemplate.html
sonar.tests=src/test
#sonar.test.inclusions=**/*.spec.ts
-sonar.test.exclusions=**/model/**,**/viewmodel/**
+sonar.test.exclusions=**/model/**,**/viewmodel/**, **/emails/emailTemplate.html
#sonar.ts.tslintconfigpath=tslint.json
sonar.typescript.lcov.reportPaths=coverage/lcov.info
\ No newline at end of file
diff --git a/mailExport/src/test/java/org/eclipse/openk/gridfailureinformation/mailexport/service/EmailServiceTest.java b/mailExport/src/test/java/org/eclipse/openk/gridfailureinformation/mailexport/service/EmailServiceTest.java
index 87551f4..0b8e95f 100644
--- a/mailExport/src/test/java/org/eclipse/openk/gridfailureinformation/mailexport/service/EmailServiceTest.java
+++ b/mailExport/src/test/java/org/eclipse/openk/gridfailureinformation/mailexport/service/EmailServiceTest.java
@@ -93,12 +93,14 @@
@Test
public void testSendMail_nok() {
mailServer.stop();
+ emailConfig.setUseHtmlEmailTemplate(false);
MailMessageDto mailMessageDto = MockDataHelper.mockMailMessageDto();
assertThrows(MessagingException.class, () -> emailService.sendMail(mailMessageDto));
}
@Test
public void testSendMail_invalidRecipient() {
+ emailConfig.setHtmlEmail(false);
MailMessageDto mailMessageDto = MockDataHelper.mockMailMessageDtoWrongRecipientFormat();
assertThrows(MessagingException.class, () -> emailService.sendMail(mailMessageDto));
}
@@ -109,6 +111,8 @@
emailConfig.setSmtpHost("localhost");
emailConfig.setEmailPort("3025");
emailConfig.setSender("testCaseSendertest.de");
+ emailConfig.setHtmlEmail(false);
+ emailConfig.setUseHtmlEmailTemplate(false);
assertThrows(MessagingException.class, () -> {
GfiEmail emailManager = new GfiEmail(emailConfig);
emailManager.sendEmail();
diff --git a/mailExport/src/test/java/org/eclipse/openk/gridfailureinformation/mailexport/util/ResourceLoaderBaseTest.java b/mailExport/src/test/java/org/eclipse/openk/gridfailureinformation/mailexport/util/ResourceLoaderBaseTest.java
new file mode 100644
index 0000000..b3f029a
--- /dev/null
+++ b/mailExport/src/test/java/org/eclipse/openk/gridfailureinformation/mailexport/util/ResourceLoaderBaseTest.java
@@ -0,0 +1,42 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
+package org.eclipse.openk.gridfailureinformation.mailexport.util;
+
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+
+public class ResourceLoaderBaseTest {
+
+ @Test
+ public void testLoadStringFromResourceNotFound() {
+ ResourceLoaderBase rlb = new ResourceLoaderBase();
+ String retString = rlb.loadStringFromResource("testNotExisting.txt");
+
+ assertNull(retString);
+ }
+
+ @Test
+ public void testLoadStringFromResource() {
+ ResourceLoaderBase rlb = new ResourceLoaderBase();
+ String retString = rlb.loadStringFromResource("testCase.txt");
+
+ assertNotNull(retString);
+ }
+}
diff --git a/mailExport/src/test/resources/testCase.txt b/mailExport/src/test/resources/testCase.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/mailExport/src/test/resources/testCase.txt
