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 ad...@apache.org on 2018/04/06 13:20:20 UTC
[01/24] james-project git commit: JAMES-2366 Introduce Forward RRT
mapping type
Repository: james-project
Updated Branches:
refs/heads/master dbc6f88cd -> 99b5cb6c7
JAMES-2366 Introduce Forward RRT mapping type
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/fd6f10ab
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fd6f10ab
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fd6f10ab
Branch: refs/heads/master
Commit: fd6f10ab67c1f6988f16ebaf1491a29abae091dd
Parents: dbc6f88
Author: Antoine Duprat <ad...@linagora.com>
Authored: Tue Mar 27 16:48:00 2018 +0200
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Apr 6 14:38:36 2018 +0200
----------------------------------------------------------------------
.../james/rrt/api/RecipientRewriteTable.java | 4 ++
.../java/org/apache/james/rrt/lib/Mapping.java | 7 ++-
.../org/apache/james/rrt/lib/MappingTest.java | 24 +++++++++
.../rrt/file/XMLRecipientRewriteTableTest.java | 2 +
.../rrt/lib/AbstractRecipientRewriteTable.java | 53 ++++++++++++++------
.../org/apache/james/rrt/lib/MappingImpl.java | 4 ++
.../user/lib/AbstractJamesUsersRepository.java | 9 ++++
.../lib/AbstractRecipientRewriteTableTest.java | 38 +++++++++++++-
.../apache/james/rrt/lib/MappingImplTest.java | 47 +++++++++++------
.../james/rrt/lib/RewriteTablesStepdefs.java | 10 ++++
.../resources/cucumber/rewrite_tables.feature | 24 ++++++++-
11 files changed, 188 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/fd6f10ab/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTable.java b/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTable.java
index f07fd69..f1f11bd 100644
--- a/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTable.java
+++ b/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTable.java
@@ -207,6 +207,10 @@ public interface RecipientRewriteTable {
*/
void removeAliasDomainMapping(Domain aliasDomain, Domain realDomain) throws RecipientRewriteTableException;
+ void addForwardMapping(String user, Domain domain, String address) throws RecipientRewriteTableException;
+
+ void removeForwardMapping(String user, Domain domain, String address) throws RecipientRewriteTableException;
+
class ErrorMappingException extends Exception {
private static final long serialVersionUID = 2348752938798L;
http://git-wip-us.apache.org/repos/asf/james-project/blob/fd6f10ab/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mapping.java
----------------------------------------------------------------------
diff --git a/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mapping.java b/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mapping.java
index 4bbf11f..72193dc 100644
--- a/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mapping.java
+++ b/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mapping.java
@@ -38,6 +38,9 @@ public interface Mapping {
if (input.startsWith(Type.Error.asPrefix())) {
return Type.Error;
}
+ if (input.startsWith(Type.Forward.asPrefix())) {
+ return Type.Forward;
+ }
return Type.Address;
}
@@ -47,6 +50,7 @@ public interface Mapping {
Regex("regex:"),
Domain("domain:"),
Error("error:"),
+ Forward("forward:"),
Address("");
private final String asPrefix;
@@ -67,7 +71,8 @@ public interface Mapping {
public static boolean hasPrefix(String mapping) {
return mapping.startsWith(Regex.asPrefix())
|| mapping.startsWith(Domain.asPrefix())
- || mapping.startsWith(Error.asPrefix());
+ || mapping.startsWith(Error.asPrefix())
+ || mapping.startsWith(Forward.asPrefix());
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fd6f10ab/server/data/data-api/src/test/java/org/apache/james/rrt/lib/MappingTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-api/src/test/java/org/apache/james/rrt/lib/MappingTest.java b/server/data/data-api/src/test/java/org/apache/james/rrt/lib/MappingTest.java
index 5c4bca8..8297fca 100644
--- a/server/data/data-api/src/test/java/org/apache/james/rrt/lib/MappingTest.java
+++ b/server/data/data-api/src/test/java/org/apache/james/rrt/lib/MappingTest.java
@@ -45,6 +45,12 @@ public class MappingTest {
}
@Test
+ public void hasPrefixShouldReturnTrueWhenForward() {
+ boolean hasPrefix = Mapping.Type.hasPrefix(Type.Forward.asPrefix() + "myRegex");
+ assertThat(hasPrefix).isTrue();
+ }
+
+ @Test
public void hasPrefixShouldReturnFalseWhenAddress() {
boolean hasPrefix = Mapping.Type.hasPrefix(Type.Address.asPrefix() + "myRegex");
assertThat(hasPrefix).isFalse();
@@ -75,6 +81,12 @@ public class MappingTest {
}
@Test
+ public void detectTypeShouldReturnForwardWhenForwardPrefix() {
+ assertThat(Mapping.detectType(Type.Forward.asPrefix() + "mapping"))
+ .isEqualTo(Type.Forward);
+ }
+
+ @Test
public void withoutPrefixShouldRemoveAddressPrefix() {
assertThat(Type.Address.withoutPrefix(Type.Address.asPrefix() + "mapping"))
.isEqualTo("mapping");
@@ -105,6 +117,12 @@ public class MappingTest {
}
@Test
+ public void withoutPrefixShouldRemoveForwardPrefix() {
+ assertThat(Type.Forward.withoutPrefix(Type.Forward.asPrefix() + "mapping"))
+ .isEqualTo("mapping");
+ }
+
+ @Test
public void withoutPrefixShouldThrowOnBadPrefix() {
assertThatThrownBy(() -> Type.Regex.withoutPrefix(Type.Domain.asPrefix() + "mapping"))
.isInstanceOf(IllegalArgumentException.class);
@@ -115,4 +133,10 @@ public class MappingTest {
assertThatThrownBy(() -> Type.Regex.withoutPrefix("mapping"))
.isInstanceOf(IllegalArgumentException.class);
}
+
+ @Test
+ public void withoutPrefixShouldThrowWhenNoPrefixOnForwardType() {
+ assertThatThrownBy(() -> Type.Forward.withoutPrefix("mapping"))
+ .isInstanceOf(IllegalArgumentException.class);
+ }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fd6f10ab/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java b/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java
index d4dd938..f5b7712 100644
--- a/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java
+++ b/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java
@@ -119,6 +119,8 @@ public class XMLRecipientRewriteTableTest extends AbstractRecipientRewriteTableT
mappings = mappings.remove(MappingImpl.address(mapping));
} else if (type == Type.Domain) {
mappings = mappings.remove(MappingImpl.domain(Domain.of(mapping)));
+ } else if (type == Type.Forward) {
+ mappings = mappings.remove(MappingImpl.forward(mapping));
}
if (mappings.size() > 0) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/fd6f10ab/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java
index a079777..2b11cee 100644
--- a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java
+++ b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java
@@ -207,35 +207,37 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT
@Override
public void addAddressMapping(String user, Domain domain, String address) throws RecipientRewriteTableException {
+ String addressWithDomain = addDefaultDomainIfNone(address);
+ checkAddressIsValid(addressWithDomain);
+ checkMapping(user, domain, MappingImpl.address(addressWithDomain));
+ LOGGER.info("Add address mapping => {} for user: {} domain: {}", addressWithDomain, user, domain.name());
+ addMappingInternal(user, domain, MappingImpl.address(addressWithDomain));
+ }
+
+ private String addDefaultDomainIfNone(String address) throws RecipientRewriteTableException {
if (address.indexOf('@') < 0) {
try {
- address = address + "@" + domainList.getDefaultDomain().asString();
+ return address + "@" + domainList.getDefaultDomain().asString();
} catch (DomainListException e) {
throw new RecipientRewriteTableException("Unable to retrieve default domain", e);
}
}
+ return address;
+ }
+
+ private void checkAddressIsValid(String addressWithDomain) throws RecipientRewriteTableException {
try {
- new MailAddress(address);
+ new MailAddress(addressWithDomain);
} catch (ParseException e) {
- throw new RecipientRewriteTableException("Invalid emailAddress: " + address, e);
+ throw new RecipientRewriteTableException("Invalid emailAddress: " + addressWithDomain, e);
}
- checkMapping(user, domain, MappingImpl.address(address));
- LOGGER.info("Add address mapping => {} for user: {} domain: {}", address, user, domain.name());
- addMappingInternal(user, domain, MappingImpl.address(address));
-
}
@Override
public void removeAddressMapping(String user, Domain domain, String address) throws RecipientRewriteTableException {
- if (address.indexOf('@') < 0) {
- try {
- address = address + "@" + domainList.getDefaultDomain().asString();
- } catch (DomainListException e) {
- throw new RecipientRewriteTableException("Unable to retrieve default domain", e);
- }
- }
- LOGGER.info("Remove address mapping => {} for user: {} domain: {}", address, user, domain.name());
- removeMappingInternal(user, domain, MappingImpl.address(address));
+ String addressWithDomain = addDefaultDomainIfNone(address);
+ LOGGER.info("Remove address mapping => {} for user: {} domain: {}", addressWithDomain, user, domain.name());
+ removeMappingInternal(user, domain, MappingImpl.address(addressWithDomain));
}
@Override
@@ -294,6 +296,9 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT
case Address:
removeAddressMapping(user, domain, map);
break;
+ case Forward:
+ removeForwardMapping(user, domain, map);
+ break;
}
}
@@ -326,6 +331,22 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT
removeMappingInternal(null, aliasDomain, MappingImpl.domain(realDomain));
}
+ @Override
+ public void addForwardMapping(String user, Domain domain, String address) throws RecipientRewriteTableException {
+ String addressWithDomain = addDefaultDomainIfNone(address);
+ checkAddressIsValid(addressWithDomain);
+ checkMapping(user, domain, MappingImpl.forward(addressWithDomain));
+ LOGGER.info("Add forward mapping => {} for user: {} domain: {}", addressWithDomain, user, domain.name());
+ addMappingInternal(user, domain, MappingImpl.forward(addressWithDomain));
+ }
+
+ @Override
+ public void removeForwardMapping(String user, Domain domain, String address) throws RecipientRewriteTableException {
+ String addressWithDomain = addDefaultDomainIfNone(address);
+ LOGGER.info("Remove forward mapping => {} for user: {} domain: {}", addressWithDomain, user, domain.name());
+ removeMappingInternal(user, domain, MappingImpl.forward(addressWithDomain));
+ }
+
/**
* Add new mapping
*
http://git-wip-us.apache.org/repos/asf/james-project/blob/fd6f10ab/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingImpl.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingImpl.java b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingImpl.java
index fcd6572..1dc0c92 100644
--- a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingImpl.java
+++ b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingImpl.java
@@ -53,6 +53,10 @@ public class MappingImpl implements Mapping, Serializable {
public static MappingImpl domain(Domain mapping) {
return new MappingImpl(Type.Domain, mapping.asString());
}
+
+ public static MappingImpl forward(String mapping) {
+ return new MappingImpl(Type.Forward, mapping);
+ }
private final Type type;
private final String mapping;
http://git-wip-us.apache.org/repos/asf/james-project/blob/fd6f10ab/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java b/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
index 3941868..8d3ce08 100644
--- a/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
+++ b/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
@@ -266,4 +266,13 @@ public abstract class AbstractJamesUsersRepository extends AbstractUsersReposito
}
+ @Override
+ public void addForwardMapping(String user, Domain domain, String address) throws RecipientRewriteTableException {
+ throw new RecipientRewriteTableException("Read-Only RecipientRewriteTable");
+ }
+
+ @Override
+ public void removeForwardMapping(String user, Domain domain, String address) throws RecipientRewriteTableException {
+ throw new RecipientRewriteTableException("Read-Only RecipientRewriteTable");
+ }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fd6f10ab/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java
index 3dad6a0..26b3187 100644
--- a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java
+++ b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java
@@ -211,7 +211,6 @@ public abstract class AbstractRecipientRewriteTableTest {
@Test
public void testAliasDomainMapping() throws ErrorMappingException, RecipientRewriteTableException {
-
String domain = "realdomain";
Domain aliasDomain = Domain.of("aliasdomain");
String user = "user";
@@ -291,6 +290,36 @@ public abstract class AbstractRecipientRewriteTableTest {
assertThat(virtualUserTable.getMappings(user, domain)).hasSize(2);
}
+ @Test
+ public void addForwardMappingShouldStore() throws ErrorMappingException, RecipientRewriteTableException {
+ String user = "test";
+ Domain domain = Domain.LOCALHOST;
+ String address = "test@localhost2";
+ String address2 = "test@james";
+
+ addMapping(user, domain, address, Type.Forward);
+ addMapping(user, domain, address2, Type.Forward);
+
+ assertThat(virtualUserTable.getMappings(user, domain)).hasSize(2);
+ }
+
+ @Test
+ public void removeForwardMappingShouldDelete() throws ErrorMappingException, RecipientRewriteTableException {
+ String user = "test";
+ Domain domain = Domain.LOCALHOST;
+ String address = "test@localhost2";
+ String address2 = "test@james";
+
+ addMapping(user, domain, address, Type.Forward);
+ addMapping(user, domain, address2, Type.Forward);
+
+
+ removeMapping(user, domain, address, Type.Forward);
+ removeMapping(user, domain, address2, Type.Forward);
+
+ assertThat(virtualUserTable.getMappings(user, domain)).isNull();
+ }
+
protected abstract AbstractRecipientRewriteTable getRecipientRewriteTable() throws Exception;
@@ -308,12 +337,14 @@ public abstract class AbstractRecipientRewriteTableTest {
case Domain:
virtualUserTable.addAliasDomainMapping(domain, Domain.of(mapping));
break;
+ case Forward:
+ virtualUserTable.addForwardMapping(user, domain, mapping);
+ break;
default:
throw new RuntimeException("Invalid mapping type: " + type.asPrefix());
}
}
-
protected void removeMapping(String user, Domain domain, String mapping, Type type) throws RecipientRewriteTableException {
switch (type) {
case Error:
@@ -328,6 +359,9 @@ public abstract class AbstractRecipientRewriteTableTest {
case Domain:
virtualUserTable.removeAliasDomainMapping(domain, Domain.of(mapping));
break;
+ case Forward:
+ virtualUserTable.removeForwardMapping(user, domain, mapping);
+ break;
default:
throw new RuntimeException("Invalid mapping type: " + type.asPrefix());
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fd6f10ab/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingImplTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingImplTest.java b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingImplTest.java
index 8810d83..e18823f 100644
--- a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingImplTest.java
+++ b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingImplTest.java
@@ -36,44 +36,53 @@ public class MappingImplTest {
.verify();
}
- @Test(expected = NullPointerException.class)
+ @Test
public void addressFactoryMethodShouldThrowOnNull() {
- assertThat(MappingImpl.address(null));
+ assertThatThrownBy(() -> MappingImpl.address(null))
+ .isInstanceOf(NullPointerException.class);
}
- @Test(expected = NullPointerException.class)
+ @Test
public void regexFactoryMethodShouldThrowOnNull() {
- assertThat(MappingImpl.regex(null));
+ assertThatThrownBy(() -> MappingImpl.regex(null))
+ .isInstanceOf(NullPointerException.class);
}
- @Test(expected = NullPointerException.class)
+ @Test
public void domainFactoryMethodShouldThrowOnNull() {
- assertThat(MappingImpl.domain(null));
+ assertThatThrownBy(() -> MappingImpl.domain(null))
+ .isInstanceOf(NullPointerException.class);
}
-
-
- @Test(expected = NullPointerException.class)
+
+ @Test
public void errorFactoryMethodShouldThrowOnNull() {
- assertThat(MappingImpl.error(null));
+ assertThatThrownBy(() -> MappingImpl.error(null))
+ .isInstanceOf(NullPointerException.class);
}
@Test
- public void hasDomainshouldReturnTrueWhenMappingContainAtMark() {
+ public void forwardFactoryMethodShouldThrowOnNull() {
+ assertThatThrownBy(() -> MappingImpl.forward(null))
+ .isInstanceOf(NullPointerException.class);
+ }
+
+ @Test
+ public void hasDomainShouldReturnTrueWhenMappingContainAtMark() {
assertThat(MappingImpl.address("a@b").hasDomain()).isTrue();
}
@Test
- public void hasDomainshouldReturnFalseWhenMappingIsEmpty() {
+ public void hasDomainShouldReturnFalseWhenMappingIsEmpty() {
assertThat(MappingImpl.address("").hasDomain()).isFalse();
}
@Test
- public void hasDomainshouldReturnFalseWhenMappingIsBlank() {
+ public void hasDomainShouldReturnFalseWhenMappingIsBlank() {
assertThat(MappingImpl.address(" ").hasDomain()).isFalse();
}
@Test
- public void hasDefaultDomainShouldReturnFalseWhenMappingDoesntContainAtMark() {
+ public void hasDomainShouldReturnFalseWhenMappingDoesntContainAtMark() {
assertThat(MappingImpl.address("abc").hasDomain()).isFalse();
}
@@ -116,6 +125,11 @@ public class MappingImplTest {
public void getTypeShouldReturnDomainWhenDomainPrefix() {
assertThat(MappingImpl.domain(Domain.of("abc")).getType()).isEqualTo(Mapping.Type.Domain);
}
+
+ @Test
+ public void getTypeShouldReturnForwardWhenForwardPrefix() {
+ assertThat(MappingImpl.forward("abc").getType()).isEqualTo(Mapping.Type.Forward);
+ }
@Test(expected = IllegalStateException.class)
public void getErrorMessageShouldThrowWhenMappingIsNotAnError() {
@@ -152,4 +166,9 @@ public class MappingImplTest {
public void getAddressShouldThrowForDomain() {
assertThatThrownBy(() -> MappingImpl.domain(Domain.of("value")).getAddress()).isInstanceOf(IllegalStateException.class);
}
+
+ @Test
+ public void getAddressShouldThrowForForward() {
+ assertThatThrownBy(() -> MappingImpl.forward("value").getAddress()).isInstanceOf(IllegalStateException.class);
+ }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fd6f10ab/server/data/data-library/src/test/java/org/apache/james/rrt/lib/RewriteTablesStepdefs.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/RewriteTablesStepdefs.java b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/RewriteTablesStepdefs.java
index 14655fe..44423d5 100644
--- a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/RewriteTablesStepdefs.java
+++ b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/RewriteTablesStepdefs.java
@@ -71,6 +71,11 @@ public class RewriteTablesStepdefs {
rewriteTable.addAliasDomainMapping(Domain.of(aliasDomain), Domain.of(domain));
}
+ @Given("store \"([^\"]*)\" forward mapping for user \"([^\"]*)\" at domain \"([^\"]*)\"")
+ public void storeForwardMappingForUserAtDomain(String address, String user, String domain) throws Throwable {
+ rewriteTable.addForwardMapping(user, Domain.of(domain), address);
+ }
+
@Given("recursive mapping is disable")
public void disableRecursiveMapping() {
rewriteTable.setRecursiveMapping(false);
@@ -96,6 +101,11 @@ public class RewriteTablesStepdefs {
rewriteTable.removeErrorMapping(user, Domain.of(domain), error);
}
+ @When("user \"([^\"]*)\" at domain \"([^\"]*)\" removes a forward mapping \"([^\"]*)\"")
+ public void userAtDomainRemovesForwardMapping(String user, String domain, String address) throws Throwable {
+ rewriteTable.removeForwardMapping(user, Domain.of(domain), address);
+ }
+
@When("wildcard address mapping \"([^\"]*)\" at domain \"([^\"]*)\" is removed")
public void removeWildcardAddressMappingAtDomain(String address, String domain) throws Throwable {
userAtDomainRemovesAddressMapping(RecipientRewriteTable.WILDCARD, domain, address);
http://git-wip-us.apache.org/repos/asf/james-project/blob/fd6f10ab/server/data/data-library/src/test/resources/cucumber/rewrite_tables.feature
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/resources/cucumber/rewrite_tables.feature b/server/data/data-library/src/test/resources/cucumber/rewrite_tables.feature
index 5ce3ec8..9e66fc0 100644
--- a/server/data/data-library/src/test/resources/cucumber/rewrite_tables.feature
+++ b/server/data/data-library/src/test/resources/cucumber/rewrite_tables.feature
@@ -218,4 +218,26 @@ Feature: Rewrite Tables tests
Given store "domain2" alias domain mapping for domain "domain1"
And store "domain3" alias domain mapping for domain "domain2"
And store "domain4" alias domain mapping for domain "domain3"
- Then mappings for user "test" at domain "domain4" should contains only "test@domain1"
\ No newline at end of file
+ Then mappings for user "test" at domain "domain4" should contains only "test@domain1"
+
+# Forward mapping
+
+ Scenario: stored forward mapping should be retrieved when one mapping is matching
+ Given store "test@localhost2" forward mapping for user "test" at domain "localhost"
+ Then mappings for user "test" at domain "localhost" should contains only "forward:test@localhost2"
+
+ Scenario: stored forward mapping should be retrieved when two mappings are matching
+ Given store "test@localhost2" forward mapping for user "test" at domain "localhost"
+ And store "test@james" forward mapping for user "test" at domain "localhost"
+ Then mappings for user "test" at domain "localhost" should contains only "forward:test@localhost2, forward:test@james"
+
+ Scenario: stored forward mapping should not be retrieved by another user
+ Given store "test@localhost2" forward mapping for user "test" at domain "localhost"
+ And store "test@james" forward mapping for user "test" at domain "localhost"
+ Then mappings for user "test2" at domain "localhost" should be empty
+
+ Scenario: removing a stored forward mapping should work
+ Given store "test@localhost2" forward mapping for user "test" at domain "localhost"
+ And store "test@james" forward mapping for user "test" at domain "localhost"
+ When user "test" at domain "localhost" removes a forward mapping "test@james"
+ Then mappings for user "test" at domain "localhost" should contains only "forward:test@localhost2"
\ 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
[11/24] james-project git commit: JAMES-2366 Adding documentation to
forwards routes
Posted by ad...@apache.org.
JAMES-2366 Adding documentation to forwards routes
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/150663f8
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/150663f8
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/150663f8
Branch: refs/heads/master
Commit: 150663f8437609fc6696b02c7d5e2ac96ede5141
Parents: 43259b5
Author: benwa <bt...@linagora.com>
Authored: Thu Mar 29 16:35:43 2018 +0700
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Apr 6 15:04:48 2018 +0200
----------------------------------------------------------------------
src/site/markdown/server/manage-webadmin.md | 88 ++++++++++++++++++++++++
1 file changed, 88 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/150663f8/src/site/markdown/server/manage-webadmin.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/server/manage-webadmin.md b/src/site/markdown/server/manage-webadmin.md
index c1ecf01..cc69984 100644
--- a/src/site/markdown/server/manage-webadmin.md
+++ b/src/site/markdown/server/manage-webadmin.md
@@ -765,6 +765,8 @@ You can use **webadmin** to define address groups.
When a specific email is sent to the group mail address, every group member will receive it.
+Note that the group mail address is virtual: it does not correspond to an existing user.
+
This feature uses [Recipients rewrite table](/server/config-recipientrewritetable.html) and requires
the [RecipientRewriteTable mailet](https://github.com/apache/james-project/blob/master/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTable.java)
to be configured.
@@ -837,6 +839,92 @@ Response codes:
- 400: Group structure or member is not valid
- 500: Internal error
+## Creating address forwards
+
+You can use **webadmin** to define address forwards.
+
+When a specific email is sent to the base mail address, every forward destination addresses will receive it.
+
+Please note that the base address can be optionaly part of the forward destination. In that case, the base recipient
+also receive a copy of the mail. Otherwise he is ommitted.
+
+Forwards can be defined for existing users. It then defers from "groups".
+
+This feature uses [Recipients rewrite table](/server/config-recipientrewritetable.html) and requires
+the [RecipientRewriteTable mailet](https://github.com/apache/james-project/blob/master/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTable.java)
+to be configured.
+
+Note that email addresses are restricted to ASCII character set. Mail addresses not matching this criteria will be rejected.
+
+### Listing Forwards
+
+```
+curl -XGET http://ip:port/address/forwards
+```
+
+Will return the users having forwards configured as a list of JSON Strings representing mail addresses. For instance:
+
+```
+["user1@domain.com", "user2@domain.com"]
+```
+
+Response codes:
+
+ - 200: Success
+ - 500: Internal error
+
+### Listing destinations in a forward
+
+```
+curl -XGET http://ip:port/address/forwards/user@domain.com
+```
+
+Will return the destination addresses of this forward as a list of JSON Strings representing mail addresses. For instance:
+
+```
+[
+ {"mailAddres":"destination1@domain.com"},
+ {"mailAddres":"destination2@domain.com"}
+]
+```
+
+Response codes:
+
+ - 200: Success
+ - 400: Forward structure is not valid
+ - 404: The given user don't have forwards or does not exist
+ - 500: Internal error
+
+### Adding a new destination to a forward
+
+```
+curl -XPUT http://ip:port/address/forwards/user@domain.com/targets/destination@domain.com
+```
+
+Will add destination@domain.com to user@domain.com, creating the forward if needed
+
+Response codes:
+
+ - 200: Success
+ - 400: Forward structure or member is not valid
+ - 403: Server does not own the requested domain
+ - 404: Requested forward address does not match an existing user
+ - 500: Internal error
+
+### Removing a destination of a forward
+
+```
+curl -XDELETE http://ip:port/address/forwards/user@domain.com/targets/destination@domain.com
+```
+
+Will remove destination@domain.com from user@domain.com, removing the forward if forward is empty after deletion
+
+Response codes:
+
+ - 200: Success
+ - 400: Forward structure or member is not valid
+ - 500: Internal error
+
## Administrating mail repositories
### Listing mail repositories
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[03/24] james-project git commit: JAMES-2366 Improve
XMLRecipientRewriteTableTest
Posted by ad...@apache.org.
JAMES-2366 Improve XMLRecipientRewriteTableTest
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/57c417c6
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/57c417c6
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/57c417c6
Branch: refs/heads/master
Commit: 57c417c612def7ce832ca712eb6bccdc03e37db7
Parents: c9078f2
Author: benwa <bt...@linagora.com>
Authored: Fri Mar 30 09:37:14 2018 +0700
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Apr 6 14:39:17 2018 +0200
----------------------------------------------------------------------
.../rrt/file/XMLRecipientRewriteTableTest.java | 68 ++++++--------------
.../org/apache/james/rrt/lib/MappingImpl.java | 4 ++
2 files changed, 24 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/57c417c6/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java b/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java
index f5b7712..5f45be3 100644
--- a/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java
+++ b/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java
@@ -31,7 +31,6 @@ import org.apache.james.rrt.lib.Mapping.Type;
import org.apache.james.rrt.lib.MappingImpl;
import org.apache.james.rrt.lib.Mappings;
import org.apache.james.rrt.lib.MappingsImpl;
-import org.apache.james.rrt.lib.MappingsImpl.Builder;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
@@ -59,7 +58,7 @@ public class XMLRecipientRewriteTableTest extends AbstractRecipientRewriteTableT
@Override
- protected AbstractRecipientRewriteTable getRecipientRewriteTable() throws Exception {
+ protected AbstractRecipientRewriteTable getRecipientRewriteTable() {
return new XMLRecipientRewriteTable();
}
@@ -70,67 +69,40 @@ public class XMLRecipientRewriteTableTest extends AbstractRecipientRewriteTableT
}
@Override
- protected void addMapping(String user, Domain domain, String mapping, Type type) throws
- RecipientRewriteTableException {
+ protected void addMapping(String user, Domain domain, String mapping, Type type) throws RecipientRewriteTableException {
+ Mappings mappings = Optional.ofNullable(virtualUserTable.getUserDomainMappings(user, domain))
+ .orElse(MappingsImpl.empty());
- Mappings mappings = virtualUserTable.getUserDomainMappings(user, domain);
-
- if (mappings != null) {
- removeMappingsFromConfig(user, domain, mappings);
- }
-
- Builder builder = MappingsImpl.from(Optional.ofNullable(mappings).orElse(MappingsImpl.empty()));
-
- builder.add(type.asPrefix() + mapping);
-
- Mappings updatedMappings = builder.build();
-
- if (!updatedMappings.isEmpty()) {
- defaultConfiguration.addProperty("mapping", user + "@" + domain.asString() + "=" + updatedMappings.serialize());
- }
-
- try {
- virtualUserTable.configure(defaultConfiguration);
- } catch (Exception e) {
- if (updatedMappings.size() > 0) {
- throw new RecipientRewriteTableException("Error update mapping", e);
- }
- }
+ Mappings updatedMappings = MappingsImpl.from(mappings)
+ .add(MappingImpl.of(type, mapping))
+ .build();
+ updateConfiguration(user, domain, mappings, updatedMappings);
}
@Override
- protected void removeMapping(String user, Domain domain, String mapping, Type type) throws
- RecipientRewriteTableException {
+ protected void removeMapping(String user, Domain domain, String mapping, Type type) throws RecipientRewriteTableException {
+ Mappings oldMappings = Optional.ofNullable(virtualUserTable.getUserDomainMappings(user, domain))
+ .orElseThrow(() -> new RecipientRewriteTableException("Cannot remove from null mappings"));
- Mappings mappings = virtualUserTable.getUserDomainMappings(user, domain);
+ Mappings updatedMappings = oldMappings.remove(MappingImpl.of(type, mapping));
- if (mappings == null) {
- throw new RecipientRewriteTableException("Cannot remove from null mappings");
- }
+ updateConfiguration(user, domain, oldMappings, updatedMappings);
+ }
- removeMappingsFromConfig(user, domain, mappings);
-
- if (type == Type.Error) {
- mappings = mappings.remove(MappingImpl.error(mapping));
- } else if (type == Type.Regex) {
- mappings = mappings.remove(MappingImpl.regex(mapping));
- } else if (type == Type.Address) {
- mappings = mappings.remove(MappingImpl.address(mapping));
- } else if (type == Type.Domain) {
- mappings = mappings.remove(MappingImpl.domain(Domain.of(mapping)));
- } else if (type == Type.Forward) {
- mappings = mappings.remove(MappingImpl.forward(mapping));
+ private void updateConfiguration(String user, Domain domain, Mappings oldMappings, Mappings updatedMappings) throws RecipientRewriteTableException {
+ if (oldMappings != null) {
+ removeMappingsFromConfig(user, domain, oldMappings);
}
- if (mappings.size() > 0) {
- defaultConfiguration.addProperty("mapping", user + "@" + domain.asString() + "=" + mappings.serialize());
+ if (!updatedMappings.isEmpty()) {
+ defaultConfiguration.addProperty("mapping", user + "@" + domain.asString() + "=" + updatedMappings.serialize());
}
try {
virtualUserTable.configure(defaultConfiguration);
} catch (Exception e) {
- if (mappings.size() > 0) {
+ if (updatedMappings.size() > 0) {
throw new RecipientRewriteTableException("Error update mapping", e);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/57c417c6/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingImpl.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingImpl.java b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingImpl.java
index 1dc0c92..0c663a9 100644
--- a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingImpl.java
+++ b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingImpl.java
@@ -37,6 +37,10 @@ public class MappingImpl implements Mapping, Serializable {
Type type = Mapping.detectType(mapping);
return new MappingImpl(type, type.withoutPrefix(mapping));
}
+
+ public static MappingImpl of(Type type, String mapping) {
+ return new MappingImpl(type, mapping);
+ }
public static MappingImpl address(String mapping) {
return new MappingImpl(Type.Address, mapping);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[14/24] james-project git commit: JAMES-2366 UsersRepository should
be case insensitive for domain part
Posted by ad...@apache.org.
JAMES-2366 UsersRepository should be case insensitive for domain part
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/3e97f941
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/3e97f941
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/3e97f941
Branch: refs/heads/master
Commit: 3e97f941634e108229214d3fe678f08c3e214feb
Parents: ce6e83d
Author: Antoine Duprat <ad...@linagora.com>
Authored: Wed Apr 4 13:53:46 2018 +0200
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Apr 6 15:04:48 2018 +0200
----------------------------------------------------------------------
.../java/org/apache/james/user/api/model/User.java | 7 +++++++
.../user/cassandra/CassandraUsersRepository.java | 2 +-
.../james/user/file/UsersFileRepositoryTest.java | 5 +++++
.../user/jdbc/DefaultUsersJdbcRepositoryTest.java | 6 ++++++
.../james/user/jdbc/JamesUsersJdbcRepositoryTest.java | 6 ++++++
.../james/user/lib/AbstractUsersRepositoryTest.java | 14 ++++++++++++++
.../james/user/memory/MemoryUsersRepository.java | 2 +-
7 files changed, 40 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/3e97f941/server/data/data-api/src/main/java/org/apache/james/user/api/model/User.java
----------------------------------------------------------------------
diff --git a/server/data/data-api/src/main/java/org/apache/james/user/api/model/User.java b/server/data/data-api/src/main/java/org/apache/james/user/api/model/User.java
index 51d7450..fe92c3e 100644
--- a/server/data/data-api/src/main/java/org/apache/james/user/api/model/User.java
+++ b/server/data/data-api/src/main/java/org/apache/james/user/api/model/User.java
@@ -49,4 +49,11 @@ public interface User {
* @return true if newPass successfully added
*/
boolean setPassword(String newPass);
+
+ default boolean hasUsername(String username) {
+ org.apache.james.core.User thisUser = org.apache.james.core.User.fromUsername(getUserName());
+ org.apache.james.core.User thatUser = org.apache.james.core.User.fromUsername(username);
+
+ return thisUser.equals(thatUser);
+ }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/3e97f941/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java b/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java
index 3a49f9f..45504ab 100644
--- a/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java
+++ b/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java
@@ -123,7 +123,7 @@ public class CassandraUsersRepository extends AbstractUsersRepository {
.join();
return Optional.ofNullable(result.one())
.map(row -> new DefaultUser(row.getString(REALNAME), row.getString(PASSWORD), row.getString(ALGORITHM)))
- .filter(user -> user.getUserName().equals(name))
+ .filter(user -> user.hasUsername(name))
.orElse(null);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/3e97f941/server/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java b/server/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
index a2826cf..9de69af 100644
--- a/server/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
+++ b/server/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
@@ -111,4 +111,9 @@ public class UsersFileRepositoryTest extends AbstractUsersRepositoryTest {
LifecycleUtil.dispose(this.usersRepository);
}
}
+
+ @Ignore
+ @Override
+ public void testShouldReturnTrueWhenAUserHasACorrectPasswordAndOtherCaseInDomain() throws Exception {
+ }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/3e97f941/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java b/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java
index 6d4bbb3..be785fe 100644
--- a/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java
+++ b/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java
@@ -32,6 +32,7 @@ import org.apache.james.user.api.UsersRepositoryException;
import org.apache.james.user.lib.AbstractUsersRepository;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
/**
* Test basic behaviors of UsersFileRepository
@@ -97,4 +98,9 @@ public class DefaultUsersJdbcRepositoryTest extends AbstractUsersJdbcRepositoryT
LifecycleUtil.dispose(this.usersRepository);
}
+ @Ignore
+ @Override
+ public void testShouldReturnTrueWhenAUserHasACorrectPasswordAndOtherCaseInDomain() throws Exception {
+ }
+
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/3e97f941/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java b/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java
index a1f8e89..66e9fd4 100644
--- a/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java
+++ b/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java
@@ -32,6 +32,7 @@ import org.apache.james.user.api.UsersRepositoryException;
import org.apache.james.user.lib.AbstractUsersRepository;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
/**
* Test basic behaviors of UsersFileRepository
@@ -96,4 +97,9 @@ public class JamesUsersJdbcRepositoryTest extends AbstractUsersJdbcRepositoryTes
LifecycleUtil.dispose(this.usersRepository);
}
+ @Ignore
+ @Override
+ public void testShouldReturnTrueWhenAUserHasACorrectPasswordAndOtherCaseInDomain() throws Exception {
+ }
+
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/3e97f941/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java b/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java
index 83b1bbc..760c96d 100644
--- a/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java
+++ b/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java
@@ -194,6 +194,20 @@ public abstract class AbstractUsersRepositoryTest {
}
@Test
+ public void testShouldReturnTrueWhenAUserHasACorrectPasswordAndOtherCaseInDomain() throws Exception {
+ usersRepository.setEnableVirtualHosting(true);
+
+ domainList.addDomain(Domain.of("jAmEs.oRg"));
+ String username = "myuser";
+ String password = "password";
+ usersRepository.addUser(username + "@jAmEs.oRg", password);
+
+ boolean actual = usersRepository.test(username + "@james.org", password);
+
+ assertThat(actual).isTrue();
+ }
+
+ @Test
public void testShouldReturnFalseWhenAUserHasAnIncorrectPassword() throws UsersRepositoryException {
//Given
usersRepository.addUser(user1, "password");
http://git-wip-us.apache.org/repos/asf/james-project/blob/3e97f941/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersRepository.java b/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersRepository.java
index 7c8b03a..500ee78 100644
--- a/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersRepository.java
+++ b/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersRepository.java
@@ -102,7 +102,7 @@ public class MemoryUsersRepository extends AbstractUsersRepository {
@Override
public boolean test(String name, final String password) throws UsersRepositoryException {
- return Optional.ofNullable(userByName.get(name))
+ return Optional.ofNullable(userByName.get(org.apache.james.core.User.fromUsername(name).asString()))
.map(user -> user.verifyPassword(password))
.orElse(false);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[07/24] james-project git commit: JAMES-2366 Mapping::getAddress
should return Optional
Posted by ad...@apache.org.
JAMES-2366 Mapping::getAddress should return Optional<MailAddress>
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/53d760bb
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/53d760bb
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/53d760bb
Branch: refs/heads/master
Commit: 53d760bb37b494f3ebfb095d0a3a1c101efd58e1
Parents: 57c417c
Author: benwa <bt...@linagora.com>
Authored: Fri Mar 30 09:57:05 2018 +0700
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Apr 6 14:46:01 2018 +0200
----------------------------------------------------------------------
.../java/org/apache/james/rrt/lib/Mapping.java | 4 ++-
.../org/apache/james/rrt/lib/MappingImpl.java | 16 +++++++++--
.../apache/james/rrt/lib/MappingImplTest.java | 29 +++++++++++++-------
.../mailets/RecipientRewriteTableProcessor.java | 27 +-----------------
.../james/webadmin/routes/GroupsRoutes.java | 5 +++-
5 files changed, 40 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/53d760bb/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mapping.java
----------------------------------------------------------------------
diff --git a/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mapping.java b/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mapping.java
index bb3ec7e..95c0599 100644
--- a/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mapping.java
+++ b/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mapping.java
@@ -20,9 +20,11 @@
package org.apache.james.rrt.lib;
+import java.util.Optional;
import java.util.function.Supplier;
import org.apache.james.core.Domain;
+import org.apache.james.core.MailAddress;
import com.google.common.base.Preconditions;
@@ -44,7 +46,7 @@ public interface Mapping {
return Type.Address;
}
- String getAddress();
+ Optional<MailAddress> asMailAddress();
enum Type {
Regex("regex:", 3),
http://git-wip-us.apache.org/repos/asf/james-project/blob/53d760bb/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingImpl.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingImpl.java b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingImpl.java
index 0c663a9..48ed54b 100644
--- a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingImpl.java
+++ b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingImpl.java
@@ -21,9 +21,13 @@
package org.apache.james.rrt.lib;
import java.io.Serializable;
+import java.util.Optional;
import java.util.function.Supplier;
+import javax.mail.internet.AddressException;
+
import org.apache.james.core.Domain;
+import org.apache.james.core.MailAddress;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
@@ -103,9 +107,15 @@ public class MappingImpl implements Mapping, Serializable {
}
@Override
- public String getAddress() {
- Preconditions.checkState(getType() == Type.Address);
- return mapping;
+ public Optional<MailAddress> asMailAddress() {
+ if (type != Type.Address && type != Type.Forward) {
+ return Optional.empty();
+ }
+ try {
+ return Optional.of(new MailAddress(mapping));
+ } catch (AddressException e) {
+ return Optional.empty();
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/53d760bb/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingImplTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingImplTest.java b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingImplTest.java
index e18823f..ab1e8d3 100644
--- a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingImplTest.java
+++ b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingImplTest.java
@@ -24,6 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.apache.james.core.Domain;
+import org.apache.james.core.MailAddress;
import org.junit.Test;
import nl.jqno.equalsverifier.EqualsVerifier;
@@ -148,27 +149,35 @@ public class MappingImplTest {
}
@Test
- public void getAddressShouldReturnMappingValueForAddress() {
- assertThat(MappingImpl.address("value").getAddress()).isEqualTo("value");
+ public void asMailAddressShouldReturnMappingValueForAddress() throws Exception {
+ assertThat(MappingImpl.address("value@domain").asMailAddress())
+ .contains(new MailAddress("value@domain"));
}
@Test
- public void getAddressShouldThrowForError() {
- assertThatThrownBy(() -> MappingImpl.error("value").getAddress()).isInstanceOf(IllegalStateException.class);
+ public void asMailAddressShouldReturnEmptyOnInvalidAddress() {
+ assertThat(MappingImpl.address("value").asMailAddress())
+ .isEmpty();
}
@Test
- public void getAddressShouldThrowForRegex() {
- assertThatThrownBy(() -> MappingImpl.regex("value").getAddress()).isInstanceOf(IllegalStateException.class);
+ public void asMailAddressShouldReturnEmptyForError() {
+ assertThat(MappingImpl.error("value").asMailAddress()).isEmpty();
}
@Test
- public void getAddressShouldThrowForDomain() {
- assertThatThrownBy(() -> MappingImpl.domain(Domain.of("value")).getAddress()).isInstanceOf(IllegalStateException.class);
+ public void asMailAddressShouldReturnEmptyForRegex() {
+ assertThat(MappingImpl.regex("value").asMailAddress()).isEmpty();
}
@Test
- public void getAddressShouldThrowForForward() {
- assertThatThrownBy(() -> MappingImpl.forward("value").getAddress()).isInstanceOf(IllegalStateException.class);
+ public void asMailAddressShouldReturnEmptyForDomain() {
+ assertThat(MappingImpl.domain(Domain.of("value")).asMailAddress()).isEmpty();
+ }
+
+ @Test
+ public void asMailAddressShouldReturnMappingValueForForward() throws Exception {
+ assertThat(MappingImpl.forward("value@domain").asMailAddress())
+ .contains(new MailAddress("value@domain"));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/53d760bb/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java
index c1bc666..7a30cef 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java
@@ -20,12 +20,10 @@
package org.apache.james.transport.mailets;
import java.util.List;
-import java.util.Optional;
import java.util.function.Function;
import java.util.function.Supplier;
import javax.mail.MessagingException;
-import javax.mail.internet.AddressException;
import javax.mail.internet.MimeMessage;
import org.apache.james.core.Domain;
@@ -35,8 +33,6 @@ import org.apache.james.domainlist.api.DomainListException;
import org.apache.james.rrt.api.RecipientRewriteTable;
import org.apache.james.rrt.api.RecipientRewriteTable.ErrorMappingException;
import org.apache.james.rrt.api.RecipientRewriteTableException;
-import org.apache.james.rrt.lib.Mapping;
-import org.apache.james.rrt.lib.Mapping.Type;
import org.apache.james.rrt.lib.Mappings;
import org.apache.james.util.MemoizedSupplier;
import org.apache.james.util.OptionalUtils;
@@ -105,27 +101,6 @@ public class RecipientRewriteTableProcessor {
private final MailetContext mailetContext;
private final Supplier<Domain> defaultDomainSupplier;
- private static final Function<Mapping, Optional<MailAddress>> mailAddressFromMapping =
- mapping -> {
- Type type = mapping.getType();
- switch (type) {
- case Address:
- return parseMappingToMailAddress(mapping.asString());
- case Forward:
- return parseMappingToMailAddress(type.withoutPrefix(mapping.asString()));
- default:
- return Optional.empty();
- }
- };
-
- private static Optional<MailAddress> parseMappingToMailAddress(String mapping) {
- try {
- return Optional.of(new MailAddress(mapping));
- } catch (AddressException e) {
- return Optional.empty();
- }
- }
-
public RecipientRewriteTableProcessor(RecipientRewriteTable virtualTableStore, DomainList domainList, MailetContext mailetContext) {
this.virtualTableStore = virtualTableStore;
this.mailetContext = mailetContext;
@@ -187,7 +162,7 @@ public class RecipientRewriteTableProcessor {
List<MailAddress> handleMappings(Mappings mappings, MailAddress sender, MailAddress recipient, MimeMessage message) throws MessagingException {
ImmutableList<MailAddress> mailAddresses = mappings.asStream()
.map(mapping -> mapping.appendDomainIfNone(defaultDomainSupplier))
- .map(mailAddressFromMapping)
+ .map(mapping -> mapping.asMailAddress())
.flatMap(OptionalUtils::toStream)
.collect(Guavate.toImmutableList());
http://git-wip-us.apache.org/repos/asf/james-project/blob/53d760bb/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/GroupsRoutes.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/GroupsRoutes.java b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/GroupsRoutes.java
index 5126804..29ec2f8 100644
--- a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/GroupsRoutes.java
+++ b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/GroupsRoutes.java
@@ -48,6 +48,7 @@ import org.apache.james.rrt.lib.Mapping;
import org.apache.james.rrt.lib.Mappings;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
+import org.apache.james.util.OptionalUtils;
import org.apache.james.webadmin.Constants;
import org.apache.james.webadmin.Routes;
import org.apache.james.webadmin.utils.ErrorResponder;
@@ -228,7 +229,9 @@ public class GroupsRoutes implements Routes {
return mappings.select(Mapping.Type.Address)
.asStream()
- .map(Mapping::getAddress)
+ .map(Mapping::asMailAddress)
+ .flatMap(OptionalUtils::toStream)
+ .map(MailAddress::asString)
.collect(Guavate.toImmutableSortedSet());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[21/24] james-project git commit: JAMES-2366 Factorize some common
constants in JMAP integration tests
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/686a75e1/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
index 6213e1a..dacb73d 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
@@ -22,7 +22,10 @@ package org.apache.james.jmap.methods.integration;
import static com.jayway.restassured.RestAssured.given;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
+import static org.apache.james.jmap.TestingConstants.ALICE;
+import static org.apache.james.jmap.TestingConstants.ALICE_PASSWORD;
import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
+import static org.apache.james.jmap.TestingConstants.DOMAIN;
import static org.apache.james.jmap.TestingConstants.NAME;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.hamcrest.Matchers.equalTo;
@@ -48,9 +51,6 @@ import com.jayway.restassured.RestAssured;
import com.jayway.restassured.http.ContentType;
public abstract class GetVacationResponseTest {
- private static final String USERS_DOMAIN = "domain.tld";
- public static final String USER = "username@" + USERS_DOMAIN;
- public static final String PASSWORD = "password";
public static final String SUBJECT = "subject";
public static final ZonedDateTime DATE_2015 = ZonedDateTime.parse("2015-10-15T14:10:00Z");
public static final ZonedDateTime DATE_2014 = ZonedDateTime.parse("2014-09-30T14:10:00+02:00");
@@ -79,9 +79,9 @@ public abstract class GetVacationResponseTest {
.build();
DataProbe dataProbe = jmapServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(USERS_DOMAIN);
- dataProbe.addUser(USER, PASSWORD);
- accessToken = authenticateJamesUser(baseUri(jmapServer), USER, PASSWORD);
+ dataProbe.addDomain(DOMAIN);
+ dataProbe.addUser(ALICE, ALICE_PASSWORD);
+ accessToken = authenticateJamesUser(baseUri(jmapServer), ALICE, ALICE_PASSWORD);
await();
}
@@ -105,7 +105,7 @@ public abstract class GetVacationResponseTest {
.then()
.statusCode(200)
.body(NAME, equalTo("vacationResponse"))
- .body(ARGUMENTS + ".accountId", equalTo(USER))
+ .body(ARGUMENTS + ".accountId", equalTo(ALICE))
.body(ARGUMENTS + ".list", hasSize(1))
.body(ARGUMENTS + ".list[0].id", equalTo("singleton"))
.body(ARGUMENTS + ".list[0].fromDate", nullValue())
@@ -118,7 +118,7 @@ public abstract class GetVacationResponseTest {
@Test
public void getVacationResponseShouldReturnStoredValue() {
- jmapGuiceProbe.modifyVacation(AccountId.fromString(USER),
+ jmapGuiceProbe.modifyVacation(AccountId.fromString(ALICE),
VacationPatch.builder()
.isEnabled(true)
.fromDate(ZonedDateTime.parse("2014-09-30T14:10:00Z"))
@@ -140,7 +140,7 @@ public abstract class GetVacationResponseTest {
.then()
.statusCode(200)
.body(NAME, equalTo("vacationResponse"))
- .body(ARGUMENTS + ".accountId", equalTo(USER))
+ .body(ARGUMENTS + ".accountId", equalTo(ALICE))
.body(ARGUMENTS + ".list", hasSize(1))
.body(ARGUMENTS + ".list[0].id", equalTo("singleton"))
.body(ARGUMENTS + ".list[0].fromDate", equalTo("2014-09-30T14:10:00Z"))
@@ -153,7 +153,7 @@ public abstract class GetVacationResponseTest {
@Test
public void getVacationResponseShouldReturnStoredValueWithNonDefaultTimezone() {
- jmapGuiceProbe.modifyVacation(AccountId.fromString(USER),
+ jmapGuiceProbe.modifyVacation(AccountId.fromString(ALICE),
VacationPatch.builder()
.isEnabled(true)
.fromDate(ZonedDateTime.parse("2014-09-30T14:10:00+02:00"))
@@ -173,7 +173,7 @@ public abstract class GetVacationResponseTest {
.then()
.statusCode(200)
.body(NAME, equalTo("vacationResponse"))
- .body(ARGUMENTS + ".accountId", equalTo(USER))
+ .body(ARGUMENTS + ".accountId", equalTo(ALICE))
.body(ARGUMENTS + ".list", hasSize(1))
.body(ARGUMENTS + ".list[0].id", equalTo("singleton"))
.body(ARGUMENTS + ".list[0].fromDate", equalTo("2014-09-30T14:10:00+02:00"))
@@ -184,7 +184,7 @@ public abstract class GetVacationResponseTest {
@Test
public void getVacationResponseShouldReturnIsActivatedWhenInRange() {
- jmapGuiceProbe.modifyVacation(AccountId.fromString(USER),
+ jmapGuiceProbe.modifyVacation(AccountId.fromString(ALICE),
VacationPatch.builder()
.isEnabled(true)
.fromDate(DATE_2014)
@@ -213,7 +213,7 @@ public abstract class GetVacationResponseTest {
public void getVacationResponseShouldNotReturnIsActivatedWhenOutOfRange() {
fixedDateZonedDateTimeProvider.setFixedDateTime(DATE_2014);
- jmapGuiceProbe.modifyVacation(AccountId.fromString(USER),
+ jmapGuiceProbe.modifyVacation(AccountId.fromString(ALICE),
VacationPatch.builder()
.isEnabled(true)
.fromDate(DATE_2015)
@@ -240,7 +240,7 @@ public abstract class GetVacationResponseTest {
@Test
public void accountIdIsNotSupported() {
- jmapGuiceProbe.modifyVacation(AccountId.fromString(USER),
+ jmapGuiceProbe.modifyVacation(AccountId.fromString(ALICE),
VacationPatch.builder()
.isEnabled(true)
.fromDate(ZonedDateTime.parse("2014-09-30T14:10:00+02:00"))
http://git-wip-us.apache.org/repos/asf/james-project/blob/686a75e1/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java
index 14da500..e283bd4 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java
@@ -28,6 +28,7 @@ import static org.apache.james.jmap.JmapCommonRequests.listMessageIdsForAccount;
import static org.apache.james.jmap.JmapCommonRequests.listMessageIdsInMailbox;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
+import static org.apache.james.jmap.TestingConstants.DOMAIN;
import static org.apache.james.jmap.TestingConstants.NAME;
import static org.apache.james.jmap.TestingConstants.calmlyAwait;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
@@ -66,9 +67,8 @@ import com.jayway.restassured.RestAssured;
import com.jayway.restassured.parsing.Parser;
public abstract class SendMDNMethodTest {
- private static final String USERS_DOMAIN = "domain.tld";
- private static final String HOMER = "homer@" + USERS_DOMAIN;
- private static final String BART = "bart@" + USERS_DOMAIN;
+ private static final String HOMER = "homer@" + DOMAIN;
+ private static final String BART = "bart@" + DOMAIN;
private static final String PASSWORD = "password";
private static final String BOB_PASSWORD = "bobPassword";
@@ -92,7 +92,7 @@ public abstract class SendMDNMethodTest {
.build();
RestAssured.defaultParser = Parser.JSON;
- dataProbe.addDomain(USERS_DOMAIN);
+ dataProbe.addDomain(DOMAIN);
dataProbe.addUser(HOMER, PASSWORD);
dataProbe.addUser(BART, BOB_PASSWORD);
mailboxProbe.createMailbox("#private", HOMER, DefaultMailboxes.INBOX);
http://git-wip-us.apache.org/repos/asf/james-project/blob/686a75e1/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
index 151707e..e874467 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
@@ -24,6 +24,7 @@ import static com.jayway.restassured.RestAssured.with;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
+import static org.apache.james.jmap.TestingConstants.DOMAIN;
import static org.apache.james.jmap.TestingConstants.FIRST_MAILBOX;
import static org.apache.james.jmap.TestingConstants.NAME;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
@@ -69,8 +70,6 @@ import com.jayway.restassured.RestAssured;
public abstract class SetMailboxesMethodTest {
- private static final String USERS_DOMAIN = "domain.tld";
-
private static final String ADMINISTER = String.valueOf(Right.Administer.asCharacter());
private static final String WRITE = String.valueOf(Right.Write.asCharacter());
private static final String DELETE_MESSAGES = String.valueOf(Right.DeleteMessages.asCharacter());
@@ -99,9 +98,9 @@ public abstract class SetMailboxesMethodTest {
.build();
RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
- username = "username@" + USERS_DOMAIN;
+ username = "username@" + DOMAIN;
String password = "password";
- dataProbe.addDomain(USERS_DOMAIN);
+ dataProbe.addDomain(DOMAIN);
dataProbe.addUser(username, password);
inboxId = mailboxProbe.createMailbox("#private", username, DefaultMailboxes.INBOX);
accessToken = authenticateJamesUser(baseUri(jmapServer), username, password);
@@ -1177,7 +1176,7 @@ public abstract class SetMailboxesMethodTest {
" {" +
" \"update\": {" +
" \"" + mailboxId.serialize() + "\" : {" +
- " \"sharedWith\" : {\"user@" + USERS_DOMAIN + "\": [\"a\", \"w\"]}" +
+ " \"sharedWith\" : {\"user@" + DOMAIN + "\": [\"a\", \"w\"]}" +
" }" +
" }" +
" }," +
@@ -1286,7 +1285,7 @@ public abstract class SetMailboxesMethodTest {
@Test
public void updateShouldApplyWhenSettingNewACL() {
String myBox = "myBox";
- String user = "user@" + USERS_DOMAIN;
+ String user = "user@" + DOMAIN;
MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username, myBox);
String requestBody =
"[" +
@@ -1322,7 +1321,7 @@ public abstract class SetMailboxesMethodTest {
@Test
public void updateShouldModifyStoredDataWhenUpdatingACL() {
String myBox = "myBox";
- String user = "user@" + USERS_DOMAIN;
+ String user = "user@" + DOMAIN;
MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username, myBox);
with()
@@ -1422,8 +1421,8 @@ public abstract class SetMailboxesMethodTest {
@Test
public void updateShouldModifyStoredDataWhenSwitchingACLUser() {
String myBox = "myBox";
- String user1 = "user1@" + USERS_DOMAIN;
- String user2 = "user2@" + USERS_DOMAIN;
+ String user1 = "user1@" + DOMAIN;
+ String user2 = "user2@" + DOMAIN;
MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, username, myBox);
with()
@@ -2122,7 +2121,7 @@ public abstract class SetMailboxesMethodTest {
" {" +
" \"update\": {" +
" \"" + inboxId.serialize() + "\" : {" +
- " \"sharedWith\" : {\"user@" + USERS_DOMAIN + "\": [\"a\", \"w\"]}" +
+ " \"sharedWith\" : {\"user@" + DOMAIN + "\": [\"a\", \"w\"]}" +
" }" +
" }" +
" }," +
@@ -2150,7 +2149,7 @@ public abstract class SetMailboxesMethodTest {
" {" +
" \"update\": {" +
" \"" + outboxId.serialize() + "\" : {" +
- " \"sharedWith\" : {\"user@" + USERS_DOMAIN + "\": [\"a\", \"w\"]}" +
+ " \"sharedWith\" : {\"user@" + DOMAIN + "\": [\"a\", \"w\"]}" +
" }" +
" }" +
" }," +
@@ -2181,7 +2180,7 @@ public abstract class SetMailboxesMethodTest {
" {" +
" \"update\": {" +
" \"" + draftId.serialize() + "\" : {" +
- " \"sharedWith\" : {\"user@" + USERS_DOMAIN + "\": [\"a\", \"w\"]}" +
+ " \"sharedWith\" : {\"user@" + DOMAIN + "\": [\"a\", \"w\"]}" +
" }" +
" }" +
" }," +
http://git-wip-us.apache.org/repos/asf/james-project/blob/686a75e1/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
index 074a820..0c2a08c 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
@@ -23,10 +23,18 @@ import static com.jayway.restassured.RestAssured.given;
import static com.jayway.restassured.RestAssured.with;
import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import static org.apache.james.jmap.TestingConstants.ALICE;
+import static org.apache.james.jmap.TestingConstants.ALICE_PASSWORD;
import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
+import static org.apache.james.jmap.TestingConstants.BOB;
+import static org.apache.james.jmap.TestingConstants.BOB_PASSWORD;
+import static org.apache.james.jmap.TestingConstants.DOMAIN;
+import static org.apache.james.jmap.TestingConstants.IMAP_PORT;
+import static org.apache.james.jmap.TestingConstants.LOCALHOST_IP;
import static org.apache.james.jmap.TestingConstants.NAME;
import static org.apache.james.jmap.TestingConstants.SECOND_ARGUMENTS;
import static org.apache.james.jmap.TestingConstants.SECOND_NAME;
+import static org.apache.james.jmap.TestingConstants.SMTP_PORT;
import static org.apache.james.jmap.TestingConstants.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.contains;
@@ -118,16 +126,10 @@ import com.jayway.restassured.parsing.Parser;
import com.jayway.restassured.specification.ResponseSpecification;
public abstract class SetMessagesMethodTest {
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int SMTP_PORT = 1025;
- private static final int IMAP_PORT = 1143;
private static final String FORWARDED = "$Forwarded";
private static final int _1MB = 1024 * 1024;
- private static final String USERS_DOMAIN = "domain.tld";
- private static final String USERNAME = "username@" + USERS_DOMAIN;
- private static final String BOB = "bob@" + USERS_DOMAIN;
+ private static final String USERNAME = "username@" + DOMAIN;
private static final String PASSWORD = "password";
- private static final String BOB_PASSWORD = "bobPassword";
private static final MailboxPath USER_MAILBOX = MailboxPath.forUser(USERNAME, "mailbox");
private static final String NOT_UPDATED = ARGUMENTS + ".notUpdated";
@@ -164,7 +166,7 @@ public abstract class SetMessagesMethodTest {
RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
RestAssured.defaultParser = Parser.JSON;
- dataProbe.addDomain(USERS_DOMAIN);
+ dataProbe.addDomain(DOMAIN);
dataProbe.addUser(USERNAME, PASSWORD);
dataProbe.addUser(BOB, BOB_PASSWORD);
mailboxProbe.createMailbox("#private", USERNAME, DefaultMailboxes.INBOX);
@@ -1218,11 +1220,10 @@ public abstract class SetMessagesMethodTest {
@Test
public void setMessagesShouldReturnErrorWhenUserIsNotTheOwnerOfOneOfTheMailboxes() throws Exception {
- String alice = "alice@" + USERS_DOMAIN;
- dataProbe.addUser(alice, "alicepassword");
- MailboxId aliceOutbox = mailboxProbe.createMailbox("#private", alice, DefaultMailboxes.OUTBOX);
+ dataProbe.addUser(ALICE, ALICE_PASSWORD);
+ MailboxId aliceOutbox = mailboxProbe.createMailbox("#private", ALICE, DefaultMailboxes.OUTBOX);
- aclProbe.replaceRights(MailboxPath.forUser(alice, DefaultMailboxes.OUTBOX), USERNAME, MailboxACL.FULL_RIGHTS);
+ aclProbe.replaceRights(MailboxPath.forUser(ALICE, DefaultMailboxes.OUTBOX), USERNAME, MailboxACL.FULL_RIGHTS);
String messageCreationId = "creationId1337";
String fromAddress = USERNAME;
@@ -2712,7 +2713,7 @@ public abstract class SetMessagesMethodTest {
public void setMessagesShouldDeliverMessageToRecipient() throws Exception {
// Sender
// Recipient
- String recipientAddress = "recipient" + "@" + USERS_DOMAIN;
+ String recipientAddress = "recipient" + "@" + DOMAIN;
String password = "password";
dataProbe.addUser(recipientAddress, password);
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipientAddress, DefaultMailboxes.INBOX);
@@ -2758,7 +2759,7 @@ public abstract class SetMessagesMethodTest {
MessageAppender.fillMailbox(mailboxProbe, USERNAME, MailboxConstants.INBOX);
- String recipientAddress = "recipient" + "@" + USERS_DOMAIN;
+ String recipientAddress = "recipient" + "@" + DOMAIN;
String password = "password";
dataProbe.addUser(recipientAddress, password);
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipientAddress, DefaultMailboxes.INBOX);
@@ -2803,7 +2804,7 @@ public abstract class SetMessagesMethodTest {
@Test
public void setMessagesShouldStripBccFromDeliveredEmail() throws Exception {
// Recipient
- String recipientAddress = "recipient" + "@" + USERS_DOMAIN;
+ String recipientAddress = "recipient" + "@" + DOMAIN;
String bccRecipient = BOB;
String password = "password";
dataProbe.addUser(recipientAddress, password);
@@ -2860,7 +2861,7 @@ public abstract class SetMessagesMethodTest {
String sentMailboxId = getMailboxId(accessToken, Role.SENT);
// Recipient
- String recipientAddress = "recipient" + "@" + USERS_DOMAIN;
+ String recipientAddress = "recipient" + "@" + DOMAIN;
String password = "password";
dataProbe.addUser(recipientAddress, password);
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipientAddress, DefaultMailboxes.INBOX);
@@ -2875,7 +2876,7 @@ public abstract class SetMessagesMethodTest {
" \"create\": { \"" + messageCreationId + "\" : {" +
" \"from\": { \"email\": \"" + fromAddress + "\"}," +
" \"to\": [{ \"name\": \"recipient\", \"email\": \"" + recipientAddress + "\"}]," +
- " \"bcc\": [{ \"name\": \"BOB\", \"email\": \"bob@" + USERS_DOMAIN + "\" }]," +
+ " \"bcc\": [{ \"name\": \"BOB\", \"email\": \"bob@" + DOMAIN + "\" }]," +
" \"cc\": [{ \"name\": \"ALICE\"}]," +
" \"subject\": \"Thank you for joining example.com!\"," +
" \"textBody\": \"Hello someone, and thank you for joining example.com!\"," +
@@ -2914,7 +2915,7 @@ public abstract class SetMessagesMethodTest {
// Sender
// Recipient
- String recipientAddress = "recipient" + "@" + USERS_DOMAIN;
+ String recipientAddress = "recipient" + "@" + DOMAIN;
String password = "password";
dataProbe.addUser(recipientAddress, password);
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipientAddress, DefaultMailboxes.INBOX);
@@ -2988,7 +2989,7 @@ public abstract class SetMessagesMethodTest {
@Test
public void setMessagesShouldSendAReadableHtmlMessage() throws Exception {
// Recipient
- String recipientAddress = "recipient" + "@" + USERS_DOMAIN;
+ String recipientAddress = "recipient" + "@" + DOMAIN;
String password = "password";
dataProbe.addUser(recipientAddress, password);
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipientAddress, DefaultMailboxes.INBOX);
@@ -3028,7 +3029,7 @@ public abstract class SetMessagesMethodTest {
@Test
public void setMessagesWhenSavingToDraftsShouldNotSendMessage() throws Exception {
- String recipientAddress = "recipient" + "@" + USERS_DOMAIN;
+ String recipientAddress = "recipient" + "@" + DOMAIN;
String recipientPassword = "password";
dataProbe.addUser(recipientAddress, recipientPassword);
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipientAddress, DefaultMailboxes.INBOX);
@@ -3075,7 +3076,7 @@ public abstract class SetMessagesMethodTest {
public void setMessagesWhenSavingToRegularMailboxShouldNotSendMessage() throws Exception {
String sender = USERNAME;
MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, sender, "regular");
- String recipientAddress = "recipient" + "@" + USERS_DOMAIN;
+ String recipientAddress = "recipient" + "@" + DOMAIN;
String recipientPassword = "password";
dataProbe.addUser(recipientAddress, recipientPassword);
await();
@@ -3135,7 +3136,7 @@ public abstract class SetMessagesMethodTest {
@Test
public void setMessagesShouldSendAReadableTextPlusHtmlMessage() throws Exception {
// Recipient
- String recipientAddress = "recipient" + "@" + USERS_DOMAIN;
+ String recipientAddress = "recipient" + "@" + DOMAIN;
String password = "password";
dataProbe.addUser(recipientAddress, password);
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipientAddress, DefaultMailboxes.INBOX);
@@ -4370,7 +4371,7 @@ public abstract class SetMessagesMethodTest {
@Test
public void setMessagesShouldVerifyHeaderOfMessageInInbox() throws Exception {
- String toUsername = "username1@" + USERS_DOMAIN;
+ String toUsername = "username1@" + DOMAIN;
String password = "password";
dataProbe.addUser(toUsername, password);
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, toUsername, DefaultMailboxes.INBOX);
@@ -4407,7 +4408,7 @@ public abstract class SetMessagesMethodTest {
@Test
public void setMessagesShouldVerifyHeaderOfMessageInSent() throws Exception {
- String toUsername = "username1@" + USERS_DOMAIN;
+ String toUsername = "username1@" + DOMAIN;
String password = "password";
dataProbe.addUser(toUsername, password);
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, toUsername, DefaultMailboxes.INBOX);
@@ -4870,7 +4871,7 @@ public abstract class SetMessagesMethodTest {
@Test
public void setMessagesShouldSetUserAddedHeadersInSent() throws Exception {
- String toUsername = "username1@" + USERS_DOMAIN;
+ String toUsername = "username1@" + DOMAIN;
String password = "password";
dataProbe.addUser(toUsername, password);
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, toUsername, DefaultMailboxes.INBOX);
@@ -5387,7 +5388,7 @@ public abstract class SetMessagesMethodTest {
.sender(fromAddress)
.recipient(fromAddress)
.build();
- try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, USERS_DOMAIN)) {
+ try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN)) {
messageSender.sendMessage(mail);
calmlyAwait.atMost(Duration.ONE_MINUTE).until(messageSender::messageHasBeenSent);
}
@@ -5428,7 +5429,7 @@ public abstract class SetMessagesMethodTest {
String sentMailboxId = getMailboxId(accessToken, Role.SENT);
// Recipient
- String recipientAddress = "recipient" + "@" + USERS_DOMAIN;
+ String recipientAddress = "recipient" + "@" + DOMAIN;
String password = "password";
dataProbe.addUser(recipientAddress, password);
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, recipientAddress, DefaultMailboxes.INBOX);
http://git-wip-us.apache.org/repos/asf/james-project/blob/686a75e1/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
index a0bd93e..22eacc8 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
@@ -23,6 +23,7 @@ import static com.jayway.restassured.RestAssured.given;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
+import static org.apache.james.jmap.TestingConstants.DOMAIN;
import static org.apache.james.jmap.TestingConstants.NAME;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.assertj.core.api.Assertions.assertThat;
@@ -48,8 +49,7 @@ import com.jayway.restassured.http.ContentType;
public abstract class SetVacationResponseTest {
- private static final String USERS_DOMAIN = "domain.tld";
- public static final String USER = "username@" + USERS_DOMAIN;
+ public static final String USER = "username@" + DOMAIN;
public static final String PASSWORD = "password";
public static final String SUBJECT = "subject";
private JmapGuiceProbe jmapGuiceProbe;
@@ -70,7 +70,7 @@ public abstract class SetVacationResponseTest {
.setPort(jmapGuiceProbe.getJmapPort())
.build();
- jmapServer.getProbe(DataProbeImpl.class).addDomain(USERS_DOMAIN);
+ jmapServer.getProbe(DataProbeImpl.class).addDomain(DOMAIN);
jmapServer.getProbe(DataProbeImpl.class).addUser(USER, PASSWORD);
accessToken = authenticateJamesUser(baseUri(jmapServer), USER, PASSWORD);
http://git-wip-us.apache.org/repos/asf/james-project/blob/686a75e1/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java
index fc1222b..5326b43 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java
@@ -26,6 +26,8 @@ import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
+import static org.apache.james.jmap.TestingConstants.IMAP_PORT;
+import static org.apache.james.jmap.TestingConstants.LOCALHOST_IP;
import static org.apache.james.jmap.TestingConstants.NAME;
import static org.apache.james.jmap.TestingConstants.calmlyAwait;
import static org.hamcrest.Matchers.equalTo;
@@ -60,8 +62,6 @@ public interface SpamAssassinContract {
String ALICE_PASSWORD = "alicePassword";
String PAUL = "paul@" + RECIPIENTS_DOMAIN;
String PAUL_PASSWORD = "paulPassword";
- String LOCALHOST = "127.0.0.1";
- int IMAP_PORT = 1143;
@BeforeEach
default void setup(JamesWithSpamAssassin james) throws Throwable {
@@ -162,7 +162,7 @@ public interface SpamAssassinContract {
.path(ARGUMENTS + ".messageIds");
try (IMAPMessageReader imapMessageReader = new IMAPMessageReader()) {
- imapMessageReader.connect(LOCALHOST, IMAP_PORT)
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(ALICE, ALICE_PASSWORD)
.select(IMAPMessageReader.INBOX);
@@ -209,7 +209,7 @@ public interface SpamAssassinContract {
.path(ARGUMENTS + ".messageIds");
try (IMAPMessageReader imapMessageReader = new IMAPMessageReader()) {
- imapMessageReader.connect(LOCALHOST, IMAP_PORT)
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(ALICE, ALICE_PASSWORD)
.select(IMAPMessageReader.INBOX);
@@ -395,7 +395,7 @@ public interface SpamAssassinContract {
// Alice is moving this message out of Spam -> forgetting in SpamAssassin
try (IMAPMessageReader imapMessageReader = new IMAPMessageReader()) {
- imapMessageReader.connect(LOCALHOST, IMAP_PORT)
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(ALICE, ALICE_PASSWORD)
.select("Spam");
@@ -455,7 +455,7 @@ public interface SpamAssassinContract {
// Alice is deleting this message
try (IMAPMessageReader imapMessageReader = new IMAPMessageReader()) {
- imapMessageReader.connect(LOCALHOST, IMAP_PORT)
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(ALICE, ALICE_PASSWORD)
.select("Spam");
http://git-wip-us.apache.org/repos/asf/james-project/blob/686a75e1/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java
index 0b28b97..15ac827 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java
@@ -19,6 +19,8 @@
package org.apache.james.jmap.methods.integration.cucumber;
+import static org.apache.james.jmap.TestingConstants.IMAP_PORT;
+import static org.apache.james.transport.mailets.remote.delivery.HeloNameProvider.LOCALHOST;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Map;
@@ -37,10 +39,6 @@ import cucumber.runtime.java.guice.ScenarioScoped;
@ScenarioScoped
public class ImapStepdefs {
-
- private static final int IMAP_PORT = 1143;
- private static final String LOCALHOST = "127.0.0.1";
-
private final UserStepdefs userStepdefs;
private final MainStepdefs mainStepdefs;
private final Map<String, IMAPMessageReader> imapConnections;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[20/24] james-project git commit: JAMES-2366 Adds more information on
invalid Forward route path
Posted by ad...@apache.org.
JAMES-2366 Adds more information on invalid Forward route path
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/aca51fcc
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/aca51fcc
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/aca51fcc
Branch: refs/heads/master
Commit: aca51fcc4f2d42394160962a4dfb15860b6acf41
Parents: 60299df
Author: benwa <bt...@linagora.com>
Authored: Thu Apr 5 09:54:20 2018 +0700
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Apr 6 15:04:49 2018 +0200
----------------------------------------------------------------------
.../java/org/apache/james/webadmin/routes/ForwardRoutes.java | 2 +-
.../org/apache/james/webadmin/routes/ForwardRoutesTest.java | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/aca51fcc/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/ForwardRoutes.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/ForwardRoutes.java b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/ForwardRoutes.java
index ffca23c..2145d40 100644
--- a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/ForwardRoutes.java
+++ b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/ForwardRoutes.java
@@ -116,7 +116,7 @@ public class ForwardRoutes implements Routes {
throw ErrorResponder.builder()
.statusCode(HttpStatus.BAD_REQUEST_400)
.type(ErrorType.INVALID_ARGUMENT)
- .message("An destination address needs to be specified in the path")
+ .message("A destination address needs to be specified in the path")
.haltError();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/aca51fcc/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
index 11a1c10..08306a5 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
@@ -466,7 +466,9 @@ class ForwardRoutesTest {
.put(ALICE)
.then()
.statusCode(HttpStatus.BAD_REQUEST_400)
- .body(is(""));
+ .body("statusCode", is(400))
+ .body("type", is("InvalidArgument"))
+ .body("message", is("A destination address needs to be specified in the path"));
}
@Test
@@ -513,7 +515,9 @@ class ForwardRoutesTest {
.delete(ALICE)
.then()
.statusCode(HttpStatus.BAD_REQUEST_400)
- .body(is(""));
+ .body("statusCode", is(400))
+ .body("type", is("InvalidArgument"))
+ .body("message", is("A destination address needs to be specified in the path"));
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[10/24] james-project git commit: JAMES-2366 Introduce REST API for
forward
Posted by ad...@apache.org.
JAMES-2366 Introduce REST API for forward
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/92f4a682
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/92f4a682
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/92f4a682
Branch: refs/heads/master
Commit: 92f4a6823a22164341135eb08603625f02449dc3
Parents: 53d760b
Author: benwa <bt...@linagora.com>
Authored: Thu Mar 29 16:16:07 2018 +0700
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Apr 6 15:04:48 2018 +0200
----------------------------------------------------------------------
.../dto/ForwardDestinationResponse.java | 32 +
.../james/webadmin/routes/ForwardRoutes.java | 263 ++++++++
.../webadmin/routes/ForwardRoutesTest.java | 676 +++++++++++++++++++
3 files changed, 971 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/92f4a682/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/dto/ForwardDestinationResponse.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/dto/ForwardDestinationResponse.java b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/dto/ForwardDestinationResponse.java
new file mode 100644
index 0000000..5e681c0
--- /dev/null
+++ b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/dto/ForwardDestinationResponse.java
@@ -0,0 +1,32 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.webadmin.dto;
+
+public class ForwardDestinationResponse {
+ private final String mailAddress;
+
+ public ForwardDestinationResponse(String mailAddress) {
+ this.mailAddress = mailAddress;
+ }
+
+ public String getMailAddress() {
+ return mailAddress;
+ }
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/92f4a682/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/ForwardRoutes.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/ForwardRoutes.java b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/ForwardRoutes.java
new file mode 100644
index 0000000..ffca23c
--- /dev/null
+++ b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/ForwardRoutes.java
@@ -0,0 +1,263 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.webadmin.routes;
+
+import static org.apache.james.webadmin.Constants.SEPARATOR;
+import static spark.Spark.halt;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+import javax.inject.Inject;
+import javax.mail.internet.AddressException;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+import org.apache.james.core.MailAddress;
+import org.apache.james.domainlist.api.DomainListException;
+import org.apache.james.rrt.api.RecipientRewriteTable;
+import org.apache.james.rrt.api.RecipientRewriteTableException;
+import org.apache.james.rrt.lib.Mapping;
+import org.apache.james.rrt.lib.Mappings;
+import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.UsersRepositoryException;
+import org.apache.james.webadmin.Constants;
+import org.apache.james.webadmin.Routes;
+import org.apache.james.webadmin.dto.ForwardDestinationResponse;
+import org.apache.james.webadmin.utils.ErrorResponder;
+import org.apache.james.webadmin.utils.ErrorResponder.ErrorType;
+import org.apache.james.webadmin.utils.JsonExtractException;
+import org.apache.james.webadmin.utils.JsonTransformer;
+import org.eclipse.jetty.http.HttpStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.steveash.guavate.Guavate;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSortedSet;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import spark.HaltException;
+import spark.Request;
+import spark.Response;
+import spark.Service;
+
+@Api(tags = "Address Forwards")
+@Path(ForwardRoutes.ROOT_PATH)
+@Produces(Constants.JSON_CONTENT_TYPE)
+public class ForwardRoutes implements Routes {
+
+ public static final String ROOT_PATH = "address/forwards";
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(ForwardRoutes.class);
+
+ private static final String FORWARD_BASE_ADDRESS = "forwardBaseAddress";
+ private static final String FORWARD_ADDRESS_PATH = ROOT_PATH + SEPARATOR + ":" + FORWARD_BASE_ADDRESS;
+ private static final String FORWARD_DESTINATION_ADDRESS = "forwardDestinationAddress";
+ private static final String USER_IN_FORWARD_DESTINATION_ADDRESSES_PATH = FORWARD_ADDRESS_PATH + SEPARATOR +
+ "targets" + SEPARATOR + ":" + FORWARD_DESTINATION_ADDRESS;
+ private static final String MAILADDRESS_ASCII_DISCLAIMER = "Note that email addresses are restricted to ASCII character set. " +
+ "Mail addresses not matching this criteria will be rejected.";
+
+ private final UsersRepository usersRepository;
+ private final JsonTransformer jsonTransformer;
+ private final RecipientRewriteTable recipientRewriteTable;
+
+ @Inject
+ @VisibleForTesting
+ ForwardRoutes(RecipientRewriteTable recipientRewriteTable, UsersRepository usersRepository, JsonTransformer jsonTransformer) {
+ this.usersRepository = usersRepository;
+ this.jsonTransformer = jsonTransformer;
+ this.recipientRewriteTable = recipientRewriteTable;
+ }
+
+ @Override
+ public void define(Service service) {
+ service.get(ROOT_PATH, this::listForwards, jsonTransformer);
+ service.get(FORWARD_ADDRESS_PATH, this::listForwardDestinations, jsonTransformer);
+ service.put(FORWARD_ADDRESS_PATH, this::throwUnknownPath);
+ service.put(USER_IN_FORWARD_DESTINATION_ADDRESSES_PATH, this::addToForwardDestinations);
+ service.delete(FORWARD_ADDRESS_PATH, this::throwUnknownPath);
+ service.delete(USER_IN_FORWARD_DESTINATION_ADDRESSES_PATH, this::removeFromForwardDestination);
+ }
+
+ public Object throwUnknownPath(Request request, Response response) {
+ throw ErrorResponder.builder()
+ .statusCode(HttpStatus.BAD_REQUEST_400)
+ .type(ErrorType.INVALID_ARGUMENT)
+ .message("An destination address needs to be specified in the path")
+ .haltError();
+ }
+
+ @GET
+ @Path(ROOT_PATH)
+ @ApiOperation(value = "getting forwards list")
+ @ApiResponses(value = {
+ @ApiResponse(code = HttpStatus.OK_200, message = "OK", response = List.class),
+ @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500,
+ message = "Internal server error - Something went bad on the server side.")
+ })
+ public Set<String> listForwards(Request request, Response response) throws RecipientRewriteTableException {
+ return Optional.ofNullable(recipientRewriteTable.getAllMappings())
+ .map(mappings ->
+ mappings.entrySet().stream()
+ .filter(e -> e.getValue().contains(Mapping.Type.Forward))
+ .map(Map.Entry::getKey)
+ .collect(Guavate.toImmutableSortedSet()))
+ .orElse(ImmutableSortedSet.of());
+ }
+
+ @PUT
+ @Path(ROOT_PATH + "/{" + FORWARD_BASE_ADDRESS + "}/targets/{" + FORWARD_DESTINATION_ADDRESS + "}")
+ @ApiOperation(value = "adding a destination address into a forward")
+ @ApiImplicitParams({
+ @ApiImplicitParam(required = true, dataType = "string", name = FORWARD_BASE_ADDRESS, paramType = "path",
+ value = "Base mail address of the forward. Sending a mail to that address will send it to all forward destinations.\n" +
+ MAILADDRESS_ASCII_DISCLAIMER),
+ @ApiImplicitParam(required = true, dataType = "string", name = FORWARD_DESTINATION_ADDRESS, paramType = "path",
+ value = "A destination mail address of the forward. Sending a mail to the base address will send an email to " +
+ "that email address (as well as other destinations).\n" +
+ MAILADDRESS_ASCII_DISCLAIMER)
+ })
+ @ApiResponses(value = {
+ @ApiResponse(code = HttpStatus.OK_200, message = "OK", response = List.class),
+ @ApiResponse(code = HttpStatus.BAD_REQUEST_400, message = FORWARD_BASE_ADDRESS + " or forward structure format is not valid"),
+ @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "requested base forward address does not match a user"),
+ @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500,
+ message = "Internal server error - Something went bad on the server side.")
+ })
+ public HaltException addToForwardDestinations(Request request, Response response) throws JsonExtractException, AddressException, RecipientRewriteTableException, UsersRepositoryException, DomainListException {
+ MailAddress forwardBaseAddress = parseMailAddress(request.params(FORWARD_BASE_ADDRESS));
+ ensureUserExist(forwardBaseAddress);
+ MailAddress destinationAddress = parseMailAddress(request.params(FORWARD_DESTINATION_ADDRESS));
+ recipientRewriteTable.addForwardMapping(forwardBaseAddress.getLocalPart(), forwardBaseAddress.getDomain(), destinationAddress.asString());
+ return halt(HttpStatus.CREATED_201);
+ }
+
+ private void ensureUserExist(MailAddress mailAddress) throws UsersRepositoryException {
+ if (!usersRepository.contains(mailAddress.asString())) {
+ throw ErrorResponder.builder()
+ .statusCode(HttpStatus.NOT_FOUND_404)
+ .type(ErrorType.INVALID_ARGUMENT)
+ .message("Requested base forward address does not correspond to a user")
+ .haltError();
+ }
+ }
+
+
+ @DELETE
+ @Path(ROOT_PATH + "/{" + FORWARD_BASE_ADDRESS + "}/targets/{" + FORWARD_DESTINATION_ADDRESS + "}")
+ @ApiOperation(value = "remove a destination address from a forward")
+ @ApiImplicitParams({
+ @ApiImplicitParam(required = true, dataType = "string", name = FORWARD_BASE_ADDRESS, paramType = "path"),
+ @ApiImplicitParam(required = true, dataType = "string", name = FORWARD_DESTINATION_ADDRESS, paramType = "path")
+ })
+ @ApiResponses(value = {
+ @ApiResponse(code = HttpStatus.OK_200, message = "OK", response = List.class),
+ @ApiResponse(code = HttpStatus.BAD_REQUEST_400,
+ message = FORWARD_BASE_ADDRESS + " or forward structure format is not valid"),
+ @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500,
+ message = "Internal server error - Something went bad on the server side.")
+ })
+ public HaltException removeFromForwardDestination(Request request, Response response) throws JsonExtractException, AddressException, RecipientRewriteTableException {
+ MailAddress baseAddress = parseMailAddress(request.params(FORWARD_BASE_ADDRESS));
+ MailAddress destinationAddressToBeRemoved = parseMailAddress(request.params(FORWARD_DESTINATION_ADDRESS));
+ recipientRewriteTable.removeForwardMapping(
+ baseAddress.getLocalPart(),
+ baseAddress.getDomain(),
+ destinationAddressToBeRemoved.asString());
+ return halt(HttpStatus.OK_200);
+ }
+
+ @GET
+ @Path(ROOT_PATH + "/{" + FORWARD_BASE_ADDRESS + "}")
+ @ApiOperation(value = "listing forward destinations")
+ @ApiImplicitParams({
+ @ApiImplicitParam(required = true, dataType = "string", name = FORWARD_BASE_ADDRESS, paramType = "path")
+ })
+ @ApiResponses(value = {
+ @ApiResponse(code = HttpStatus.OK_200, message = "OK", response = List.class),
+ @ApiResponse(code = HttpStatus.BAD_REQUEST_400, message = "The forward is not an address"),
+ @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "The forward does not exist"),
+ @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500,
+ message = "Internal server error - Something went bad on the server side.")
+ })
+ public ImmutableSet<ForwardDestinationResponse> listForwardDestinations(Request request, Response response) throws RecipientRewriteTable.ErrorMappingException, RecipientRewriteTableException {
+ MailAddress baseAddress = parseMailAddress(request.params(FORWARD_BASE_ADDRESS));
+ Mappings mappings = recipientRewriteTable.getMappings(baseAddress.getLocalPart(), baseAddress.getDomain());
+
+ ensureNonEmptyMappings(mappings);
+
+ return mappings.select(Mapping.Type.Forward)
+ .asStream()
+ .map(mapping -> mapping.asMailAddress()
+ .orElseThrow(() -> new IllegalStateException(String.format("Can not compute address for mapping %s", mapping.asString()))))
+ .map(MailAddress::asString)
+ .sorted()
+ .map(ForwardDestinationResponse::new)
+ .collect(Guavate.toImmutableSet());
+ }
+
+ private MailAddress parseMailAddress(String address) {
+ try {
+ String decodedAddress = URLDecoder.decode(address, StandardCharsets.UTF_8.displayName());
+ return new MailAddress(decodedAddress);
+ } catch (AddressException e) {
+ throw ErrorResponder.builder()
+ .statusCode(HttpStatus.BAD_REQUEST_400)
+ .type(ErrorType.INVALID_ARGUMENT)
+ .message("The forward is not an email address")
+ .cause(e)
+ .haltError();
+ } catch (UnsupportedEncodingException e) {
+ LOGGER.error("UTF-8 should be a valid encoding");
+ throw ErrorResponder.builder()
+ .statusCode(HttpStatus.INTERNAL_SERVER_ERROR_500)
+ .type(ErrorType.SERVER_ERROR)
+ .message("Internal server error - Something went bad on the server side.")
+ .cause(e)
+ .haltError();
+ }
+ }
+
+ private void ensureNonEmptyMappings(Mappings mappings) {
+ if (mappings == null || mappings.isEmpty()) {
+ throw ErrorResponder.builder()
+ .statusCode(HttpStatus.NOT_FOUND_404)
+ .type(ErrorType.INVALID_ARGUMENT)
+ .message("The forward does not exist")
+ .haltError();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/92f4a682/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
new file mode 100644
index 0000000..11a1c10
--- /dev/null
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
@@ -0,0 +1,676 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.webadmin.routes;
+
+import static com.jayway.restassured.RestAssured.when;
+import static com.jayway.restassured.RestAssured.with;
+import static org.apache.james.webadmin.Constants.SEPARATOR;
+import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.hasItems;
+import static org.hamcrest.CoreMatchers.is;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.configuration.DefaultConfigurationBuilder;
+import org.apache.james.core.Domain;
+import org.apache.james.dnsservice.api.DNSService;
+import org.apache.james.domainlist.api.DomainList;
+import org.apache.james.domainlist.memory.MemoryDomainList;
+import org.apache.james.metrics.logger.DefaultMetricFactory;
+import org.apache.james.rrt.api.RecipientRewriteTable;
+import org.apache.james.rrt.api.RecipientRewriteTableException;
+import org.apache.james.rrt.memory.MemoryRecipientRewriteTable;
+import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.memory.MemoryUsersRepository;
+import org.apache.james.webadmin.WebAdminServer;
+import org.apache.james.webadmin.WebAdminUtils;
+import org.apache.james.webadmin.utils.JsonTransformer;
+import org.eclipse.jetty.http.HttpStatus;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import com.jayway.restassured.RestAssured;
+import com.jayway.restassured.filter.log.LogDetail;
+import com.jayway.restassured.http.ContentType;
+
+class ForwardRoutesTest {
+
+ private static final Domain DOMAIN = Domain.of("b.com");
+ public static final String CEDRIC = "cedric@" + DOMAIN.name();
+ public static final String ALICE = "alice@" + DOMAIN.name();
+ public static final String ALICE_WITH_SLASH = "alice/@" + DOMAIN.name();
+ public static final String ALICE_WITH_ENCODED_SLASH = "alice%2F@" + DOMAIN.name();
+ public static final String BOB = "bob@" + DOMAIN.name();
+ public static final String BOB_PASSWORD = "123456";
+ public static final String ALICE_PASSWORD = "789123";
+ public static final String ALICE_SLASH_PASSWORD = "abcdef";
+ public static final String CEDRIC_PASSWORD = "456789";
+
+ private WebAdminServer webAdminServer;
+
+ private void createServer(ForwardRoutes forwardRoutes) throws Exception {
+ webAdminServer = WebAdminUtils.createWebAdminServer(
+ new DefaultMetricFactory(),
+ forwardRoutes);
+ webAdminServer.configure(NO_CONFIGURATION);
+ webAdminServer.await();
+
+ RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
+ .setBasePath("address/forwards")
+ .log(LogDetail.METHOD)
+ .build();
+ }
+
+ @AfterEach
+ void stop() {
+ webAdminServer.destroy();
+ }
+
+ @Nested
+ class NormalBehaviour {
+
+ MemoryUsersRepository usersRepository;
+ MemoryDomainList domainList;
+ MemoryRecipientRewriteTable memoryRecipientRewriteTable;
+
+ @BeforeEach
+ void setUp() throws Exception {
+ memoryRecipientRewriteTable = new MemoryRecipientRewriteTable();
+ DNSService dnsService = mock(DNSService.class);
+ domainList = new MemoryDomainList(dnsService);
+ domainList.setAutoDetectIP(false);
+ domainList.setAutoDetect(false);
+ domainList.configure(new DefaultConfigurationBuilder());
+ domainList.addDomain(DOMAIN);
+
+ usersRepository = MemoryUsersRepository.withVirtualHosting();
+ usersRepository.setDomainList(domainList);
+ usersRepository.configure(new DefaultConfigurationBuilder());
+
+ usersRepository.addUser(BOB, BOB_PASSWORD);
+ usersRepository.addUser(ALICE, ALICE_PASSWORD);
+ usersRepository.addUser(ALICE_WITH_SLASH, ALICE_SLASH_PASSWORD);
+ usersRepository.addUser(CEDRIC, CEDRIC_PASSWORD);
+
+ createServer(new ForwardRoutes(memoryRecipientRewriteTable, usersRepository, new JsonTransformer()));
+ }
+
+ @Test
+ void getForwardShouldBeEmpty() {
+ when()
+ .get()
+ .then()
+ .contentType(ContentType.JSON)
+ .statusCode(HttpStatus.OK_200)
+ .body(is("[]"));
+ }
+
+ @Test
+ void getForwardShouldListExistingForwardsInAlphabeticOrder() {
+ with()
+ .put(ALICE + SEPARATOR + "targets" + SEPARATOR + BOB);
+
+ with()
+ .put(CEDRIC + SEPARATOR + "targets" + SEPARATOR + BOB);
+
+ List<String> addresses =
+ when()
+ .get()
+ .then()
+ .contentType(ContentType.JSON)
+ .statusCode(HttpStatus.OK_200)
+ .extract()
+ .body()
+ .jsonPath()
+ .getList(".");
+ assertThat(addresses).containsExactly(ALICE, CEDRIC);
+ }
+
+ @Test
+ void getNotRegisteredForwardShouldReturnNotFound() {
+ Map<String, Object> errors = when()
+ .get("unknown@domain.travel")
+ .then()
+ .statusCode(HttpStatus.NOT_FOUND_404)
+ .contentType(ContentType.JSON)
+ .extract()
+ .body()
+ .jsonPath()
+ .getMap(".");
+
+ assertThat(errors)
+ .containsEntry("statusCode", HttpStatus.NOT_FOUND_404)
+ .containsEntry("type", "InvalidArgument")
+ .containsEntry("message", "The forward does not exist");
+ }
+
+ @Test
+ void putUserInForwardShouldReturnCreated() {
+ when()
+ .put(ALICE + SEPARATOR + "targets" + SEPARATOR + BOB)
+ .then()
+ .statusCode(HttpStatus.CREATED_201);
+ }
+
+ @Test
+ void putUserWithSlashInForwardShouldReturnCreated() {
+ when()
+ .put(BOB + SEPARATOR + "targets" + SEPARATOR + ALICE_WITH_ENCODED_SLASH)
+ .then()
+ .statusCode(HttpStatus.CREATED_201);
+ }
+
+ @Test
+ void putUserWithSlashInForwardShouldAddItAsADestination() {
+ with()
+ .put(BOB + SEPARATOR + "targets" + SEPARATOR + ALICE_WITH_ENCODED_SLASH);
+
+ when()
+ .get(BOB)
+ .then()
+ .contentType(ContentType.JSON)
+ .statusCode(HttpStatus.OK_200)
+ .body("mailAddress", hasItems(ALICE_WITH_SLASH));
+ }
+
+ @Test
+ void putUserInForwardShouldCreateForward() {
+ with()
+ .put(ALICE + SEPARATOR + "targets" + SEPARATOR + BOB);
+
+ when()
+ .get(ALICE)
+ .then()
+ .contentType(ContentType.JSON)
+ .statusCode(HttpStatus.OK_200)
+ .body("mailAddress", hasItems(BOB));
+ }
+
+ @Test
+ void putUserInForwardWithEncodedSlashShouldReturnCreated() {
+ when()
+ .put(ALICE_WITH_ENCODED_SLASH + SEPARATOR + "targets" + SEPARATOR + BOB)
+ .then()
+ .statusCode(HttpStatus.CREATED_201);
+ }
+
+ @Test
+ void putUserInForwardWithEncodedSlashShouldCreateForward() {
+ with()
+ .put(ALICE_WITH_ENCODED_SLASH + SEPARATOR + "targets" + SEPARATOR + BOB);
+
+ when()
+ .get(ALICE_WITH_ENCODED_SLASH)
+ .then()
+ .contentType(ContentType.JSON)
+ .statusCode(HttpStatus.OK_200)
+ .body("mailAddress", hasItems(BOB));
+ }
+
+ @Test
+ void putSameUserInForwardTwiceShouldBeIdempotent() {
+ with()
+ .put(ALICE + SEPARATOR + "targets" + SEPARATOR + BOB);
+
+ with()
+ .put(ALICE + SEPARATOR + "targets" + SEPARATOR + BOB);
+
+ when()
+ .get(ALICE)
+ .then()
+ .contentType(ContentType.JSON)
+ .statusCode(HttpStatus.OK_200)
+ .body("mailAddress", hasItems(BOB));
+ }
+
+ @Test
+ void putUserInForwardShouldAllowSeveralDestinations() {
+ with()
+ .put(ALICE + SEPARATOR + "targets" + SEPARATOR + BOB);
+
+ with()
+ .put(ALICE + SEPARATOR + "targets" + SEPARATOR + CEDRIC);
+
+ when()
+ .get(ALICE)
+ .then()
+ .contentType(ContentType.JSON)
+ .statusCode(HttpStatus.OK_200)
+ .body("mailAddress", hasItems(BOB, CEDRIC));
+ }
+
+ @Test
+ void forwardShouldAllowIdentity() {
+ with()
+ .put(ALICE + SEPARATOR + "targets" + SEPARATOR + ALICE);
+
+ with()
+ .put(ALICE + SEPARATOR + "targets" + SEPARATOR + CEDRIC);
+
+ when()
+ .get(ALICE)
+ .then()
+ .contentType(ContentType.JSON)
+ .statusCode(HttpStatus.OK_200)
+ .body("mailAddress", hasItems(ALICE, CEDRIC));
+ }
+
+ @Test
+ void putUserInForwardShouldRequireExistingBaseUser() {
+ Map<String, Object> errors = when()
+ .put("notFound@" + DOMAIN.name() + SEPARATOR + "targets" + SEPARATOR + BOB)
+ .then()
+ .statusCode(HttpStatus.NOT_FOUND_404)
+ .contentType(ContentType.JSON)
+ .extract()
+ .body()
+ .jsonPath()
+ .getMap(".");
+
+ assertThat(errors)
+ .containsEntry("statusCode", HttpStatus.NOT_FOUND_404)
+ .containsEntry("type", "InvalidArgument")
+ .containsEntry("message", "Requested base forward address does not correspond to a user");
+ }
+
+ @Test
+ void getForwardShouldReturnMembersInAlphabeticOrder() {
+ with()
+ .put(ALICE + SEPARATOR + "targets" + SEPARATOR + BOB);
+
+ with()
+ .put(ALICE + SEPARATOR + "targets" + SEPARATOR + CEDRIC);
+
+ when()
+ .get(ALICE)
+ .then()
+ .contentType(ContentType.JSON)
+ .statusCode(HttpStatus.OK_200)
+ .body("mailAddress", hasItems(BOB, CEDRIC));
+ }
+
+ @Test
+ void forwardShouldAcceptExternalAddresses() {
+ String externalAddress = "external@other.com";
+
+ with()
+ .put(ALICE + SEPARATOR + "targets" + SEPARATOR + externalAddress);
+
+ when()
+ .get(ALICE)
+ .then()
+ .contentType(ContentType.JSON)
+ .statusCode(HttpStatus.OK_200)
+ .body("mailAddress", hasItems(externalAddress));
+ }
+
+ @Test
+ void deleteUserNotInForwardShouldReturnOK() {
+ when()
+ .delete(ALICE + SEPARATOR + "targets" + SEPARATOR + BOB)
+ .then()
+ .statusCode(HttpStatus.OK_200);
+ }
+
+ @Test
+ void deleteLastUserInForwardShouldDeleteForward() {
+ with()
+ .put(ALICE + SEPARATOR + "targets" + SEPARATOR + BOB);
+
+ with()
+ .delete(ALICE + SEPARATOR + "targets" + SEPARATOR + BOB);
+
+ when()
+ .get()
+ .then()
+ .contentType(ContentType.JSON)
+ .statusCode(HttpStatus.OK_200)
+ .body(is("[]"));
+ }
+ }
+
+ @Nested
+ class FilteringOtherRewriteRuleTypes extends NormalBehaviour {
+
+ @BeforeEach
+ void setup() throws Exception {
+ super.setUp();
+ memoryRecipientRewriteTable.addErrorMapping("error", DOMAIN, "disabled");
+ memoryRecipientRewriteTable.addRegexMapping("regex", DOMAIN, ".*@b\\.com");
+ memoryRecipientRewriteTable.addAliasDomainMapping(Domain.of("alias"), DOMAIN);
+ }
+
+ }
+
+ @Nested
+ class ExceptionHandling {
+
+ private RecipientRewriteTable memoryRecipientRewriteTable;
+
+ @BeforeEach
+ void setUp() throws Exception {
+ memoryRecipientRewriteTable = mock(RecipientRewriteTable.class);
+ UsersRepository userRepository = mock(UsersRepository.class);
+ Mockito.when(userRepository.contains(eq(ALICE))).thenReturn(true);
+ DomainList domainList = mock(DomainList.class);
+ Mockito.when(domainList.containsDomain(any())).thenReturn(true);
+ createServer(new ForwardRoutes(memoryRecipientRewriteTable, userRepository, new JsonTransformer()));
+ }
+
+ @Test
+ void getMalformedForwardShouldReturnBadRequest() {
+ Map<String, Object> errors = when()
+ .get("not-an-address")
+ .then()
+ .statusCode(HttpStatus.BAD_REQUEST_400)
+ .contentType(ContentType.JSON)
+ .extract()
+ .body()
+ .jsonPath()
+ .getMap(".");
+
+ assertThat(errors)
+ .containsEntry("statusCode", HttpStatus.BAD_REQUEST_400)
+ .containsEntry("type", "InvalidArgument")
+ .containsEntry("message", "The forward is not an email address")
+ .containsEntry("cause", "Out of data at position 1 in 'not-an-address'");
+ }
+
+ @Test
+ void putMalformedForwardShouldReturnBadRequest() {
+ Map<String, Object> errors = when()
+ .put("not-an-address" + SEPARATOR + "targets" + SEPARATOR + BOB)
+ .then()
+ .statusCode(HttpStatus.BAD_REQUEST_400)
+ .contentType(ContentType.JSON)
+ .extract()
+ .body()
+ .jsonPath()
+ .getMap(".");
+
+ assertThat(errors)
+ .containsEntry("statusCode", HttpStatus.BAD_REQUEST_400)
+ .containsEntry("type", "InvalidArgument")
+ .containsEntry("message", "The forward is not an email address")
+ .containsEntry("cause", "Out of data at position 1 in 'not-an-address'");
+ }
+
+ @Test
+ void putUserInForwardWithSlashShouldReturnNotFound() {
+ when()
+ .put(ALICE_WITH_SLASH + SEPARATOR + "targets" + SEPARATOR + BOB)
+ .then()
+ .statusCode(HttpStatus.NOT_FOUND_404)
+ .body(containsString("404 Not found"));
+ }
+
+ @Test
+ void putUserWithSlashInForwardShouldReturnNotFound() {
+ when()
+ .put(ALICE + SEPARATOR + "targets" + SEPARATOR + ALICE_WITH_SLASH)
+ .then()
+ .statusCode(HttpStatus.NOT_FOUND_404)
+ .body(containsString("404 Not found"));
+ }
+
+ @Test
+ void putMalformedAddressShouldReturnBadRequest() {
+ Map<String, Object> errors = when()
+ .put(ALICE + SEPARATOR + "targets" + SEPARATOR + "not-an-address")
+ .then()
+ .statusCode(HttpStatus.BAD_REQUEST_400)
+ .contentType(ContentType.JSON)
+ .extract()
+ .body()
+ .jsonPath()
+ .getMap(".");
+
+ assertThat(errors)
+ .containsEntry("statusCode", HttpStatus.BAD_REQUEST_400)
+ .containsEntry("type", "InvalidArgument")
+ .containsEntry("message", "The forward is not an email address")
+ .containsEntry("cause", "Out of data at position 1 in 'not-an-address'");
+ }
+
+ @Test
+ void putRequiresTwoPathParams() {
+ when()
+ .put(ALICE)
+ .then()
+ .statusCode(HttpStatus.BAD_REQUEST_400)
+ .body(is(""));
+ }
+
+ @Test
+ void deleteMalformedForwardShouldReturnBadRequest() {
+ Map<String, Object> errors = when()
+ .delete("not-an-address" + SEPARATOR + "targets" + SEPARATOR + ALICE)
+ .then()
+ .statusCode(HttpStatus.BAD_REQUEST_400)
+ .contentType(ContentType.JSON)
+ .extract()
+ .body()
+ .jsonPath()
+ .getMap(".");
+
+ assertThat(errors)
+ .containsEntry("statusCode", HttpStatus.BAD_REQUEST_400)
+ .containsEntry("type", "InvalidArgument")
+ .containsEntry("message", "The forward is not an email address")
+ .containsEntry("cause", "Out of data at position 1 in 'not-an-address'");
+ }
+
+ @Test
+ void deleteMalformedAddressShouldReturnBadRequest() {
+ Map<String, Object> errors = when()
+ .delete(ALICE + SEPARATOR + "targets" + SEPARATOR + "not-an-address")
+ .then()
+ .statusCode(HttpStatus.BAD_REQUEST_400)
+ .contentType(ContentType.JSON)
+ .extract()
+ .body()
+ .jsonPath()
+ .getMap(".");
+
+ assertThat(errors)
+ .containsEntry("statusCode", HttpStatus.BAD_REQUEST_400)
+ .containsEntry("type", "InvalidArgument")
+ .containsEntry("message", "The forward is not an email address")
+ .containsEntry("cause", "Out of data at position 1 in 'not-an-address'");
+ }
+
+ @Test
+ void deleteRequiresTwoPathParams() {
+ when()
+ .delete(ALICE)
+ .then()
+ .statusCode(HttpStatus.BAD_REQUEST_400)
+ .body(is(""));
+ }
+
+ @Test
+ void putShouldReturnErrorWhenRecipientRewriteTableExceptionIsThrown() throws Exception {
+ doThrow(RecipientRewriteTableException.class)
+ .when(memoryRecipientRewriteTable)
+ .addForwardMapping(anyString(), any(), anyString());
+
+ when()
+ .put(ALICE + SEPARATOR + "targets" + SEPARATOR + BOB)
+ .then()
+ .statusCode(HttpStatus.INTERNAL_SERVER_ERROR_500)
+ .body(containsString("500 Internal Server Error"));
+ }
+
+ @Test
+ void putShouldReturnErrorWhenErrorMappingExceptionIsThrown() throws Exception {
+ doThrow(RecipientRewriteTable.ErrorMappingException.class)
+ .when(memoryRecipientRewriteTable)
+ .addForwardMapping(anyString(), any(), anyString());
+
+ when()
+ .put(ALICE + SEPARATOR + "targets" + SEPARATOR + BOB)
+ .then()
+ .statusCode(HttpStatus.INTERNAL_SERVER_ERROR_500)
+ .body(containsString("500 Internal Server Error"));
+ }
+
+ @Test
+ void putShouldReturnErrorWhenRuntimeExceptionIsThrown() throws Exception {
+ doThrow(RuntimeException.class)
+ .when(memoryRecipientRewriteTable)
+ .addForwardMapping(anyString(), any(), anyString());
+
+ when()
+ .put(ALICE + SEPARATOR + "targets" + SEPARATOR + BOB)
+ .then()
+ .statusCode(HttpStatus.INTERNAL_SERVER_ERROR_500)
+ .body(containsString("500 Internal Server Error"));
+ }
+
+ @Test
+ void getAllShouldReturnErrorWhenRecipientRewriteTableExceptionIsThrown() throws Exception {
+ doThrow(RecipientRewriteTableException.class)
+ .when(memoryRecipientRewriteTable)
+ .getAllMappings();
+
+ when()
+ .get()
+ .then()
+ .statusCode(HttpStatus.INTERNAL_SERVER_ERROR_500)
+ .body(containsString("500 Internal Server Error"));
+ }
+
+ @Test
+ void getAllShouldReturnErrorWhenErrorMappingExceptionIsThrown() throws Exception {
+ doThrow(RecipientRewriteTable.ErrorMappingException.class)
+ .when(memoryRecipientRewriteTable)
+ .getAllMappings();
+
+ when()
+ .get()
+ .then()
+ .statusCode(HttpStatus.INTERNAL_SERVER_ERROR_500)
+ .body(containsString("500 Internal Server Error"));
+ }
+
+ @Test
+ void getAllShouldReturnErrorWhenRuntimeExceptionIsThrown() throws Exception {
+ doThrow(RuntimeException.class)
+ .when(memoryRecipientRewriteTable)
+ .getAllMappings();
+
+ when()
+ .get()
+ .then()
+ .statusCode(HttpStatus.INTERNAL_SERVER_ERROR_500)
+ .body(containsString("500 Internal Server Error"));
+ }
+
+ @Test
+ void deleteShouldReturnErrorWhenRecipientRewriteTableExceptionIsThrown() throws Exception {
+ doThrow(RecipientRewriteTableException.class)
+ .when(memoryRecipientRewriteTable)
+ .removeForwardMapping(anyString(), any(), anyString());
+
+ when()
+ .delete(ALICE + SEPARATOR + "targets" + SEPARATOR + BOB)
+ .then()
+ .statusCode(HttpStatus.INTERNAL_SERVER_ERROR_500)
+ .body(containsString("500 Internal Server Error"));
+ }
+
+ @Test
+ void deleteShouldReturnErrorWhenErrorMappingExceptionIsThrown() throws Exception {
+ doThrow(RecipientRewriteTable.ErrorMappingException.class)
+ .when(memoryRecipientRewriteTable)
+ .removeForwardMapping(anyString(), any(), anyString());
+
+ when()
+ .delete(ALICE + SEPARATOR + "targets" + SEPARATOR + BOB)
+ .then()
+ .statusCode(HttpStatus.INTERNAL_SERVER_ERROR_500)
+ .body(containsString("500 Internal Server Error"));
+ }
+
+ @Test
+ void deleteShouldReturnErrorWhenRuntimeExceptionIsThrown() throws Exception {
+ doThrow(RuntimeException.class)
+ .when(memoryRecipientRewriteTable)
+ .removeForwardMapping(anyString(), any(), anyString());
+
+ when()
+ .delete(ALICE + SEPARATOR + "targets" + SEPARATOR + BOB)
+ .then()
+ .statusCode(HttpStatus.INTERNAL_SERVER_ERROR_500)
+ .body(containsString("500 Internal Server Error"));
+ }
+
+ @Test
+ void getShouldReturnErrorWhenRecipientRewriteTableExceptionIsThrown() throws Exception {
+ doThrow(RecipientRewriteTableException.class)
+ .when(memoryRecipientRewriteTable)
+ .getMappings(anyString(), any());
+
+ when()
+ .get(ALICE)
+ .then()
+ .statusCode(HttpStatus.INTERNAL_SERVER_ERROR_500)
+ .body(containsString("500 Internal Server Error"));
+ }
+
+ @Test
+ void getShouldReturnErrorWhenErrorMappingExceptionIsThrown() throws Exception {
+ doThrow(RecipientRewriteTable.ErrorMappingException.class)
+ .when(memoryRecipientRewriteTable)
+ .getMappings(anyString(), any());
+
+ when()
+ .get(ALICE)
+ .then()
+ .statusCode(HttpStatus.INTERNAL_SERVER_ERROR_500)
+ .body(containsString("500 Internal Server Error"));
+ }
+
+ @Test
+ void getShouldReturnErrorWhenRuntimeExceptionIsThrown() throws Exception {
+ doThrow(RuntimeException.class)
+ .when(memoryRecipientRewriteTable)
+ .getMappings(anyString(), any());
+
+ when()
+ .get(ALICE)
+ .then()
+ .statusCode(HttpStatus.INTERNAL_SERVER_ERROR_500)
+ .body(containsString("500 Internal Server Error"));
+ }
+ }
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[13/24] james-project git commit: JAMES-2366 Fix grammar mistake in
Cucumber specs
Posted by ad...@apache.org.
JAMES-2366 Fix grammar mistake in Cucumber specs
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/60299dfa
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/60299dfa
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/60299dfa
Branch: refs/heads/master
Commit: 60299dfaa90c7bbe9977ab1196706e25dad557d2
Parents: 3e97f94
Author: benwa <bt...@linagora.com>
Authored: Thu Apr 5 09:37:28 2018 +0700
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Apr 6 15:04:48 2018 +0200
----------------------------------------------------------------------
.../james/rrt/lib/RewriteTablesStepdefs.java | 2 +-
.../resources/cucumber/rewrite_tables.feature | 62 ++++++++++----------
2 files changed, 32 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/60299dfa/server/data/data-library/src/test/java/org/apache/james/rrt/lib/RewriteTablesStepdefs.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/RewriteTablesStepdefs.java b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/RewriteTablesStepdefs.java
index 44423d5..c274bc1 100644
--- a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/RewriteTablesStepdefs.java
+++ b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/RewriteTablesStepdefs.java
@@ -126,7 +126,7 @@ public class RewriteTablesStepdefs {
assertThat(rewriteTable.getMappings(user, Domain.of(domain))).isNullOrEmpty();
}
- @Then("mappings for user \"([^\"]*)\" at domain \"([^\"]*)\" should contains only \"([^\"]*)\"")
+ @Then("mappings for user \"([^\"]*)\" at domain \"([^\"]*)\" should contain only \"([^\"]*)\"")
public void assertMappingsForUser(String user, String domain, List<String> mappings) throws Throwable {
assertThat(rewriteTable.getMappings(user, Domain.of(domain)).asStrings()).containsOnlyElementsOf(mappings);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/60299dfa/server/data/data-library/src/test/resources/cucumber/rewrite_tables.feature
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/resources/cucumber/rewrite_tables.feature b/server/data/data-library/src/test/resources/cucumber/rewrite_tables.feature
index 9e66fc0..03d4c55 100644
--- a/server/data/data-library/src/test/resources/cucumber/rewrite_tables.feature
+++ b/server/data/data-library/src/test/resources/cucumber/rewrite_tables.feature
@@ -8,12 +8,12 @@ Feature: Rewrite Tables tests
Scenario: stored regexp mapping should be retrieved when one mapping matching
Given store "(.*)@localhost" regexp mapping for user "test" at domain "localhost"
- Then mappings for user "test" at domain "localhost" should contains only "regex:(.*)@localhost"
+ Then mappings for user "test" at domain "localhost" should contain only "regex:(.*)@localhost"
Scenario: stored regexp mapping should be retrieved when two mappings matching
Given store "(.*)@localhost" regexp mapping for user "test" at domain "localhost"
And store "(.+)@test" regexp mapping for user "test" at domain "localhost"
- Then mappings for user "test" at domain "localhost" should contains only "regex:(.*)@localhost, regex:(.+)@test"
+ Then mappings for user "test" at domain "localhost" should contain only "regex:(.*)@localhost, regex:(.+)@test"
Scenario: stored regexp mapping should not be retrieved by another user
Given store "(.*)@localhost" regexp mapping for user "test" at domain "localhost"
@@ -24,7 +24,7 @@ Feature: Rewrite Tables tests
Given store "(.*)@localhost" regexp mapping for user "test" at domain "localhost"
And store "(.+)@test" regexp mapping for user "test" at domain "localhost"
When user "test" at domain "localhost" removes a regexp mapping "(.+)@test"
- Then mappings for user "test" at domain "localhost" should contains only "regex:(.*)@localhost"
+ Then mappings for user "test" at domain "localhost" should contain only "regex:(.*)@localhost"
@readonly
Scenario: storing an invalid regexp mapping should not work
@@ -35,12 +35,12 @@ Feature: Rewrite Tables tests
Scenario: stored address mapping should be retrieved when one mapping matching
Given store "test@localhost2" address mapping for user "test" at domain "localhost"
- Then mappings for user "test" at domain "localhost" should contains only "test@localhost2"
+ Then mappings for user "test" at domain "localhost" should contain only "test@localhost2"
Scenario: stored address mapping should be retrieved when two mappings matching
Given store "test@localhost2" address mapping for user "test" at domain "localhost"
And store "test@james" address mapping for user "test" at domain "localhost"
- Then mappings for user "test" at domain "localhost" should contains only "test@localhost2, test@james"
+ Then mappings for user "test" at domain "localhost" should contain only "test@localhost2, test@james"
Scenario: stored address mapping should not be retrieved by another user
Given store "test@localhost2" address mapping for user "test" at domain "localhost"
@@ -51,7 +51,7 @@ Feature: Rewrite Tables tests
Given store "test@localhost2" address mapping for user "test" at domain "localhost"
And store "test@james" address mapping for user "test" at domain "localhost"
When user "test" at domain "localhost" removes a address mapping "test@james"
- Then mappings for user "test" at domain "localhost" should contains only "test@localhost2"
+ Then mappings for user "test" at domain "localhost" should contain only "test@localhost2"
# Error mapping
@@ -88,81 +88,81 @@ Feature: Rewrite Tables tests
Scenario: stored address mapping as wildcard should be retrieved by one user when one mapping matching
Given store "test@localhost" address mapping as wildcard for domain "localhost"
- Then mappings for user "user" at domain "localhost" should contains only "test@localhost"
+ Then mappings for user "user" at domain "localhost" should contain only "test@localhost"
Scenario: stored address mapping as wildcard should be retrieved by two users when one mapping matching
Given store "test@localhost" address mapping as wildcard for domain "localhost"
- Then mappings for user "user" at domain "localhost" should contains only "test@localhost"
- And mappings for user "user2" at domain "localhost" should contains only "test@localhost"
+ Then mappings for user "user" at domain "localhost" should contain only "test@localhost"
+ And mappings for user "user2" at domain "localhost" should contain only "test@localhost"
Scenario: direct mapping should override address mapping as wildcard
Given recursive mapping is disable
Given store "test@localhost" address mapping as wildcard for domain "localhost"
And store "mine@localhost" address mapping for user "user" at domain "localhost"
- Then mappings for user "user" at domain "localhost" should contains only "mine@localhost"
+ Then mappings for user "user" at domain "localhost" should contain only "mine@localhost"
Scenario: direct mapping should override address mapping as wildcard (reverse insertion order)
Given recursive mapping is disable
Given store "mine@localhost" address mapping for user "user" at domain "localhost"
And store "test@localhost" address mapping as wildcard for domain "localhost"
- Then mappings for user "user" at domain "localhost" should contains only "mine@localhost"
+ Then mappings for user "user" at domain "localhost" should contain only "mine@localhost"
Scenario: direct mapping should not override address mapping as wildcard when other user
Given store "test@localhost" address mapping as wildcard for domain "localhost"
And store "mine@localhost" address mapping for user "user" at domain "localhost"
- Then mappings for user "user2" at domain "localhost" should contains only "test@localhost"
+ Then mappings for user "user2" at domain "localhost" should contain only "test@localhost"
Scenario: direct mapping should be retrieved when removing address mapping as wildcard
Given store "test@localhost" address mapping as wildcard for domain "localhost"
And store "mine@localhost" address mapping for user "user" at domain "localhost"
When wildcard address mapping "test@localhost" at domain "localhost" is removed
- Then mappings for user "user" at domain "localhost" should contains only "mine@localhost"
+ Then mappings for user "user" at domain "localhost" should contain only "mine@localhost"
Scenario: stored address mappings as wildcard should be retrieved when two address mappings as wildcard
Given store "test@localhost" address mapping as wildcard for domain "localhost"
And store "test2@localhost" address mapping as wildcard for domain "localhost"
- Then mappings for user "user" at domain "localhost" should contains only "test@localhost, test2@localhost"
+ Then mappings for user "user" at domain "localhost" should contain only "test@localhost, test2@localhost"
# Alias mapping
Scenario: address mapping should be retrieved when searching with a domain alias
Given store "aliasdomain" alias domain mapping for domain "localhost"
- Then mappings for user "test" at domain "aliasdomain" should contains only "test@localhost"
+ Then mappings for user "test" at domain "aliasdomain" should contain only "test@localhost"
Scenario: address mapping should be retrieved when searching with a domain alias
Given store "test2@localhost" address mapping for user "test" at domain "localhost"
And store "aliasdomain" alias domain mapping for domain "localhost"
- Then mappings for user "test" at domain "aliasdomain" should contains only "test2@localhost"
+ Then mappings for user "test" at domain "aliasdomain" should contain only "test2@localhost"
Scenario: address mapping should be retrieved when searching with a domain alias (reverse insertion order)
Given store "aliasdomain" alias domain mapping for domain "localhost"
And store "test2@localhost" address mapping for user "test" at domain "localhost"
- Then mappings for user "test" at domain "aliasdomain" should contains only "test2@localhost"
+ Then mappings for user "test" at domain "aliasdomain" should contain only "test2@localhost"
Scenario: address mapping should be retrieved when searching with the correct domain and exists an alias domain
Given store "test2@localhost" address mapping for user "test" at domain "localhost"
And store "aliasdomain" alias domain mapping for domain "localhost"
- Then mappings for user "test" at domain "localhost" should contains only "test2@localhost"
+ Then mappings for user "test" at domain "localhost" should contain only "test2@localhost"
Scenario: wildcard address mapping should be retrieved when searching with a domain alias
Given store "wildcard@localhost" address mapping as wildcard for domain "localhost"
And store "aliasdomain" alias domain mapping for domain "localhost"
- Then mappings for user "test" at domain "aliasdomain" should contains only "wildcard@localhost"
+ Then mappings for user "test" at domain "aliasdomain" should contain only "wildcard@localhost"
Scenario: wildcard address mapping should be retrieved when searching with a domain and exists an alias domain
Given store "wildcard@localhost" address mapping as wildcard for domain "localhost"
And store "aliasdomain" alias domain mapping for domain "localhost"
- Then mappings for user "test" at domain "localhost" should contains only "wildcard@localhost"
+ Then mappings for user "test" at domain "localhost" should contain only "wildcard@localhost"
Scenario: both wildcard address mapping and default user address should be retrieved when wildcard address mapping on alias domain
Given store "wildcard@localhost" address mapping as wildcard for domain "aliasdomain"
And store "aliasdomain" alias domain mapping for domain "localhost"
- Then mappings for user "test" at domain "aliasdomain" should contains only "test@localhost, wildcard@localhost"
+ Then mappings for user "test" at domain "aliasdomain" should contain only "test@localhost, wildcard@localhost"
Scenario: both wildcard address mapping and default user address should be retrieved when wildcard address mapping on alias domain (reverse insertion order)
Given store "aliasdomain" alias domain mapping for domain "localhost"
And store "wildcard@localhost" address mapping as wildcard for domain "aliasdomain"
- Then mappings for user "test" at domain "aliasdomain" should contains only "test@localhost, wildcard@localhost"
+ Then mappings for user "test" at domain "aliasdomain" should contain only "test@localhost, wildcard@localhost"
Scenario: asking for a removed domain alias should fail
Given store "wildcard@localhost" address mapping as wildcard for domain "localhost"
@@ -176,7 +176,7 @@ Feature: Rewrite Tables tests
Given store "test2@localhost" address mapping for user "test" at domain "localhost"
And store "(.*)@localhost" regexp mapping for user "test" at domain "localhost"
And store "aliasdomain" alias domain mapping for domain "localhost"
- Then mappings for user "test" at domain "localhost" should contains only "test2@localhost, regex:(.*)@localhost"
+ Then mappings for user "test" at domain "localhost" should contain only "test2@localhost, regex:(.*)@localhost"
# Recursive mapping
@@ -184,20 +184,20 @@ Feature: Rewrite Tables tests
Given recursive mapping is disable
And store "user2@domain2" address mapping for user "user1" at domain "domain1"
And store "user3@domain3" address mapping for user "user2" at domain "domain2"
- Then mappings for user "user1" at domain "domain1" should contains only "user2@domain2"
+ Then mappings for user "user1" at domain "domain1" should contain only "user2@domain2"
Scenario: recursive mapping should work when two levels
Given recursive mapping is enable
And store "user2@domain2" address mapping for user "user1" at domain "domain1"
And store "user3@domain3" address mapping for user "user2" at domain "domain2"
- Then mappings for user "user1" at domain "domain1" should contains only "user3@domain3"
+ Then mappings for user "user1" at domain "domain1" should contain only "user3@domain3"
Scenario: recursive mapping should work when three levels
Given recursive mapping is enable
And store "user2@domain2" address mapping for user "user1" at domain "domain1"
And store "user3@domain3" address mapping for user "user2" at domain "domain2"
And store "user4@domain4" address mapping for user "user3" at domain "domain3"
- Then mappings for user "user1" at domain "domain1" should contains only "user4@domain4"
+ Then mappings for user "user1" at domain "domain1" should contain only "user4@domain4"
Scenario: recursive mapping should throw exception when a loop exists
Given recursive mapping is enable
@@ -212,24 +212,24 @@ Feature: Rewrite Tables tests
And store "user3@domain3" address mapping for user "user2" at domain "domain2"
And store "user4@domain4" address mapping for user "user3" at domain "domain3"
When user "user2" at domain "domain2" removes a address mapping "user3@domain3"
- Then mappings for user "user1" at domain "domain1" should contains only "user2@domain2"
+ Then mappings for user "user1" at domain "domain1" should contain only "user2@domain2"
Scenario: recursive mapping should work when three levels on alias domains
Given store "domain2" alias domain mapping for domain "domain1"
And store "domain3" alias domain mapping for domain "domain2"
And store "domain4" alias domain mapping for domain "domain3"
- Then mappings for user "test" at domain "domain4" should contains only "test@domain1"
+ Then mappings for user "test" at domain "domain4" should contain only "test@domain1"
# Forward mapping
Scenario: stored forward mapping should be retrieved when one mapping is matching
Given store "test@localhost2" forward mapping for user "test" at domain "localhost"
- Then mappings for user "test" at domain "localhost" should contains only "forward:test@localhost2"
+ Then mappings for user "test" at domain "localhost" should contain only "forward:test@localhost2"
Scenario: stored forward mapping should be retrieved when two mappings are matching
Given store "test@localhost2" forward mapping for user "test" at domain "localhost"
And store "test@james" forward mapping for user "test" at domain "localhost"
- Then mappings for user "test" at domain "localhost" should contains only "forward:test@localhost2, forward:test@james"
+ Then mappings for user "test" at domain "localhost" should contain only "forward:test@localhost2, forward:test@james"
Scenario: stored forward mapping should not be retrieved by another user
Given store "test@localhost2" forward mapping for user "test" at domain "localhost"
@@ -240,4 +240,4 @@ Feature: Rewrite Tables tests
Given store "test@localhost2" forward mapping for user "test" at domain "localhost"
And store "test@james" forward mapping for user "test" at domain "localhost"
When user "test" at domain "localhost" removes a forward mapping "test@james"
- Then mappings for user "test" at domain "localhost" should contains only "forward:test@localhost2"
\ No newline at end of file
+ Then mappings for user "test" at domain "localhost" should contain only "forward:test@localhost2"
\ 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
[15/24] james-project git commit: JAMES-2366 Factorize WebAdmin Test
configuration
Posted by ad...@apache.org.
JAMES-2366 Factorize WebAdmin Test configuration
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/77bb6b55
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/77bb6b55
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/77bb6b55
Branch: refs/heads/master
Commit: 77bb6b550d54c1832311242f471b088c1f0f2878
Parents: aca51fc
Author: benwa <bt...@linagora.com>
Authored: Thu Apr 5 16:23:53 2018 +0700
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Apr 6 15:04:49 2018 +0200
----------------------------------------------------------------------
.../test/java/org/apache/james/FixingGhostMailboxTest.java | 6 +-----
.../java/org/apache/james/mailets/TemporaryJamesServer.java | 3 +--
.../jmap/cassandra/CassandraForwardIntegrationTest.java | 8 +-------
.../james/jmap/memory/MemoryForwardIntegrationTest.java | 8 +-------
.../webadmin/integration/WebAdminConfigurationModule.java | 3 +--
.../org/apache/james/webadmin/WebAdminConfiguration.java | 7 +++++++
.../test/java/org/apache/james/webadmin/WebAdminUtils.java | 9 +--------
7 files changed, 13 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/77bb6b55/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
index 036ee10..5de81da 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
@@ -67,7 +67,6 @@ import org.apache.james.task.TaskManager;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.JmapGuiceProbe;
import org.apache.james.utils.WebAdminGuiceProbe;
-import org.apache.james.webadmin.RandomPortSupplier;
import org.apache.james.webadmin.WebAdminConfiguration;
import org.apache.james.webadmin.WebAdminUtils;
import org.apache.james.webadmin.routes.CassandraMailboxMergingRoutes;
@@ -127,10 +126,7 @@ public class FixingGhostMailboxTest {
public void setup() throws Throwable {
jmapServer = rule.jmapServer(cassandra.getModule(),
binder -> binder.bind(WebAdminConfiguration.class)
- .toInstance(WebAdminConfiguration.builder()
- .port(new RandomPortSupplier())
- .enabled()
- .build()));
+ .toInstance(WebAdminConfiguration.TEST_CONFIGURATION));
jmapServer.start();
webAdminProbe = jmapServer.getProbe(WebAdminGuiceProbe.class);
mailboxProbe = jmapServer.getProbe(MailboxProbeImpl.class);
http://git-wip-us.apache.org/repos/asf/james-project/blob/77bb6b55/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
index a621caa..2a6e737 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
@@ -41,7 +41,6 @@ import org.apache.james.mailets.configuration.SmtpConfiguration;
import org.apache.james.modules.TestJMAPServerModule;
import org.apache.james.utils.GuiceProbe;
import org.apache.james.webadmin.WebAdminConfiguration;
-import org.apache.james.webadmin.WebAdminUtils;
import org.junit.rules.TemporaryFolder;
import com.google.common.collect.ImmutableList;
@@ -141,7 +140,7 @@ public class TemporaryJamesServer {
.overrideWith(additionalModules)
.overrideWith(new TestJMAPServerModule(LIMIT_TO_3_MESSAGES))
.overrideWith(new TemporaryFilesystemModule(temporaryFolder))
- .overrideWith((binder) -> binder.bind(WebAdminConfiguration.class).toProvider(WebAdminUtils::webAdminConfigurationForTesting));
+ .overrideWith((binder) -> binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION));
jamesServer.start();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/77bb6b55/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraForwardIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraForwardIntegrationTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraForwardIntegrationTest.java
index 2630250..c0e1517 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraForwardIntegrationTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraForwardIntegrationTest.java
@@ -24,7 +24,6 @@ import org.apache.james.DockerCassandraRule;
import org.apache.james.GuiceJamesServer;
import org.apache.james.backends.cassandra.ContainerLifecycleConfiguration;
import org.apache.james.jmap.methods.integration.ForwardIntegrationTest;
-import org.apache.james.webadmin.RandomPortSupplier;
import org.apache.james.webadmin.WebAdminConfiguration;
import org.junit.ClassRule;
import org.junit.Rule;
@@ -47,12 +46,7 @@ public class CassandraForwardIntegrationTest extends ForwardIntegrationTest {
protected GuiceJamesServer createJmapServer() {
return rule.jmapServer(cassandra.getModule(),
binder -> binder.bind(WebAdminConfiguration.class)
- .toInstance(WebAdminConfiguration.builder()
- .enabled()
- .corsDisabled()
- .host("127.0.0.1")
- .port(new RandomPortSupplier())
- .build()));
+ .toInstance(WebAdminConfiguration.TEST_CONFIGURATION));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/77bb6b55/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryForwardIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryForwardIntegrationTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryForwardIntegrationTest.java
index 458e1e3..b1d64ee 100644
--- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryForwardIntegrationTest.java
+++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryForwardIntegrationTest.java
@@ -22,7 +22,6 @@ package org.apache.james.jmap.memory;
import org.apache.james.GuiceJamesServer;
import org.apache.james.MemoryJmapTestRule;
import org.apache.james.jmap.methods.integration.ForwardIntegrationTest;
-import org.apache.james.webadmin.RandomPortSupplier;
import org.apache.james.webadmin.WebAdminConfiguration;
import org.junit.Rule;
@@ -35,12 +34,7 @@ public class MemoryForwardIntegrationTest extends ForwardIntegrationTest {
protected GuiceJamesServer createJmapServer() {
return memoryJmap
.jmapServer(binder -> binder.bind(WebAdminConfiguration.class)
- .toInstance(WebAdminConfiguration.builder()
- .enabled()
- .corsDisabled()
- .host("127.0.0.1")
- .port(new RandomPortSupplier())
- .build()));
+ .toInstance(WebAdminConfiguration.TEST_CONFIGURATION));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/77bb6b55/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminConfigurationModule.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminConfigurationModule.java b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminConfigurationModule.java
index 8bcf260..f84810b 100644
--- a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminConfigurationModule.java
+++ b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminConfigurationModule.java
@@ -20,7 +20,6 @@
package org.apache.james.webadmin.integration;
import org.apache.james.webadmin.WebAdminConfiguration;
-import org.apache.james.webadmin.WebAdminUtils;
import com.google.inject.AbstractModule;
@@ -28,7 +27,7 @@ public class WebAdminConfigurationModule extends AbstractModule {
@Override
protected void configure() {
- bind(WebAdminConfiguration.class).toProvider(WebAdminUtils::webAdminConfigurationForTesting);
+ bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/77bb6b55/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminConfiguration.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminConfiguration.java b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminConfiguration.java
index 8712a4c..e4a90e9 100644
--- a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminConfiguration.java
+++ b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminConfiguration.java
@@ -36,6 +36,13 @@ public class WebAdminConfiguration {
.disabled()
.build();
+ public static final WebAdminConfiguration TEST_CONFIGURATION = WebAdminConfiguration.builder()
+ .enabled()
+ .corsDisabled()
+ .host("127.0.0.1")
+ .port(new RandomPortSupplier())
+ .build();
+
public static Builder builder() {
return new Builder();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/77bb6b55/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java
index 5b4e147..76862b4 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java
@@ -34,15 +34,8 @@ import com.jayway.restassured.http.ContentType;
public class WebAdminUtils {
- public static WebAdminConfiguration webAdminConfigurationForTesting() {
- return WebAdminConfiguration.builder()
- .enabled()
- .port(new RandomPortSupplier())
- .build();
- }
-
public static WebAdminServer createWebAdminServer(MetricFactory metricFactory, Routes... routes) throws IOException {
- return new WebAdminServer(webAdminConfigurationForTesting(),
+ return new WebAdminServer(WebAdminConfiguration.TEST_CONFIGURATION,
ImmutableSet.copyOf(routes),
new NoAuthenticationFilter(),
metricFactory);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[08/24] james-project git commit: JAMES-2366 Sanitize a bit
GroupRoutesTest
Posted by ad...@apache.org.
JAMES-2366 Sanitize a bit GroupRoutesTest
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ba306837
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ba306837
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ba306837
Branch: refs/heads/master
Commit: ba306837bffe7735ac18a0be5d675fda9fc602a2
Parents: 150663f
Author: benwa <bt...@linagora.com>
Authored: Mon Apr 2 10:08:32 2018 +0700
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Apr 6 15:04:48 2018 +0200
----------------------------------------------------------------------
.../apache/james/webadmin/routes/GroupsRoutesTest.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/ba306837/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
index acd0005..e412b44 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
@@ -81,8 +81,8 @@ class GroupsRoutesTest {
webAdminServer.await();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
- .setBasePath(GroupsRoutes.ROOT_PATH)
- .log(LogDetail.ALL)
+ .setBasePath("address/groups")
+ .log(LogDetail.METHOD)
.build();
}
@@ -120,7 +120,7 @@ class GroupsRoutesTest {
}
@Test
- void getGroupsShouldListExistingGroupsInOrder() {
+ void getGroupsShouldListExistingGroupsInAlphabeticOrder() {
given()
.put(GROUP2 + SEPARATOR + USER_A);
@@ -141,7 +141,7 @@ class GroupsRoutesTest {
}
@Test
- void getUnregisteredGroupShouldReturnNotFound() {
+ void getNotRegisteredGroupShouldReturnNotFound() {
Map<String, Object> errors = when()
.get("unknown@domain.travel")
.then()
@@ -318,7 +318,7 @@ class GroupsRoutesTest {
}
@Test
- void getGroupShouldReturnMembersInOrder() {
+ void getGroupShouldReturnMembersInAlphabeticOrder() {
given()
.put(GROUP1 + SEPARATOR + USER_B);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[04/24] james-project git commit: JAMES-2366 Handle Forward mappings
in RRT mailet
Posted by ad...@apache.org.
JAMES-2366 Handle Forward mappings in RRT mailet
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c9078f25
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c9078f25
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c9078f25
Branch: refs/heads/master
Commit: c9078f2569c6cef757f8e6104efb77732bc58164
Parents: d1b0a11
Author: Antoine Duprat <ad...@linagora.com>
Authored: Thu Mar 29 16:50:35 2018 +0200
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Apr 6 14:39:17 2018 +0200
----------------------------------------------------------------------
.../RecipientRewriteTableIntegrationTest.java | 69 +++++++++++++++++---
.../mailets/RecipientRewriteTableProcessor.java | 23 +++++--
2 files changed, 77 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9078f25/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
index c176fba..2268a78 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
@@ -25,6 +25,7 @@ import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP;
import static org.apache.james.mailets.configuration.Constants.PASSWORD;
import static org.apache.james.mailets.configuration.Constants.SMTP_PORT;
import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute;
+import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.probe.DataProbe;
import org.apache.james.utils.DataProbeImpl;
@@ -39,11 +40,16 @@ import org.junit.rules.TemporaryFolder;
public class RecipientRewriteTableIntegrationTest {
private static final String JAMES_ANOTHER_DOMAIN = "james.com";
- private static final String FROM = "fromUser@" + DEFAULT_DOMAIN;
- private static final String RECIPIENT = "touser@" + DEFAULT_DOMAIN;
- private static final String ANY_AT_JAMES = "any@" + DEFAULT_DOMAIN;
+ private static final String FROM_LOCAL_PART = "fromUser";
+ private static final String FROM = FROM_LOCAL_PART + "@" + DEFAULT_DOMAIN;
+ private static final String RECIPIENT_LOCAL_PART = "touser";
+ private static final String RECIPIENT = RECIPIENT_LOCAL_PART + "@" + DEFAULT_DOMAIN;
+ private static final String ANY_LOCAL_PART = "any";
+ private static final String ANY_AT_JAMES = ANY_LOCAL_PART + "@" + DEFAULT_DOMAIN;
private static final String OTHER_AT_JAMES = "other@" + DEFAULT_DOMAIN;
- private static final String ANY_AT_ANOTHER_DOMAIN = "any@" + JAMES_ANOTHER_DOMAIN;
+ private static final String ANY_AT_ANOTHER_DOMAIN = ANY_LOCAL_PART + "@" + JAMES_ANOTHER_DOMAIN;
+ private static final String GROUP_LOCAL_PART = "group";
+ private static final String GROUP = GROUP_LOCAL_PART + "@" + DEFAULT_DOMAIN;
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -75,8 +81,8 @@ public class RecipientRewriteTableIntegrationTest {
@Test
public void rrtServiceShouldDeliverEmailToMappingRecipients() throws Exception {
- dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, ANY_AT_JAMES);
- dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, OTHER_AT_JAMES);
+ dataProbe.addAddressMapping(RECIPIENT_LOCAL_PART, DEFAULT_DOMAIN, ANY_AT_JAMES);
+ dataProbe.addAddressMapping(RECIPIENT_LOCAL_PART, DEFAULT_DOMAIN, OTHER_AT_JAMES);
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.sendMessage(FROM, RECIPIENT)
@@ -86,16 +92,18 @@ public class RecipientRewriteTableIntegrationTest {
.login(ANY_AT_JAMES, PASSWORD)
.select(IMAPMessageReader.INBOX)
.awaitMessage(awaitAtMostOneMinute);
+ assertThat(imapMessageReader.readFirstMessage()).isNotNull();
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(OTHER_AT_JAMES, PASSWORD)
.select(IMAPMessageReader.INBOX)
.awaitMessage(awaitAtMostOneMinute);
+ assertThat(imapMessageReader.readFirstMessage()).isNotNull();
}
@Test
public void rrtServiceShouldNotDeliverEmailToRecipientWhenHaveMappingRecipients() throws Exception {
- dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, ANY_AT_JAMES);
- dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, OTHER_AT_JAMES);
+ dataProbe.addAddressMapping(RECIPIENT_LOCAL_PART, DEFAULT_DOMAIN, ANY_AT_JAMES);
+ dataProbe.addAddressMapping(RECIPIENT_LOCAL_PART, DEFAULT_DOMAIN, OTHER_AT_JAMES);
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.sendMessage(FROM, RECIPIENT)
@@ -105,6 +113,7 @@ public class RecipientRewriteTableIntegrationTest {
.login(RECIPIENT, PASSWORD)
.select(IMAPMessageReader.INBOX)
.awaitNoMessage(awaitAtMostOneMinute);
+ assertThat(imapMessageReader.readFirstMessage()).isNotNull();
}
@Test
@@ -113,8 +122,8 @@ public class RecipientRewriteTableIntegrationTest {
String localUser = nonDomainUser + "@" + dataProbe.getDefaultDomain();
dataProbe.addUser(localUser, PASSWORD);
- dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, nonDomainUser);
- dataProbe.addAddressMapping("touser", DEFAULT_DOMAIN, OTHER_AT_JAMES);
+ dataProbe.addAddressMapping(RECIPIENT_LOCAL_PART, DEFAULT_DOMAIN, nonDomainUser);
+ dataProbe.addAddressMapping(RECIPIENT_LOCAL_PART, DEFAULT_DOMAIN, OTHER_AT_JAMES);
messageSender.connect(LOCALHOST_IP, SMTP_PORT)
.sendMessage(FROM, RECIPIENT)
@@ -124,10 +133,12 @@ public class RecipientRewriteTableIntegrationTest {
.login(localUser, PASSWORD)
.select(IMAPMessageReader.INBOX)
.awaitMessage(awaitAtMostOneMinute);
+ assertThat(imapMessageReader.readFirstMessage()).isNotNull();
imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
.login(OTHER_AT_JAMES, PASSWORD)
.select(IMAPMessageReader.INBOX)
.awaitMessage(awaitAtMostOneMinute);
+ assertThat(imapMessageReader.readFirstMessage()).isNotNull();
}
@Test
@@ -143,6 +154,7 @@ public class RecipientRewriteTableIntegrationTest {
.login(ANY_AT_ANOTHER_DOMAIN, PASSWORD)
.select(IMAPMessageReader.INBOX)
.awaitMessage(awaitAtMostOneMinute);
+ assertThat(imapMessageReader.readFirstMessage()).isNotNull();
}
@Test
@@ -158,6 +170,43 @@ public class RecipientRewriteTableIntegrationTest {
.login(ANY_AT_JAMES, PASSWORD)
.select(IMAPMessageReader.INBOX)
.awaitNoMessage(awaitAtMostOneMinute);
+ assertThat(imapMessageReader.readFirstMessage()).isNotNull();
}
+ @Test
+ public void rrtServiceShouldDeliverEmailToForwardRecipients() throws Exception {
+ dataProbe.addForwardMapping(RECIPIENT_LOCAL_PART, DEFAULT_DOMAIN, ANY_AT_JAMES);
+ dataProbe.addForwardMapping(RECIPIENT_LOCAL_PART, DEFAULT_DOMAIN, OTHER_AT_JAMES);
+
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(FROM, RECIPIENT)
+ .awaitSent(awaitAtMostOneMinute);
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(ANY_AT_JAMES, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(awaitAtMostOneMinute);
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(OTHER_AT_JAMES, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(awaitAtMostOneMinute);
+ assertThat(imapMessageReader.readFirstMessage()).isNotNull();
+ }
+
+ @Test
+ public void rrtServiceShouldFollowForwardWhenSendingToAGroup() throws Exception {
+ dataProbe.addAddressMapping(GROUP_LOCAL_PART, DEFAULT_DOMAIN, ANY_AT_JAMES);
+
+ dataProbe.addForwardMapping(ANY_LOCAL_PART, DEFAULT_DOMAIN, OTHER_AT_JAMES);
+
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(FROM, GROUP)
+ .awaitSent(awaitAtMostOneMinute);
+
+ imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT)
+ .login(OTHER_AT_JAMES, PASSWORD)
+ .select(IMAPMessageReader.INBOX)
+ .awaitMessage(awaitAtMostOneMinute);
+ assertThat(imapMessageReader.readFirstMessage()).isNotNull();
+ }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9078f25/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java
index 76961e4..c1bc666 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java
@@ -36,6 +36,7 @@ import org.apache.james.rrt.api.RecipientRewriteTable;
import org.apache.james.rrt.api.RecipientRewriteTable.ErrorMappingException;
import org.apache.james.rrt.api.RecipientRewriteTableException;
import org.apache.james.rrt.lib.Mapping;
+import org.apache.james.rrt.lib.Mapping.Type;
import org.apache.james.rrt.lib.Mappings;
import org.apache.james.util.MemoizedSupplier;
import org.apache.james.util.OptionalUtils;
@@ -105,14 +106,26 @@ public class RecipientRewriteTableProcessor {
private final Supplier<Domain> defaultDomainSupplier;
private static final Function<Mapping, Optional<MailAddress>> mailAddressFromMapping =
- addressMapping -> {
- try {
- return Optional.of(new MailAddress(addressMapping.asString()));
- } catch (AddressException e) {
- return Optional.empty();
+ mapping -> {
+ Type type = mapping.getType();
+ switch (type) {
+ case Address:
+ return parseMappingToMailAddress(mapping.asString());
+ case Forward:
+ return parseMappingToMailAddress(type.withoutPrefix(mapping.asString()));
+ default:
+ return Optional.empty();
}
};
+ private static Optional<MailAddress> parseMappingToMailAddress(String mapping) {
+ try {
+ return Optional.of(new MailAddress(mapping));
+ } catch (AddressException e) {
+ return Optional.empty();
+ }
+ }
+
public RecipientRewriteTableProcessor(RecipientRewriteTable virtualTableStore, DomainList domainList, MailetContext mailetContext) {
this.virtualTableStore = virtualTableStore;
this.mailetContext = mailetContext;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[02/24] james-project git commit: JAMES-2366 Add Forward mapping
handling in DataProbe
Posted by ad...@apache.org.
JAMES-2366 Add Forward mapping handling in DataProbe
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/71a465ef
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/71a465ef
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/71a465ef
Branch: refs/heads/master
Commit: 71a465ef8b1b8908a35a4036a81775f1dd247a14
Parents: fd6f10a
Author: Antoine Duprat <ad...@linagora.com>
Authored: Thu Mar 29 11:24:54 2018 +0200
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Apr 6 14:39:16 2018 +0200
----------------------------------------------------------------------
.../james/cli/probe/impl/JmxDataProbe.java | 22 ++++++++++++++++++
.../org/apache/james/utils/DataProbeImpl.java | 10 ++++++++
.../java/org/apache/james/probe/DataProbe.java | 3 +++
.../RecipientRewriteTableManagementMBean.java | 24 ++++++++++++++++++++
.../lib/RecipientRewriteTableManagement.java | 18 +++++++++++++++
5 files changed, 77 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/71a465ef/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java
----------------------------------------------------------------------
diff --git a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java
index 631e11b..4e24f18 100644
--- a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java
+++ b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java
@@ -237,4 +237,26 @@ public class JmxDataProbe implements DataProbe, JmxProbe {
virtualUserTableProxy.addDomainMapping(aliasDomain, deliveryDomain);
}
}
+
+ @Override
+ public void addForwardMapping(String user, String domain, String address) throws Exception {
+ try (Closeable closeable =
+ MDCBuilder.create()
+ .addContext(MDCBuilder.PROTOCOL, JMX)
+ .addContext(MDCBuilder.ACTION, "addForwardMapping")
+ .build()) {
+ virtualUserTableProxy.addForwardMapping(user, domain, address);
+ }
+ }
+
+ @Override
+ public void removeForwardMapping(String user, String domain, String address) throws Exception {
+ try (Closeable closeable =
+ MDCBuilder.create()
+ .addContext(MDCBuilder.PROTOCOL, JMX)
+ .addContext(MDCBuilder.ACTION, "removeForwardMapping")
+ .build()) {
+ virtualUserTableProxy.removeForwardMapping(user, domain, address);
+ }
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/71a465ef/server/container/guice/guice-common/src/main/java/org/apache/james/utils/DataProbeImpl.java
----------------------------------------------------------------------
diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/DataProbeImpl.java b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/DataProbeImpl.java
index b911dc9..1e70007 100644
--- a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/DataProbeImpl.java
+++ b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/DataProbeImpl.java
@@ -133,4 +133,14 @@ public class DataProbeImpl implements GuiceProbe, DataProbe {
public void addDomainAliasMapping(String aliasDomain, String deliveryDomain) throws Exception {
recipientRewriteTable.addAliasDomainMapping(Domain.of(aliasDomain), Domain.of(deliveryDomain));
}
+
+ @Override
+ public void addForwardMapping(String user, String domain, String address) throws Exception {
+ recipientRewriteTable.addForwardMapping(user, Domain.of(domain), address);
+ }
+
+ @Override
+ public void removeForwardMapping(String user, String domain, String address) throws Exception {
+ recipientRewriteTable.removeForwardMapping(user, Domain.of(domain), address);
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/71a465ef/server/data/data-api/src/main/java/org/apache/james/probe/DataProbe.java
----------------------------------------------------------------------
diff --git a/server/data/data-api/src/main/java/org/apache/james/probe/DataProbe.java b/server/data/data-api/src/main/java/org/apache/james/probe/DataProbe.java
index 31488d7..2dc6f8c 100644
--- a/server/data/data-api/src/main/java/org/apache/james/probe/DataProbe.java
+++ b/server/data/data-api/src/main/java/org/apache/james/probe/DataProbe.java
@@ -58,4 +58,7 @@ public interface DataProbe {
void addDomainAliasMapping(String aliasDomain, String deliveryDomain) throws Exception;
+ void addForwardMapping(String toUser, String toDomain, String fromAddress) throws Exception;
+
+ void removeForwardMapping(String toUser, String toDomain, String fromAddress) throws Exception;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/71a465ef/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTableManagementMBean.java
----------------------------------------------------------------------
diff --git a/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTableManagementMBean.java b/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTableManagementMBean.java
index 19def77..dec0e4d 100644
--- a/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTableManagementMBean.java
+++ b/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTableManagementMBean.java
@@ -187,4 +187,28 @@ public interface RecipientRewriteTableManagementMBean {
* If an error occurred
*/
Map<String, Mappings> getAllMappings() throws Exception;
+
+ /***
+ * Add forward mapping
+ *
+ * @param toUser
+ * the username part of the mail address destination defined for this forward.
+ * @param toDomain
+ * the domain part of the mail address destination defined for this forward.
+ * @param fromAddress The base address of the forward. Mails for this address will be sent to the added forward destination.
+ * @throws Exception If an error occurred
+ */
+ void addForwardMapping(String user, String domain, String address) throws Exception;
+
+ /**
+ * Remove forward mapping
+ *
+ * @param toUser
+ * the username part of the mail address destination defined for this forward.
+ * @param toDomain
+ * the domain part of the mail address destination defined for this forward.
+ * @param fromAddress The base address of the forward. Mails for this address will no more sent to the removed forward destination.
+ * @throws Exception If an error occurred
+ */
+ void removeForwardMapping(String toUser, String toDomain, String fromAddress) throws Exception;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/71a465ef/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java
index 7e22a3e..57c7346 100644
--- a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java
+++ b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java
@@ -155,4 +155,22 @@ public class RecipientRewriteTableManagement extends StandardMBean implements Re
}
}
+ @Override
+ public void addForwardMapping(String user, String domain, String address) throws Exception {
+ try {
+ rrt.addForwardMapping(user, Domain.of(domain), address);
+ } catch (RecipientRewriteTableException e) {
+ throw new Exception(e.getMessage());
+ }
+ }
+
+ @Override
+ public void removeForwardMapping(String user, String domain, String address) throws Exception {
+ try {
+ rrt.removeForwardMapping(user, Domain.of(domain), address);
+ } catch (RecipientRewriteTableException e) {
+ throw new Exception(e.getMessage());
+ }
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[19/24] james-project git commit: JAMES-2366 Factorize baseUri in
JMAP integration tests
Posted by ad...@apache.org.
JAMES-2366 Factorize baseUri in JMAP integration tests
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a2f301f4
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a2f301f4
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a2f301f4
Branch: refs/heads/master
Commit: a2f301f454848285457a55bbed79dfef01f40522
Parents: fa564d2
Author: benwa <bt...@linagora.com>
Authored: Thu Apr 5 16:48:03 2018 +0700
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Apr 6 15:04:49 2018 +0200
----------------------------------------------------------------------
.../java/org/apache/james/ESReporterTest.java | 14 ++------
.../apache/james/FixingGhostMailboxTest.java | 15 ++------
.../org/apache/james/jmap/JmapURIBuilder.java | 37 ++++++++++++++++++++
.../org/apache/james/jmap/ProvisioningTest.java | 16 +++------
.../james/jmap/VacationIntegrationTest.java | 37 ++++++++------------
.../integration/ForwardIntegrationTest.java | 30 ++++++----------
.../integration/GetMailboxesMethodTest.java | 15 ++------
.../integration/GetMessageListMethodTest.java | 17 +++------
.../integration/GetVacationResponseTest.java | 16 ++-------
.../methods/integration/SendMDNMethodTest.java | 18 +++-------
.../integration/SetMailboxesMethodTest.java | 17 ++-------
.../integration/SetVacationResponseTest.java | 16 ++-------
.../integration/SpamAssassinContract.java | 15 ++------
.../integration/cucumber/DownloadStepdefs.java | 29 +++++++--------
.../integration/cucumber/HttpClient.java | 4 ++-
.../integration/cucumber/MainStepdefs.java | 12 -------
.../integration/cucumber/UploadStepdefs.java | 5 +--
.../integration/cucumber/UserStepdefs.java | 6 ++--
18 files changed, 119 insertions(+), 200 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/a2f301f4/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java
index 03eb38b..a020a49 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java
@@ -22,6 +22,8 @@ import static com.jayway.awaitility.Awaitility.await;
import static com.jayway.restassured.RestAssured.given;
import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
+import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import java.net.InetAddress;
import java.nio.charset.StandardCharsets;
@@ -31,8 +33,6 @@ import java.util.TimerTask;
import java.util.stream.Collectors;
import org.apache.commons.net.imap.IMAPClient;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.james.jmap.HttpJmapAuthentication;
import org.apache.james.jmap.api.access.AccessToken;
import org.apache.james.modules.TestESMetricReporterModule;
import org.apache.james.utils.DataProbeImpl;
@@ -87,19 +87,11 @@ public class ESReporterTest {
.setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
.setPort(server.getProbe(JmapGuiceProbe.class).getJmapPort())
.build();
- accessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), USERNAME, PASSWORD);
+ accessToken = authenticateJamesUser(baseUri(server), USERNAME, PASSWORD);
timer = new Timer();
}
- private URIBuilder baseUri() {
- return new URIBuilder()
- .setScheme("http")
- .setHost("localhost")
- .setPort(server.getProbe(JmapGuiceProbe.class).getJmapPort())
- .setCharset(StandardCharsets.UTF_8);
- }
-
@After
public void tearDown() throws Exception {
timer.cancel();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a2f301f4/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
index 5de81da..f5d30e3 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
@@ -25,6 +25,8 @@ import static com.jayway.restassured.RestAssured.given;
import static com.jayway.restassured.RestAssured.with;
import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
+import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsInAnyOrder;
@@ -41,10 +43,8 @@ import java.util.Date;
import javax.mail.Flags;
-import org.apache.http.client.utils.URIBuilder;
import org.apache.james.backends.cassandra.ContainerLifecycleConfiguration;
import org.apache.james.backends.cassandra.init.CassandraTypesProvider;
-import org.apache.james.jmap.HttpJmapAuthentication;
import org.apache.james.jmap.api.access.AccessToken;
import org.apache.james.mailbox.cassandra.mail.task.MailboxMergingTask;
import org.apache.james.mailbox.cassandra.mail.utils.MailboxBaseTupleUtil;
@@ -151,7 +151,7 @@ public class FixingGhostMailboxTest {
dataProbe.addDomain(domain);
dataProbe.addUser(alice, alicePassword);
dataProbe.addUser(bob, "bobSecret");
- accessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), alice, alicePassword);
+ accessToken = authenticateJamesUser(baseUri(jmapServer), alice, alicePassword);
session = Cluster.builder()
.addContactPoint(cassandra.getIp())
@@ -198,15 +198,6 @@ public class FixingGhostMailboxTest {
return new ByteArrayInputStream("Subject: toto\r\n\r\ncontent".getBytes(StandardCharsets.UTF_8));
}
- private URIBuilder baseUri() {
- return new URIBuilder()
- .setScheme("http")
- .setHost("localhost")
- .setPort(jmapServer.getProbe(JmapGuiceProbe.class)
- .getJmapPort())
- .setCharset(Charsets.UTF_8);
- }
-
@After
public void teardown() {
jmapServer.stop();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a2f301f4/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapURIBuilder.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapURIBuilder.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapURIBuilder.java
new file mode 100644
index 0000000..a966ac4
--- /dev/null
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapURIBuilder.java
@@ -0,0 +1,37 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+package org.apache.james.jmap;
+
+import java.nio.charset.StandardCharsets;
+
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.james.GuiceJamesServer;
+import org.apache.james.utils.JmapGuiceProbe;
+
+public class JmapURIBuilder {
+
+ public static URIBuilder baseUri(GuiceJamesServer jamesServer) {
+ return new URIBuilder()
+ .setScheme("http")
+ .setHost("localhost")
+ .setPort(jamesServer.getProbe(JmapGuiceProbe.class)
+ .getJmapPort())
+ .setCharset(StandardCharsets.UTF_8);
+ }
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a2f301f4/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java
index fdce82a..d3bc3c9 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java
@@ -21,16 +21,16 @@ package org.apache.james.jmap;
import static com.jayway.restassured.RestAssured.given;
import static com.jayway.restassured.RestAssured.with;
+import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
+import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasItems;
import static org.hamcrest.Matchers.hasSize;
-import java.nio.charset.StandardCharsets;
import java.util.concurrent.TimeUnit;
-import org.apache.http.client.utils.URIBuilder;
import org.apache.james.GuiceJamesServer;
import org.apache.james.mailbox.DefaultMailboxes;
import org.apache.james.modules.MailboxProbeImpl;
@@ -74,7 +74,7 @@ public abstract class ProvisioningTest {
@Test
public void provisionMailboxesShouldNotDuplicateMailboxByName() throws Exception {
- String token = HttpJmapAuthentication.authenticateJamesUser(baseUri(), USER, PASSWORD).serialize();
+ String token = authenticateJamesUser(baseUri(jmapServer), USER, PASSWORD).serialize();
boolean termination = new ConcurrentTestRunner(10, 1,
(a, b) -> with()
@@ -100,7 +100,7 @@ public abstract class ProvisioningTest {
@Test
public void provisionMailboxesShouldSubscribeToThem() throws Exception {
- String token = HttpJmapAuthentication.authenticateJamesUser(baseUri(), USER, PASSWORD).serialize();
+ String token = authenticateJamesUser(baseUri(jmapServer), USER, PASSWORD).serialize();
with()
.header("Authorization", token)
@@ -111,12 +111,4 @@ public abstract class ProvisioningTest {
.listSubscriptions(USER))
.containsAll(DefaultMailboxes.DEFAULT_MAILBOXES);
}
-
- private URIBuilder baseUri() {
- return new URIBuilder()
- .setScheme("http")
- .setHost("localhost")
- .setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort())
- .setCharset(StandardCharsets.UTF_8);
- }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a2f301f4/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
index fd02e35..ffed249 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
@@ -21,18 +21,18 @@ package org.apache.james.jmap;
import static com.jayway.restassured.RestAssured.given;
import static com.jayway.restassured.RestAssured.with;
+import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
+import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.calmlyAwait;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
-import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-import org.apache.http.client.utils.URIBuilder;
import org.apache.james.GuiceJamesServer;
import org.apache.james.jmap.api.access.AccessToken;
import org.apache.james.jmap.api.vacation.AccountId;
@@ -93,15 +93,6 @@ public abstract class VacationIntegrationTest {
.build();
}
- private URIBuilder baseUri() {
- return new URIBuilder()
- .setScheme("http")
- .setHost("localhost")
- .setPort(guiceJamesServer.getProbe(JmapGuiceProbe.class)
- .getJmapPort())
- .setCharset(StandardCharsets.UTF_8);
- }
-
@After
public void teardown() {
guiceJamesServer.stop();
@@ -117,8 +108,8 @@ public abstract class VacationIntegrationTest {
*/
// Given
- AccessToken user1AccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), USER_1, PASSWORD);
- AccessToken user2AccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), USER_2, PASSWORD);
+ AccessToken user1AccessToken = authenticateJamesUser(baseUri(guiceJamesServer), USER_1, PASSWORD);
+ AccessToken user2AccessToken = authenticateJamesUser(baseUri(guiceJamesServer), USER_2, PASSWORD);
// User 1 benw@mydomain.tld sets a Vacation on its account
setVacationResponse(user1AccessToken);
@@ -139,8 +130,8 @@ public abstract class VacationIntegrationTest {
@Test
public void jmapVacationShouldGenerateAReplyEvenWhenNoText() throws Exception {
// Given
- AccessToken user1AccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), USER_1, PASSWORD);
- AccessToken user2AccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), USER_2, PASSWORD);
+ AccessToken user1AccessToken = authenticateJamesUser(baseUri(guiceJamesServer), USER_1, PASSWORD);
+ AccessToken user2AccessToken = authenticateJamesUser(baseUri(guiceJamesServer), USER_2, PASSWORD);
jmapGuiceProbe.modifyVacation(
AccountId.fromString(USER_1),
VacationPatch.builder()
@@ -163,8 +154,8 @@ public abstract class VacationIntegrationTest {
@Test
public void jmapVacationShouldHaveSupportForHtmlMail() throws Exception {
// Given
- AccessToken user1AccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), USER_1, PASSWORD);
- AccessToken user2AccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), USER_2, PASSWORD);
+ AccessToken user1AccessToken = authenticateJamesUser(baseUri(guiceJamesServer), USER_1, PASSWORD);
+ AccessToken user2AccessToken = authenticateJamesUser(baseUri(guiceJamesServer), USER_2, PASSWORD);
setHtmlVacationResponse(user1AccessToken);
// When
@@ -187,8 +178,8 @@ public abstract class VacationIntegrationTest {
*/
// Given
- AccessToken user1AccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), USER_1, PASSWORD);
- AccessToken user2AccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), USER_2, PASSWORD);
+ AccessToken user1AccessToken = authenticateJamesUser(baseUri(guiceJamesServer), USER_1, PASSWORD);
+ AccessToken user2AccessToken = authenticateJamesUser(baseUri(guiceJamesServer), USER_2, PASSWORD);
// When
// User 2 matthieu@mydomain.tld sends User 1 a mail
@@ -228,8 +219,8 @@ public abstract class VacationIntegrationTest {
*/
// Given
- AccessToken user1AccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), USER_1, PASSWORD);
- AccessToken user2AccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), USER_2, PASSWORD);
+ AccessToken user1AccessToken = authenticateJamesUser(baseUri(guiceJamesServer), USER_1, PASSWORD);
+ AccessToken user2AccessToken = authenticateJamesUser(baseUri(guiceJamesServer), USER_2, PASSWORD);
// User 1 benw@mydomain.tld sets a Vacation on its account
setVacationResponse(user1AccessToken);
@@ -259,8 +250,8 @@ public abstract class VacationIntegrationTest {
*/
// Given
- AccessToken user1AccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), USER_1, PASSWORD);
- AccessToken user2AccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), USER_2, PASSWORD);
+ AccessToken user1AccessToken = authenticateJamesUser(baseUri(guiceJamesServer), USER_1, PASSWORD);
+ AccessToken user2AccessToken = authenticateJamesUser(baseUri(guiceJamesServer), USER_2, PASSWORD);
// User 1 benw@mydomain.tld sets a Vacation on its account
setVacationResponse(user1AccessToken);
// User 2 matthieu@mydomain.tld sends User 1 a mail
http://git-wip-us.apache.org/repos/asf/james-project/blob/a2f301f4/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
index 7f8f047..92d02b6 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
@@ -21,19 +21,18 @@ package org.apache.james.jmap.methods.integration;
import static com.jayway.restassured.RestAssured.given;
import static com.jayway.restassured.RestAssured.with;
+import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
+import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.calmlyAwait;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
-import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-import org.apache.http.client.utils.URIBuilder;
import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.HttpJmapAuthentication;
import org.apache.james.jmap.api.access.AccessToken;
import org.apache.james.mailbox.Role;
import org.apache.james.probe.DataProbe;
@@ -96,7 +95,7 @@ public abstract class ForwardIntegrationTest {
public void messageShouldBeForwardedWhenDefinedInRESTAPI() {
webAdminApi.put(String.format("/address/forwards/%s/targets/%s", ALICE, BOB));
- AccessToken cedricAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), CEDRIC, CEDRIC_PASSWORD);
+ AccessToken cedricAccessToken = authenticateJamesUser(baseUri(jmapServer), CEDRIC, CEDRIC_PASSWORD);
String messageCreationId = "creationId1337";
String requestBody = "[" +
" [" +
@@ -123,7 +122,7 @@ public abstract class ForwardIntegrationTest {
.body(requestBody)
.post("/jmap");
- AccessToken bobAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), BOB, BOB_PASSWORD);
+ AccessToken bobAccessToken = authenticateJamesUser(baseUri(jmapServer), BOB, BOB_PASSWORD);
calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInRecipientsMailboxes(bobAccessToken));
given()
.header("Authorization", bobAccessToken.serialize())
@@ -142,8 +141,8 @@ public abstract class ForwardIntegrationTest {
webAdminApi.put(String.format("/address/forwards/%s/targets/%s", ALICE, BOB));
webAdminApi.put(String.format("/address/forwards/%s/targets/%s", ALICE, ALICE));
- AccessToken cedricAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), CEDRIC, CEDRIC_PASSWORD);
- AccessToken aliceAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), ALICE, ALICE_PASSWORD);
+ AccessToken cedricAccessToken = authenticateJamesUser(baseUri(jmapServer), CEDRIC, CEDRIC_PASSWORD);
+ AccessToken aliceAccessToken = authenticateJamesUser(baseUri(jmapServer), ALICE, ALICE_PASSWORD);
String messageCreationId = "creationId1337";
String requestBody = "[" +
" [" +
@@ -170,7 +169,7 @@ public abstract class ForwardIntegrationTest {
.body(requestBody)
.post("/jmap");
- AccessToken bobAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), BOB, BOB_PASSWORD);
+ AccessToken bobAccessToken = authenticateJamesUser(baseUri(jmapServer), BOB, BOB_PASSWORD);
calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInRecipientsMailboxes(bobAccessToken));
given()
.header("Authorization", bobAccessToken.serialize())
@@ -199,8 +198,8 @@ public abstract class ForwardIntegrationTest {
public void baseRecipientShouldNotReceiveEmailOnDefaultForward() {
webAdminApi.put(String.format("/address/forwards/%s/targets/%s", ALICE, BOB));
- AccessToken cedricAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), CEDRIC, CEDRIC_PASSWORD);
- AccessToken aliceAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), ALICE, ALICE_PASSWORD);
+ AccessToken cedricAccessToken = authenticateJamesUser(baseUri(jmapServer), CEDRIC, CEDRIC_PASSWORD);
+ AccessToken aliceAccessToken = authenticateJamesUser(baseUri(jmapServer), ALICE, ALICE_PASSWORD);
String messageCreationId = "creationId1337";
String requestBody = "[" +
" [" +
@@ -227,7 +226,7 @@ public abstract class ForwardIntegrationTest {
.body(requestBody)
.post("/jmap");
- AccessToken bobAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), BOB, BOB_PASSWORD);
+ AccessToken bobAccessToken = authenticateJamesUser(baseUri(jmapServer), BOB, BOB_PASSWORD);
calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInRecipientsMailboxes(bobAccessToken));
given()
@@ -242,15 +241,6 @@ public abstract class ForwardIntegrationTest {
.body(ARGUMENTS + ".messageIds", hasSize(0));
}
- private URIBuilder baseUri() {
- return new URIBuilder()
- .setScheme("http")
- .setHost("localhost")
- .setPort(jmapServer.getProbe(JmapGuiceProbe.class)
- .getJmapPort())
- .setCharset(StandardCharsets.UTF_8);
- }
-
private String getOutboxId(AccessToken accessToken) {
return getMailboxId(accessToken, Role.OUTBOX);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a2f301f4/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
index e9506cf..74a8f53 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
@@ -20,6 +20,8 @@
package org.apache.james.jmap.methods.integration;
import static com.jayway.restassured.RestAssured.given;
+import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
+import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.empty;
@@ -44,9 +46,7 @@ import java.util.Optional;
import javax.mail.Flags;
-import org.apache.http.client.utils.URIBuilder;
import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.HttpJmapAuthentication;
import org.apache.james.jmap.api.access.AccessToken;
import org.apache.james.jmap.model.mailbox.MailboxNamespace;
import org.apache.james.mailbox.DefaultMailboxes;
@@ -121,16 +121,7 @@ public abstract class GetMailboxesMethodTest {
dataProbe.addDomain(domain);
dataProbe.addUser(alice, alicePassword);
dataProbe.addUser(bob, "bobSecret");
- accessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), alice, alicePassword);
- }
-
- private URIBuilder baseUri() {
- return new URIBuilder()
- .setScheme("http")
- .setHost("localhost")
- .setPort(jmapServer.getProbe(JmapGuiceProbe.class)
- .getJmapPort())
- .setCharset(StandardCharsets.UTF_8);
+ accessToken = authenticateJamesUser(baseUri(jmapServer), alice, alicePassword);
}
@After
http://git-wip-us.apache.org/repos/asf/james-project/blob/a2f301f4/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
index f33ca0d..5eff994 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
@@ -20,6 +20,8 @@
package org.apache.james.jmap.methods.integration;
import static com.jayway.restassured.RestAssured.given;
+import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
+import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.contains;
@@ -38,9 +40,7 @@ import java.util.Date;
import javax.mail.Flags;
-import org.apache.http.client.utils.URIBuilder;
import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.HttpJmapAuthentication;
import org.apache.james.jmap.api.access.AccessToken;
import org.apache.james.jmap.model.Number;
import org.apache.james.mailbox.FlagsBuilder;
@@ -108,21 +108,12 @@ public abstract class GetMessageListMethodTest {
dataProbe.addDomain(domain);
String alicePassword = "alicePassword";
dataProbe.addUser(alice, alicePassword);
- this.aliceAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), alice, alicePassword);
+ this.aliceAccessToken = authenticateJamesUser(baseUri(jmapServer), alice, alicePassword);
this.bob = "bob@" + domain;
String bobPassword = "bobPassword";
dataProbe.addUser(bob, bobPassword);
- this.bobAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), bob, bobPassword);
- }
-
- private URIBuilder baseUri() {
- return new URIBuilder()
- .setScheme("http")
- .setHost("localhost")
- .setPort(jmapServer.getProbe(JmapGuiceProbe.class)
- .getJmapPort())
- .setCharset(StandardCharsets.UTF_8);
+ this.bobAccessToken = authenticateJamesUser(baseUri(jmapServer), bob, bobPassword);
}
@After
http://git-wip-us.apache.org/repos/asf/james-project/blob/a2f301f4/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
index df02cac..a4c5b6a 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
@@ -20,18 +20,17 @@
package org.apache.james.jmap.methods.integration;
import static com.jayway.restassured.RestAssured.given;
+import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
+import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.core.IsNull.nullValue;
-import java.nio.charset.StandardCharsets;
import java.time.ZonedDateTime;
-import org.apache.http.client.utils.URIBuilder;
import org.apache.james.GuiceJamesServer;
import org.apache.james.jmap.FixedDateZonedDateTimeProvider;
-import org.apache.james.jmap.HttpJmapAuthentication;
import org.apache.james.jmap.api.access.AccessToken;
import org.apache.james.jmap.api.vacation.AccountId;
import org.apache.james.jmap.api.vacation.VacationPatch;
@@ -83,20 +82,11 @@ public abstract class GetVacationResponseTest {
DataProbe dataProbe = jmapServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(USERS_DOMAIN);
dataProbe.addUser(USER, PASSWORD);
- accessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), USER, PASSWORD);
+ accessToken = authenticateJamesUser(baseUri(jmapServer), USER, PASSWORD);
await();
}
- private URIBuilder baseUri() {
- return new URIBuilder()
- .setScheme("http")
- .setHost("localhost")
- .setPort(jmapServer.getProbe(JmapGuiceProbe.class)
- .getJmapPort())
- .setCharset(StandardCharsets.UTF_8);
- }
-
@After
public void teardown() {
jmapServer.stop();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a2f301f4/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java
index 23b0b90..cc3d9c9 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java
@@ -21,6 +21,8 @@ package org.apache.james.jmap.methods.integration;
import static com.jayway.restassured.RestAssured.given;
import static com.jayway.restassured.RestAssured.with;
+import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
+import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.calmlyAwait;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.hamcrest.Matchers.contains;
@@ -31,14 +33,11 @@ import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.startsWith;
-import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
import java.util.Optional;
-import org.apache.http.client.utils.URIBuilder;
import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.HttpJmapAuthentication;
import org.apache.james.jmap.MessageAppender;
import org.apache.james.jmap.api.access.AccessToken;
import org.apache.james.mailbox.DefaultMailboxes;
@@ -95,8 +94,8 @@ public abstract class SendMDNMethodTest {
dataProbe.addUser(HOMER, PASSWORD);
dataProbe.addUser(BART, BOB_PASSWORD);
mailboxProbe.createMailbox("#private", HOMER, DefaultMailboxes.INBOX);
- homerAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), HOMER, PASSWORD);
- bartAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), BART, BOB_PASSWORD);
+ homerAccessToken = authenticateJamesUser(baseUri(jmapServer), HOMER, PASSWORD);
+ bartAccessToken = authenticateJamesUser(baseUri(jmapServer), BART, BOB_PASSWORD);
}
private void bartSendMessageToHomer() {
@@ -164,15 +163,6 @@ public abstract class SendMDNMethodTest {
calmlyAwait.until(() -> !listMessageIdsForAccount(homerAccessToken).isEmpty());
}
- private URIBuilder baseUri() {
- return new URIBuilder()
- .setScheme("http")
- .setHost("localhost")
- .setPort(jmapServer.getProbe(JmapGuiceProbe.class)
- .getJmapPort())
- .setCharset(StandardCharsets.UTF_8);
- }
-
@After
public void teardown() {
jmapServer.stop();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a2f301f4/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
index a7b5b75..839491d 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
@@ -21,6 +21,8 @@ package org.apache.james.jmap.methods.integration;
import static com.jayway.restassured.RestAssured.given;
import static com.jayway.restassured.RestAssured.with;
+import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
+import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.contains;
@@ -37,12 +39,8 @@ import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.collection.IsMapWithSize.aMapWithSize;
-import java.nio.charset.StandardCharsets;
-
import org.apache.commons.lang3.StringUtils;
-import org.apache.http.client.utils.URIBuilder;
import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.HttpJmapAuthentication;
import org.apache.james.jmap.api.access.AccessToken;
import org.apache.james.mailbox.DefaultMailboxes;
import org.apache.james.mailbox.model.MailboxACL;
@@ -106,20 +104,11 @@ public abstract class SetMailboxesMethodTest {
dataProbe.addDomain(USERS_DOMAIN);
dataProbe.addUser(username, password);
inboxId = mailboxProbe.createMailbox("#private", username, DefaultMailboxes.INBOX);
- accessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), username, password);
+ accessToken = authenticateJamesUser(baseUri(jmapServer), username, password);
await();
}
- private URIBuilder baseUri() {
- return new URIBuilder()
- .setScheme("http")
- .setHost("localhost")
- .setPort(jmapServer.getProbe(JmapGuiceProbe.class)
- .getJmapPort())
- .setCharset(StandardCharsets.UTF_8);
- }
-
@After
public void teardown() {
jmapServer.stop();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a2f301f4/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
index 5644fc9..0724ced 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
@@ -20,17 +20,16 @@
package org.apache.james.jmap.methods.integration;
import static com.jayway.restassured.RestAssured.given;
+import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
+import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.equalTo;
-import java.nio.charset.StandardCharsets;
import java.time.ZonedDateTime;
import java.util.Optional;
-import org.apache.http.client.utils.URIBuilder;
import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.HttpJmapAuthentication;
import org.apache.james.jmap.api.access.AccessToken;
import org.apache.james.jmap.api.vacation.AccountId;
import org.apache.james.jmap.api.vacation.Vacation;
@@ -73,20 +72,11 @@ public abstract class SetVacationResponseTest {
jmapServer.getProbe(DataProbeImpl.class).addDomain(USERS_DOMAIN);
jmapServer.getProbe(DataProbeImpl.class).addUser(USER, PASSWORD);
- accessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), USER, PASSWORD);
+ accessToken = authenticateJamesUser(baseUri(jmapServer), USER, PASSWORD);
await();
}
- private URIBuilder baseUri() {
- return new URIBuilder()
- .setScheme("http")
- .setHost("localhost")
- .setPort(jmapServer.getProbe(JmapGuiceProbe.class)
- .getJmapPort())
- .setCharset(StandardCharsets.UTF_8);
- }
-
@After
public void teardown() {
jmapServer.stop();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a2f301f4/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java
index bf9793a..0599108 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java
@@ -23,6 +23,8 @@ import static com.jayway.restassured.RestAssured.given;
import static com.jayway.restassured.RestAssured.with;
import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
+import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.calmlyAwait;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
@@ -31,9 +33,7 @@ import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
-import org.apache.http.client.utils.URIBuilder;
import org.apache.james.GuiceJamesServer;
-import org.apache.james.jmap.HttpJmapAuthentication;
import org.apache.james.jmap.api.access.AccessToken;
import org.apache.james.mailbox.Role;
import org.apache.james.utils.DataProbeImpl;
@@ -81,16 +81,7 @@ public interface SpamAssassinContract {
}
default AccessToken accessTokenFor(GuiceJamesServer james, String user, String password) {
- return HttpJmapAuthentication.authenticateJamesUser(baseUri(james), user, password);
- }
-
- default URIBuilder baseUri(GuiceJamesServer james) {
- return new URIBuilder()
- .setScheme("http")
- .setHost("localhost")
- .setPort(james.getProbe(JmapGuiceProbe.class)
- .getJmapPort())
- .setCharset(StandardCharsets.UTF_8);
+ return authenticateJamesUser(baseUri(james), user, password);
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/a2f301f4/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java
index f6ece8d..a4365ac 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java
@@ -19,6 +19,7 @@
package org.apache.james.jmap.methods.integration.cucumber;
+import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException;
@@ -137,7 +138,7 @@ public class DownloadStepdefs {
@When("^\"([^\"]*)\" checks for the availability of the attachment endpoint$")
public void optionDownload(String username) throws Throwable {
AccessToken accessToken = userStepdefs.authenticate(username);
- URI target = mainStepdefs.baseUri().setPath("/download/" + ONE_ATTACHMENT_EML_ATTACHMENT_BLOB_ID).build();
+ URI target = baseUri(mainStepdefs.jmapServer).setPath("/download/" + ONE_ATTACHMENT_EML_ATTACHMENT_BLOB_ID).build();
Request request = Request.Options(target);
if (accessToken != null) {
request.addHeader("Authorization", accessToken.serialize());
@@ -163,7 +164,7 @@ public class DownloadStepdefs {
.orElse(null));
response = Request.Get(
- mainStepdefs.baseUri()
+ baseUri(mainStepdefs.jmapServer)
.setPath("/download/" + attachmentIdOrMessageId)
.build())
.execute()
@@ -176,7 +177,7 @@ public class DownloadStepdefs {
}
private void downLoad(String username, String blobId) throws IOException, URISyntaxException {
- URIBuilder uriBuilder = mainStepdefs.baseUri().setPath("/download/" + blobId);
+ URIBuilder uriBuilder = baseUri(mainStepdefs.jmapServer).setPath("/download/" + blobId);
response = authenticatedDownloadRequest(uriBuilder, blobId, username).execute().returnResponse();
}
@@ -235,7 +236,7 @@ public class DownloadStepdefs {
}
private void trustForBlobId(String blobId, String username) throws Exception {
- Response tokenGenerationResponse = Request.Post(mainStepdefs.baseUri().setPath("/download/" + blobId).build())
+ Response tokenGenerationResponse = Request.Post(baseUri(mainStepdefs.jmapServer).setPath("/download/" + blobId).build())
.addHeader("Authorization", userStepdefs.authenticate(username).serialize())
.execute();
String serializedAttachmentAccessToken = tokenGenerationResponse.returnContent().asString();
@@ -249,7 +250,7 @@ public class DownloadStepdefs {
@When("^\"([^\"]*)\" downloads \"(?:[^\"]*)\" with a valid authentication token but a bad blobId$")
public void downloadsWithValidToken(String username) {
userStepdefs.execWithUser(username, () -> {
- URIBuilder uriBuilder = mainStepdefs.baseUri().setPath("/download/badblobId");
+ URIBuilder uriBuilder = baseUri(mainStepdefs.jmapServer).setPath("/download/badblobId");
response = Request.Get(uriBuilder.build())
.addHeader("Authorization", userStepdefs.authenticate(username).serialize())
.execute()
@@ -261,7 +262,7 @@ public class DownloadStepdefs {
@When("^\"(?:[^\"]*)\" downloads \"([^\"]*)\" without any authentication token$")
public void getDownloadWithoutToken(String attachmentId) throws Exception {
String blobId = blobIdByAttachmentId.get(attachmentId);
- response = Request.Get(mainStepdefs.baseUri().setPath("/download/" + blobId).build())
+ response = Request.Get(baseUri(mainStepdefs.jmapServer).setPath("/download/" + blobId).build())
.execute()
.returnResponse();
}
@@ -270,7 +271,7 @@ public class DownloadStepdefs {
public void getDownloadWithEmptyToken(String attachmentId) throws Exception {
String blobId = blobIdByAttachmentId.get(attachmentId);
response = Request.Get(
- mainStepdefs.baseUri()
+ baseUri(mainStepdefs.jmapServer)
.setPath("/download/" + blobId)
.addParameter("access_token", "")
.build())
@@ -282,7 +283,7 @@ public class DownloadStepdefs {
public void getDownloadWithBadToken(String attachmentId) throws Exception {
String blobId = blobIdByAttachmentId.get(attachmentId);
response = Request.Get(
- mainStepdefs.baseUri()
+ baseUri(mainStepdefs.jmapServer)
.setPath("/download/" + blobId)
.addParameter("access_token", "bad")
.build())
@@ -294,7 +295,7 @@ public class DownloadStepdefs {
public void getDownloadWithUnknownToken(String attachmentId) throws Exception {
String blobId = blobIdByAttachmentId.get(attachmentId);
response = Request.Get(
- mainStepdefs.baseUri()
+ baseUri(mainStepdefs.jmapServer)
.setPath("/download/" + blobId)
.addParameter("access_token", INVALID_ATTACHMENT_TOKEN)
.build())
@@ -306,7 +307,7 @@ public class DownloadStepdefs {
public void getDownloadWithoutBlobId(String username, String attachmentId) throws Throwable {
String blobId = blobIdByAttachmentId.get(attachmentId);
- URIBuilder uriBuilder = mainStepdefs.baseUri().setPath("/download/");
+ URIBuilder uriBuilder = baseUri(mainStepdefs.jmapServer).setPath("/download/");
trustForBlobId(blobId, username);
AttachmentAccessTokenKey key = new AttachmentAccessTokenKey(username, blobId);
uriBuilder.addParameter("access_token", attachmentAccessTokens.get(key).serialize());
@@ -319,7 +320,7 @@ public class DownloadStepdefs {
public void getDownloadWithWrongBlobId(String username, String attachmentId) throws Throwable {
String blobId = blobIdByAttachmentId.get(attachmentId);
- URIBuilder uriBuilder = mainStepdefs.baseUri().setPath("/download/badbadbadbadbadbadbadbadbadbadbadbadbadb");
+ URIBuilder uriBuilder = baseUri(mainStepdefs.jmapServer).setPath("/download/badbadbadbadbadbadbadbadbadbadbadbadbadb");
trustForBlobId(blobId, username);
AttachmentAccessTokenKey key = new AttachmentAccessTokenKey(username, blobId);
uriBuilder.addParameter("access_token", attachmentAccessTokens.get(key).serialize());
@@ -332,7 +333,7 @@ public class DownloadStepdefs {
public void postDownload(String username, String attachmentId) throws Throwable {
String blobId = blobIdByAttachmentId.get(attachmentId);
AccessToken accessToken = userStepdefs.authenticate(username);
- response = Request.Post(mainStepdefs.baseUri().setPath("/download/" + blobId).build())
+ response = Request.Post(baseUri(mainStepdefs.jmapServer).setPath("/download/" + blobId).build())
.addHeader("Authorization", accessToken.serialize())
.execute()
.returnResponse();
@@ -341,7 +342,7 @@ public class DownloadStepdefs {
@When("^\"([^\"]*)\" downloads \"([^\"]*)\" with \"([^\"]*)\" name$")
public void downloadsWithName(String username, String attachmentId, String name) throws Exception {
String blobId = blobIdByAttachmentId.get(attachmentId);
- URIBuilder uriBuilder = mainStepdefs.baseUri().setPath("/download/" + blobId + "/" + name);
+ URIBuilder uriBuilder = baseUri(mainStepdefs.jmapServer).setPath("/download/" + blobId + "/" + name);
response = authenticatedDownloadRequest(uriBuilder, blobId, username)
.execute()
.returnResponse();
@@ -350,7 +351,7 @@ public class DownloadStepdefs {
@When("^\"(?:[^\"]*)\" downloads \"([^\"]*)\" with an expired token$")
public void getDownloadWithExpiredToken(String attachmentId) throws Exception {
String blobId = blobIdByAttachmentId.get(attachmentId);
- response = Request.Get(mainStepdefs.baseUri().setPath("/download/" + blobId)
+ response = Request.Get(baseUri(mainStepdefs.jmapServer).setPath("/download/" + blobId)
.addParameter("access_token", EXPIRED_ATTACHMENT_TOKEN)
.build())
.execute()
http://git-wip-us.apache.org/repos/asf/james-project/blob/a2f301f4/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/HttpClient.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/HttpClient.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/HttpClient.java
index 70b8449..c9201a7 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/HttpClient.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/HttpClient.java
@@ -19,6 +19,8 @@
package org.apache.james.jmap.methods.integration.cucumber;
+import static org.apache.james.jmap.JmapURIBuilder.baseUri;
+
import javax.inject.Inject;
import org.apache.http.HttpResponse;
@@ -43,7 +45,7 @@ public class HttpClient {
}
public void post(String requestBody) throws Exception {
- response = Request.Post(mainStepdefs.baseUri().setPath("/jmap").build())
+ response = Request.Post(baseUri(mainStepdefs.jmapServer).setPath("/jmap").build())
.addHeader("Authorization", userStepdefs.authenticate(userStepdefs.getConnectedUser()).serialize())
.addHeader("Accept", org.apache.http.entity.ContentType.APPLICATION_JSON.getMimeType())
.bodyString(requestBody, org.apache.http.entity.ContentType.APPLICATION_JSON)
http://git-wip-us.apache.org/repos/asf/james-project/blob/a2f301f4/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java
index f055598..3eefebb 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java
@@ -19,12 +19,10 @@
package org.apache.james.jmap.methods.integration.cucumber;
-import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.List;
import java.util.stream.Stream;
-import org.apache.http.client.utils.URIBuilder;
import org.apache.james.GuiceJamesServer;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailbox.model.MailboxId;
@@ -35,7 +33,6 @@ import org.apache.james.modules.ACLProbeImpl;
import org.apache.james.modules.MailboxProbeImpl;
import org.apache.james.probe.DataProbe;
import org.apache.james.utils.DataProbeImpl;
-import org.apache.james.utils.JmapGuiceProbe;
import org.apache.james.utils.MessageIdProbe;
import com.github.steveash.guavate.Guavate;
@@ -62,16 +59,7 @@ public class MainStepdefs {
aclProbe = jmapServer.getProbe(ACLProbeImpl.class);
messageIdProbe = jmapServer.getProbe(MessageIdProbe.class);
}
-
- public URIBuilder baseUri() {
- return new URIBuilder()
- .setScheme("http")
- .setHost("localhost")
- .setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort())
- .setCharset(StandardCharsets.UTF_8);
- }
-
public void tearDown() {
jmapServer.stop();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a2f301f4/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java
index 59c6681..d4362cc 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java
@@ -19,6 +19,7 @@
package org.apache.james.jmap.methods.integration.cucumber;
+import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.BufferedInputStream;
@@ -68,7 +69,7 @@ public class UploadStepdefs {
private UploadStepdefs(UserStepdefs userStepdefs, MainStepdefs mainStepdefs) throws URISyntaxException {
this.userStepdefs = userStepdefs;
this.mainStepdefs = mainStepdefs;
- uploadUri = mainStepdefs.baseUri().setPath("/upload").build();
+ uploadUri = baseUri(mainStepdefs.jmapServer).setPath("/upload").build();
}
@Given("^\"([^\"]*)\" is starting uploading a content$")
@@ -204,7 +205,7 @@ public class UploadStepdefs {
@Then("^\"([^\"]*)\" should be able to retrieve the content$")
public void contentShouldBeRetrievable(String username) throws Exception {
AccessToken accessToken = userStepdefs.authenticate(username);
- Request request = Request.Get(mainStepdefs.baseUri().setPath("/download/" + _1M_ZEROED_FILE_BLOB_ID).build());
+ Request request = Request.Get(baseUri(mainStepdefs.jmapServer).setPath("/download/" + _1M_ZEROED_FILE_BLOB_ID).build());
if (accessToken != null) {
request.addHeader("Authorization", accessToken.serialize());
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a2f301f4/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java
index d81f0be..c65efff 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java
@@ -19,6 +19,9 @@
package org.apache.james.jmap.methods.integration.cucumber;
+import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
+import static org.apache.james.jmap.JmapURIBuilder.baseUri;
+
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.HashSet;
@@ -29,7 +32,6 @@ import java.util.Set;
import javax.inject.Inject;
-import org.apache.james.jmap.HttpJmapAuthentication;
import org.apache.james.jmap.api.access.AccessToken;
import com.github.fge.lambdas.Throwing;
@@ -123,7 +125,7 @@ public class UserStepdefs {
String password = passwordByUser.get(user);
Preconditions.checkState(password != null, "unknown user " + user);
- return HttpJmapAuthentication.authenticateJamesUser(mainStepdefs.baseUri(), user, password);
+ return authenticateJamesUser(baseUri(mainStepdefs.jmapServer), user, password);
});
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[24/24] james-project git commit: JAMES-2366 Run WebAdminServer on a
random port in tests
Posted by ad...@apache.org.
JAMES-2366 Run WebAdminServer on a random port in tests
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/99b5cb6c
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/99b5cb6c
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/99b5cb6c
Branch: refs/heads/master
Commit: 99b5cb6c779a88cfd5ff39da32dbe2a4d802f5ad
Parents: 686a75e
Author: Antoine Duprat <ad...@linagora.com>
Authored: Thu Apr 5 15:46:24 2018 +0200
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Apr 6 15:04:50 2018 +0200
----------------------------------------------------------------------
.../apache/james/utils/WebAdminGuiceProbe.java | 4 +-
.../main/java/org/apache/james/util/Port.java | 6 ++-
.../james/webadmin/RandomPortSupplier.java | 28 +++++-------
.../apache/james/webadmin/WebAdminServer.java | 10 ++++-
.../james/webadmin/WebAdminServerTest.java | 46 ++++++++++++++++++++
.../apache/james/webadmin/WebAdminUtils.java | 5 ++-
.../webadmin/routes/MailQueueRoutesTest.java | 2 +-
7 files changed, 75 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/99b5cb6c/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/utils/WebAdminGuiceProbe.java
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/utils/WebAdminGuiceProbe.java b/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/utils/WebAdminGuiceProbe.java
index 7b0528b..844d228 100644
--- a/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/utils/WebAdminGuiceProbe.java
+++ b/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/utils/WebAdminGuiceProbe.java
@@ -21,7 +21,7 @@ package org.apache.james.utils;
import javax.inject.Inject;
-import org.apache.james.webadmin.PortSupplier;
+import org.apache.james.util.Port;
import org.apache.james.webadmin.WebAdminServer;
public class WebAdminGuiceProbe implements GuiceProbe {
@@ -32,7 +32,7 @@ public class WebAdminGuiceProbe implements GuiceProbe {
this.webAdminServer = webAdminServer;
}
- public PortSupplier getWebAdminPort() {
+ public Port getWebAdminPort() {
return webAdminServer.getPort();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/99b5cb6c/server/container/util-java8/src/main/java/org/apache/james/util/Port.java
----------------------------------------------------------------------
diff --git a/server/container/util-java8/src/main/java/org/apache/james/util/Port.java b/server/container/util-java8/src/main/java/org/apache/james/util/Port.java
index 2acc4b6..016c4b4 100644
--- a/server/container/util-java8/src/main/java/org/apache/james/util/Port.java
+++ b/server/container/util-java8/src/main/java/org/apache/james/util/Port.java
@@ -44,10 +44,14 @@ public class Port {
private final int value;
public Port(int value) {
- assertValid(value);
+ validate(value);
this.value = value;
}
+ protected void validate(int port) {
+ assertValid(port);
+ }
+
public int getValue() {
return value;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/99b5cb6c/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/RandomPortSupplier.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/RandomPortSupplier.java b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/RandomPortSupplier.java
index 7f545b2..6289378 100644
--- a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/RandomPortSupplier.java
+++ b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/RandomPortSupplier.java
@@ -19,31 +19,23 @@
package org.apache.james.webadmin;
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.util.function.Supplier;
-
-import org.apache.james.util.MemoizedSupplier;
import org.apache.james.util.Port;
-import com.github.fge.lambdas.Throwing;
-
public class RandomPortSupplier implements PortSupplier {
- public static int findFreePort() throws IOException {
- try (ServerSocket socket = new ServerSocket(0)) {
- return socket.getLocalPort();
- }
+ @Override
+ public Port get() {
+ return new RandomPort();
}
- private final Supplier<Integer> portSupplier;
+ private static class RandomPort extends Port {
- public RandomPortSupplier() {
- portSupplier = MemoizedSupplier.of(Throwing.supplier(RandomPortSupplier::findFreePort));
- }
+ public RandomPort() {
+ super(0);
+ }
- @Override
- public Port get() {
- return new Port(portSupplier.get());
+ @Override
+ protected void validate(int port) {
+ }
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/99b5cb6c/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java
index e544022..c21ab8c 100644
--- a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java
+++ b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java
@@ -28,6 +28,7 @@ import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.metrics.api.MetricFactory;
+import org.apache.james.util.Port;
import org.apache.james.webadmin.authentication.AuthenticationFilter;
import org.apache.james.webadmin.mdc.LoggingRequestFilter;
import org.apache.james.webadmin.mdc.LoggingResponseFilter;
@@ -39,6 +40,8 @@ import org.apache.james.webadmin.routes.CORSRoute;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.base.Preconditions;
+
import spark.Service;
public class WebAdminServer implements Configurable {
@@ -52,6 +55,7 @@ public class WebAdminServer implements Configurable {
private final Service service;
private final AuthenticationFilter authenticationFilter;
private final MetricFactory metricFactory;
+ private Port port;
// Spark do not allow to retrieve allocated port when using a random port. Thus we generate the port.
@Inject
@@ -76,6 +80,7 @@ public class WebAdminServer implements Configurable {
configureMDC();
routesList.forEach(routes -> routes.define(service));
service.awaitInitialization();
+ port = new Port(service.port());
LOGGER.info("Web admin server started");
}
}
@@ -123,7 +128,8 @@ public class WebAdminServer implements Configurable {
service.awaitInitialization();
}
- public PortSupplier getPort() {
- return configuration.getPort();
+ public Port getPort() {
+ Preconditions.checkState(port != null, "WebAdminServer should be configured.");
+ return port;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/99b5cb6c/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java
new file mode 100644
index 0000000..abb72a9
--- /dev/null
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminServerTest.java
@@ -0,0 +1,46 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+package org.apache.james.webadmin;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.apache.james.metrics.logger.DefaultMetricFactory;
+import org.apache.james.util.Port;
+import org.junit.Test;
+
+public class WebAdminServerTest {
+
+ @Test
+ public void getPortShouldThrowWhenNotConfigured() throws Exception {
+ WebAdminServer server = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory());
+ assertThatThrownBy(() -> server.getPort())
+ .isInstanceOf(IllegalStateException.class);
+ }
+
+ @Test
+ public void getPortShouldReturnPortWhenConfigured() throws Exception {
+ WebAdminServer server = WebAdminUtils.createWebAdminServer(new DefaultMetricFactory());
+ server.configure(WebAdminServer.NO_CONFIGURATION);
+
+ Port port = server.getPort();
+
+ assertThat(port).isNotNull();
+ }
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/99b5cb6c/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java
index 76862b4..f4f95ff 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java
@@ -26,6 +26,7 @@ import java.io.IOException;
import java.nio.charset.StandardCharsets;
import org.apache.james.metrics.api.MetricFactory;
+import org.apache.james.util.Port;
import org.apache.james.webadmin.authentication.NoAuthenticationFilter;
import com.google.common.collect.ImmutableSet;
@@ -45,12 +46,12 @@ public class WebAdminUtils {
return buildRequestSpecification(webAdminServer.getPort());
}
- public static RequestSpecBuilder buildRequestSpecification(PortSupplier portSupplier) {
+ public static RequestSpecBuilder buildRequestSpecification(Port port) {
return new RequestSpecBuilder()
.setContentType(ContentType.JSON)
.setAccept(ContentType.JSON)
.setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
- .setPort(portSupplier.get().getValue());
+ .setPort(port.getValue());
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/99b5cb6c/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
index 3a33798..ac75c9b 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
@@ -81,7 +81,7 @@ public class MailQueueRoutesTest {
.setContentType(ContentType.JSON)
.setAccept(ContentType.JSON)
.setBasePath(MailQueueRoutes.BASE_URL)
- .setPort(server.getPort().get().getValue())
+ .setPort(server.getPort().getValue())
.setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
.build();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[12/24] james-project git commit: JAMES-2366 Add JMAP integration
test with Forward RRT mapping
Posted by ad...@apache.org.
JAMES-2366 Add JMAP integration test with Forward RRT mapping
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ce6e83dd
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ce6e83dd
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ce6e83dd
Branch: refs/heads/master
Commit: ce6e83dd65982729d36ab9175c90890952871be8
Parents: ba30683
Author: Antoine Duprat <ad...@linagora.com>
Authored: Wed Apr 4 18:08:02 2018 +0200
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Apr 6 15:04:48 2018 +0200
----------------------------------------------------------------------
pom.xml | 5 +
.../CassandraForwardIntegrationTest.java | 58 ++++
.../src/test/resources/mailetcontainer.xml | 1 +
.../jmap-integration-testing-common/pom.xml | 10 +
.../integration/ForwardIntegrationTest.java | 299 +++++++++++++++++++
.../memory/MemoryForwardIntegrationTest.java | 46 +++
.../src/test/resources/mailetcontainer.xml | 1 +
7 files changed, 420 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/ce6e83dd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fd60a8d..bc2ceb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1182,6 +1182,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>james-server-guice-webadmin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-jetty</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ce6e83dd/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraForwardIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraForwardIntegrationTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraForwardIntegrationTest.java
new file mode 100644
index 0000000..2630250
--- /dev/null
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraForwardIntegrationTest.java
@@ -0,0 +1,58 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.jmap.cassandra;
+
+import org.apache.james.CassandraJmapTestRule;
+import org.apache.james.DockerCassandraRule;
+import org.apache.james.GuiceJamesServer;
+import org.apache.james.backends.cassandra.ContainerLifecycleConfiguration;
+import org.apache.james.jmap.methods.integration.ForwardIntegrationTest;
+import org.apache.james.webadmin.RandomPortSupplier;
+import org.apache.james.webadmin.WebAdminConfiguration;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.rules.TestRule;
+
+public class CassandraForwardIntegrationTest extends ForwardIntegrationTest {
+
+ @ClassRule
+ public static DockerCassandraRule cassandra = new DockerCassandraRule();
+
+ public static ContainerLifecycleConfiguration cassandraLifecycleConfiguration = ContainerLifecycleConfiguration.withDefaultIterationsBetweenRestart().container(cassandra.getRawContainer()).build();
+
+ @Rule
+ public CassandraJmapTestRule rule = CassandraJmapTestRule.defaultTestRule();
+
+ @Rule
+ public TestRule cassandraLifecycleTestRule = cassandraLifecycleConfiguration.asTestRule();
+
+ @Override
+ protected GuiceJamesServer createJmapServer() {
+ return rule.jmapServer(cassandra.getModule(),
+ binder -> binder.bind(WebAdminConfiguration.class)
+ .toInstance(WebAdminConfiguration.builder()
+ .enabled()
+ .corsDisabled()
+ .host("127.0.0.1")
+ .port(new RandomPortSupplier())
+ .build()));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ce6e83dd/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
index 7148bac..0698316 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
@@ -51,6 +51,7 @@
<name>bcc</name>
</mailet>
<mailet match="All" class="org.apache.james.jmap.mailet.TextCalendarBodyToAttachment"/>
+ <mailet match="All" class="RecipientRewriteTable" />
<mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.VacationMailet"/>
<mailet match="RecipientIsLocal" class="Sieve"/>
<mailet match="RecipientIsLocal" class="SpamAssassin">
http://git-wip-us.apache.org/repos/asf/james-project/blob/ce6e83dd/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
index b7a87ac..fc05e0c 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
@@ -78,6 +78,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>james-server-guice-webadmin</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
@@ -95,6 +100,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>james-server-webadmin-core</artifactId>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ce6e83dd/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
new file mode 100644
index 0000000..07ded58
--- /dev/null
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
@@ -0,0 +1,299 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.jmap.methods.integration;
+
+import static com.jayway.restassured.RestAssured.given;
+import static com.jayway.restassured.RestAssured.with;
+import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
+import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import static org.apache.james.jmap.TestingConstants.calmlyAwait;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
+
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.james.GuiceJamesServer;
+import org.apache.james.jmap.HttpJmapAuthentication;
+import org.apache.james.jmap.api.access.AccessToken;
+import org.apache.james.mailbox.Role;
+import org.apache.james.probe.DataProbe;
+import org.apache.james.utils.DataProbeImpl;
+import org.apache.james.utils.JmapGuiceProbe;
+import org.apache.james.utils.WebAdminGuiceProbe;
+import org.apache.james.webadmin.WebAdminUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.jayway.restassured.RestAssured;
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+
+public abstract class ForwardIntegrationTest {
+
+ private static final String DOMAIN = "domain";
+ private static final String BOB = "bob@" + DOMAIN;
+ private static final String BOB_PASSWORD = "123456";
+ private static final String ALICE = "alice@" + DOMAIN;
+ private static final String ALICE_PASSWORD = "789123";
+ private static final String CEDRIC = "cedric@" + DOMAIN;
+ private static final String CEDRIC_PASSWORD = "456789";
+
+ private static final String NAME = "[0][0]";
+ private static final String ARGUMENTS = "[0][1]";
+
+ protected abstract GuiceJamesServer createJmapServer();
+
+ private GuiceJamesServer jmapServer;
+ private RequestSpecification webAdminApi;
+
+ @Before
+ public void setUp() throws Exception {
+ jmapServer = createJmapServer();
+ jmapServer.start();
+
+ DataProbe dataProbe = jmapServer.getProbe(DataProbeImpl.class);
+ dataProbe.addDomain(DOMAIN);
+ dataProbe.addUser(BOB, BOB_PASSWORD);
+ dataProbe.addUser(ALICE, ALICE_PASSWORD);
+ dataProbe.addUser(CEDRIC, CEDRIC_PASSWORD);
+
+ RestAssured.requestSpecification = new RequestSpecBuilder()
+ .setContentType(ContentType.JSON)
+ .setAccept(ContentType.JSON)
+ .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
+ .setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort())
+ .build();
+
+ WebAdminGuiceProbe webAdminGuiceProbe = jmapServer.getProbe(WebAdminGuiceProbe.class);
+ webAdminGuiceProbe.await();
+ webAdminApi = given()
+ .spec(WebAdminUtils.buildRequestSpecification(webAdminGuiceProbe.getWebAdminPort()).build());
+ }
+
+ @After
+ public void tearDown() {
+ jmapServer.stop();
+ }
+
+ @Test
+ public void messageShouldBeForwardedWhenDefinedInRESTAPI() {
+ webAdminApi.put(String.format("/address/forwards/%s/targets/%s", ALICE, BOB));
+
+ AccessToken cedricAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), CEDRIC, CEDRIC_PASSWORD);
+ String messageCreationId = "creationId1337";
+ String requestBody = "[" +
+ " [" +
+ " \"setMessages\"," +
+ " {" +
+ " \"create\": { \"" + messageCreationId + "\" : {" +
+ " \"from\": { \"name\": \"Me\", \"email\": \"" + CEDRIC + "\"}," +
+ " \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+ " \"subject\": \"subject\"," +
+ " \"isUnread\": true," +
+ " \"isFlagged\": true," +
+ " \"isAnswered\": true," +
+ " \"isDraft\": true," +
+ " \"isForwarded\": true," +
+ " \"mailboxIds\": [\"" + getOutboxId(cedricAccessToken) + "\"]" +
+ " }}" +
+ " }," +
+ " \"#0\"" +
+ " ]" +
+ "]";
+
+ with()
+ .header("Authorization", cedricAccessToken.serialize())
+ .body(requestBody)
+ .post("/jmap");
+
+ AccessToken bobAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), BOB, BOB_PASSWORD);
+ calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInRecipientsMailboxes(bobAccessToken));
+ given()
+ .header("Authorization", bobAccessToken.serialize())
+ .body("[[\"getMessageList\", {}, \"#0\"]]")
+ .when()
+ .post("/jmap")
+ .then()
+ .log().ifValidationFails()
+ .statusCode(200)
+ .body(NAME, equalTo("messageList"))
+ .body(ARGUMENTS + ".messageIds", hasSize(1));
+ }
+
+ @Test
+ public void messageShouldBeForwardedWhenBaseRecipientWhenInDestination() {
+ webAdminApi.put(String.format("/address/forwards/%s/targets/%s", ALICE, BOB));
+ webAdminApi.put(String.format("/address/forwards/%s/targets/%s", ALICE, ALICE));
+
+ AccessToken cedricAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), CEDRIC, CEDRIC_PASSWORD);
+ AccessToken aliceAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), ALICE, ALICE_PASSWORD);
+ String messageCreationId = "creationId1337";
+ String requestBody = "[" +
+ " [" +
+ " \"setMessages\"," +
+ " {" +
+ " \"create\": { \"" + messageCreationId + "\" : {" +
+ " \"from\": { \"name\": \"Me\", \"email\": \"" + CEDRIC + "\"}," +
+ " \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+ " \"subject\": \"subject\"," +
+ " \"isUnread\": true," +
+ " \"isFlagged\": true," +
+ " \"isAnswered\": true," +
+ " \"isDraft\": true," +
+ " \"isForwarded\": true," +
+ " \"mailboxIds\": [\"" + getOutboxId(cedricAccessToken) + "\"]" +
+ " }}" +
+ " }," +
+ " \"#0\"" +
+ " ]" +
+ "]";
+
+ with()
+ .header("Authorization", cedricAccessToken.serialize())
+ .body(requestBody)
+ .post("/jmap");
+
+ AccessToken bobAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), BOB, BOB_PASSWORD);
+ calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInRecipientsMailboxes(bobAccessToken));
+ given()
+ .header("Authorization", bobAccessToken.serialize())
+ .body("[[\"getMessageList\", {}, \"#0\"]]")
+ .when()
+ .post("/jmap")
+ .then()
+ .log().ifValidationFails()
+ .statusCode(200)
+ .body(NAME, equalTo("messageList"))
+ .body(ARGUMENTS + ".messageIds", hasSize(1));
+
+ given()
+ .header("Authorization", aliceAccessToken.serialize())
+ .body("[[\"getMessageList\", {}, \"#0\"]]")
+ .when()
+ .post("/jmap")
+ .then()
+ .log().ifValidationFails()
+ .statusCode(200)
+ .body(NAME, equalTo("messageList"))
+ .body(ARGUMENTS + ".messageIds", hasSize(1));
+ }
+
+ @Test
+ public void baseRecipientShouldNotReceiveEmailOnDefaultForward() {
+ webAdminApi.put(String.format("/address/forwards/%s/targets/%s", ALICE, BOB));
+
+ AccessToken cedricAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), CEDRIC, CEDRIC_PASSWORD);
+ AccessToken aliceAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), ALICE, ALICE_PASSWORD);
+ String messageCreationId = "creationId1337";
+ String requestBody = "[" +
+ " [" +
+ " \"setMessages\"," +
+ " {" +
+ " \"create\": { \"" + messageCreationId + "\" : {" +
+ " \"from\": { \"name\": \"Me\", \"email\": \"" + CEDRIC + "\"}," +
+ " \"to\": [{ \"name\": \"Alice\", \"email\": \"" + ALICE + "\"}]," +
+ " \"subject\": \"subject\"," +
+ " \"isUnread\": true," +
+ " \"isFlagged\": true," +
+ " \"isAnswered\": true," +
+ " \"isDraft\": true," +
+ " \"isForwarded\": true," +
+ " \"mailboxIds\": [\"" + getOutboxId(cedricAccessToken) + "\"]" +
+ " }}" +
+ " }," +
+ " \"#0\"" +
+ " ]" +
+ "]";
+
+ with()
+ .header("Authorization", cedricAccessToken.serialize())
+ .body(requestBody)
+ .post("/jmap");
+
+ AccessToken bobAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(), BOB, BOB_PASSWORD);
+ calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInRecipientsMailboxes(bobAccessToken));
+
+ given()
+ .header("Authorization", aliceAccessToken.serialize())
+ .body("[[\"getMessageList\", {}, \"#0\"]]")
+ .when()
+ .post("/jmap")
+ .then()
+ .log().ifValidationFails()
+ .statusCode(200)
+ .body(NAME, equalTo("messageList"))
+ .body(ARGUMENTS + ".messageIds", hasSize(0));
+ }
+
+ private URIBuilder baseUri() {
+ return new URIBuilder()
+ .setScheme("http")
+ .setHost("localhost")
+ .setPort(jmapServer.getProbe(JmapGuiceProbe.class)
+ .getJmapPort())
+ .setCharset(StandardCharsets.UTF_8);
+ }
+
+ private String getOutboxId(AccessToken accessToken) {
+ return getMailboxId(accessToken, Role.OUTBOX);
+ }
+
+ private String getMailboxId(AccessToken accessToken, Role role) {
+ return getAllMailboxesIds(accessToken).stream()
+ .filter(x -> x.get("role").equalsIgnoreCase(role.serialize()))
+ .map(x -> x.get("id"))
+ .findFirst().get();
+ }
+
+ private List<Map<String, String>> getAllMailboxesIds(AccessToken accessToken) {
+ return with()
+ .header("Authorization", accessToken.serialize())
+ .body("[[\"getMailboxes\", {\"properties\": [\"role\", \"id\"]}, \"#0\"]]")
+ .post("/jmap")
+ .andReturn()
+ .body()
+ .jsonPath()
+ .getList(ARGUMENTS + ".list");
+ }
+
+ private boolean isAnyMessageFoundInRecipientsMailboxes(AccessToken recipientToken) {
+ try {
+ with()
+ .header("Authorization", recipientToken.serialize())
+ .body("[[\"getMessageList\", {}, \"#0\"]]")
+ .when()
+ .post("/jmap")
+ .then()
+ .statusCode(200)
+ .body(NAME, equalTo("messageList"))
+ .body(ARGUMENTS + ".messageIds", hasSize(1));
+ return true;
+
+ } catch (AssertionError e) {
+ return false;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ce6e83dd/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryForwardIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryForwardIntegrationTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryForwardIntegrationTest.java
new file mode 100644
index 0000000..458e1e3
--- /dev/null
+++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryForwardIntegrationTest.java
@@ -0,0 +1,46 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.jmap.memory;
+
+import org.apache.james.GuiceJamesServer;
+import org.apache.james.MemoryJmapTestRule;
+import org.apache.james.jmap.methods.integration.ForwardIntegrationTest;
+import org.apache.james.webadmin.RandomPortSupplier;
+import org.apache.james.webadmin.WebAdminConfiguration;
+import org.junit.Rule;
+
+public class MemoryForwardIntegrationTest extends ForwardIntegrationTest {
+
+ @Rule
+ public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule();
+
+ @Override
+ protected GuiceJamesServer createJmapServer() {
+ return memoryJmap
+ .jmapServer(binder -> binder.bind(WebAdminConfiguration.class)
+ .toInstance(WebAdminConfiguration.builder()
+ .enabled()
+ .corsDisabled()
+ .host("127.0.0.1")
+ .port(new RandomPortSupplier())
+ .build()));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ce6e83dd/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
index c4ca2b1..fdbe341 100644
--- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
+++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
@@ -51,6 +51,7 @@
<name>bcc</name>
</mailet>
<mailet match="All" class="org.apache.james.jmap.mailet.TextCalendarBodyToAttachment"/>
+ <mailet match="All" class="RecipientRewriteTable" />
<mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.VacationMailet"/>
<mailet match="RecipientIsLocal" class="Sieve"/>
<mailet match="RecipientIsLocal" class="SpamAssassin">
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[06/24] james-project git commit: JAMES-2366 Forward mappings should
be sorted just after Domains
Posted by ad...@apache.org.
JAMES-2366 Forward mappings should be sorted just after Domains
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d1b0a112
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d1b0a112
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d1b0a112
Branch: refs/heads/master
Commit: d1b0a112b99054a67ad5f4f2262f7527eed17a85
Parents: 048e362
Author: Antoine Duprat <ad...@linagora.com>
Authored: Thu Mar 29 15:38:26 2018 +0200
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Apr 6 14:39:17 2018 +0200
----------------------------------------------------------------------
.../java/org/apache/james/rrt/lib/Mapping.java | 18 +++++++++-----
.../org/apache/james/rrt/lib/MappingsImpl.java | 25 +++++++-------------
.../lib/AbstractRecipientRewriteTableTest.java | 5 +++-
.../apache/james/rrt/lib/MappingsImplTest.java | 13 ++++++++++
4 files changed, 37 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/d1b0a112/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mapping.java
----------------------------------------------------------------------
diff --git a/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mapping.java b/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mapping.java
index 72193dc..bb3ec7e 100644
--- a/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mapping.java
+++ b/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mapping.java
@@ -47,16 +47,18 @@ public interface Mapping {
String getAddress();
enum Type {
- Regex("regex:"),
- Domain("domain:"),
- Error("error:"),
- Forward("forward:"),
- Address("");
+ Regex("regex:", 3),
+ Domain("domain:", 1),
+ Error("error:", 3),
+ Forward("forward:", 2),
+ Address("", 3);
private final String asPrefix;
+ private final int order;
- Type(String asPrefix) {
+ Type(String asPrefix, Integer order) {
this.asPrefix = asPrefix;
+ this.order = order;
}
public String asPrefix() {
@@ -74,6 +76,10 @@ public interface Mapping {
|| mapping.startsWith(Error.asPrefix())
|| mapping.startsWith(Forward.asPrefix());
}
+
+ public int getOrder() {
+ return order;
+ }
}
Type getType();
http://git-wip-us.apache.org/repos/asf/james-project/blob/d1b0a112/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java
index eab5fd8..23c3a3d 100644
--- a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java
+++ b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java
@@ -44,6 +44,10 @@ public class MappingsImpl implements Mappings, Serializable {
private static final long serialVersionUID = 1L;
+ public static final Comparator<Mapping> MAPPING_COMPARATOR = Comparator
+ .<Mapping, Integer>comparing(mapping -> mapping.getType().getOrder())
+ .thenComparing(Mapping::asString);
+
public static MappingsImpl empty() {
return builder().build();
}
@@ -103,7 +107,6 @@ public class MappingsImpl implements Mappings, Serializable {
mappings.add(mapping);
return this;
}
-
public Builder addAll(Mappings mappings) {
this.mappings.addAll(mappings);
@@ -111,24 +114,12 @@ public class MappingsImpl implements Mappings, Serializable {
}
public MappingsImpl build() {
- Comparator<? super Mapping> byTypeComparator = (mapping1, mapping2) -> {
- if (mapping1.getType() == mapping2.getType()) {
- return mapping1.asString().compareTo(mapping2.asString());
- }
- if (mapping1.getType() == Type.Domain) {
- return -1;
- }
- if (mapping2.getType() == Type.Domain) {
- return 1;
- }
- return mapping1.asString().compareTo(mapping2.asString());
- };
- return new MappingsImpl(mappings.build().stream()
- .sorted(byTypeComparator)
- .collect(Guavate.toImmutableList()));
+ return new MappingsImpl(mappings.build()
+ .stream()
+ .sorted(MAPPING_COMPARATOR)
+ .collect(Guavate.toImmutableList()));
}
-
}
private final ImmutableList<Mapping> mappings;
http://git-wip-us.apache.org/repos/asf/james-project/blob/d1b0a112/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java
index 3c69fab..143fb27 100644
--- a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java
+++ b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java
@@ -223,7 +223,10 @@ public abstract class AbstractRecipientRewriteTableTest {
assertThat(virtualUserTable.getMappings(user, aliasDomain))
.describedAs("Domain mapped as first, Address mapped as second")
- .containsExactly(MappingImpl.address(user + "@" + domain), MappingImpl.address(user2 + "@" + domain));
+ .isEqualTo(MappingsImpl.builder()
+ .add(MappingImpl.address(user + "@" + domain))
+ .add(MappingImpl.address(user2 + "@" + domain))
+ .build());
removeMapping(RecipientRewriteTable.WILDCARD, aliasDomain, user2 + "@" + domain, Type.Address);
http://git-wip-us.apache.org/repos/asf/james-project/blob/d1b0a112/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingsImplTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingsImplTest.java b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingsImplTest.java
index efb5add..1f8dcd9 100644
--- a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingsImplTest.java
+++ b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingsImplTest.java
@@ -326,4 +326,17 @@ public class MappingsImplTest {
.build();
assertThat(mappingsImpl).containsExactly(domainMapping, domain2Mapping, addressMapping, errorMapping);
}
+
+ @Test
+ public void builderShouldPutDomainAliasFirstThenForwardWhenVariousMappings() {
+ MappingImpl regexMapping = MappingImpl.regex("regex");
+ MappingImpl forwardMapping = MappingImpl.forward("forward");
+ MappingImpl domainMapping = MappingImpl.domain(Domain.of("domain"));
+ MappingsImpl mappingsImpl = MappingsImpl.builder()
+ .add(regexMapping)
+ .add(forwardMapping)
+ .add(domainMapping)
+ .build();
+ assertThat(mappingsImpl).containsExactly(domainMapping, forwardMapping, regexMapping);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[22/24] james-project git commit: JAMES-2366 Factorize some common
constants in JMAP integration tests
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/686a75e1/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
index 692e716..c6337bb 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
@@ -22,7 +22,12 @@ package org.apache.james.jmap.methods.integration;
import static com.jayway.restassured.RestAssured.given;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
+import static org.apache.james.jmap.TestingConstants.ALICE;
+import static org.apache.james.jmap.TestingConstants.ALICE_PASSWORD;
import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
+import static org.apache.james.jmap.TestingConstants.BOB;
+import static org.apache.james.jmap.TestingConstants.BOB_PASSWORD;
+import static org.apache.james.jmap.TestingConstants.DOMAIN;
import static org.apache.james.jmap.TestingConstants.NAME;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.hamcrest.Matchers.allOf;
@@ -83,9 +88,6 @@ public abstract class GetMessageListMethodTest {
private AccessToken aliceAccessToken;
private AccessToken bobAccessToken;
- private String alice;
- private String bob;
- private String domain;
private GuiceJamesServer jmapServer;
private MailboxProbe mailboxProbe;
private DataProbe dataProbe;
@@ -102,18 +104,11 @@ public abstract class GetMessageListMethodTest {
.setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort())
.build();
- this.domain = "domain.tld";
-
- this.alice = "alice@" + domain;
- dataProbe.addDomain(domain);
- String alicePassword = "alicePassword";
- dataProbe.addUser(alice, alicePassword);
- this.aliceAccessToken = authenticateJamesUser(baseUri(jmapServer), alice, alicePassword);
-
- this.bob = "bob@" + domain;
- String bobPassword = "bobPassword";
- dataProbe.addUser(bob, bobPassword);
- this.bobAccessToken = authenticateJamesUser(baseUri(jmapServer), bob, bobPassword);
+ dataProbe.addDomain(DOMAIN);
+ dataProbe.addUser(ALICE, ALICE_PASSWORD);
+ this.aliceAccessToken = authenticateJamesUser(baseUri(jmapServer), ALICE, ALICE_PASSWORD);
+ dataProbe.addUser(BOB, BOB_PASSWORD);
+ this.bobAccessToken = authenticateJamesUser(baseUri(jmapServer), BOB, BOB_PASSWORD);
}
@After
@@ -123,15 +118,15 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldNotListMessageIfTheUserHasOnlyLookupRight() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, bob, "delegated");
- MailboxPath delegatedMailboxPath = MailboxPath.forUser(bob, "delegated");
- mailboxProbe.appendMessage(bob, delegatedMailboxPath,
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB, "delegated");
+ MailboxPath delegatedMailboxPath = MailboxPath.forUser(BOB, "delegated");
+ mailboxProbe.appendMessage(BOB, delegatedMailboxPath,
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
await();
aclProbe.replaceRights(delegatedMailboxPath,
- alice,
+ ALICE,
new Rfc4314Rights(Right.Lookup));
given()
@@ -147,15 +142,15 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldListMessageWhenTheUserHasOnlyReadRight() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, bob, "delegated");
- MailboxPath delegatedMailboxPath = MailboxPath.forUser(bob, "delegated");
- ComposedMessageId message = mailboxProbe.appendMessage(bob, delegatedMailboxPath,
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB, "delegated");
+ MailboxPath delegatedMailboxPath = MailboxPath.forUser(BOB, "delegated");
+ ComposedMessageId message = mailboxProbe.appendMessage(BOB, delegatedMailboxPath,
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
await();
aclProbe.replaceRights(delegatedMailboxPath,
- alice,
+ ALICE,
new Rfc4314Rights(Right.Read));
given()
@@ -171,10 +166,10 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldNotFilterMessagesWhenTextFilterMatchesBodyAfterTheMessageMailboxHasBeenChanged() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
- MailboxId otherMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "otherMailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
+ MailboxId otherMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "otherMailbox");
- ComposedMessageId message = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags());
await();
@@ -201,19 +196,19 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldListMessageThatHasBeenMovedInAMailboxWhereTheUserHasOnlyReadRight() throws Exception {
- MailboxId delegatedMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, bob, "delegated");
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, bob, "not_delegated");
+ MailboxId delegatedMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB, "delegated");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB, "not_delegated");
- MailboxPath notDelegatedMailboxPath = MailboxPath.forUser(bob, "not_delegated");
- MailboxPath delegatedMailboxPath = MailboxPath.forUser(bob, "delegated");
+ MailboxPath notDelegatedMailboxPath = MailboxPath.forUser(BOB, "not_delegated");
+ MailboxPath delegatedMailboxPath = MailboxPath.forUser(BOB, "delegated");
- ComposedMessageId message = mailboxProbe.appendMessage(bob, notDelegatedMailboxPath,
+ ComposedMessageId message = mailboxProbe.appendMessage(BOB, notDelegatedMailboxPath,
new ByteArrayInputStream("Subject: chaussette\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
await();
aclProbe.replaceRights(delegatedMailboxPath,
- alice,
+ ALICE,
new Rfc4314Rights(Right.Read));
String messageId = message.getMessageId().serialize();
@@ -240,15 +235,15 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldNotDuplicateMessagesInSeveralMailboxes() throws Exception {
- MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
- MailboxId mailboxId2 = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox2");
+ MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
+ MailboxId mailboxId2 = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox2");
- ComposedMessageId message = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
await();
- jmapServer.getProbe(JmapGuiceProbe.class).setInMailboxes(message.getMessageId(), alice, mailboxId, mailboxId2);
+ jmapServer.getProbe(JmapGuiceProbe.class).setInMailboxes(message.getMessageId(), ALICE, mailboxId, mailboxId2);
given()
.header("Authorization", aliceAccessToken.serialize())
@@ -263,11 +258,11 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListSetFlaggedFilterShouldResultFlaggedMessages() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
- ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- ComposedMessageId messageFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.FLAGGED));
await();
@@ -287,11 +282,11 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListUnsetFlaggedFilterShouldReturnNotFlaggedMessages() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
- ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- ComposedMessageId messageFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.FLAGGED));
await();
@@ -311,11 +306,11 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListReadFilterShouldReturnOnlyReadMessages() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
- ComposedMessageId messageNotRead = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotRead = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- ComposedMessageId messageRead = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageRead = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.SEEN));
await();
@@ -335,11 +330,11 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListUnreadFilterShouldReturnOnlyUnreadMessages() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
- ComposedMessageId messageNotRead = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotRead = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- ComposedMessageId messageRead = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageRead = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.SEEN));
await();
@@ -359,11 +354,11 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListSetDraftFilterShouldReturnOnlyDraftMessages() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
- ComposedMessageId messageNotDraft = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotDraft = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- ComposedMessageId messageDraft = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageDraft = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.DRAFT));
await();
@@ -383,11 +378,11 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListUnsetDraftFilterShouldReturnOnlyNonDraftMessages() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
- ComposedMessageId messageNotDraft = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotDraft = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- ComposedMessageId messageDraft = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageDraft = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.DRAFT));
await();
@@ -407,11 +402,11 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListSetAnsweredFilterShouldReturnOnlyAnsweredMessages() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
- ComposedMessageId messageNotAnswered = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotAnswered = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- ComposedMessageId messageAnswered = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageAnswered = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.ANSWERED));
await();
@@ -431,11 +426,11 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListUnsetAnsweredFilterShouldReturnOnlyNotAnsweredMessages() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
- ComposedMessageId messageNotAnswered = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotAnswered = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- ComposedMessageId messageAnswered = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageAnswered = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.ANSWERED));
await();
@@ -455,11 +450,11 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListSetForwardedFilterShouldReturnOnlyForwardedMessages() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
- ComposedMessageId messageNotForwarded = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotForwarded = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- ComposedMessageId messageForwarded = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageForwarded = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(FORWARDED));
await();
@@ -479,11 +474,11 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListUnsetForwardedFilterShouldReturnOnlyNotForwardedMessages() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
- ComposedMessageId messageNotForwarded = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotForwarded = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- ComposedMessageId messageForwarded = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageForwarded = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(FORWARDED));
await();
@@ -503,15 +498,15 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListANDOperatorShouldReturnMessagesWhichMatchAllConditions() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
- ComposedMessageId messageNotSeenNotFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotSeenNotFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- ComposedMessageId messageNotSeenFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotSeenFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.FLAGGED));
- ComposedMessageId messageSeenNotFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageSeenNotFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/oneInlinedImage.eml"), new Date(), false, new Flags(Flags.Flag.SEEN));
- ComposedMessageId messageSeenFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageSeenFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/oneInlinedImage.eml"), new Date(), false, FlagsBuilder.builder().add(Flags.Flag.SEEN, Flags.Flag.FLAGGED).build());
await();
@@ -533,15 +528,15 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListOROperatorShouldReturnMessagesWhichMatchOneOfAllConditions() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
- ComposedMessageId messageNotSeenNotFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotSeenNotFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- ComposedMessageId messageNotSeenFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotSeenFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.FLAGGED));
- ComposedMessageId messageSeenNotFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageSeenNotFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/oneInlinedImage.eml"), new Date(), false, new Flags(Flags.Flag.SEEN));
- ComposedMessageId messageSeenFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageSeenFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/oneInlinedImage.eml"), new Date(), false, FlagsBuilder.builder().add(Flags.Flag.SEEN, Flags.Flag.FLAGGED).build());
await();
@@ -563,15 +558,15 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListNOTOperatorShouldReturnMessagesWhichNotMatchAnyCondition() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
- ComposedMessageId messageNotSeenNotFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotSeenNotFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- ComposedMessageId messageNotSeenFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotSeenFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.FLAGGED));
- ComposedMessageId messageSeenNotFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageSeenNotFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/oneInlinedImage.eml"), new Date(), false, new Flags(Flags.Flag.SEEN));
- ComposedMessageId messageSeenFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageSeenFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/oneInlinedImage.eml"), new Date(), false, FlagsBuilder.builder().add(Flags.Flag.SEEN, Flags.Flag.FLAGGED).build());
await();
@@ -593,15 +588,15 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListNestedOperatorsShouldReturnMessagesWhichMatchConditions() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
- ComposedMessageId messageNotSeenNotFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotSeenNotFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- ComposedMessageId messageNotSeenFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotSeenFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags(Flags.Flag.FLAGGED));
- ComposedMessageId messageSeenNotFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageSeenNotFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/oneInlinedImage.eml"), new Date(), false, new Flags(Flags.Flag.SEEN));
- ComposedMessageId messageSeenFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageSeenFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/oneInlinedImage.eml"), new Date(), false, FlagsBuilder.builder().add(Flags.Flag.SEEN, Flags.Flag.FLAGGED).build());
await();
@@ -652,13 +647,13 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldSupportHasAttachmentSetToTrue() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
- mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- ComposedMessageId message2 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags());
- mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/oneInlinedImage.eml"), new Date(), false, new Flags());
await();
@@ -675,13 +670,13 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldSupportHasAttachmentSetToFalse() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
- ComposedMessageId message1 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags());
- ComposedMessageId message3 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message3 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/oneInlinedImage.eml"), new Date(), false, new Flags());
await();
@@ -710,11 +705,11 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldReturnAllMessagesWhenSingleMailboxNoParameters() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
- ComposedMessageId message1 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- ComposedMessageId message2 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
await();
@@ -731,12 +726,12 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldReturnAllMessagesWhenMultipleMailboxesAndNoParameters() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
- ComposedMessageId message1 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
+ ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox2");
- ComposedMessageId message2 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox2"),
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox2");
+ ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox2"),
new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
await();
@@ -753,16 +748,16 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldReturnAllMessagesOfCurrentUserOnlyWhenMultipleMailboxesAndNoParameters() throws Exception {
- String otherUser = "other@" + domain;
+ String otherUser = "other@" + DOMAIN;
String password = "password";
dataProbe.addUser(otherUser, password);
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
- ComposedMessageId message1 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
+ ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox2");
- ComposedMessageId message2 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox2"),
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox2");
+ ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox2"),
new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
await();
@@ -784,8 +779,8 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldExcludeMessagesWhenInMailboxesFilterMatches() throws Exception {
- MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
- ComposedMessageId message = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
+ ComposedMessageId message = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
await();
@@ -802,11 +797,11 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldExcludeMessagesWhenMultipleInMailboxesFilterMatches() throws Exception {
- MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
- ComposedMessageId message = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
+ ComposedMessageId message = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- MailboxId mailboxId2 = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox2");
+ MailboxId mailboxId2 = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox2");
await();
given()
@@ -822,8 +817,8 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldExcludeMessagesWhenNotInMailboxesFilterMatches() throws Exception {
- MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
- mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
+ mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
await();
@@ -841,12 +836,12 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldExcludeMessagesWhenNotInMailboxesFilterMatchesTwice() throws Exception {
- MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
- mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
+ mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- MailboxId mailbox2Id = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox2");
- mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox2"),
+ MailboxId mailbox2Id = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox2");
+ mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox2"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
await();
@@ -863,8 +858,8 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldExcludeMessagesWhenIdenticalNotInMailboxesAndInmailboxesFilterMatch() throws Exception {
- MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
- mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
+ mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
await();
@@ -881,11 +876,11 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldIncludeMessagesWhenNotInMailboxesFilterDoesNotMatch() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
- ComposedMessageId message = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
+ ComposedMessageId message = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- MailboxId mailbox2Id = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox2");
+ MailboxId mailbox2Id = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox2");
await();
given()
@@ -901,11 +896,11 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldIncludeMessagesWhenEmptyNotInMailboxesFilter() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
- ComposedMessageId message = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
+ ComposedMessageId message = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox2");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox2");
await();
given()
@@ -921,10 +916,10 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldExcludeMessagesWhenInMailboxesFilterDoesntMatches() throws Exception {
- MailboxId emptyMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "emptyMailbox");
+ MailboxId emptyMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "emptyMailbox");
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
- mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
+ mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
await();
@@ -940,8 +935,8 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldExcludeMessagesWhenTextFilterDoesntMatches() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
- mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
+ mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
await();
@@ -957,8 +952,8 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldIncludeMessagesWhenTextFilterMatchesBody() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
- ComposedMessageId message = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
+ ComposedMessageId message = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags());
await();
@@ -974,8 +969,8 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldIncludeMessagesWhenSubjectFilterMatchesSubject() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
- ComposedMessageId message = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
+ ComposedMessageId message = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"), new Date(), false, new Flags());
await();
@@ -991,8 +986,8 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldIncludeMessagesWhenFromFilterMatchesFrom() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
- ComposedMessageId message = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
+ ComposedMessageId message = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/mailWithRecipients.eml"), new Date(), false, new Flags());
await();
@@ -1008,8 +1003,8 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldExcludeMessagesWhenFromFilterDoesntMatchFrom() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
- mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
+ mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/mailWithRecipients.eml"), new Date(), false, new Flags());
await();
@@ -1025,8 +1020,8 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldIncludeMessagesWhenToFilterMatchesTo() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
- ComposedMessageId message = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
+ ComposedMessageId message = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/mailWithRecipients.eml"), new Date(), false, new Flags());
await();
@@ -1042,8 +1037,8 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldExcludeMessagesWhenToFilterDoesntMatchTo() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
- mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
+ mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/mailWithRecipients.eml"), new Date(), false, new Flags());
await();
@@ -1059,8 +1054,8 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldIncludeMessagesWhenCcFilterMatchesCc() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
- ComposedMessageId message = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
+ ComposedMessageId message = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/mailWithRecipients.eml"), new Date(), false, new Flags());
await();
@@ -1076,8 +1071,8 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldExcludeMessagesWhenCcFilterDoesntMatchCc() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
- mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
+ mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/mailWithRecipients.eml"), new Date(), false, new Flags());
await();
@@ -1093,8 +1088,8 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldIncludeMessagesWhenBccFilterMatchesBcc() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
- ComposedMessageId message = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
+ ComposedMessageId message = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/mailWithRecipients.eml"), new Date(), false, new Flags());
await();
@@ -1110,8 +1105,8 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldExcludeMessagesWhenBccFilterDoesntMatchBcc() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
- mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
+ mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
ClassLoader.getSystemResourceAsStream("eml/mailWithRecipients.eml"), new Date(), false, new Flags());
await();
@@ -1127,7 +1122,7 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldExcludeMessagesWhenAttachmentFilterDoesntMatch() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
byte[] attachmentContent = ClassLoaderUtils.getSystemResourceAsByteArray("eml/attachment.pdf");
BodyPart attachment = BodyPartBuilder.create()
.setBody(attachmentContent, "application/pdf")
@@ -1141,7 +1136,7 @@ public abstract class GetMessageListMethodTest {
Message message = Message.Builder.of()
.setBody(multipart)
.build();
- mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream(DefaultMessageWriter.asBytes(message)), new Date(), false, new Flags());
await();
@@ -1157,7 +1152,7 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldIncludeMessagesWhenAttachmentFilterMatches() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
byte[] attachmentContent = ClassLoaderUtils.getSystemResourceAsByteArray("eml/attachment.pdf");
BodyPart attachment = BodyPartBuilder.create()
.setBody(attachmentContent, "application/pdf")
@@ -1171,7 +1166,7 @@ public abstract class GetMessageListMethodTest {
Message message = Message.Builder.of()
.setBody(multipart)
.build();
- ComposedMessageId composedMessageId = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId composedMessageId = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream(DefaultMessageWriter.asBytes(message)), new Date(), false, new Flags());
await();
@@ -1187,12 +1182,12 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldSortMessagesWhenSortedByDateDefault() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
LocalDate date = LocalDate.now();
- ComposedMessageId message1 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
- ComposedMessageId message2 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
await();
@@ -1209,13 +1204,13 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldSortMessagesWhenDateDoesntHaveCentury() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
LocalDate date = LocalDate.parse("Wed, 28 Jun 17 09:23:01 +0200", ImapDateTimeFormatter.rfc5322());
- ComposedMessageId message1 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
LocalDate date2 = LocalDate.parse("Tue, 27 Jun 2017 09:23:01 +0200", ImapDateTimeFormatter.rfc5322());
- ComposedMessageId message2 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), convertToDate(date2), false, new Flags());
await();
@@ -1232,12 +1227,12 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldSortMessagesWhenSortedByDateAsc() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
LocalDate date = LocalDate.now();
- ComposedMessageId message1 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Date: Fri, 02 Jun 2017 13:54:59 +0200\r\nSubject: test\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
- ComposedMessageId message2 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Date: Fri, 02 Jun 2017 14:54:59 +0200\r\nSubject: test2\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
await();
@@ -1254,12 +1249,12 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldSortMessagesWhenSortedBySubjectAsc() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
LocalDate date = LocalDate.now();
- ComposedMessageId message1 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Date: Fri, 02 Jun 2017 13:54:59 +0200\r\nSubject: a subject\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
- ComposedMessageId message2 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Date: Fri, 02 Jun 2017 14:54:59 +0200\r\nSubject: b subject\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
await();
@@ -1276,12 +1271,12 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldSortMessagesWhenSortedBySubjectDesc() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
LocalDate date = LocalDate.now();
- ComposedMessageId message1 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Date: Fri, 02 Jun 2017 13:54:59 +0200\r\nSubject: a subject\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
- ComposedMessageId message2 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Date: Fri, 02 Jun 2017 14:54:59 +0200\r\nSubject: b subject\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
await();
@@ -1298,12 +1293,12 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldSortMessagesWhenSortedByFromAsc() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
LocalDate date = LocalDate.now();
- ComposedMessageId message1 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Date: Fri, 02 Jun 2017 13:54:59 +0200\r\nSubject: subject\r\nFrom: bbb\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
- ComposedMessageId message2 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Date: Fri, 02 Jun 2017 14:54:59 +0200\r\nSubject: subject\r\nFrom: aaa\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
await();
@@ -1320,12 +1315,12 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldSortMessagesWhenSortedByFromDesc() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
LocalDate date = LocalDate.now();
- ComposedMessageId message1 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Date: Fri, 02 Jun 2017 13:54:59 +0200\r\nSubject: subject\r\nFrom: aaa\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
- ComposedMessageId message2 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Date: Fri, 02 Jun 2017 14:54:59 +0200\r\nSubject: subject\r\nFrom: bbb\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
await();
@@ -1342,12 +1337,12 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldSortMessagesWhenSortedByToAsc() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
LocalDate date = LocalDate.now();
- ComposedMessageId message1 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Date: Fri, 02 Jun 2017 13:54:59 +0200\r\nSubject: subject\r\nTo: bbb\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
- ComposedMessageId message2 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Date: Fri, 02 Jun 2017 14:54:59 +0200\r\nSubject: subject\r\nTo: aaa\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
await();
@@ -1364,12 +1359,12 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldSortMessagesWhenSortedByToDesc() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
LocalDate date = LocalDate.now();
- ComposedMessageId message1 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Date: Fri, 02 Jun 2017 13:54:59 +0200\r\nSubject: subject\r\nTo: aaa\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
- ComposedMessageId message2 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Date: Fri, 02 Jun 2017 14:54:59 +0200\r\nSubject: subject\r\nTo: bbb\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
await();
@@ -1387,12 +1382,12 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldSortMessagesWhenSortedBySizeAsc() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
LocalDate date = LocalDate.now();
- ComposedMessageId message1 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Date: Fri, 02 Jun 2017 13:54:59 +0200\r\nSubject: subject\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
- ComposedMessageId message2 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Date: Fri, 02 Jun 2017 14:54:59 +0200\r\nSubject: subject\r\n\r\ntestmail bigger".getBytes()), convertToDate(date), false, new Flags());
await();
@@ -1409,12 +1404,12 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldSortMessagesWhenSortedBySizeDesc() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
LocalDate date = LocalDate.now();
- ComposedMessageId message1 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Date: Fri, 02 Jun 2017 13:54:59 +0200\r\nSubject: subject\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
- ComposedMessageId message2 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Date: Fri, 02 Jun 2017 14:54:59 +0200\r\nSubject: subject\r\n\r\ntestmail bigger".getBytes()), convertToDate(date), false, new Flags());
await();
@@ -1431,14 +1426,14 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldSortMessagesWhenSortedBySizeAndDateAsc() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
LocalDate date = LocalDate.now();
- ComposedMessageId message1 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Date: Fri, 02 Jun 2017 13:54:59 +0200\r\nSubject: test\r\n\r\ntestmail really bigger".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
- ComposedMessageId message2 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Date: Fri, 02 Jun 2017 14:54:59 +0200\r\nSubject: test\r\n\r\ntestmail smaller".getBytes()), convertToDate(date), false, new Flags());
- ComposedMessageId message3 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message3 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Date: Fri, 02 Jun 2017 15:54:59 +0200\r\nSubject: test\r\n\r\ntestmail really bigger".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
await();
@@ -1456,14 +1451,14 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldSortMessagesWhenSortedByDateAndSizeAsc() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
LocalDate date = LocalDate.now();
- ComposedMessageId message1 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Date: Fri, 02 Jun 2017 13:54:59 +0200\r\nSubject: test\r\n\r\ntestmail really bigger".getBytes()), convertToDate(date), false, new Flags());
- ComposedMessageId message2 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Date: Fri, 02 Jun 2017 13:54:59 +0200\r\nSubject: test\r\n\r\ntestmail smaller".getBytes()), convertToDate(date), false, new Flags());
- ComposedMessageId message3 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message3 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Date: Fri, 02 Jun 2017 15:54:59 +0200\r\nSubject: test\r\n\r\ntestmail really bigger".getBytes()), convertToDate(date), false, new Flags());
await();
@@ -1481,12 +1476,12 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldSupportIdSorting() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
LocalDate date = LocalDate.now();
- ComposedMessageId message1 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
- ComposedMessageId message2 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
await();
@@ -1503,12 +1498,12 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldSortMessagesWhenSortedByDateDesc() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
LocalDate date = LocalDate.now();
- ComposedMessageId message1 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
- ComposedMessageId message2 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
await();
@@ -1549,12 +1544,12 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldReturnAllMessagesWhenPositionIsNotGiven() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
LocalDate date = LocalDate.now();
- ComposedMessageId message1 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
- ComposedMessageId message2 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
await();
@@ -1571,12 +1566,12 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldReturnSkipMessagesWhenPositionIsGiven() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
LocalDate date = LocalDate.now();
- mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
- ComposedMessageId message2 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
await();
@@ -1593,14 +1588,14 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldReturnSkipMessagesWhenPositionAndLimitGiven() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
LocalDate date = LocalDate.now();
- mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(2)), false, new Flags());
- ComposedMessageId message2 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
- mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test3\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
await();
@@ -1617,12 +1612,12 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldReturnAllMessagesWhenLimitIsNotGiven() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
LocalDate date = LocalDate.now();
- ComposedMessageId message1 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
- ComposedMessageId message2 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
await();
@@ -1639,12 +1634,12 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldReturnLimitMessagesWhenLimitGiven() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
LocalDate date = LocalDate.now();
- ComposedMessageId message = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
- mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
await();
@@ -1661,16 +1656,16 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldReturnLimitMessagesWithDefaultValueWhenLimitIsNotGiven() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
LocalDate date = LocalDate.now();
- ComposedMessageId message1 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message1 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
- ComposedMessageId message2 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message2 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
- ComposedMessageId message3 = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message3 = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test3\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
- mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test4\r\n\r\ntestmail".getBytes()), convertToDate(date), false, new Flags());
await();
@@ -1687,10 +1682,10 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldChainFetchingMessagesWhenAskedFor() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
LocalDate date = LocalDate.now();
- ComposedMessageId message = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId message = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
await();
@@ -1711,14 +1706,14 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListShouldComputeTextBodyWhenNoTextBodyButHtmlBody() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
String mailContent = "Content-Type: text/html\r\n"
+ "Subject: message 1 subject\r\n"
+ "\r\n"
+ "Hello <b>someone</b>, and thank you for joining example.com!";
LocalDate date = LocalDate.now();
- mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream(mailContent.getBytes()), convertToDate(date.plusDays(1)), false, new Flags());
await();
@@ -1738,11 +1733,11 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListHasKeywordFilterShouldReturnMessagesWithKeywords() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
- ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- ComposedMessageId messageFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags(Flags.Flag.FLAGGED));
await();
@@ -1762,16 +1757,16 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListHasKeywordFilterShouldReturnMessagesWithUserKeywords() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
Flags flags = FlagsBuilder.builder()
.add(Flags.Flag.FLAGGED)
.add(FORWARDED)
.build();
- ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- ComposedMessageId messageFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, flags);
await();
@@ -1791,11 +1786,11 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListNotKeywordFilterShouldReturnMessagesWithoutKeywords() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
- ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- ComposedMessageId messageFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags(Flags.Flag.FLAGGED));
await();
@@ -1815,16 +1810,16 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListNotKeywordFilterShouldReturnMessagesWithoutUserKeywords() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
Flags flags = FlagsBuilder.builder()
.add(Flags.Flag.FLAGGED)
.add(FORWARDED)
.build();
- ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- ComposedMessageId messageFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, flags);
await();
@@ -1844,16 +1839,16 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListNotKeywordFilterShouldReturnMessagesWithoutKeywordsWhenMultipleNotKeywordAndFilterOperator() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
Flags flags = FlagsBuilder.builder()
.add(FORWARDED)
.add(Flags.Flag.DRAFT)
.build();
- ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags(Flags.Flag.FLAGGED));
- ComposedMessageId messageFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, flags);
await();
@@ -1872,11 +1867,11 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListHasKeywordAndNotKeywordFilterShouldReturnMessagesWithAndWithoutKeywords() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
- ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- ComposedMessageId messageFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags(Flags.Flag.FLAGGED));
await();
@@ -1896,11 +1891,11 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListHasKeywordShouldIgnoreDeleted() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
- ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- ComposedMessageId messageFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags(Flags.Flag.DELETED));
await();
@@ -1919,11 +1914,11 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListHasKeywordShouldIgnoreRecent() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
- ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- ComposedMessageId messageFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags(Flags.Flag.RECENT));
await();
@@ -1942,11 +1937,11 @@ public abstract class GetMessageListMethodTest {
@Test
public void getMessageListNotKeywordShouldIgnoreDeleted() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "mailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "mailbox");
- ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "mailbox"),
+ ComposedMessageId messageNotFlagged = mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "mailbox"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
- ComposedMessageId messageFlagged = mailboxProbe.appendMessage(alice, MailboxPath.forUse
<TRUNCATED>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[09/24] james-project git commit: JAMES-2366 Bind webadmin forward
routes
Posted by ad...@apache.org.
JAMES-2366 Bind webadmin forward routes
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/43259b5f
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/43259b5f
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/43259b5f
Branch: refs/heads/master
Commit: 43259b5f1dc94429c4eea75f6af060612feb4065
Parents: 92f4a68
Author: benwa <bt...@linagora.com>
Authored: Thu Mar 29 16:17:34 2018 +0700
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Apr 6 15:04:48 2018 +0200
----------------------------------------------------------------------
.../java/org/apache/james/modules/server/DataRoutesModules.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/43259b5f/server/container/guice/protocols/webadmin-data/src/main/java/org/apache/james/modules/server/DataRoutesModules.java
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/webadmin-data/src/main/java/org/apache/james/modules/server/DataRoutesModules.java b/server/container/guice/protocols/webadmin-data/src/main/java/org/apache/james/modules/server/DataRoutesModules.java
index a279651..2ae64ec 100644
--- a/server/container/guice/protocols/webadmin-data/src/main/java/org/apache/james/modules/server/DataRoutesModules.java
+++ b/server/container/guice/protocols/webadmin-data/src/main/java/org/apache/james/modules/server/DataRoutesModules.java
@@ -21,6 +21,7 @@ package org.apache.james.modules.server;
import org.apache.james.webadmin.Routes;
import org.apache.james.webadmin.routes.DomainsRoutes;
+import org.apache.james.webadmin.routes.ForwardRoutes;
import org.apache.james.webadmin.routes.GroupsRoutes;
import org.apache.james.webadmin.routes.UserRoutes;
@@ -33,6 +34,7 @@ public class DataRoutesModules extends AbstractModule {
protected void configure() {
Multibinder<Routes> routesMultibinder = Multibinder.newSetBinder(binder(), Routes.class);
routesMultibinder.addBinding().to(DomainsRoutes.class);
+ routesMultibinder.addBinding().to(ForwardRoutes.class);
routesMultibinder.addBinding().to(GroupsRoutes.class);
routesMultibinder.addBinding().to(UserRoutes.class);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[17/24] james-project git commit: JAMES-2366 Factorize some common
JMAP calls in JMAP integration tests
Posted by ad...@apache.org.
JAMES-2366 Factorize some common JMAP calls in JMAP integration tests
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/7be706d8
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/7be706d8
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/7be706d8
Branch: refs/heads/master
Commit: 7be706d808f253053cef42e4e815507c822fa357
Parents: a2f301f
Author: benwa <bt...@linagora.com>
Authored: Thu Apr 5 16:54:22 2018 +0700
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Apr 6 15:04:49 2018 +0200
----------------------------------------------------------------------
.../apache/james/jmap/JmapCommonRequests.java | 101 +++++++++++++++++++
.../integration/ForwardIntegrationTest.java | 44 +-------
.../methods/integration/SendMDNMethodTest.java | 54 +---------
3 files changed, 107 insertions(+), 92 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/7be706d8/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java
new file mode 100644
index 0000000..6397833
--- /dev/null
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java
@@ -0,0 +1,101 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.jmap;
+
+import static com.jayway.restassured.RestAssured.with;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.james.jmap.api.access.AccessToken;
+import org.apache.james.mailbox.Role;
+
+public class JmapCommonRequests {
+ private static final String NAME = "[0][0]";
+ private static final String ARGUMENTS = "[0][1]";
+
+ public static String getOutboxId(AccessToken accessToken) {
+ return getMailboxId(accessToken, Role.OUTBOX);
+ }
+
+ public static String getMailboxId(AccessToken accessToken, Role role) {
+ return getAllMailboxesIds(accessToken).stream()
+ .filter(x -> x.get("role").equalsIgnoreCase(role.serialize()))
+ .map(x -> x.get("id"))
+ .findFirst().get();
+ }
+
+ public static List<Map<String, String>> getAllMailboxesIds(AccessToken accessToken) {
+ return with()
+ .header("Authorization", accessToken.serialize())
+ .body("[[\"getMailboxes\", {\"properties\": [\"role\", \"id\"]}, \"#0\"]]")
+ .post("/jmap")
+ .andReturn()
+ .body()
+ .jsonPath()
+ .getList(ARGUMENTS + ".list");
+ }
+
+ public static boolean isAnyMessageFoundInRecipientsMailboxes(AccessToken recipientToken) {
+ try {
+ with()
+ .header("Authorization", recipientToken.serialize())
+ .body("[[\"getMessageList\", {}, \"#0\"]]")
+ .when()
+ .post("/jmap")
+ .then()
+ .statusCode(200)
+ .body(NAME, equalTo("messageList"))
+ .body(ARGUMENTS + ".messageIds", hasSize(1));
+ return true;
+
+ } catch (AssertionError e) {
+ return false;
+ }
+ }
+
+ public static String getInboxId(AccessToken accessToken) {
+ return getMailboxId(accessToken, Role.INBOX);
+ }
+
+ public static List<String> listMessageIdsForAccount(AccessToken accessToken) {
+ return with()
+ .header("Authorization", accessToken.serialize())
+ .body("[[\"getMessageList\", {}, \"#0\"]]")
+ .post("/jmap")
+ .then()
+ .extract()
+ .body()
+ .path(ARGUMENTS + ".messageIds");
+ }
+
+ public static List<String> listMessageIdsInMailbox(AccessToken accessToken, String mailboxId) {
+ return with()
+ .header("Authorization", accessToken.serialize())
+ .body("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"" + mailboxId + "\"]}}, \"#0\"]]")
+ .post("/jmap")
+ .then()
+ .extract()
+ .body()
+ .path(ARGUMENTS + ".messageIds");
+ }
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/7be706d8/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
index 92d02b6..8511b45 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
@@ -22,19 +22,18 @@ package org.apache.james.jmap.methods.integration;
import static com.jayway.restassured.RestAssured.given;
import static com.jayway.restassured.RestAssured.with;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
+import static org.apache.james.jmap.JmapCommonRequests.getOutboxId;
+import static org.apache.james.jmap.JmapCommonRequests.isAnyMessageFoundInRecipientsMailboxes;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.calmlyAwait;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
-import java.util.List;
-import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.apache.james.GuiceJamesServer;
import org.apache.james.jmap.api.access.AccessToken;
-import org.apache.james.mailbox.Role;
import org.apache.james.probe.DataProbe;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.JmapGuiceProbe;
@@ -241,43 +240,4 @@ public abstract class ForwardIntegrationTest {
.body(ARGUMENTS + ".messageIds", hasSize(0));
}
- private String getOutboxId(AccessToken accessToken) {
- return getMailboxId(accessToken, Role.OUTBOX);
- }
-
- private String getMailboxId(AccessToken accessToken, Role role) {
- return getAllMailboxesIds(accessToken).stream()
- .filter(x -> x.get("role").equalsIgnoreCase(role.serialize()))
- .map(x -> x.get("id"))
- .findFirst().get();
- }
-
- private List<Map<String, String>> getAllMailboxesIds(AccessToken accessToken) {
- return with()
- .header("Authorization", accessToken.serialize())
- .body("[[\"getMailboxes\", {\"properties\": [\"role\", \"id\"]}, \"#0\"]]")
- .post("/jmap")
- .andReturn()
- .body()
- .jsonPath()
- .getList(ARGUMENTS + ".list");
- }
-
- private boolean isAnyMessageFoundInRecipientsMailboxes(AccessToken recipientToken) {
- try {
- with()
- .header("Authorization", recipientToken.serialize())
- .body("[[\"getMessageList\", {}, \"#0\"]]")
- .when()
- .post("/jmap")
- .then()
- .statusCode(200)
- .body(NAME, equalTo("messageList"))
- .body(ARGUMENTS + ".messageIds", hasSize(1));
- return true;
-
- } catch (AssertionError e) {
- return false;
- }
- }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/7be706d8/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java
index cc3d9c9..faeb705 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java
@@ -22,6 +22,10 @@ package org.apache.james.jmap.methods.integration;
import static com.jayway.restassured.RestAssured.given;
import static com.jayway.restassured.RestAssured.with;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
+import static org.apache.james.jmap.JmapCommonRequests.getInboxId;
+import static org.apache.james.jmap.JmapCommonRequests.getOutboxId;
+import static org.apache.james.jmap.JmapCommonRequests.listMessageIdsForAccount;
+import static org.apache.james.jmap.JmapCommonRequests.listMessageIdsInMailbox;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.calmlyAwait;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
@@ -34,14 +38,12 @@ import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.startsWith;
import java.util.List;
-import java.util.Map;
import java.util.Optional;
import org.apache.james.GuiceJamesServer;
import org.apache.james.jmap.MessageAppender;
import org.apache.james.jmap.api.access.AccessToken;
import org.apache.james.mailbox.DefaultMailboxes;
-import org.apache.james.mailbox.Role;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailbox.model.MessageId;
@@ -490,52 +492,4 @@ public abstract class SendMDNMethodTest {
.body(ARGUMENTS + ".description", containsString("Unrecognized MDN Disposition action mode invalid. Should be one of [manual-action, automatic-action]"));
}
- private String getInboxId(AccessToken accessToken) {
- return getMailboxId(accessToken, Role.INBOX);
- }
-
- private String getOutboxId(AccessToken accessToken) {
- return getMailboxId(accessToken, Role.OUTBOX);
- }
-
- private String getMailboxId(AccessToken accessToken, Role role) {
- return getAllMailboxesIds(accessToken).stream()
- .filter(x -> x.get("role").equalsIgnoreCase(role.serialize()))
- .map(x -> x.get("id"))
- .findFirst().get();
- }
-
- private List<Map<String, String>> getAllMailboxesIds(AccessToken accessToken) {
- return with()
- .header("Authorization", accessToken.serialize())
- .body("[[\"getMailboxes\", {\"properties\": [\"role\", \"id\"]}, \"#0\"]]")
- .post("/jmap")
- .andReturn()
- .body()
- .jsonPath()
- .getList(ARGUMENTS + ".list");
- }
-
- private List<String> listMessageIdsForAccount(AccessToken accessToken) {
- return with()
- .header("Authorization", accessToken.serialize())
- .body("[[\"getMessageList\", {}, \"#0\"]]")
- .post("/jmap")
- .then()
- .extract()
- .body()
- .path(ARGUMENTS + ".messageIds");
- }
-
- private List<String> listMessageIdsInMailbox(AccessToken accessToken, String mailboxId) {
- return with()
- .header("Authorization", accessToken.serialize())
- .body("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"" + mailboxId + "\"]}}, \"#0\"]]")
- .post("/jmap")
- .then()
- .extract()
- .body()
- .path(ARGUMENTS + ".messageIds");
- }
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[16/24] james-project git commit: JAMES-2366 Factorize JMAP
integration tests requests specifications
Posted by ad...@apache.org.
JAMES-2366 Factorize JMAP integration tests requests specifications
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/fa564d20
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fa564d20
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fa564d20
Branch: refs/heads/master
Commit: fa564d20db44e26c70204cdd7e0c02894d9db569
Parents: 77bb6b5
Author: benwa <bt...@linagora.com>
Authored: Thu Apr 5 16:31:20 2018 +0700
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Apr 6 15:04:49 2018 +0200
----------------------------------------------------------------------
.../apache/james/jmap/JMAPAuthenticationTest.java | 8 ++------
.../java/org/apache/james/jmap/ProvisioningTest.java | 7 ++-----
.../java/org/apache/james/jmap/TestingConstants.java | 11 +++++++++++
.../apache/james/jmap/VacationIntegrationTest.java | 15 +++------------
.../methods/integration/ForwardIntegrationTest.java | 10 ++--------
.../methods/integration/GetMailboxesMethodTest.java | 10 ++--------
.../integration/GetMessageListMethodTest.java | 10 ++--------
.../methods/integration/GetVacationResponseTest.java | 9 ++-------
.../jmap/methods/integration/SendMDNMethodTest.java | 10 ++--------
.../methods/integration/SetMailboxesMethodTest.java | 10 ++--------
.../methods/integration/SetVacationResponseTest.java | 12 +++---------
11 files changed, 33 insertions(+), 79 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/fa564d20/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
index 1ce4d38..fab854f 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
@@ -20,15 +20,13 @@ package org.apache.james.jmap;
import static com.jayway.restassured.RestAssured.given;
import static com.jayway.restassured.RestAssured.with;
-import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
-import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.hamcrest.Matchers.both;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.isA;
import static org.hamcrest.Matchers.notNullValue;
-import java.nio.charset.StandardCharsets;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.UUID;
@@ -42,7 +40,6 @@ import org.junit.Before;
import org.junit.Test;
import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType;
public abstract class JMAPAuthenticationTest {
@@ -63,8 +60,7 @@ public abstract class JMAPAuthenticationTest {
zonedDateTimeProvider.setFixedDateTime(oldDate);
jmapServer = createJmapServer(zonedDateTimeProvider);
jmapServer.start();
- RestAssured.requestSpecification = new RequestSpecBuilder()
- .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
+ RestAssured.requestSpecification = jmapRequestSpecBuilder
.setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort())
.build();
http://git-wip-us.apache.org/repos/asf/james-project/blob/fa564d20/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java
index 67e40f8..fdce82a 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java
@@ -21,8 +21,7 @@ package org.apache.james.jmap;
import static com.jayway.restassured.RestAssured.given;
import static com.jayway.restassured.RestAssured.with;
-import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
-import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasItems;
@@ -43,7 +42,6 @@ import org.junit.Before;
import org.junit.Test;
import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.builder.RequestSpecBuilder;
public abstract class ProvisioningTest {
private static final String NAME = "[0][0]";
@@ -60,8 +58,7 @@ public abstract class ProvisioningTest {
public void setup() throws Throwable {
jmapServer = createJmapServer();
jmapServer.start();
- RestAssured.requestSpecification = new RequestSpecBuilder()
- .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
+ RestAssured.requestSpecification = jmapRequestSpecBuilder
.setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort())
.build();
http://git-wip-us.apache.org/repos/asf/james-project/blob/fa564d20/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java
index 9e9e37d..9cd1141 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java
@@ -19,9 +19,16 @@
package org.apache.james.jmap;
+import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
+import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+
+import java.nio.charset.StandardCharsets;
+
import com.jayway.awaitility.Awaitility;
import com.jayway.awaitility.Duration;
import com.jayway.awaitility.core.ConditionFactory;
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.http.ContentType;
public interface TestingConstants {
Duration slowPacedPollInterval = Duration.FIVE_HUNDRED_MILLISECONDS;
@@ -32,5 +39,9 @@ public interface TestingConstants {
.pollDelay(slowPacedPollInterval)
.await();
+ RequestSpecBuilder jmapRequestSpecBuilder = new RequestSpecBuilder()
+ .setContentType(ContentType.JSON)
+ .setAccept(ContentType.JSON)
+ .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fa564d20/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
index f6de795..fd02e35 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
@@ -21,9 +21,8 @@ package org.apache.james.jmap;
import static com.jayway.restassured.RestAssured.given;
import static com.jayway.restassured.RestAssured.with;
-import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
-import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
import static org.apache.james.jmap.TestingConstants.calmlyAwait;
+import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
@@ -50,8 +49,6 @@ import org.junit.Before;
import org.junit.Test;
import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
public abstract class VacationIntegrationTest {
@@ -91,14 +88,8 @@ public abstract class VacationIntegrationTest {
await();
jmapGuiceProbe = guiceJamesServer.getProbe(JmapGuiceProbe.class);
- RestAssured.requestSpecification = new RequestSpecBuilder()
- .setContentType(ContentType.JSON)
- .setAccept(ContentType.JSON)
- .setConfig(newConfig()
- .encoderConfig(
- encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
- .setPort(jmapGuiceProbe
- .getJmapPort())
+ RestAssured.requestSpecification = jmapRequestSpecBuilder
+ .setPort(jmapGuiceProbe.getJmapPort())
.build();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fa564d20/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
index 07ded58..7f8f047 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
@@ -21,9 +21,8 @@ package org.apache.james.jmap.methods.integration;
import static com.jayway.restassured.RestAssured.given;
import static com.jayway.restassured.RestAssured.with;
-import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
-import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
import static org.apache.james.jmap.TestingConstants.calmlyAwait;
+import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
@@ -47,8 +46,6 @@ import org.junit.Before;
import org.junit.Test;
import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification;
public abstract class ForwardIntegrationTest {
@@ -80,10 +77,7 @@ public abstract class ForwardIntegrationTest {
dataProbe.addUser(ALICE, ALICE_PASSWORD);
dataProbe.addUser(CEDRIC, CEDRIC_PASSWORD);
- RestAssured.requestSpecification = new RequestSpecBuilder()
- .setContentType(ContentType.JSON)
- .setAccept(ContentType.JSON)
- .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
+ RestAssured.requestSpecification = jmapRequestSpecBuilder
.setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort())
.build();
http://git-wip-us.apache.org/repos/asf/james-project/blob/fa564d20/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
index a91c6e5..e9506cf 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
@@ -20,8 +20,7 @@
package org.apache.james.jmap.methods.integration;
import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
-import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.equalTo;
@@ -77,8 +76,6 @@ import org.junit.Test;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
public abstract class GetMailboxesMethodTest {
private static final String NAME = "[0][0]";
@@ -110,10 +107,7 @@ public abstract class GetMailboxesMethodTest {
aclProbe = jmapServer.getProbe(ACLProbeImpl.class);
quotaProbe = jmapServer.getProbe(QuotaProbesImpl.class);
- RestAssured.requestSpecification = new RequestSpecBuilder()
- .setContentType(ContentType.JSON)
- .setAccept(ContentType.JSON)
- .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
+ RestAssured.requestSpecification = jmapRequestSpecBuilder
.setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort())
.build();
RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
http://git-wip-us.apache.org/repos/asf/james-project/blob/fa564d20/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
index 3c5d7b7..f33ca0d 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
@@ -20,8 +20,7 @@
package org.apache.james.jmap.methods.integration;
import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
-import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsInAnyOrder;
@@ -70,8 +69,6 @@ import org.junit.Before;
import org.junit.Test;
import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
public abstract class GetMessageListMethodTest {
private static final String FORWARDED = "$Forwarded";
@@ -101,10 +98,7 @@ public abstract class GetMessageListMethodTest {
dataProbe = jmapServer.getProbe(DataProbeImpl.class);
aclProbe = jmapServer.getProbe(ACLProbeImpl.class);
- RestAssured.requestSpecification = new RequestSpecBuilder()
- .setContentType(ContentType.JSON)
- .setAccept(ContentType.JSON)
- .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
+ RestAssured.requestSpecification = jmapRequestSpecBuilder
.setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort())
.build();
http://git-wip-us.apache.org/repos/asf/james-project/blob/fa564d20/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
index ef94455..df02cac 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
@@ -20,8 +20,7 @@
package org.apache.james.jmap.methods.integration;
import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
-import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.core.IsNull.nullValue;
@@ -45,7 +44,6 @@ import org.junit.Before;
import org.junit.Test;
import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType;
public abstract class GetVacationResponseTest {
@@ -78,10 +76,7 @@ public abstract class GetVacationResponseTest {
jmapServer.start();
jmapGuiceProbe = jmapServer.getProbe(JmapGuiceProbe.class);
- RestAssured.requestSpecification = new RequestSpecBuilder()
- .setContentType(ContentType.JSON)
- .setAccept(ContentType.JSON)
- .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
+ RestAssured.requestSpecification = jmapRequestSpecBuilder
.setPort(jmapGuiceProbe.getJmapPort())
.build();
http://git-wip-us.apache.org/repos/asf/james-project/blob/fa564d20/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java
index b1144e2..23b0b90 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java
@@ -21,9 +21,8 @@ package org.apache.james.jmap.methods.integration;
import static com.jayway.restassured.RestAssured.given;
import static com.jayway.restassured.RestAssured.with;
-import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
-import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
import static org.apache.james.jmap.TestingConstants.calmlyAwait;
+import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
@@ -61,8 +60,6 @@ import org.junit.Before;
import org.junit.Test;
import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
import com.jayway.restassured.parsing.Parser;
public abstract class SendMDNMethodTest {
@@ -89,10 +86,7 @@ public abstract class SendMDNMethodTest {
MailboxProbe mailboxProbe = jmapServer.getProbe(MailboxProbeImpl.class);
DataProbe dataProbe = jmapServer.getProbe(DataProbeImpl.class);
- RestAssured.requestSpecification = new RequestSpecBuilder()
- .setContentType(ContentType.JSON)
- .setAccept(ContentType.JSON)
- .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
+ RestAssured.requestSpecification = jmapRequestSpecBuilder
.setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort())
.build();
RestAssured.defaultParser = Parser.JSON;
http://git-wip-us.apache.org/repos/asf/james-project/blob/fa564d20/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
index addba8a..a7b5b75 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
@@ -21,8 +21,7 @@ package org.apache.james.jmap.methods.integration;
import static com.jayway.restassured.RestAssured.given;
import static com.jayway.restassured.RestAssured.with;
-import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
-import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsInAnyOrder;
@@ -66,8 +65,6 @@ import org.junit.Test;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
public abstract class SetMailboxesMethodTest {
@@ -99,10 +96,7 @@ public abstract class SetMailboxesMethodTest {
mailboxProbe = jmapServer.getProbe(MailboxProbeImpl.class);
DataProbe dataProbe = jmapServer.getProbe(DataProbeImpl.class);
- RestAssured.requestSpecification = new RequestSpecBuilder()
- .setContentType(ContentType.JSON)
- .setAccept(ContentType.JSON)
- .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
+ RestAssured.requestSpecification = jmapRequestSpecBuilder
.setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort())
.build();
RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
http://git-wip-us.apache.org/repos/asf/james-project/blob/fa564d20/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
index 3bc81a6..5644fc9 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
@@ -20,8 +20,7 @@
package org.apache.james.jmap.methods.integration;
import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
-import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.equalTo;
@@ -44,7 +43,6 @@ import org.junit.Before;
import org.junit.Test;
import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType;
public abstract class SetVacationResponseTest {
@@ -69,12 +67,8 @@ public abstract class SetVacationResponseTest {
jmapServer = createJmapServer();
jmapServer.start();
jmapGuiceProbe = jmapServer.getProbe(JmapGuiceProbe.class);
- RestAssured.requestSpecification = new RequestSpecBuilder()
- .setContentType(ContentType.JSON)
- .setAccept(ContentType.JSON)
- .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
- .setPort(jmapGuiceProbe
- .getJmapPort())
+ RestAssured.requestSpecification = jmapRequestSpecBuilder
+ .setPort(jmapGuiceProbe.getJmapPort())
.build();
jmapServer.getProbe(DataProbeImpl.class).addDomain(USERS_DOMAIN);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[18/24] james-project git commit: JAMES-2366 Factorize some common
JSON path constants in JMAP integration tests
Posted by ad...@apache.org.
JAMES-2366 Factorize some common JSON path constants in JMAP integration tests
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/e229cb23
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/e229cb23
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/e229cb23
Branch: refs/heads/master
Commit: e229cb2397a2dc2650a4057d01a0351e97d61c72
Parents: 7be706d
Author: benwa <bt...@linagora.com>
Authored: Thu Apr 5 17:08:43 2018 +0700
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Apr 6 15:04:49 2018 +0200
----------------------------------------------------------------------
.../test/java/org/apache/james/jmap/TestingConstants.java | 7 +++++++
.../java/org/apache/james/jmap/VacationIntegrationTest.java | 6 +++---
.../jmap/methods/integration/ForwardIntegrationTest.java | 4 ++--
.../jmap/methods/integration/GetMailboxesMethodTest.java | 9 ++++-----
.../jmap/methods/integration/GetMessageListMethodTest.java | 4 ++--
.../jmap/methods/integration/GetVacationResponseTest.java | 5 ++---
.../james/jmap/methods/integration/SendMDNMethodTest.java | 4 ++--
.../jmap/methods/integration/SetMailboxesMethodTest.java | 6 +++---
.../jmap/methods/integration/SetMessagesMethodTest.java | 8 ++++----
.../jmap/methods/integration/SetVacationResponseTest.java | 4 ++--
.../jmap/methods/integration/SpamAssassinContract.java | 4 ++--
.../integration/cucumber/GetMailboxesMethodStepdefs.java | 5 ++---
.../integration/cucumber/GetMessageListMethodStepdefs.java | 2 +-
.../integration/cucumber/GetMessagesMethodStepdefs.java | 4 ++--
.../integration/cucumber/SetMailboxesMethodStepdefs.java | 5 ++---
15 files changed, 40 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java
index 9cd1141..aa1da2f 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java
@@ -44,4 +44,11 @@ public interface TestingConstants {
.setAccept(ContentType.JSON)
.setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)));
+ String NAME = "[0][0]";
+ String ARGUMENTS = "[0][1]";
+ String FIRST_MAILBOX = ARGUMENTS + ".list[0]";
+ String SECOND_MAILBOX = ARGUMENTS + ".list[1]";
+ String SECOND_NAME = "[1][0]";
+ String SECOND_ARGUMENTS = "[1][1]";
+
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
index ffed249..5afcdec 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
@@ -23,6 +23,9 @@ import static com.jayway.restassured.RestAssured.given;
import static com.jayway.restassured.RestAssured.with;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
+import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
+import static org.apache.james.jmap.TestingConstants.SECOND_ARGUMENTS;
+import static org.apache.james.jmap.TestingConstants.SECOND_NAME;
import static org.apache.james.jmap.TestingConstants.calmlyAwait;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.hamcrest.Matchers.empty;
@@ -52,9 +55,6 @@ import com.jayway.restassured.RestAssured;
public abstract class VacationIntegrationTest {
- private static final String ARGUMENTS = "[0][1]";
- private static final String SECOND_NAME = "[1][0]";
- private static final String SECOND_ARGUMENTS = "[1][1]";
private static final String DOMAIN = "mydomain.tld";
private static final String USER_1 = "benwa@" + DOMAIN;
private static final String USER_2 = "matthieu@" + DOMAIN;
http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
index 8511b45..8aa0908 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
@@ -25,6 +25,8 @@ import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser
import static org.apache.james.jmap.JmapCommonRequests.getOutboxId;
import static org.apache.james.jmap.JmapCommonRequests.isAnyMessageFoundInRecipientsMailboxes;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
+import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
+import static org.apache.james.jmap.TestingConstants.NAME;
import static org.apache.james.jmap.TestingConstants.calmlyAwait;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.hamcrest.Matchers.equalTo;
@@ -56,8 +58,6 @@ public abstract class ForwardIntegrationTest {
private static final String CEDRIC = "cedric@" + DOMAIN;
private static final String CEDRIC_PASSWORD = "456789";
- private static final String NAME = "[0][0]";
- private static final String ARGUMENTS = "[0][1]";
protected abstract GuiceJamesServer createJmapServer();
http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
index 74a8f53..97d3510 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
@@ -22,6 +22,10 @@ package org.apache.james.jmap.methods.integration;
import static com.jayway.restassured.RestAssured.given;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
+import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
+import static org.apache.james.jmap.TestingConstants.FIRST_MAILBOX;
+import static org.apache.james.jmap.TestingConstants.NAME;
+import static org.apache.james.jmap.TestingConstants.SECOND_MAILBOX;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.empty;
@@ -78,11 +82,6 @@ import com.google.common.collect.ImmutableMap;
import com.jayway.restassured.RestAssured;
public abstract class GetMailboxesMethodTest {
- private static final String NAME = "[0][0]";
- private static final String ARGUMENTS = "[0][1]";
- private static final String FIRST_MAILBOX = ARGUMENTS + ".list[0]";
- private static final String SECOND_MAILBOX = ARGUMENTS + ".list[1]";
-
public static final String READ = String.valueOf(Right.Read.asCharacter());
public static final String LOOKUP = String.valueOf(Right.Lookup.asCharacter());
public static final String ADMINISTER = String.valueOf(Right.Administer.asCharacter());
http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
index 5eff994..692e716 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
@@ -22,6 +22,8 @@ package org.apache.james.jmap.methods.integration;
import static com.jayway.restassured.RestAssured.given;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
+import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
+import static org.apache.james.jmap.TestingConstants.NAME;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.contains;
@@ -72,8 +74,6 @@ import com.jayway.restassured.RestAssured;
public abstract class GetMessageListMethodTest {
private static final String FORWARDED = "$Forwarded";
- private static final String NAME = "[0][0]";
- private static final String ARGUMENTS = "[0][1]";
private static final ZoneId ZONE_ID = ZoneId.of("Europe/Paris");
private ACLProbeImpl aclProbe;
http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
index a4c5b6a..6213e1a 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
@@ -22,6 +22,8 @@ package org.apache.james.jmap.methods.integration;
import static com.jayway.restassured.RestAssured.given;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
+import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
+import static org.apache.james.jmap.TestingConstants.NAME;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
@@ -46,9 +48,6 @@ import com.jayway.restassured.RestAssured;
import com.jayway.restassured.http.ContentType;
public abstract class GetVacationResponseTest {
-
- private static final String NAME = "[0][0]";
- private static final String ARGUMENTS = "[0][1]";
private static final String USERS_DOMAIN = "domain.tld";
public static final String USER = "username@" + USERS_DOMAIN;
public static final String PASSWORD = "password";
http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java
index faeb705..14da500 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java
@@ -27,6 +27,8 @@ import static org.apache.james.jmap.JmapCommonRequests.getOutboxId;
import static org.apache.james.jmap.JmapCommonRequests.listMessageIdsForAccount;
import static org.apache.james.jmap.JmapCommonRequests.listMessageIdsInMailbox;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
+import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
+import static org.apache.james.jmap.TestingConstants.NAME;
import static org.apache.james.jmap.TestingConstants.calmlyAwait;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.hamcrest.Matchers.contains;
@@ -64,8 +66,6 @@ import com.jayway.restassured.RestAssured;
import com.jayway.restassured.parsing.Parser;
public abstract class SendMDNMethodTest {
- private static final String NAME = "[0][0]";
- private static final String ARGUMENTS = "[0][1]";
private static final String USERS_DOMAIN = "domain.tld";
private static final String HOMER = "homer@" + USERS_DOMAIN;
private static final String BART = "bart@" + USERS_DOMAIN;
http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
index 839491d..151707e 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
@@ -23,6 +23,9 @@ import static com.jayway.restassured.RestAssured.given;
import static com.jayway.restassured.RestAssured.with;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
+import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
+import static org.apache.james.jmap.TestingConstants.FIRST_MAILBOX;
+import static org.apache.james.jmap.TestingConstants.NAME;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.contains;
@@ -66,9 +69,6 @@ import com.jayway.restassured.RestAssured;
public abstract class SetMailboxesMethodTest {
- private static final String NAME = "[0][0]";
- private static final String ARGUMENTS = "[0][1]";
- private static final String FIRST_MAILBOX = ARGUMENTS + ".list[0]";
private static final String USERS_DOMAIN = "domain.tld";
private static final String ADMINISTER = String.valueOf(Right.Administer.asCharacter());
http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
index d042556..074a820 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
@@ -23,6 +23,10 @@ import static com.jayway.restassured.RestAssured.given;
import static com.jayway.restassured.RestAssured.with;
import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
+import static org.apache.james.jmap.TestingConstants.NAME;
+import static org.apache.james.jmap.TestingConstants.SECOND_ARGUMENTS;
+import static org.apache.james.jmap.TestingConstants.SECOND_NAME;
import static org.apache.james.jmap.TestingConstants.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.contains;
@@ -119,10 +123,6 @@ public abstract class SetMessagesMethodTest {
private static final int IMAP_PORT = 1143;
private static final String FORWARDED = "$Forwarded";
private static final int _1MB = 1024 * 1024;
- private static final String NAME = "[0][0]";
- private static final String ARGUMENTS = "[0][1]";
- private static final String SECOND_NAME = "[1][0]";
- private static final String SECOND_ARGUMENTS = "[1][1]";
private static final String USERS_DOMAIN = "domain.tld";
private static final String USERNAME = "username@" + USERS_DOMAIN;
private static final String BOB = "bob@" + USERS_DOMAIN;
http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
index 0724ced..a0bd93e 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
@@ -22,6 +22,8 @@ package org.apache.james.jmap.methods.integration;
import static com.jayway.restassured.RestAssured.given;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
+import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
+import static org.apache.james.jmap.TestingConstants.NAME;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.equalTo;
@@ -46,8 +48,6 @@ import com.jayway.restassured.http.ContentType;
public abstract class SetVacationResponseTest {
- private static final String NAME = "[0][0]";
- private static final String ARGUMENTS = "[0][1]";
private static final String USERS_DOMAIN = "domain.tld";
public static final String USER = "username@" + USERS_DOMAIN;
public static final String PASSWORD = "password";
http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java
index 0599108..fc1222b 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java
@@ -25,6 +25,8 @@ import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
+import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
+import static org.apache.james.jmap.TestingConstants.NAME;
import static org.apache.james.jmap.TestingConstants.calmlyAwait;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
@@ -50,8 +52,6 @@ import com.jayway.restassured.parsing.Parser;
public interface SpamAssassinContract {
- String NAME = "[0][0]";
- String ARGUMENTS = "[0][1]";
String BOBS_DOMAIN = "spamer.com";
String BOB = "bob@" + BOBS_DOMAIN;
String BOB_PASSWORD = "bobPassword";
http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMailboxesMethodStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMailboxesMethodStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMailboxesMethodStepdefs.java
index b293819..3a7ee03 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMailboxesMethodStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMailboxesMethodStepdefs.java
@@ -21,6 +21,8 @@ package org.apache.james.jmap.methods.integration.cucumber;
import static com.jayway.jsonpath.Criteria.where;
import static com.jayway.jsonpath.Filter.filter;
+import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
+import static org.apache.james.jmap.TestingConstants.NAME;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.ArrayList;
@@ -38,9 +40,6 @@ import cucumber.runtime.java.guice.ScenarioScoped;
@ScenarioScoped
public class GetMailboxesMethodStepdefs {
- private static final String NAME = "[0][0]";
- private static final String ARGUMENTS = "[0][1]";
-
private final UserStepdefs userStepdefs;
private final HttpClient httpClient;
private final MainStepdefs mainStepdefs;
http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessageListMethodStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessageListMethodStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessageListMethodStepdefs.java
index 3795b8d..c3b99af 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessageListMethodStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessageListMethodStepdefs.java
@@ -19,6 +19,7 @@
package org.apache.james.jmap.methods.integration.cucumber;
+import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.List;
@@ -34,7 +35,6 @@ import cucumber.runtime.java.guice.ScenarioScoped;
@ScenarioScoped
public class GetMessageListMethodStepdefs {
- private static final String ARGUMENTS = "[0][1]";
private final MainStepdefs mainStepdefs;
private final HttpClient httpClient;
private final MessageIdStepdefs messageIdStepdefs;
http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java
index 9db74ca..f9bd5db 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java
@@ -19,6 +19,8 @@
package org.apache.james.jmap.methods.integration.cucumber;
+import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
+import static org.apache.james.jmap.TestingConstants.NAME;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.ByteArrayInputStream;
@@ -63,8 +65,6 @@ import net.minidev.json.JSONArray;
public class GetMessagesMethodStepdefs {
private static final Optional<Map<String, String>> NO_HEADERS = Optional.empty();
- private static final String NAME = "[0][0]";
- private static final String ARGUMENTS = "[0][1]";
private static final String FIRST_MESSAGE = ARGUMENTS + ".list[0]";
private static final String ATTACHMENTS = FIRST_MESSAGE + ".attachments";
private static final String FIRST_ATTACHMENT = ATTACHMENTS + "[0]";
http://git-wip-us.apache.org/repos/asf/james-project/blob/e229cb23/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/SetMailboxesMethodStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/SetMailboxesMethodStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/SetMailboxesMethodStepdefs.java
index 657e812..a02db3d 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/SetMailboxesMethodStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/SetMailboxesMethodStepdefs.java
@@ -19,6 +19,8 @@
package org.apache.james.jmap.methods.integration.cucumber;
+import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
+import static org.apache.james.jmap.TestingConstants.NAME;
import static org.apache.james.jmap.TestingConstants.calmlyAwait;
import static org.assertj.core.api.Assertions.assertThat;
@@ -52,9 +54,6 @@ import cucumber.runtime.java.guice.ScenarioScoped;
@ScenarioScoped
public class SetMailboxesMethodStepdefs {
- private static final String NAME = "[0][0]";
- private static final String ARGUMENTS = "[0][1]";
-
private final MainStepdefs mainStepdefs;
private final UserStepdefs userStepdefs;
private final HttpClient httpClient;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[23/24] james-project git commit: JAMES-2366 Factorize some common
constants in JMAP integration tests
Posted by ad...@apache.org.
JAMES-2366 Factorize some common constants in JMAP integration tests
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/686a75e1
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/686a75e1
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/686a75e1
Branch: refs/heads/master
Commit: 686a75e11aba3128fa1c209c30bd8eaa99d4e343
Parents: e229cb2
Author: benwa <bt...@linagora.com>
Authored: Thu Apr 5 17:27:08 2018 +0700
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Apr 6 15:04:50 2018 +0200
----------------------------------------------------------------------
.../org/apache/james/jmap/TestingConstants.java | 14 +
.../james/jmap/VacationIntegrationTest.java | 2 +-
.../jmap/VacationRelayIntegrationTest.java | 6 +-
.../integration/ForwardIntegrationTest.java | 16 +-
.../integration/GetMailboxesMethodTest.java | 191 ++++---
.../integration/GetMessageListMethodTest.java | 513 +++++++++----------
.../integration/GetVacationResponseTest.java | 28 +-
.../methods/integration/SendMDNMethodTest.java | 8 +-
.../integration/SetMailboxesMethodTest.java | 23 +-
.../integration/SetMessagesMethodTest.java | 55 +-
.../integration/SetVacationResponseTest.java | 6 +-
.../integration/SpamAssassinContract.java | 12 +-
.../integration/cucumber/ImapStepdefs.java | 6 +-
13 files changed, 441 insertions(+), 439 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/686a75e1/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java
index aa1da2f..7dba329 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java
@@ -51,4 +51,18 @@ public interface TestingConstants {
String SECOND_NAME = "[1][0]";
String SECOND_ARGUMENTS = "[1][1]";
+ String DOMAIN = "domain.tld";
+ String BOB = "bob@" + DOMAIN;
+ String BOB_PASSWORD = "123456";
+ String ALICE = "alice@" + DOMAIN;
+ String ALICE_PASSWORD = "789123";
+ String CEDRIC = "cedric@" + DOMAIN;
+ String CEDRIC_PASSWORD = "456789";
+
+
+ String LOCALHOST_IP = "127.0.0.1";
+ int SMTP_PORT = 1025;
+ int IMAP_PORT = 1143;
+
+
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/686a75e1/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
index 5afcdec..ef954df 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
@@ -24,6 +24,7 @@ import static com.jayway.restassured.RestAssured.with;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
+import static org.apache.james.jmap.TestingConstants.DOMAIN;
import static org.apache.james.jmap.TestingConstants.SECOND_ARGUMENTS;
import static org.apache.james.jmap.TestingConstants.SECOND_NAME;
import static org.apache.james.jmap.TestingConstants.calmlyAwait;
@@ -55,7 +56,6 @@ import com.jayway.restassured.RestAssured;
public abstract class VacationIntegrationTest {
- private static final String DOMAIN = "mydomain.tld";
private static final String USER_1 = "benwa@" + DOMAIN;
private static final String USER_2 = "matthieu@" + DOMAIN;
private static final String PASSWORD = "secret";
http://git-wip-us.apache.org/repos/asf/james-project/blob/686a75e1/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 8620089..ce1706f 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
@@ -20,6 +20,9 @@
package org.apache.james.jmap;
import static com.jayway.awaitility.Duration.ONE_MINUTE;
+import static org.apache.james.jmap.TestingConstants.DOMAIN;
+import static org.apache.james.jmap.TestingConstants.LOCALHOST_IP;
+import static org.apache.james.jmap.TestingConstants.SMTP_PORT;
import static org.apache.james.jmap.TestingConstants.calmlyAwait;
import static org.hamcrest.Matchers.equalTo;
@@ -45,14 +48,11 @@ import org.junit.Test;
public abstract class VacationRelayIntegrationTest {
- private static final String DOMAIN = "mydomain.tld";
private static final String USER = "benwa";
private static final String USER_WITH_DOMAIN = USER + '@' + DOMAIN;
private static final String PASSWORD = "secret";
private static final String REASON = "Message explaining my wonderful vacations";
- private static final String LOCALHOST_IP = "127.0.0.1";
- private static final int SMTP_PORT = 1025;
@Rule
public FakeSmtp fakeSmtp = new FakeSmtp();
http://git-wip-us.apache.org/repos/asf/james-project/blob/686a75e1/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
index 8aa0908..71d8d3e 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
@@ -25,7 +25,14 @@ import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser
import static org.apache.james.jmap.JmapCommonRequests.getOutboxId;
import static org.apache.james.jmap.JmapCommonRequests.isAnyMessageFoundInRecipientsMailboxes;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
+import static org.apache.james.jmap.TestingConstants.ALICE;
+import static org.apache.james.jmap.TestingConstants.ALICE_PASSWORD;
import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
+import static org.apache.james.jmap.TestingConstants.BOB;
+import static org.apache.james.jmap.TestingConstants.BOB_PASSWORD;
+import static org.apache.james.jmap.TestingConstants.CEDRIC;
+import static org.apache.james.jmap.TestingConstants.CEDRIC_PASSWORD;
+import static org.apache.james.jmap.TestingConstants.DOMAIN;
import static org.apache.james.jmap.TestingConstants.NAME;
import static org.apache.james.jmap.TestingConstants.calmlyAwait;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
@@ -50,15 +57,6 @@ import com.jayway.restassured.specification.RequestSpecification;
public abstract class ForwardIntegrationTest {
- private static final String DOMAIN = "domain";
- private static final String BOB = "bob@" + DOMAIN;
- private static final String BOB_PASSWORD = "123456";
- private static final String ALICE = "alice@" + DOMAIN;
- private static final String ALICE_PASSWORD = "789123";
- private static final String CEDRIC = "cedric@" + DOMAIN;
- private static final String CEDRIC_PASSWORD = "456789";
-
-
protected abstract GuiceJamesServer createJmapServer();
private GuiceJamesServer jmapServer;
http://git-wip-us.apache.org/repos/asf/james-project/blob/686a75e1/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
index 97d3510..0cda516 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
@@ -22,7 +22,13 @@ package org.apache.james.jmap.methods.integration;
import static com.jayway.restassured.RestAssured.given;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
+import static org.apache.james.jmap.TestingConstants.ALICE;
+import static org.apache.james.jmap.TestingConstants.ALICE_PASSWORD;
import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
+import static org.apache.james.jmap.TestingConstants.BOB;
+import static org.apache.james.jmap.TestingConstants.BOB_PASSWORD;
+import static org.apache.james.jmap.TestingConstants.CEDRIC;
+import static org.apache.james.jmap.TestingConstants.DOMAIN;
import static org.apache.james.jmap.TestingConstants.FIRST_MAILBOX;
import static org.apache.james.jmap.TestingConstants.NAME;
import static org.apache.james.jmap.TestingConstants.SECOND_MAILBOX;
@@ -89,10 +95,6 @@ public abstract class GetMailboxesMethodTest {
protected abstract GuiceJamesServer createJmapServer();
private AccessToken accessToken;
- private String domain;
- private String alice;
- private String bob;
- private String cedric;
private GuiceJamesServer jmapServer;
private MailboxProbe mailboxProbe;
private ACLProbe aclProbe;
@@ -111,16 +113,11 @@ public abstract class GetMailboxesMethodTest {
.build();
RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
- domain = "domain.tld";
- alice = "alice@" + domain;
- String alicePassword = "aliceSecret";
- bob = "bob@" + domain;
- cedric = "cedric@" + domain;
DataProbe dataProbe = jmapServer.getProbe(DataProbeImpl.class);
- dataProbe.addDomain(domain);
- dataProbe.addUser(alice, alicePassword);
- dataProbe.addUser(bob, "bobSecret");
- accessToken = authenticateJamesUser(baseUri(jmapServer), alice, alicePassword);
+ dataProbe.addDomain(DOMAIN);
+ dataProbe.addUser(ALICE, ALICE_PASSWORD);
+ dataProbe.addUser(BOB, BOB_PASSWORD);
+ accessToken = authenticateJamesUser(baseUri(jmapServer), ALICE, ALICE_PASSWORD);
}
@After
@@ -143,9 +140,9 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnEmptyWhenIdsDoesntMatch() {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "name");
- String removedId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "quicklyRemoved").serialize();
- mailboxProbe.deleteMailbox(MailboxConstants.USER_NAMESPACE, alice, "quicklyRemoved");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "name");
+ String removedId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "quicklyRemoved").serialize();
+ mailboxProbe.deleteMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "quicklyRemoved");
given()
.header("Authorization", accessToken.serialize())
@@ -173,8 +170,8 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnMailboxesWhenIdsMatch() {
- String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, DefaultMailboxes.INBOX).serialize();
- String mailboxId2 = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "myMailbox").serialize();
+ String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, DefaultMailboxes.INBOX).serialize();
+ String mailboxId2 = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "myMailbox").serialize();
given()
.header("Authorization", accessToken.serialize())
@@ -191,8 +188,8 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnOnlyMatchingMailboxesWhenIdsGiven() {
- String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, DefaultMailboxes.INBOX).serialize();
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "myMailbox");
+ String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, DefaultMailboxes.INBOX).serialize();
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "myMailbox");
given()
.header("Authorization", accessToken.serialize())
@@ -208,7 +205,7 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnEmptyWhenIdsIsEmpty() {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, DefaultMailboxes.INBOX);
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, DefaultMailboxes.INBOX);
given()
.header("Authorization", accessToken.serialize())
@@ -223,8 +220,8 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnAllMailboxesWhenIdsIsNull() {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "myMailbox");
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "myMailbox2");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "myMailbox");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "myMailbox2");
List<String> expectedMailboxes = ImmutableList.<String>builder()
.addAll(DefaultMailboxes.DEFAULT_MAILBOXES)
@@ -247,10 +244,10 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnSharedWithProperty() throws Exception {
String mailboxName = "myMailbox";
- String myMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, mailboxName).serialize();
- String targetUser1 = "toUser1@" + domain;
- String targetUser2 = "toUser2@" + domain;
- Mailbox myMailbox = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, alice, mailboxName);
+ String myMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, mailboxName).serialize();
+ String targetUser1 = "toUser1@" + DOMAIN;
+ String targetUser2 = "toUser2@" + DOMAIN;
+ Mailbox myMailbox = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, ALICE, mailboxName);
aclProbe.replaceRights(myMailbox.generateAssociatedPath(), targetUser1, new Rfc4314Rights(Right.Lookup, Right.Administer));
aclProbe.replaceRights(myMailbox.generateAssociatedPath(), targetUser2, new Rfc4314Rights(Right.Read, Right.Lookup));
@@ -270,10 +267,10 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldRemoveOwnerRight() throws Exception {
String mailboxName = "myMailbox";
- String myMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, mailboxName).serialize();
- String targetUser1 = "toUser1@" + domain;
- Mailbox myMailbox = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, alice, mailboxName);
- aclProbe.replaceRights(myMailbox.generateAssociatedPath(), alice, new Rfc4314Rights(Right.Read, Right.Administer));
+ String myMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, mailboxName).serialize();
+ String targetUser1 = "toUser1@" + DOMAIN;
+ Mailbox myMailbox = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, ALICE, mailboxName);
+ aclProbe.replaceRights(myMailbox.generateAssociatedPath(), ALICE, new Rfc4314Rights(Right.Read, Right.Administer));
aclProbe.replaceRights(myMailbox.generateAssociatedPath(), targetUser1, new Rfc4314Rights(Right.Read, Right.Lookup));
given()
@@ -291,7 +288,7 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxShouldReturnEmptySharedWithWhenNoDelegation() {
String mailboxName = "myMailbox";
- String myMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, mailboxName).serialize();
+ String myMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, mailboxName).serialize();
given()
.header("Authorization", accessToken.serialize())
@@ -308,9 +305,9 @@ public abstract class GetMailboxesMethodTest {
@Test
public void nonHandledRightsShouldBeFilteredOut() throws Exception {
String mailboxName = "myMailbox";
- String myMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, mailboxName).serialize();
- String targetUser1 = "toUser1@" + domain;
- Mailbox myMailbox = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, alice, mailboxName);
+ String myMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, mailboxName).serialize();
+ String targetUser1 = "toUser1@" + DOMAIN;
+ Mailbox myMailbox = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, ALICE, mailboxName);
aclProbe.replaceRights(myMailbox.generateAssociatedPath(), targetUser1, new Rfc4314Rights(Right.Lookup, Right.Post));
given()
@@ -380,9 +377,9 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnMailboxesWhenAvailable() throws Exception {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "name");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "name");
- mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "name"),
+ mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "name"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
given()
@@ -398,9 +395,9 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnMailboxPropertiesWhenAvailable() throws Exception {
- String myMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "name").serialize();
+ String myMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "name").serialize();
- mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, "name"),
+ mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, "name"),
new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), false, new Flags());
given()
@@ -429,7 +426,7 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnFilteredMailboxesPropertiesWhenRequestContainsFilterProperties() {
- String myMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "name").serialize();
+ String myMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "name").serialize();
given()
.header("Authorization", accessToken.serialize())
@@ -458,7 +455,7 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnIdWhenRequestContainsEmptyPropertyListFilter() {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "name");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "name");
given()
.header("Authorization", accessToken.serialize())
@@ -474,7 +471,7 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldIgnoreUnknownPropertiesWhenRequestContainsUnknownPropertyListFilter() {
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "name");
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, "name");
given()
.header("Authorization", accessToken.serialize())
@@ -490,8 +487,8 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnMailboxesWithSortOrder() {
- MailboxId inboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, DefaultMailboxes.INBOX);
- MailboxId trashId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, DefaultMailboxes.TRASH);
+ MailboxId inboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, DefaultMailboxes.INBOX);
+ MailboxId trashId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, DefaultMailboxes.TRASH);
given()
.header("Authorization", accessToken.serialize())
@@ -510,7 +507,7 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnMailboxesWithRolesInLowerCase() {
- MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, DefaultMailboxes.OUTBOX);
+ MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, DefaultMailboxes.OUTBOX);
given()
.header("Authorization", accessToken.serialize())
@@ -527,10 +524,10 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnMailboxesWithFilteredSharedWithWhenShared() throws Exception {
String mailboxName = "name";
- MailboxId bobMailbox = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, bob, mailboxName);
- MailboxPath bobMailboxPath = MailboxPath.forUser(bob, mailboxName);
- aclProbe.replaceRights(bobMailboxPath, alice, new Rfc4314Rights(Right.Lookup));
- aclProbe.replaceRights(bobMailboxPath, cedric, new Rfc4314Rights(Right.Lookup));
+ MailboxId bobMailbox = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB, mailboxName);
+ MailboxPath bobMailboxPath = MailboxPath.forUser(BOB, mailboxName);
+ aclProbe.replaceRights(bobMailboxPath, ALICE, new Rfc4314Rights(Right.Lookup));
+ aclProbe.replaceRights(bobMailboxPath, CEDRIC, new Rfc4314Rights(Right.Lookup));
Map<String, String> sharedWith = given()
.header("Authorization", accessToken.serialize())
@@ -545,16 +542,16 @@ public abstract class GetMailboxesMethodTest {
.jsonPath()
.get(FIRST_MAILBOX + ".sharedWith");
- assertThat(sharedWith).containsOnlyKeys(alice);
+ assertThat(sharedWith).containsOnlyKeys(ALICE);
}
@Test
public void getMailboxesShouldReturnMailboxesWithFullSharedWithWhenHasAdminRight() throws Exception {
String mailboxName = "name";
- MailboxId bobMailbox = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, bob, mailboxName);
- MailboxPath bobMailboxPath = MailboxPath.forUser(bob, mailboxName);
- aclProbe.replaceRights(bobMailboxPath, alice, new Rfc4314Rights(Right.Lookup, Right.Administer));
- aclProbe.replaceRights(bobMailboxPath, cedric, new Rfc4314Rights(Right.Lookup));
+ MailboxId bobMailbox = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB, mailboxName);
+ MailboxPath bobMailboxPath = MailboxPath.forUser(BOB, mailboxName);
+ aclProbe.replaceRights(bobMailboxPath, ALICE, new Rfc4314Rights(Right.Lookup, Right.Administer));
+ aclProbe.replaceRights(bobMailboxPath, CEDRIC, new Rfc4314Rights(Right.Lookup));
Map<String, String> sharedWith = given()
.header("Authorization", accessToken.serialize())
@@ -569,18 +566,18 @@ public abstract class GetMailboxesMethodTest {
.jsonPath()
.get(FIRST_MAILBOX + ".sharedWith");
- assertThat(sharedWith).containsOnlyKeys(alice, cedric);
+ assertThat(sharedWith).containsOnlyKeys(ALICE, CEDRIC);
}
@Test
public void getMailboxesShouldReturnAllAccessibleMailboxesWhenEmptyIds() throws Exception {
String sharedMailboxName = "BobShared";
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, bob, DefaultMailboxes.INBOX);
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, bob, sharedMailboxName);
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB, DefaultMailboxes.INBOX);
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB, sharedMailboxName);
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, DefaultMailboxes.INBOX);
- MailboxPath bobMailboxPath = MailboxPath.forUser(bob, sharedMailboxName);
- aclProbe.replaceRights(bobMailboxPath, alice, new Rfc4314Rights(Right.Lookup));
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, DefaultMailboxes.INBOX);
+ MailboxPath bobMailboxPath = MailboxPath.forUser(BOB, sharedMailboxName);
+ aclProbe.replaceRights(bobMailboxPath, ALICE, new Rfc4314Rights(Right.Lookup));
List<String> expectedMailboxes = ImmutableList.<String>builder()
.addAll(DefaultMailboxes.DEFAULT_MAILBOXES)
@@ -603,16 +600,16 @@ public abstract class GetMailboxesMethodTest {
public void getMailboxesShouldFilterMailboxesWithLookupRightWhenEmptyIds() throws Exception {
String sharedReadMailboxName = "BobShared";
String sharedAdministerMailboxName = "BobShared1";
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, bob, DefaultMailboxes.INBOX);
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, bob, sharedReadMailboxName);
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, bob, sharedAdministerMailboxName);
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB, DefaultMailboxes.INBOX);
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB, sharedReadMailboxName);
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB, sharedAdministerMailboxName);
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, DefaultMailboxes.INBOX);
- MailboxPath bobSharedReadMailboxPath = MailboxPath.forUser(bob, sharedReadMailboxName);
- MailboxPath bobSharedAdministerMailboxPath = MailboxPath.forUser(bob, sharedAdministerMailboxName);
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, DefaultMailboxes.INBOX);
+ MailboxPath bobSharedReadMailboxPath = MailboxPath.forUser(BOB, sharedReadMailboxName);
+ MailboxPath bobSharedAdministerMailboxPath = MailboxPath.forUser(BOB, sharedAdministerMailboxName);
- aclProbe.replaceRights(bobSharedReadMailboxPath, alice, new Rfc4314Rights(Right.Lookup));
- aclProbe.replaceRights(bobSharedAdministerMailboxPath, alice, new Rfc4314Rights(Right.Administer));
+ aclProbe.replaceRights(bobSharedReadMailboxPath, ALICE, new Rfc4314Rights(Right.Lookup));
+ aclProbe.replaceRights(bobSharedAdministerMailboxPath, ALICE, new Rfc4314Rights(Right.Administer));
List<String> expectedMailboxes = ImmutableList.<String>builder()
.addAll(DefaultMailboxes.DEFAULT_MAILBOXES)
@@ -634,11 +631,11 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnExactUserInbox() throws Exception {
String mailboxName = "BobShared";
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, bob, mailboxName);
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, bob, DefaultMailboxes.INBOX);
- MailboxId aliceInboxMailbox = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, DefaultMailboxes.INBOX);
- MailboxPath bobMailboxPath = MailboxPath.forUser(bob, mailboxName);
- aclProbe.replaceRights(bobMailboxPath, alice, new Rfc4314Rights(Right.Lookup));
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB, mailboxName);
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB, DefaultMailboxes.INBOX);
+ MailboxId aliceInboxMailbox = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, DefaultMailboxes.INBOX);
+ MailboxPath bobMailboxPath = MailboxPath.forUser(BOB, mailboxName);
+ aclProbe.replaceRights(bobMailboxPath, ALICE, new Rfc4314Rights(Right.Lookup));
given()
.header("Authorization", accessToken.serialize())
@@ -655,12 +652,12 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnSharedMailboxesWithRead() throws Exception {
String sharedMailboxName = "BobShared";
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, bob, DefaultMailboxes.INBOX);
- MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, bob, sharedMailboxName);
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB, DefaultMailboxes.INBOX);
+ MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB, sharedMailboxName);
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, DefaultMailboxes.INBOX);
- MailboxPath bobMailboxPath = MailboxPath.forUser(bob, sharedMailboxName);
- aclProbe.replaceRights(bobMailboxPath, alice, new Rfc4314Rights(Right.Lookup));
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, DefaultMailboxes.INBOX);
+ MailboxPath bobMailboxPath = MailboxPath.forUser(BOB, sharedMailboxName);
+ aclProbe.replaceRights(bobMailboxPath, ALICE, new Rfc4314Rights(Right.Lookup));
given()
.header("Authorization", accessToken.serialize())
@@ -677,10 +674,10 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnDelegatedNamespaceWhenSharedMailbox() throws Exception {
String sharedMailboxName = "BobShared";
- MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, bob, sharedMailboxName);
+ MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB, sharedMailboxName);
- MailboxPath bobMailboxPath = MailboxPath.forUser(bob, sharedMailboxName);
- aclProbe.replaceRights(bobMailboxPath, alice, new Rfc4314Rights(Right.Lookup));
+ MailboxPath bobMailboxPath = MailboxPath.forUser(BOB, sharedMailboxName);
+ aclProbe.replaceRights(bobMailboxPath, ALICE, new Rfc4314Rights(Right.Lookup));
given()
.header("Authorization", accessToken.serialize())
@@ -692,12 +689,12 @@ public abstract class GetMailboxesMethodTest {
.body(NAME, equalTo("mailboxes"))
.body(ARGUMENTS + ".list", hasSize(1))
.body(FIRST_MAILBOX + ".namespace.type", equalTo(MailboxNamespace.Type.Delegated.toString()))
- .body(FIRST_MAILBOX + ".namespace.owner", equalTo(bob));
+ .body(FIRST_MAILBOX + ".namespace.owner", equalTo(BOB));
}
@Test
public void getMailboxesShouldReturnPersonalNamespaceWhenOwnerMailbox() {
- MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, DefaultMailboxes.INBOX);
+ MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, DefaultMailboxes.INBOX);
given()
.header("Authorization", accessToken.serialize())
@@ -715,7 +712,7 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnAllowedForAllMayPropertiesWhenOwner() {
- MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, DefaultMailboxes.INBOX);
+ MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, DefaultMailboxes.INBOX);
given()
.header("Authorization", accessToken.serialize())
@@ -737,10 +734,10 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnPartiallyAllowedMayPropertiesWhenDelegated() throws Exception {
String sharedMailboxName = "BobShared";
- MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, bob, sharedMailboxName);
+ MailboxId mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB, sharedMailboxName);
- MailboxPath bobMailboxPath = MailboxPath.forUser(bob, sharedMailboxName);
- aclProbe.replaceRights(bobMailboxPath, alice, new Rfc4314Rights(Right.Lookup, Right.Read));
+ MailboxPath bobMailboxPath = MailboxPath.forUser(BOB, sharedMailboxName);
+ aclProbe.replaceRights(bobMailboxPath, ALICE, new Rfc4314Rights(Right.Lookup, Right.Read));
given()
.header("Authorization", accessToken.serialize())
@@ -761,7 +758,7 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnUnlimitedQuotasForInboxByDefault() {
- String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, DefaultMailboxes.INBOX).serialize();
+ String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, DefaultMailboxes.INBOX).serialize();
given()
.header("Authorization", accessToken.serialize())
@@ -779,7 +776,7 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnMaxStorageQuotasForInboxWhenSet() throws Exception {
quotaProbe.setGlobalMaxStorage(SerializableQuotaValue.valueOf(Optional.of(QuotaSize.size(42))));
- String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, DefaultMailboxes.INBOX).serialize();
+ String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, DefaultMailboxes.INBOX).serialize();
given()
.header("Authorization", accessToken.serialize())
@@ -796,7 +793,7 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnMaxMessageQuotasForInboxWhenSet() throws Exception {
quotaProbe.setGlobalMaxMessageCount(SerializableQuotaValue.valueOf(Optional.of(QuotaCount.count(43))));
- String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, DefaultMailboxes.INBOX).serialize();
+ String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, DefaultMailboxes.INBOX).serialize();
given()
.header("Authorization", accessToken.serialize())
@@ -812,12 +809,12 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldDisplayDifferentMaxQuotaPerMailboxWhenSet() throws Exception {
- String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, DefaultMailboxes.INBOX).serialize();
+ String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, DefaultMailboxes.INBOX).serialize();
String sharedMailboxName = "BobShared";
- MailboxId sharedMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, bob, sharedMailboxName);
+ MailboxId sharedMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, BOB, sharedMailboxName);
- MailboxPath bobMailboxPath = MailboxPath.forUser(bob, sharedMailboxName);
- aclProbe.replaceRights(bobMailboxPath, alice, new Rfc4314Rights(Right.Lookup, Right.Read));
+ MailboxPath bobMailboxPath = MailboxPath.forUser(BOB, sharedMailboxName);
+ aclProbe.replaceRights(bobMailboxPath, ALICE, new Rfc4314Rights(Right.Lookup, Right.Read));
quotaProbe.setMaxMessageCount("#private&alice@domain.tld", SerializableQuotaValue.valueOf(Optional.of(QuotaCount.count(42))));
quotaProbe.setMaxMessageCount("#private&bob@domain.tld", SerializableQuotaValue.valueOf(Optional.of(QuotaCount.count(43))));
@@ -850,7 +847,7 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnEmptyQuotasForInboxWhenNoMail() {
- String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, DefaultMailboxes.INBOX).serialize();
+ String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, DefaultMailboxes.INBOX).serialize();
given()
.header("Authorization", accessToken.serialize())
@@ -867,9 +864,9 @@ public abstract class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnUpdatedQuotasForInboxWhenMailReceived() throws Exception {
- String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, DefaultMailboxes.INBOX).serialize();
+ String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, DefaultMailboxes.INBOX).serialize();
String message = "Subject: hello\r\n\r\nContent";
- mailboxProbe.appendMessage(alice, MailboxPath.forUser(alice, DefaultMailboxes.INBOX),
+ mailboxProbe.appendMessage(ALICE, MailboxPath.forUser(ALICE, DefaultMailboxes.INBOX),
new ByteArrayInputStream(message.getBytes(StandardCharsets.UTF_8)),
new Date(), true, new Flags());
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[05/24] james-project git commit: JAMES-2366 Mappings should be
sorted when building the list
Posted by ad...@apache.org.
JAMES-2366 Mappings should be sorted when building the list
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/048e3625
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/048e3625
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/048e3625
Branch: refs/heads/master
Commit: 048e362529ba5605c9551dc63ac14611ab4a5ee2
Parents: 71a465e
Author: Antoine Duprat <ad...@linagora.com>
Authored: Thu Mar 29 15:28:16 2018 +0200
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Apr 6 14:39:17 2018 +0200
----------------------------------------------------------------------
.../rrt/lib/AbstractRecipientRewriteTable.java | 16 +------
.../org/apache/james/rrt/lib/MappingsImpl.java | 18 ++++++-
.../lib/AbstractRecipientRewriteTableTest.java | 36 --------------
.../apache/james/rrt/lib/MappingsImplTest.java | 49 +++++++++++++-------
4 files changed, 50 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/048e3625/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java
index 2b11cee..8b314b1 100644
--- a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java
+++ b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java
@@ -40,8 +40,6 @@ import org.apache.james.rrt.lib.Mapping.Type;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
-
/**
*
*/
@@ -423,24 +421,12 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT
String mappings = mapAddressInternal(user, domain);
if (mappings != null) {
- return sortMappings(MappingsImpl.fromRawString(mappings));
+ return MappingsImpl.fromRawString(mappings);
} else {
return null;
}
}
- @VisibleForTesting static Mappings sortMappings(Mappings mappings) {
- if (mappings.contains(Mapping.Type.Domain)) {
- return
- MappingsImpl.builder()
- .addAll(mappings.select(Mapping.Type.Domain))
- .addAll(mappings.exclude(Mapping.Type.Domain))
- .build();
- } else {
- return mappings;
- }
- }
-
private void checkMapping(String user, Domain domain, Mapping mapping) throws RecipientRewriteTableException {
Mappings mappings = getUserDomainMappings(user, domain);
if (mappings != null && mappings.contains(mapping)) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/048e3625/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java
index 73949f6..eab5fd8 100644
--- a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java
+++ b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java
@@ -23,6 +23,7 @@ package org.apache.james.rrt.lib;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Comparator;
import java.util.Iterator;
import java.util.Optional;
import java.util.StringTokenizer;
@@ -110,8 +111,23 @@ public class MappingsImpl implements Mappings, Serializable {
}
public MappingsImpl build() {
- return new MappingsImpl(mappings.build());
+ Comparator<? super Mapping> byTypeComparator = (mapping1, mapping2) -> {
+ if (mapping1.getType() == mapping2.getType()) {
+ return mapping1.asString().compareTo(mapping2.asString());
+ }
+ if (mapping1.getType() == Type.Domain) {
+ return -1;
+ }
+ if (mapping2.getType() == Type.Domain) {
+ return 1;
+ }
+ return mapping1.asString().compareTo(mapping2.asString());
+ };
+ return new MappingsImpl(mappings.build().stream()
+ .sorted(byTypeComparator)
+ .collect(Guavate.toImmutableList()));
}
+
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/048e3625/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java
index 26b3187..3c69fab 100644
--- a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java
+++ b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java
@@ -231,42 +231,6 @@ public abstract class AbstractRecipientRewriteTableTest {
}
@Test
- public void sortMappingsShouldReturnEmptyWhenEmpty() {
- assertThat(AbstractRecipientRewriteTable.sortMappings(MappingsImpl.empty())).isEmpty();
- }
-
- @Test
- public void sortMappingsShouldReturnSameStringWhenSingleDomainAlias() {
- String singleDomainAlias = Type.Domain.asPrefix() + "first";
- assertThat(AbstractRecipientRewriteTable.sortMappings(MappingsImpl.fromRawString(singleDomainAlias)))
- .containsExactly(MappingImpl.domain(Domain.of("first")));
- }
-
- @Test
- public void sortMappingsShouldReturnSameStringWhenTwoDomainAliases() {
- MappingsImpl mappings = MappingsImpl.builder()
- .add(Type.Domain.asPrefix() + "first")
- .add(Type.Domain.asPrefix() + "second")
- .build();
- assertThat(AbstractRecipientRewriteTable.sortMappings(mappings)).isEqualTo(mappings);
- }
-
- @Test
- public void sortMappingsShouldPutDomainAliasFirstWhenVariousMappings() {
- String regexMapping = Type.Regex.asPrefix() + "first";
- String domainMapping = Type.Domain.asPrefix() + "second";
- MappingsImpl mappings = MappingsImpl.builder()
- .add(regexMapping)
- .add(domainMapping)
- .build();
- assertThat(AbstractRecipientRewriteTable.sortMappings(mappings))
- .isEqualTo(MappingsImpl.builder()
- .add(domainMapping)
- .add(regexMapping)
- .build());
- }
-
- @Test
public void addMappingShouldThrowWhenMappingAlreadyExists() throws Exception {
String user = "test";
Domain domain = Domain.LOCALHOST;
http://git-wip-us.apache.org/repos/asf/james-project/blob/048e3625/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingsImplTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingsImplTest.java b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingsImplTest.java
index 496c74e..efb5add 100644
--- a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingsImplTest.java
+++ b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingsImplTest.java
@@ -45,82 +45,82 @@ public class MappingsImplTest {
@Test
public void fromRawStringShouldReturnSingletonCollectionWhenSingleElementString() {
MappingsImpl actual = MappingsImpl.fromRawString("value");
- assertThat(actual).containsExactly(MappingImpl.address("value"));
+ assertThat(actual).containsOnly(MappingImpl.address("value"));
}
@Test
public void fromRawStringShouldReturnCollectionWhenSeveralElementsString() {
MappingsImpl actual = MappingsImpl.fromRawString("value1;value2");
- assertThat(actual).containsExactly(MappingImpl.address("value1"), MappingImpl.address("value2"));
+ assertThat(actual).containsOnly(MappingImpl.address("value1"), MappingImpl.address("value2"));
}
@Test
public void fromRawStringShouldReturnSingleElementCollectionWhenTrailingDelimiterString() {
MappingsImpl actual = MappingsImpl.fromRawString("value1;");
- assertThat(actual).containsExactly(MappingImpl.address("value1"));
+ assertThat(actual).containsOnly(MappingImpl.address("value1"));
}
@Test
public void fromRawStringShouldReturnSingleElementCollectionWhenHeadingDelimiterString() {
MappingsImpl actual = MappingsImpl.fromRawString(";value1");
- assertThat(actual).containsExactly(MappingImpl.address("value1"));
+ assertThat(actual).containsOnly(MappingImpl.address("value1"));
}
@Test
public void fromRawStringShouldTrimValues() {
MappingsImpl actual = MappingsImpl.fromRawString("value1 ; value2 ");
- assertThat(actual).containsExactly(MappingImpl.address("value1"), MappingImpl.address("value2"));
+ assertThat(actual).containsOnly(MappingImpl.address("value1"), MappingImpl.address("value2"));
}
@Test
public void fromRawStringShouldNotSkipEmptyValue() {
MappingsImpl actual = MappingsImpl.fromRawString("value1; ;value2");
- assertThat(actual).containsExactly(MappingImpl.address("value1"), MappingImpl.address(""), MappingImpl.address("value2"));
+ assertThat(actual).containsOnly(MappingImpl.address("value1"), MappingImpl.address(""), MappingImpl.address("value2"));
}
@Test
public void fromRawStringShouldReturnCollectionWhenValueContainsCommaSeperatedValues() {
MappingsImpl actual = MappingsImpl.fromRawString("value1,value2");
- assertThat(actual).containsExactly(MappingImpl.address("value1"),MappingImpl.address("value2"));
+ assertThat(actual).containsOnly(MappingImpl.address("value1"),MappingImpl.address("value2"));
}
@Test
public void fromRawStringShouldReturnCollectionWhenValueContainsColonSeperatedValues() {
MappingsImpl actual = MappingsImpl.fromRawString("value1:value2");
- assertThat(actual).containsExactly(MappingImpl.address("value1"),MappingImpl.address("value2"));
+ assertThat(actual).containsOnly(MappingImpl.address("value1"),MappingImpl.address("value2"));
}
@Test
public void fromRawStringShouldUseCommaDelimiterBeforeSemicolonWhenValueContainsBoth() {
MappingsImpl actual = MappingsImpl.fromRawString("value1;value1,value2");
- assertThat(actual).containsExactly(MappingImpl.address("value1;value1"),MappingImpl.address("value2"));
+ assertThat(actual).containsOnly(MappingImpl.address("value1;value1"),MappingImpl.address("value2"));
}
@Test
public void fromRawStringShouldUseSemicolonDelimiterBeforeColonWhenValueContainsBoth() {
MappingsImpl actual = MappingsImpl.fromRawString("value1:value1;value2");
- assertThat(actual).containsExactly(MappingImpl.address("value1:value1"),MappingImpl.address("value2"));
+ assertThat(actual).containsOnly(MappingImpl.address("value1:value1"),MappingImpl.address("value2"));
}
@Test
public void fromRawStringShouldNotUseColonDelimiterWhenValueStartsWithError() {
MappingsImpl actual = MappingsImpl.fromRawString("error:test");
- assertThat(actual).containsExactly(MappingImpl.error("test"));
+ assertThat(actual).containsOnly(MappingImpl.error("test"));
}
@Test
public void fromRawStringShouldNotUseColonDelimiterWhenValueStartsWithDomain() {
MappingsImpl actual = MappingsImpl.fromRawString("domain:test");
- assertThat(actual).containsExactly(MappingImpl.domain(Domain.of("test")));
+ assertThat(actual).containsOnly(MappingImpl.domain(Domain.of("test")));
}
@Test
public void fromRawStringShouldNotUseColonDelimiterWhenValueStartsWithRegex() {
MappingsImpl actual = MappingsImpl.fromRawString("regex:test");
- assertThat(actual).containsExactly(MappingImpl.regex("test"));
+ assertThat(actual).containsOnly(MappingImpl.regex("test"));
}
@Test
@@ -252,7 +252,7 @@ public class MappingsImplTest {
@Test
public void unionShouldReturnMergedWhenBothContainsData() {
Mappings mappings = MappingsImpl.fromRawString("toto").union(MappingsImpl.fromRawString("tata"));
- assertThat(mappings).containsExactly(MappingImpl.address("toto"),MappingImpl.address("tata"));
+ assertThat(mappings).containsOnly(MappingImpl.address("toto"),MappingImpl.address("tata"));
}
@Test
@@ -286,7 +286,7 @@ public class MappingsImplTest {
MappingsImpl mappingsImpl = MappingsImpl.Builder
.merge(left, empty)
.build();
- assertThat(mappingsImpl).containsExactly(expectedMapping);
+ assertThat(mappingsImpl).containsOnly(expectedMapping);
}
@Test
@@ -297,7 +297,7 @@ public class MappingsImplTest {
MappingsImpl mappingsImpl = MappingsImpl.Builder
.merge(empty, right)
.build();
- assertThat(mappingsImpl).containsExactly(expectedMapping);
+ assertThat(mappingsImpl).containsOnly(expectedMapping);
}
@Test
@@ -309,6 +309,21 @@ public class MappingsImplTest {
MappingsImpl mappingsImpl = MappingsImpl.Builder
.merge(left, right)
.build();
- assertThat(mappingsImpl).containsExactly(leftMapping, rightMapping);
+ assertThat(mappingsImpl).containsOnly(leftMapping, rightMapping);
+ }
+
+ @Test
+ public void builderShouldPutDomainAliasFirstWhenVariousMappings() {
+ MappingImpl addressMapping = MappingImpl.address("aaa");
+ MappingImpl errorMapping = MappingImpl.error("error");
+ MappingImpl domainMapping = MappingImpl.domain(Domain.of("domain"));
+ MappingImpl domain2Mapping = MappingImpl.domain(Domain.of("domain2"));
+ MappingsImpl mappingsImpl = MappingsImpl.builder()
+ .add(domainMapping)
+ .add(addressMapping)
+ .add(errorMapping)
+ .add(domain2Mapping)
+ .build();
+ assertThat(mappingsImpl).containsExactly(domainMapping, domain2Mapping, addressMapping, errorMapping);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org