You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2017/11/07 03:17:33 UTC
[1/3] james-project git commit: PROTOCOLS-117 FlagsFactory should
trim empty and null user flags
Repository: james-project
Updated Branches:
refs/heads/master f1d6f12f6 -> b353752b2
PROTOCOLS-117 FlagsFactory should trim empty and null user flags
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0b27e886
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0b27e886
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0b27e886
Branch: refs/heads/master
Commit: 0b27e88688324a46cd01c62e5465ba7e279ca64b
Parents: f1d6f12
Author: Matthieu Baechler <ma...@apache.org>
Authored: Mon Nov 6 15:12:19 2017 +0100
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Mon Nov 6 15:12:19 2017 +0100
----------------------------------------------------------------------
.../james/mailbox/store/mail/model/FlagsFactory.java | 2 ++
.../mailbox/store/mail/model/FlagsFactoryTest.java | 15 +++++++++++++++
2 files changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/0b27e886/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/FlagsFactory.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/FlagsFactory.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/FlagsFactory.java
index eb3c9e4..3f506cd 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/FlagsFactory.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/FlagsFactory.java
@@ -25,6 +25,7 @@ import java.util.stream.Stream;
import javax.mail.Flags;
+import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
public class FlagsFactory {
@@ -114,6 +115,7 @@ public class FlagsFactory {
toUserFlagStream(flagsOrEmpty),
userFlags.stream())
.distinct()
+ .filter(s -> !Strings.isNullOrEmpty(s))
.filter(flagsFilter.getUserFlagFilter());
final Flags result = new Flags();
http://git-wip-us.apache.org/repos/asf/james-project/blob/0b27e886/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/FlagsFactoryTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/FlagsFactoryTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/FlagsFactoryTest.java
index 9f080cd..5f32579 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/FlagsFactoryTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/FlagsFactoryTest.java
@@ -123,4 +123,19 @@ public class FlagsFactoryTest {
assertThat(actual.getUserFlags()).containsOnly("soCool");
}
+ @Test
+ public void builderShouldTrimEmptyUserFlags() {
+ Flags flags = new Flags();
+ flags.add("");
+ flags.add("value2");
+ Flags actual = FlagsFactory.builder().flags(flags).addUserFlags("", "value").build();
+ assertThat(actual.getUserFlags()).containsOnly("value", "value2");
+ }
+
+ @Test
+ public void builderShouldTrimNullUserFlags() {
+ Flags actual = FlagsFactory.builder().addUserFlags(null, "value").build();
+ assertThat(actual.getUserFlags()).containsOnly("value");
+ }
+
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[3/3] james-project git commit: JAMES-1952 Correct and reactivate
ignored test
Posted by bt...@apache.org.
JAMES-1952 Correct and reactivate ignored test
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/b353752b
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/b353752b
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/b353752b
Branch: refs/heads/master
Commit: b353752b28d08e4864012c35c28f10a7cd324975
Parents: 3f921ba
Author: benwa <bt...@linagora.com>
Authored: Sun Nov 5 23:22:39 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Tue Nov 7 10:16:43 2017 +0700
----------------------------------------------------------------------
.../es/ClientProviderImplConnectionTest.java | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/b353752b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java
----------------------------------------------------------------------
diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java
index ea93049..2008419 100644
--- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java
+++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java
@@ -24,7 +24,6 @@ import java.util.concurrent.TimeUnit;
import org.apache.james.util.streams.SwarmGenericContainer;
import org.elasticsearch.client.Client;
import org.elasticsearch.index.query.QueryBuilders;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.slf4j.Logger;
@@ -32,7 +31,6 @@ import org.slf4j.LoggerFactory;
import com.jayway.awaitility.Awaitility;
-@Ignore("JAMES-1952")
public class ClientProviderImplConnectionTest {
private static final Logger LOGGER = LoggerFactory.getLogger(ClientProviderImplConnectionTest.class);
private static final String DOCKER_ES_IMAGE = "elasticsearch:2.2.1";
@@ -45,14 +43,15 @@ public class ClientProviderImplConnectionTest {
@Rule
public SwarmGenericContainer es2 = new SwarmGenericContainer(DOCKER_ES_IMAGE)
- .withAffinityToContainer();
+ .withAffinityToContainer()
+ .withExposedPorts(ES_APPLICATIVE_PORT);
@Test
public void connectingASingleServerShouldWork() throws Exception {
Awaitility.await()
.atMost(1, TimeUnit.MINUTES)
.pollInterval(5, TimeUnit.SECONDS)
- .until(() -> isConnected(ClientProviderImpl.forHost(es1.getHostIp(), 9300)));
+ .until(() -> isConnected(ClientProviderImpl.forHost(es1.getContainerIp(), 9300)));
}
@Test
@@ -62,8 +61,8 @@ public class ClientProviderImplConnectionTest {
.pollInterval(5, TimeUnit.SECONDS)
.until(() ->isConnected(
ClientProviderImpl.fromHostsString(
- es1.getHostIp() + ":" + ES_APPLICATIVE_PORT + ","
- + es2.getHostIp() + ":" + ES_APPLICATIVE_PORT)));
+ es1.getContainerIp() + ":" + ES_APPLICATIVE_PORT + ","
+ + es2.getContainerIp() + ":" + ES_APPLICATIVE_PORT)));
}
@Test
@@ -75,8 +74,8 @@ public class ClientProviderImplConnectionTest {
.pollInterval(5, TimeUnit.SECONDS)
.until(() -> isConnected(
ClientProviderImpl.fromHostsString(
- es1.getHostIp() + ":" + ES_APPLICATIVE_PORT + ","
- + es2.getHostIp() + ":" + ES_APPLICATIVE_PORT)));
+ es1.getContainerIp() + ":" + ES_APPLICATIVE_PORT + ","
+ + es2.getContainerIp() + ":" + ES_APPLICATIVE_PORT)));
}
private boolean isConnected(ClientProvider clientProvider) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/3] james-project git commit: JAMES-2207 Waiting strategy was
missing in VacationRelayIntegrationTest and for SmtpForwarding
Posted by bt...@apache.org.
JAMES-2207 Waiting strategy was missing in VacationRelayIntegrationTest and for SmtpForwarding
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/3f921bab
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/3f921bab
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/3f921bab
Branch: refs/heads/master
Commit: 3f921bab62f64032e01293ce60c1a6624f7ff1b0
Parents: 0b27e88
Author: benwa <bt...@linagora.com>
Authored: Sun Nov 5 22:55:58 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Tue Nov 7 10:16:16 2017 +0700
----------------------------------------------------------------------
.../src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java | 4 +++-
.../java/org/apache/james/jmap/VacationRelayIntegrationTest.java | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/3f921bab/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
index 8510c53..1e87578 100644
--- a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
+++ b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
@@ -33,6 +33,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
+import org.testcontainers.containers.wait.HostPortWaitStrategy;
import com.google.common.base.Charsets;
import com.jayway.restassured.RestAssured;
@@ -49,7 +50,8 @@ public abstract class ForwardSmtpTest {
private final TemporaryFolder folder = new TemporaryFolder();
private final SwarmGenericContainer fakeSmtp = new SwarmGenericContainer("weave/rest-smtp-sink:latest")
.withExposedPorts(25)
- .withAffinityToContainer();
+ .withAffinityToContainer()
+ .waitingFor(new HostPortWaitStrategy());
@Rule
public final RuleChain chain = RuleChain.outerRule(folder).around(fakeSmtp);
http://git-wip-us.apache.org/repos/asf/james-project/blob/3f921bab/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
index 7bc8266..a750699 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
@@ -43,6 +43,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import org.testcontainers.containers.wait.HostPortWaitStrategy;
import com.google.common.base.Charsets;
import com.jayway.awaitility.Awaitility;
@@ -66,7 +67,8 @@ public abstract class VacationRelayIntegrationTest {
@Rule
public final SwarmGenericContainer fakeSmtp = new SwarmGenericContainer("weave/rest-smtp-sink:latest")
- .withExposedPorts(VacationRelayIntegrationTest.REST_SMTP_SINK_PORT);
+ .withExposedPorts(REST_SMTP_SINK_PORT)
+ .waitingFor(new HostPortWaitStrategy());
private ConditionFactory calmlyAwait;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org