commit 78dac2ce925fb7de832388375e62862ee7339239
author Oliver Lietz <olli@apache.org> Mon Dec 16 21:41:19 2019 +0100
committer Oliver Lietz <olli@apache.org> Mon Dec 16 21:41:19 2019 +0100
tree a5d08a8d8faa7aeddee2a5e515fccb1d19c89feb
parent 199be109b1479802846d184fa2a4e62af97c4567

SLING-3017 Improve Karaf integration tests

adjust SlingCommonsMessagingMailIT

src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsMessagingMailIT.java

diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsMessagingMailIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsMessagingMailIT.java
index 5a5a3cf..adb68fb 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsMessagingMailIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsMessagingMailIT.java
@@ -18,9 +18,6 @@
  */
 package org.apache.sling.karaf.tests.bootstrap;
 
-import javax.inject.Inject;
-
-import org.apache.sling.commons.messaging.MessageService;
 import org.apache.sling.karaf.testing.KarafTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -30,28 +27,18 @@
 import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.ops4j.pax.exam.util.Filter;
 import org.osgi.framework.Bundle;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
 public class SlingCommonsMessagingMailIT extends KarafTestSupport {
 
-    @Inject
-    @Filter(timeout = 300000)
-    public MessageService messageService;
-
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            editConfigurationFilePut("etc/org.apache.sling.commons.messaging.mail.internal.SimpleMailBuilder.config", "subject", "Default Subject"),
-            editConfigurationFilePut("etc/org.apache.sling.commons.messaging.mail.internal.SimpleMailBuilder.config", "from", "from@example.net"),
-            editConfigurationFilePut("etc/org.apache.sling.commons.messaging.mail.internal.SimpleMailBuilder.config", "smtp.hostname", "localhost"),
-            editConfigurationFilePut("etc/org.apache.sling.commons.messaging.mail.internal.SimpleMailBuilder.config", "smtp.port", "25"),
             addSlingFeatures("sling-commons-messaging-mail")
         );
     }