JAMES-1958 Rely on AssertJ extractions when asserting big Pojo
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ef119a44 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ef119a44 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ef119a44 Branch: refs/heads/master Commit: ef119a44f2103d3073c6558c26f18f5b8791f9ef Parents: fd82c99 Author: benwa <btell...@linagora.com> Authored: Mon Mar 13 17:57:42 2017 +0700 Committer: benwa <btell...@linagora.com> Committed: Wed Mar 15 09:02:32 2017 +0700 ---------------------------------------------------------------------- .../webadmin/WebAdminConfigurationTest.java | 74 ++++++++++---------- 1 file changed, 38 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/ef119a44/server/protocols/webadmin/src/test/java/org/apache/james/webadmin/WebAdminConfigurationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/src/test/java/org/apache/james/webadmin/WebAdminConfigurationTest.java b/server/protocols/webadmin/src/test/java/org/apache/james/webadmin/WebAdminConfigurationTest.java index 48df15e..dd46f34 100644 --- a/server/protocols/webadmin/src/test/java/org/apache/james/webadmin/WebAdminConfigurationTest.java +++ b/server/protocols/webadmin/src/test/java/org/apache/james/webadmin/WebAdminConfigurationTest.java @@ -46,11 +46,8 @@ public class WebAdminConfigurationTest { assertThat(WebAdminConfiguration.builder() .disabled() .build()) - .isEqualTo(new WebAdminConfiguration(false, - null, - TlsConfiguration.builder().disabled().build(), - false, - "*")); + .extracting(WebAdminConfiguration::isEnabled) + .containsExactly(false); } @Test @@ -61,18 +58,26 @@ public class WebAdminConfigurationTest { } @Test - public void builderShouldBuildRightObject() { + public void builderShouldBuildWithRightPort() { assertThat( WebAdminConfiguration.builder() .enabled() .port(PORT) .build()) - .isEqualTo(new WebAdminConfiguration( - true, - PORT, - TlsConfiguration.builder().disabled().build(), - false, - "*")); + .extracting(WebAdminConfiguration::getPort) + .containsExactly(PORT); + } + + + @Test + public void builderShouldBuildWithEnable() { + assertThat( + WebAdminConfiguration.builder() + .enabled() + .port(PORT) + .build()) + .extracting(WebAdminConfiguration::isEnabled) + .containsExactly(true); } @Test @@ -88,12 +93,8 @@ public class WebAdminConfigurationTest { .https(tlsConfiguration) .port(PORT) .build()) - .isEqualTo(new WebAdminConfiguration( - true, - PORT, - tlsConfiguration, - false, - "*")); + .extracting(WebAdminConfiguration::getTlsConfiguration) + .containsExactly(tlsConfiguration); } @Test @@ -104,12 +105,21 @@ public class WebAdminConfigurationTest { .port(PORT) .CORSenabled() .build()) - .isEqualTo(new WebAdminConfiguration( - true, - PORT, - TlsConfiguration.builder().disabled().build(), - true, - "*")); + .extracting(WebAdminConfiguration::isEnableCORS) + .containsExactly(true); + } + + + @Test + public void builderShouldAcceptAllOriginsByDefault() { + assertThat( + WebAdminConfiguration.builder() + .enabled() + .port(PORT) + .CORSenabled() + .build()) + .extracting(WebAdminConfiguration::getUrlCORSOrigin) + .containsExactly("*"); } @Test @@ -120,12 +130,8 @@ public class WebAdminConfigurationTest { .port(PORT) .CORSdisabled() .build()) - .isEqualTo(new WebAdminConfiguration( - true, - PORT, - TlsConfiguration.builder().disabled().build(), - false, - "*")); + .extracting(WebAdminConfiguration::isEnableCORS) + .containsExactly(false); } @Test @@ -138,12 +144,8 @@ public class WebAdminConfigurationTest { .CORSenabled() .urlCORSOrigin(origin) .build()) - .isEqualTo(new WebAdminConfiguration( - true, - PORT, - TlsConfiguration.builder().disabled().build(), - true, - origin)); + .extracting(WebAdminConfiguration::getUrlCORSOrigin) + .containsExactly(origin); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org