http://git-wip-us.apache.org/repos/asf/james-project/blob/33cb12e5/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java index b876140..816e184 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java @@ -26,6 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Map; +import org.apache.james.core.Domain; import org.apache.james.dnsservice.api.InMemoryDNSService; import org.apache.james.domainlist.memory.MemoryDomainList; import org.apache.james.mailbox.inmemory.quota.InMemoryPerUserMaxQuotaManager; @@ -51,7 +52,7 @@ public class DomainQuotaRoutesTest { private static final String QUOTA_DOMAINS = "/quota/domains"; private static final String PERDU_COM = "perdu.com"; - private static final String TROUVÃ_COM = "trouvé.com"; + private static final Domain TROUVÃ_COM = Domain.of("trouvé.com"); private static final String COUNT = "count"; private static final String SIZE = "size"; private WebAdminServer webAdminServer; @@ -60,14 +61,14 @@ public class DomainQuotaRoutesTest { @Before public void setUp() throws Exception { maxQuotaManager = new InMemoryPerUserMaxQuotaManager(); - MemoryDomainList domainList = new MemoryDomainList(new InMemoryDNSService()); - domainList.setAutoDetect(false); - domainList.setAutoDetectIP(false); - domainList.addDomain(TROUVÃ_COM); + MemoryDomainList memoryDomainList = new MemoryDomainList(new InMemoryDNSService()); + memoryDomainList.setAutoDetect(false); + memoryDomainList.setAutoDetectIP(false); + memoryDomainList.addDomain(TROUVÃ_COM); DomainQuotaService domainQuotaService = new DomainQuotaService(maxQuotaManager); QuotaModule quotaModule = new QuotaModule(); MemoryUsersRepository usersRepository = MemoryUsersRepository.withVirtualHosting(); - DomainQuotaRoutes domainQuotaRoutes = new DomainQuotaRoutes(domainList, domainQuotaService, usersRepository, new JsonTransformer(quotaModule), ImmutableSet.of(quotaModule)); + DomainQuotaRoutes domainQuotaRoutes = new DomainQuotaRoutes(memoryDomainList, domainQuotaService, usersRepository, new JsonTransformer(quotaModule), ImmutableSet.of(quotaModule)); webAdminServer = WebAdminUtils.createWebAdminServer( new NoopMetricFactory(), domainQuotaRoutes); @@ -95,7 +96,7 @@ public class DomainQuotaRoutesTest { @Test public void getCountShouldReturnNoContentByDefault() { given() - .get(QUOTA_DOMAINS + "/" + TROUVÃ_COM + "/" + COUNT) + .get(QUOTA_DOMAINS + "/" + TROUVÃ_COM.name() + "/" + COUNT) .then() .statusCode(HttpStatus.NO_CONTENT_204); } @@ -107,7 +108,7 @@ public class DomainQuotaRoutesTest { Long actual = given() - .get(QUOTA_DOMAINS + "/" + TROUVÃ_COM + "/" + COUNT) + .get(QUOTA_DOMAINS + "/" + TROUVÃ_COM.name() + "/" + COUNT) .then() .statusCode(HttpStatus.OK_200) .contentType(ContentType.JSON) @@ -131,7 +132,7 @@ public class DomainQuotaRoutesTest { public void putCountShouldRejectInvalid() { Map<String, Object> errors = given() .body("invalid") - .put(QUOTA_DOMAINS + "/" + TROUVÃ_COM + "/" + COUNT) + .put(QUOTA_DOMAINS + "/" + TROUVÃ_COM.name() + "/" + COUNT) .then() .statusCode(HttpStatus.BAD_REQUEST_400) .contentType(ContentType.JSON) @@ -152,7 +153,7 @@ public class DomainQuotaRoutesTest { given() .body("-1") .when() - .put(QUOTA_DOMAINS + "/" + TROUVÃ_COM + "/" + COUNT) + .put(QUOTA_DOMAINS + "/" + TROUVÃ_COM.name() + "/" + COUNT) .then() .statusCode(HttpStatus.NO_CONTENT_204); @@ -163,7 +164,7 @@ public class DomainQuotaRoutesTest { public void putCountShouldRejectNegativeOtherThanMinusOne() { Map<String, Object> errors = given() .body("-2") - .put(QUOTA_DOMAINS + "/" + TROUVÃ_COM + "/" + COUNT) + .put(QUOTA_DOMAINS + "/" + TROUVÃ_COM.name() + "/" + COUNT) .then() .statusCode(HttpStatus.BAD_REQUEST_400) .contentType(ContentType.JSON) @@ -182,7 +183,7 @@ public class DomainQuotaRoutesTest { public void putCountShouldAcceptValidValue() { given() .body("42") - .put(QUOTA_DOMAINS + "/" + TROUVÃ_COM + "/" + COUNT) + .put(QUOTA_DOMAINS + "/" + TROUVÃ_COM.name() + "/" + COUNT) .then() .statusCode(HttpStatus.NO_CONTENT_204); @@ -202,7 +203,7 @@ public class DomainQuotaRoutesTest { maxQuotaManager.setDomainMaxMessage(TROUVÃ_COM, QuotaCount.count(42)); given() - .delete(QUOTA_DOMAINS + "/" + TROUVÃ_COM + "/" + COUNT) + .delete(QUOTA_DOMAINS + "/" + TROUVÃ_COM.name() + "/" + COUNT) .then() .statusCode(HttpStatus.NO_CONTENT_204); @@ -220,7 +221,7 @@ public class DomainQuotaRoutesTest { @Test public void getSizeShouldReturnNoContentByDefault() { when() - .get(QUOTA_DOMAINS + "/" + TROUVÃ_COM + "/" + SIZE) + .get(QUOTA_DOMAINS + "/" + TROUVÃ_COM.name() + "/" + SIZE) .then() .statusCode(HttpStatus.NO_CONTENT_204); } @@ -233,7 +234,7 @@ public class DomainQuotaRoutesTest { long quota = given() - .get(QUOTA_DOMAINS + "/" + TROUVÃ_COM + "/" + SIZE) + .get(QUOTA_DOMAINS + "/" + TROUVÃ_COM.name() + "/" + SIZE) .then() .statusCode(HttpStatus.OK_200) .contentType(ContentType.JSON) @@ -247,7 +248,7 @@ public class DomainQuotaRoutesTest { public void putSizeShouldRejectInvalid() { Map<String, Object> errors = given() .body("invalid") - .put(QUOTA_DOMAINS + "/" + TROUVÃ_COM + "/" + SIZE) + .put(QUOTA_DOMAINS + "/" + TROUVÃ_COM.name() + "/" + SIZE) .then() .statusCode(HttpStatus.BAD_REQUEST_400) .contentType(ContentType.JSON) @@ -278,7 +279,7 @@ public class DomainQuotaRoutesTest { given() .body("-1") .when() - .put(QUOTA_DOMAINS + "/" + TROUVÃ_COM + "/" + SIZE) + .put(QUOTA_DOMAINS + "/" + TROUVÃ_COM.name() + "/" + SIZE) .then() .statusCode(HttpStatus.NO_CONTENT_204); @@ -289,7 +290,7 @@ public class DomainQuotaRoutesTest { public void putSizeShouldRejectNegativeOtherThanMinusOne() { Map<String, Object> errors = given() .body("-2") - .put(QUOTA_DOMAINS + "/" + TROUVÃ_COM + "/" + SIZE) + .put(QUOTA_DOMAINS + "/" + TROUVÃ_COM.name() + "/" + SIZE) .then() .statusCode(HttpStatus.BAD_REQUEST_400) .contentType(ContentType.JSON) @@ -309,7 +310,7 @@ public class DomainQuotaRoutesTest { given() .body("42") .when() - .put(QUOTA_DOMAINS + "/" + TROUVÃ_COM + "/" + SIZE) + .put(QUOTA_DOMAINS + "/" + TROUVÃ_COM.name() + "/" + SIZE) .then() .statusCode(HttpStatus.NO_CONTENT_204); @@ -329,7 +330,7 @@ public class DomainQuotaRoutesTest { maxQuotaManager.setDomainMaxStorage(TROUVÃ_COM, QuotaSize.size(42)); given() - .delete(QUOTA_DOMAINS + "/" + TROUVÃ_COM + "/" + SIZE) + .delete(QUOTA_DOMAINS + "/" + TROUVÃ_COM.name() + "/" + SIZE) .then() .statusCode(HttpStatus.NO_CONTENT_204); @@ -348,7 +349,7 @@ public class DomainQuotaRoutesTest { public void getQuotaShouldReturnBothEmptyWhenDefaultValues() { JsonPath jsonPath = given() - .get(QUOTA_DOMAINS + "/" + TROUVÃ_COM) + .get(QUOTA_DOMAINS + "/" + TROUVÃ_COM.name()) .then() .statusCode(HttpStatus.OK_200) .contentType(ContentType.JSON) @@ -366,7 +367,7 @@ public class DomainQuotaRoutesTest { JsonPath jsonPath = given() - .get(QUOTA_DOMAINS + "/" + TROUVÃ_COM) + .get(QUOTA_DOMAINS + "/" + TROUVÃ_COM.name()) .then() .statusCode(HttpStatus.OK_200) .contentType(ContentType.JSON) @@ -385,7 +386,7 @@ public class DomainQuotaRoutesTest { JsonPath jsonPath = given() - .get(QUOTA_DOMAINS + "/" + TROUVÃ_COM) + .get(QUOTA_DOMAINS + "/" + TROUVÃ_COM.name()) .then() .statusCode(HttpStatus.OK_200) .contentType(ContentType.JSON) @@ -408,7 +409,7 @@ public class DomainQuotaRoutesTest { public void putQuotaShouldUpdateBothQuota() { given() .body("{\"count\":52,\"size\":42}") - .put(QUOTA_DOMAINS + "/" + TROUVÃ_COM) + .put(QUOTA_DOMAINS + "/" + TROUVÃ_COM.name()) .then() .statusCode(HttpStatus.NO_CONTENT_204); @@ -420,7 +421,7 @@ public class DomainQuotaRoutesTest { public void putQuotaShouldBeAbleToRemoveBothQuota() { given() .body("{\"count\":null,\"count\":null}") - .put(QUOTA_DOMAINS + "/" + TROUVÃ_COM) + .put(QUOTA_DOMAINS + "/" + TROUVÃ_COM.name()) .then() .statusCode(HttpStatus.NO_CONTENT_204);
http://git-wip-us.apache.org/repos/asf/james-project/blob/33cb12e5/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java index bf5109f..8c11748 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java @@ -26,6 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Map; +import org.apache.james.core.Domain; import org.apache.james.core.User; import org.apache.james.dnsservice.api.InMemoryDNSService; import org.apache.james.domainlist.memory.MemoryDomainList; @@ -72,7 +73,7 @@ public class UserQuotaRoutesTest { maxQuotaManager = new InMemoryPerUserMaxQuotaManager(); MemoryDomainList memoryDomainList = new MemoryDomainList(new InMemoryDNSService()); memoryDomainList.setAutoDetect(false); - memoryDomainList.addDomain(PERDU_COM); + memoryDomainList.addDomain(Domain.of(PERDU_COM)); MemoryUsersRepository usersRepository = MemoryUsersRepository.withVirtualHosting(); usersRepository.setDomainList(memoryDomainList); usersRepository.addUser(BOB.asString(), PASSWORD); @@ -395,8 +396,8 @@ public class UserQuotaRoutesTest { public void getQuotaShouldReturnBothWhenValueSpecified() throws Exception { maxQuotaManager.setGlobalMaxStorage(QuotaSize.size(1111)); maxQuotaManager.setGlobalMaxMessage(QuotaCount.count(22)); - maxQuotaManager.setDomainMaxStorage(PERDU_COM, QuotaSize.size(34)); - maxQuotaManager.setDomainMaxMessage(PERDU_COM, QuotaCount.count(23)); + maxQuotaManager.setDomainMaxStorage(Domain.of(PERDU_COM), QuotaSize.size(34)); + maxQuotaManager.setDomainMaxMessage(Domain.of(PERDU_COM), QuotaCount.count(23)); maxQuotaManager.setMaxStorage(userQuotaRootResolver.forUser(BOB), QuotaSize.size(42)); maxQuotaManager.setMaxMessage(userQuotaRootResolver.forUser(BOB), QuotaCount.count(52)); @@ -424,7 +425,7 @@ public class UserQuotaRoutesTest { public void getQuotaShouldReturnOnlySpecifiedValues() throws Exception { maxQuotaManager.setGlobalMaxStorage(QuotaSize.size(1111)); maxQuotaManager.setMaxMessage(userQuotaRootResolver.forUser(BOB), QuotaCount.count(18)); - maxQuotaManager.setDomainMaxMessage(PERDU_COM, QuotaCount.count(52)); + maxQuotaManager.setDomainMaxMessage(Domain.of(PERDU_COM), QuotaCount.count(52)); JsonPath jsonPath = given() --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
