This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 4b8a7a278e7fc428fadcab399fd768dd7ad7f29a Author: Rene Cordier <rcord...@linagora.com> AuthorDate: Mon Nov 11 16:22:57 2019 +0700 [Refactoring] Moving tests in mailbox.model.search to JUnit 5 --- .../james/mailbox/model/search/ExactNameTest.java | 16 +- .../mailbox/model/search/MailboxQueryTest.java | 70 +++---- .../mailbox/model/search/PrefixedRegexTest.java | 232 ++++++++++----------- .../mailbox/model/search/PrefixedWildcardTest.java | 18 +- .../james/mailbox/model/search/WildcardTest.java | 14 +- 5 files changed, 175 insertions(+), 175 deletions(-) diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/ExactNameTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/ExactNameTest.java index 94ca305..77979a8 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/ExactNameTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/ExactNameTest.java @@ -22,7 +22,7 @@ package org.apache.james.mailbox.model.search; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import org.junit.Test; +import org.junit.jupiter.api.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -30,43 +30,43 @@ public class ExactNameTest { public static final String NAME = "toto"; @Test - public void shouldMatchBeanContract() { + void shouldMatchBeanContract() { EqualsVerifier.forClass(ExactName.class) .verify(); } @Test - public void constructorShouldThrowOnNullName() { + void constructorShouldThrowOnNullName() { assertThatThrownBy(() -> new ExactName(null)) .isInstanceOf(NullPointerException.class); } @Test - public void isWildShouldReturnFalse() { + void isWildShouldReturnFalse() { assertThat(new ExactName(NAME).isWild()) .isFalse(); } @Test - public void getCombinedNameShouldReturnName() { + void getCombinedNameShouldReturnName() { assertThat(new ExactName(NAME).getCombinedName()) .isEqualTo(NAME); } @Test - public void isExpressionMatchShouldReturnTrueWhenName() { + void isExpressionMatchShouldReturnTrueWhenName() { assertThat(new ExactName(NAME).isExpressionMatch(NAME)) .isTrue(); } @Test - public void isExpressionMatchShouldReturnFalseWhenOtherValue() { + void isExpressionMatchShouldReturnFalseWhenOtherValue() { assertThat(new ExactName(NAME).isExpressionMatch("other")) .isFalse(); } @Test - public void isExpressionMatchShouldThrowOnNullValue() { + void isExpressionMatchShouldThrowOnNullValue() { assertThatThrownBy(() -> new ExactName(NAME).isExpressionMatch(null)) .isInstanceOf(NullPointerException.class); } diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/MailboxQueryTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/MailboxQueryTest.java index 4f87989..664fa4c 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/MailboxQueryTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/MailboxQueryTest.java @@ -21,33 +21,34 @@ package org.apache.james.mailbox.model.search; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatCode; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.search.MailboxQuery.Builder; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import nl.jqno.equalsverifier.EqualsVerifier; -public class MailboxQueryTest { +class MailboxQueryTest { private static final String CURRENT_USER = "user"; private MailboxPath mailboxPath; - @Before - public void setUp() { + @BeforeEach + void setUp() { mailboxPath = new MailboxPath("namespace", "user", "name"); } @Test - public void shouldMatchBeanContract() { + void shouldMatchBeanContract() { EqualsVerifier.forClass(MailboxQuery.class) .verify(); } @Test - public void buildShouldMatchAllValuesWhenMatchesAll() throws Exception { - + void buildShouldMatchAllValuesWhenMatchesAll() { MailboxQuery actual = MailboxQuery.builder() .userAndNamespaceFrom(mailboxPath) .matchesAllMailboxNames() @@ -57,7 +58,7 @@ public class MailboxQueryTest { } @Test - public void buildShouldConstructMailboxPathWhenPrivateUserMailboxes() throws Exception { + void buildShouldConstructMailboxPathWhenPrivateUserMailboxes() { MailboxPath expected = MailboxPath.forUser("user", ""); MailboxQuery actual = MailboxQuery.builder() @@ -71,7 +72,7 @@ public class MailboxQueryTest { } @Test - public void buildShouldMatchAllValuesWhenPrivateUserMailboxes() throws Exception { + void buildShouldMatchAllValuesWhenPrivateUserMailboxes() { Builder testee = MailboxQuery.builder() .username("user") .privateNamespace(); @@ -82,42 +83,41 @@ public class MailboxQueryTest { } @Test - public void builderShouldNotThrowWhenNoBaseDefined() throws Exception { + void builderShouldNotThrowWhenNoBaseDefined() { Builder testee = MailboxQuery.builder() .expression(new ExactName("abc")); - testee.build(); + assertThatCode(testee::build) + .doesNotThrowAnyException(); } - @Test(expected = IllegalStateException.class) - public void builderShouldThrowWhenBaseAndUsernameGiven() throws Exception { - Builder testee = MailboxQuery.builder() + @Test + void builderShouldThrowWhenBaseAndUsernameGiven() { + assertThatThrownBy(() -> MailboxQuery.builder() .userAndNamespaceFrom(mailboxPath) - .username("user"); - - testee.build(); + .username("user")) + .isInstanceOf(IllegalStateException.class); } - @Test(expected = IllegalStateException.class) - public void builderShouldThrowWhenBaseGiven() throws Exception { - Builder testee = MailboxQuery.builder() + @Test + void builderShouldThrowWhenBaseGiven() { + assertThatThrownBy(() -> MailboxQuery.builder() .userAndNamespaceFrom(mailboxPath) - .privateNamespace(); - - testee.build(); + .privateNamespace()) + .isInstanceOf(IllegalStateException.class); } @Test - public void builderShouldNotThrowWhenMissingUsername() throws Exception { + void builderShouldNotThrowWhenMissingUsername() { Builder testee = MailboxQuery.builder() .privateNamespace(); - testee.build(); + assertThatCode(testee::build) + .doesNotThrowAnyException(); } @Test - public void builderShouldUseBaseWhenGiven() throws Exception { - + void builderShouldUseBaseWhenGiven() { MailboxQuery actual = MailboxQuery.builder() .userAndNamespaceFrom(mailboxPath) .build(); @@ -128,7 +128,7 @@ public class MailboxQueryTest { } @Test - public void belongsToNamespaceAndUserShouldReturnTrueWithIdenticalMailboxes() { + void belongsToNamespaceAndUserShouldReturnTrueWithIdenticalMailboxes() { MailboxQuery mailboxQuery = MailboxQuery.builder() .userAndNamespaceFrom(mailboxPath) .build(); @@ -138,7 +138,7 @@ public class MailboxQueryTest { } @Test - public void belongsToNamespaceAndUserShouldReturnTrueWithIdenticalMailboxesWithNullNamespace() { + void belongsToNamespaceAndUserShouldReturnTrueWithIdenticalMailboxesWithNullNamespace() { MailboxPath mailboxPath = new MailboxPath(null, "user", "name"); MailboxQuery mailboxQuery = MailboxQuery.builder() @@ -150,7 +150,7 @@ public class MailboxQueryTest { } @Test - public void belongsToNamespaceAndUserShouldReturnTrueWithMailboxWithSameNamespaceAndUser() { + void belongsToNamespaceAndUserShouldReturnTrueWithMailboxWithSameNamespaceAndUser() { MailboxQuery mailboxQuery = MailboxQuery.builder() .userAndNamespaceFrom(new MailboxPath("namespace", CURRENT_USER, "name")) .build(); @@ -160,7 +160,7 @@ public class MailboxQueryTest { } @Test - public void belongsToNamespaceAndUserShouldReturnFalseWithDifferentNamespace() { + void belongsToNamespaceAndUserShouldReturnFalseWithDifferentNamespace() { MailboxQuery mailboxQuery = MailboxQuery.builder() .userAndNamespaceFrom(new MailboxPath("namespace", CURRENT_USER, "name")) .build(); @@ -170,7 +170,7 @@ public class MailboxQueryTest { } @Test - public void belongsToNamespaceAndUserShouldReturnFalseWithDifferentUser() { + void belongsToNamespaceAndUserShouldReturnFalseWithDifferentUser() { MailboxQuery mailboxQuery = MailboxQuery.builder() .userAndNamespaceFrom(new MailboxPath("namespace", CURRENT_USER, "name")) .build(); @@ -178,9 +178,9 @@ public class MailboxQueryTest { assertThat(mailboxQuery.belongsToRequestedNamespaceAndUser(new MailboxPath("namespace", CURRENT_USER + "2", "name"))) .isFalse(); } - + @Test - public void belongsToNamespaceAndUserShouldReturnFalseWhenDifferentUser() { + void belongsToNamespaceAndUserShouldReturnFalseWhenDifferentUser() { MailboxQuery mailboxQuery = MailboxQuery.builder() .userAndNamespaceFrom(new MailboxPath("namespace", CURRENT_USER, "name")) .build(); diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/PrefixedRegexTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/PrefixedRegexTest.java index 6092e05..517eb72 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/PrefixedRegexTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/PrefixedRegexTest.java @@ -21,11 +21,11 @@ package org.apache.james.mailbox.model.search; import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; import nl.jqno.equalsverifier.EqualsVerifier; -public class PrefixedRegexTest { +class PrefixedRegexTest { private static final char PATH_DELIMITER = '.'; private static final String PREFIX = "name"; private static final String EMPTY_PREFIX = ""; @@ -38,7 +38,7 @@ public class PrefixedRegexTest { } @Test - public void isWildShouldReturnTrueWhenOnlyFreeWildcard() throws Exception { + void isWildShouldReturnTrueWhenOnlyFreeWildcard() { PrefixedRegex prefixedRegex = new PrefixedRegex(PREFIX, "*", PATH_DELIMITER); boolean actual = prefixedRegex.isWild(); @@ -47,7 +47,7 @@ public class PrefixedRegexTest { } @Test - public void isWildShouldReturnTrueWhenOnlyLocalWildcard() throws Exception { + void isWildShouldReturnTrueWhenOnlyLocalWildcard() { PrefixedRegex prefixedRegex = new PrefixedRegex(PREFIX, "%", PATH_DELIMITER); boolean actual = prefixedRegex.isWild(); @@ -56,7 +56,7 @@ public class PrefixedRegexTest { } @Test - public void isWildShouldReturnTrueWhenFreeWildcardAtBeginning() throws Exception { + void isWildShouldReturnTrueWhenFreeWildcardAtBeginning() { PrefixedRegex prefixedRegex = new PrefixedRegex(PREFIX, "*One", PATH_DELIMITER); boolean actual = prefixedRegex.isWild(); @@ -65,7 +65,7 @@ public class PrefixedRegexTest { } @Test - public void isWildShouldReturnTrueWhenLocalWildcardAtBeginning() throws Exception { + void isWildShouldReturnTrueWhenLocalWildcardAtBeginning() { PrefixedRegex prefixedRegex = new PrefixedRegex(PREFIX, "%One", PATH_DELIMITER); boolean actual = prefixedRegex.isWild(); @@ -74,7 +74,7 @@ public class PrefixedRegexTest { } @Test - public void isWildShouldReturnTrueWhenFreeWildcardInMiddle() throws Exception { + void isWildShouldReturnTrueWhenFreeWildcardInMiddle() { PrefixedRegex prefixedRegex = new PrefixedRegex(PREFIX, "A*A", PATH_DELIMITER); boolean actual = prefixedRegex.isWild(); @@ -83,7 +83,7 @@ public class PrefixedRegexTest { } @Test - public void isWildShouldReturnTrueWhenLocalWildcardInMiddle() throws Exception { + void isWildShouldReturnTrueWhenLocalWildcardInMiddle() { PrefixedRegex prefixedRegex = new PrefixedRegex(PREFIX, "A%A", PATH_DELIMITER); boolean actual = prefixedRegex.isWild(); @@ -92,7 +92,7 @@ public class PrefixedRegexTest { } @Test - public void isWildShouldReturnTrueWhenFreeWildcardAtEnd() throws Exception { + void isWildShouldReturnTrueWhenFreeWildcardAtEnd() { PrefixedRegex prefixedRegex = new PrefixedRegex(PREFIX, "One*", PATH_DELIMITER); boolean actual = prefixedRegex.isWild(); @@ -101,7 +101,7 @@ public class PrefixedRegexTest { } @Test - public void isWildShouldReturnTrueWhenLocalWildcardAtEnd() throws Exception { + void isWildShouldReturnTrueWhenLocalWildcardAtEnd() { PrefixedRegex prefixedRegex = new PrefixedRegex(PREFIX, "One%", PATH_DELIMITER); boolean actual = prefixedRegex.isWild(); @@ -110,7 +110,7 @@ public class PrefixedRegexTest { } @Test - public void isWildShouldReturnFalseWhenEmptyExpression() throws Exception { + void isWildShouldReturnFalseWhenEmptyExpression() { PrefixedRegex prefixedRegex = new PrefixedRegex(PREFIX, "", PATH_DELIMITER); boolean actual = prefixedRegex.isWild(); @@ -119,7 +119,7 @@ public class PrefixedRegexTest { } @Test - public void isWildShouldReturnFalseWhenNullExpression() throws Exception { + void isWildShouldReturnFalseWhenNullExpression() { PrefixedRegex prefixedRegex = new PrefixedRegex(PREFIX, null, PATH_DELIMITER); boolean actual = prefixedRegex.isWild(); @@ -128,7 +128,7 @@ public class PrefixedRegexTest { } @Test - public void isWildShouldReturnFalseWhenNoWildcard() throws Exception { + void isWildShouldReturnFalseWhenNoWildcard() { PrefixedRegex prefixedRegex = new PrefixedRegex(PREFIX, "ONE", PATH_DELIMITER); boolean actual = prefixedRegex.isWild(); @@ -137,7 +137,7 @@ public class PrefixedRegexTest { } @Test - public void getCombinedNameShouldWork() throws Exception { + void getCombinedNameShouldWork() { PrefixedRegex prefixedRegex = new PrefixedRegex(PREFIX, "mailbox", PATH_DELIMITER); String actual = prefixedRegex.getCombinedName(); @@ -146,7 +146,7 @@ public class PrefixedRegexTest { } @Test - public void getCombinedNameShouldWorkWhenEmptyExpression() throws Exception { + void getCombinedNameShouldWorkWhenEmptyExpression() { PrefixedRegex prefixedRegex = new PrefixedRegex(PREFIX, "", PATH_DELIMITER); String actual = prefixedRegex.getCombinedName(); @@ -155,7 +155,7 @@ public class PrefixedRegexTest { } @Test - public void getCombinedNameShouldReturnEmptyStringWhenNullMailboxPathAndExpression() throws Exception { + void getCombinedNameShouldReturnEmptyStringWhenNullMailboxPathAndExpression() { String prefix = null; String regex = null; PrefixedRegex prefixedRegex = new PrefixedRegex(prefix, regex, PATH_DELIMITER); @@ -166,7 +166,7 @@ public class PrefixedRegexTest { } @Test - public void getCombinedNameShouldIgnoreDelimiterWhenPresentAtBeginningOfExpression() throws Exception { + void getCombinedNameShouldIgnoreDelimiterWhenPresentAtBeginningOfExpression() { PrefixedRegex prefixedRegex = new PrefixedRegex(PREFIX, ".mailbox", PATH_DELIMITER); String actual = prefixedRegex.getCombinedName(); @@ -175,7 +175,7 @@ public class PrefixedRegexTest { } @Test - public void getCombinedNameShouldIgnoreDelimiterWhenPresentAtEndOfMailboxName() throws Exception { + void getCombinedNameShouldIgnoreDelimiterWhenPresentAtEndOfMailboxName() { PrefixedRegex prefixedRegex = new PrefixedRegex(PREFIX + ".", ".mailbox", PATH_DELIMITER); String actual = prefixedRegex.getCombinedName(); @@ -184,7 +184,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnFalseWhenNullExpression() throws Exception { + void isExpressionMatchShouldReturnFalseWhenNullExpression() { PrefixedRegex testee = new PrefixedRegex(PREFIX, null, PATH_DELIMITER); boolean actual = testee.isExpressionMatch("folder"); @@ -193,7 +193,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchFolderWhenMatching() throws Exception { + void isExpressionMatchShouldMatchFolderWhenMatching() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("mailbox"); @@ -202,7 +202,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnFalseWhenNameBeginsWithDelimiter() throws Exception { + void isExpressionMatchShouldReturnFalseWhenNameBeginsWithDelimiter() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch(".mailbox"); @@ -211,7 +211,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnFalseWhenNameEndsWithDelimiter() throws Exception { + void isExpressionMatchShouldReturnFalseWhenNameEndsWithDelimiter() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("mailbox."); @@ -220,7 +220,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchFolderWhenNoMatching() throws Exception { + void isExpressionMatchShouldNotMatchFolderWhenNoMatching() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub"); @@ -229,7 +229,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchFolderWithExpandedEndName() throws Exception { + void isExpressionMatchShouldNotMatchFolderWithExpandedEndName() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("mailbox123"); @@ -238,7 +238,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchSubFolder() throws Exception { + void isExpressionMatchShouldNotMatchSubFolder() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("mailbox.123"); @@ -247,7 +247,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnTrueWhenEmptyNameAndExpression() throws Exception { + void isExpressionMatchShouldReturnTrueWhenEmptyNameAndExpression() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "", PATH_DELIMITER); boolean actual = testee.isExpressionMatch(""); @@ -256,7 +256,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnFalseWhenEmptyExpressionAndNameBeginsWithDelimiter() throws Exception { + void isExpressionMatchShouldReturnFalseWhenEmptyExpressionAndNameBeginsWithDelimiter() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "", PATH_DELIMITER); boolean actual = testee.isExpressionMatch(".123"); @@ -265,7 +265,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchFolderWhenEmptyExpression() throws Exception { + void isExpressionMatchShouldNotMatchFolderWhenEmptyExpression() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("folder"); @@ -274,7 +274,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnTrueWhenEmptyNameAndOnlyLocalWildcard() throws Exception { + void isExpressionMatchShouldReturnTrueWhenEmptyNameAndOnlyLocalWildcard() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "%", PATH_DELIMITER); boolean actual = testee.isExpressionMatch(""); @@ -283,7 +283,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnTrueWhenOnlyLocalWildcard() throws Exception { + void isExpressionMatchShouldReturnTrueWhenOnlyLocalWildcard() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "%", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("folder"); @@ -292,7 +292,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchSubFolderWhenOnlyLocalWildcard() throws Exception { + void isExpressionMatchShouldNotMatchSubFolderWhenOnlyLocalWildcard() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "%", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("mailbox.sub"); @@ -301,7 +301,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnTrueWhenEmptyNameAndOnlyFreeWildcard() throws Exception { + void isExpressionMatchShouldReturnTrueWhenEmptyNameAndOnlyFreeWildcard() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "*", PATH_DELIMITER); boolean actual = testee.isExpressionMatch(""); @@ -310,7 +310,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchFolderWhenOnlyFreeWildcard() throws Exception { + void isExpressionMatchShouldMatchFolderWhenOnlyFreeWildcard() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "*", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub"); @@ -319,7 +319,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchSubFolderWhenOnlyFreeWildcard() throws Exception { + void isExpressionMatchShouldMatchSubFolderWhenOnlyFreeWildcard() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "*", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("mailbox.sub"); @@ -328,7 +328,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnFalseWhenEmptyNameAndLocalWildcardAtEnd() throws Exception { + void isExpressionMatchShouldReturnFalseWhenEmptyNameAndLocalWildcardAtEnd() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "mailbox%", PATH_DELIMITER); boolean actual = testee.isExpressionMatch(""); @@ -337,7 +337,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnFalseWhenLocalWildcardAtEndAndNoMatching() throws Exception { + void isExpressionMatchShouldReturnFalseWhenLocalWildcardAtEndAndNoMatching() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "mailbox%", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub"); @@ -346,7 +346,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchFolderWhenLocalWildcardAtEndNotUsed() throws Exception { + void isExpressionMatchShouldMatchFolderWhenLocalWildcardAtEndNotUsed() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "mailbox%", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("mailbox"); @@ -355,7 +355,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnTrueWhenLocalWildcardAtEndUsed() throws Exception { + void isExpressionMatchShouldReturnTrueWhenLocalWildcardAtEndUsed() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "mailbox%", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("mailboxsub"); @@ -364,7 +364,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchSubFolderWhenLocalWildcardAtEnd() throws Exception { + void isExpressionMatchShouldNotMatchSubFolderWhenLocalWildcardAtEnd() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "mailbox%", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("mailbox.sub"); @@ -373,7 +373,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnFalseWhenEmptyNameAndLocalWildcardAtBeginning() throws Exception { + void isExpressionMatchShouldReturnFalseWhenEmptyNameAndLocalWildcardAtBeginning() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "%mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch(""); @@ -382,7 +382,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchFolderWhenLocalWildcardAtBeginningAndNoMatching() throws Exception { + void isExpressionMatchShouldNotMatchFolderWhenLocalWildcardAtBeginningAndNoMatching() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "%mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub"); @@ -391,7 +391,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchFolderWhenLocalWildcardAtBeginningNotUsed() throws Exception { + void isExpressionMatchShouldMatchFolderWhenLocalWildcardAtBeginningNotUsed() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "%mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("mailbox"); @@ -400,7 +400,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchFolderWhenLocalWildcardAtBeginningUsed() throws Exception { + void isExpressionMatchShouldMatchFolderWhenLocalWildcardAtBeginningUsed() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "%mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("submailbox"); @@ -409,7 +409,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchSubFolderWhenLocalWildcardAtBeginning() throws Exception { + void isExpressionMatchShouldNotMatchSubFolderWhenLocalWildcardAtBeginning() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "%mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub.mailbox"); @@ -418,7 +418,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchDeeplyNestedFolderWhenLocalWildcardAtBeginning() throws Exception { + void isExpressionMatchShouldNotMatchDeeplyNestedFolderWhenLocalWildcardAtBeginning() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "%mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub.mailbox.sub"); @@ -427,7 +427,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnFalseWhenEmptyNameAndLocalWildcardInMiddle() throws Exception { + void isExpressionMatchShouldReturnFalseWhenEmptyNameAndLocalWildcardInMiddle() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub%mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch(""); @@ -436,7 +436,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnFalseWhenLocalWildcardInMiddleAndMissingEndName() throws Exception { + void isExpressionMatchShouldReturnFalseWhenLocalWildcardInMiddleAndMissingEndName() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub%mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub"); @@ -445,7 +445,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchFolderWhenLocalWildcardInMiddleAndMatching() throws Exception { + void isExpressionMatchShouldMatchFolderWhenLocalWildcardInMiddleAndMatching() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub%mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("submailbox"); @@ -454,7 +454,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchFolderWhenLocalWildcardInMiddle() throws Exception { + void isExpressionMatchShouldMatchFolderWhenLocalWildcardInMiddle() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub%mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub123mailbox"); @@ -463,7 +463,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchSubFolderWhenLocalWildcardInMiddle() throws Exception { + void isExpressionMatchShouldNotMatchSubFolderWhenLocalWildcardInMiddle() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub%mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub.mailbox"); @@ -472,7 +472,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchSubFolderWhenLocalWildcardInMiddleAndExpandedMiddleName() throws Exception { + void isExpressionMatchShouldNotMatchSubFolderWhenLocalWildcardInMiddleAndExpandedMiddleName() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub%mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub.123mailbox"); @@ -481,7 +481,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnFalseWhenLocalWildcardInMiddleAndMissingBeginningName() throws Exception { + void isExpressionMatchShouldReturnFalseWhenLocalWildcardInMiddleAndMissingBeginningName() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub%mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("mailbox"); @@ -490,7 +490,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchDeeplyNestedFolderWhenLocalWildcardInMiddle() throws Exception { + void isExpressionMatchShouldNotMatchDeeplyNestedFolderWhenLocalWildcardInMiddle() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub%mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("subw.hat.eve.rmailbox"); @@ -499,7 +499,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchSubFolderWhenFreeWildcardAtEnd() throws Exception { + void isExpressionMatchShouldMatchSubFolderWhenFreeWildcardAtEnd() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "mailbox*", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("mailbox.sub"); @@ -508,7 +508,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnFalseWhenEmptyNameAndFreeWildcardAtEnd() throws Exception { + void isExpressionMatchShouldReturnFalseWhenEmptyNameAndFreeWildcardAtEnd() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "mailbox*", PATH_DELIMITER); boolean actual = testee.isExpressionMatch(""); @@ -517,7 +517,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchFolderWhenFreeWildcardAtEndAndNoMatching() throws Exception { + void isExpressionMatchShouldNotMatchFolderWhenFreeWildcardAtEndAndNoMatching() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "mailbox*", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub"); @@ -526,7 +526,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchFolderWhenFreeWildcardAtEndNotUsed() throws Exception { + void isExpressionMatchShouldMatchFolderWhenFreeWildcardAtEndNotUsed() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "mailbox*", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("mailbox"); @@ -535,7 +535,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchFolderWhenFreeWildcardAtEndUsed() throws Exception { + void isExpressionMatchShouldMatchFolderWhenFreeWildcardAtEndUsed() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "mailbox*", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("mailbox123"); @@ -544,7 +544,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnFalseWhenEmptyNameAndFreeWildcardAtBeginning() throws Exception { + void isExpressionMatchShouldReturnFalseWhenEmptyNameAndFreeWildcardAtBeginning() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "*mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch(""); @@ -553,7 +553,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchFolderWhenFreeWildcardAtBeginningAndNoMatching() throws Exception { + void isExpressionMatchShouldNotMatchFolderWhenFreeWildcardAtBeginningAndNoMatching() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "*mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub"); @@ -562,7 +562,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchFolderWhenFreeWildcardAtBeginningNotUsed() throws Exception { + void isExpressionMatchShouldMatchFolderWhenFreeWildcardAtBeginningNotUsed() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "*mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("mailbox"); @@ -571,7 +571,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchFolderWhenFreeWildcardAtBeginningUsed() throws Exception { + void isExpressionMatchShouldMatchFolderWhenFreeWildcardAtBeginningUsed() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "*mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("submailbox"); @@ -580,7 +580,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchSubFolderWhenFreeWildcardAtBeginning() throws Exception { + void isExpressionMatchShouldMatchSubFolderWhenFreeWildcardAtBeginning() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "*mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub.mailbox"); @@ -589,7 +589,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnFalseWhenEmptyNameAndFreeWildcardInMiddle() throws Exception { + void isExpressionMatchShouldReturnFalseWhenEmptyNameAndFreeWildcardInMiddle() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub*mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch(""); @@ -598,7 +598,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchFolderWhenFreeWildcardInMiddleAndMissingEndName() throws Exception { + void isExpressionMatchShouldNotMatchFolderWhenFreeWildcardInMiddleAndMissingEndName() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub*mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub"); @@ -607,7 +607,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchFolderWhenFreeWildcardInMiddleNotUsed() throws Exception { + void isExpressionMatchShouldMatchFolderWhenFreeWildcardInMiddleNotUsed() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub*mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("submailbox"); @@ -616,7 +616,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchSubFolderWhenFreeWildcardInMiddle() throws Exception { + void isExpressionMatchShouldMatchSubFolderWhenFreeWildcardInMiddle() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub*mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub.mailbox"); @@ -625,7 +625,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnFalseWhenFreeWildcardInMiddleNotUsedAndMissingBeginningName() throws Exception { + void isExpressionMatchShouldReturnFalseWhenFreeWildcardInMiddleNotUsedAndMissingBeginningName() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub*mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("mailbox"); @@ -634,7 +634,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchDeeplyNestedFolderWhenFreeWildcardInMiddle() throws Exception { + void isExpressionMatchShouldMatchDeeplyNestedFolderWhenFreeWildcardInMiddle() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub*mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("subw.hat.eve.rmailbox"); @@ -643,7 +643,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnFalseWhenEmptyNameAndDoubleFreeWildcardInMiddle() throws Exception { + void isExpressionMatchShouldReturnFalseWhenEmptyNameAndDoubleFreeWildcardInMiddle() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub**mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch(""); @@ -652,7 +652,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnFalseWhenDoubleFreeWildcardInMiddleAndMissingEndName() throws Exception { + void isExpressionMatchShouldReturnFalseWhenDoubleFreeWildcardInMiddleAndMissingEndName() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub**mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub"); @@ -661,7 +661,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnTrueWhenDoubleFreeWildcardInMiddleNotUsed() throws Exception { + void isExpressionMatchShouldReturnTrueWhenDoubleFreeWildcardInMiddleNotUsed() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub**mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("submailbox"); @@ -670,7 +670,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchSubFolderWhenDoubleFreeWildcardInMiddle() throws Exception { + void isExpressionMatchShouldMatchSubFolderWhenDoubleFreeWildcardInMiddle() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub**mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub.mailbox"); @@ -679,7 +679,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnFalseWhenDoubleFreeWildcardInMiddleAndMissingBeginningName() throws Exception { + void isExpressionMatchShouldReturnFalseWhenDoubleFreeWildcardInMiddleAndMissingBeginningName() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub**mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("mailbox"); @@ -688,7 +688,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchDeeplyNestedFolderWhenDoubleFreeWildcardInMiddle() throws Exception { + void isExpressionMatchShouldMatchDeeplyNestedFolderWhenDoubleFreeWildcardInMiddle() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub**mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("subw.hat.eve.rmailbox"); @@ -697,7 +697,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnFalseWhenEmptyNameAndFreeLocalWildcardInMiddle() throws Exception { + void isExpressionMatchShouldReturnFalseWhenEmptyNameAndFreeLocalWildcardInMiddle() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub*%mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch(""); @@ -706,7 +706,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnFalseWhenFreeLocalWildcardInMiddleAndMissingEndName() throws Exception { + void isExpressionMatchShouldReturnFalseWhenFreeLocalWildcardInMiddleAndMissingEndName() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub*%mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub"); @@ -715,7 +715,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchFolderWhenFreeLocalWildcardInMiddleNotUsed() throws Exception { + void isExpressionMatchShouldMatchFolderWhenFreeLocalWildcardInMiddleNotUsed() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub*%mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("submailbox"); @@ -724,7 +724,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchSubFolderWhenFreeLocalWildcardInMiddle() throws Exception { + void isExpressionMatchShouldMatchSubFolderWhenFreeLocalWildcardInMiddle() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub*%mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub.mailbox"); @@ -733,7 +733,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnFalseWhenFreeLocalWildcardInMiddleAndMissingBeginningName() throws Exception { + void isExpressionMatchShouldReturnFalseWhenFreeLocalWildcardInMiddleAndMissingBeginningName() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub*%mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("mailbox"); @@ -742,7 +742,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchDeeplyNestedFolderWhenFreeLocalWildcardInMiddle() throws Exception { + void isExpressionMatchShouldMatchDeeplyNestedFolderWhenFreeLocalWildcardInMiddle() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub*%mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("subw.hat.eve.rmailbox"); @@ -751,7 +751,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldReturnFalseWhenEmptyNameAndLocalFreeWildcardInMiddle() throws Exception { + void isExpressionMatchShouldReturnFalseWhenEmptyNameAndLocalFreeWildcardInMiddle() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub%*mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch(""); @@ -760,7 +760,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchFolderWhenLocalFreeWildcardInMiddleAndMissingEndName() throws Exception { + void isExpressionMatchShouldNotMatchFolderWhenLocalFreeWildcardInMiddleAndMissingEndName() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub%*mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub"); @@ -769,7 +769,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchFolderWhenLocalFreewildcardInMiddleNotUsed() throws Exception { + void isExpressionMatchShouldMatchFolderWhenLocalFreewildcardInMiddleNotUsed() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub%*mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("submailbox"); @@ -778,7 +778,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchSubFolderWhenLocalFreeWildcardInMiddle() throws Exception { + void isExpressionMatchShouldMatchSubFolderWhenLocalFreeWildcardInMiddle() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub%*mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub.mailbox"); @@ -787,7 +787,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchFolderWhenLocalFreeWildcardInMiddleAndMissingBeginningName() throws Exception { + void isExpressionMatchShouldNotMatchFolderWhenLocalFreeWildcardInMiddleAndMissingBeginningName() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub%*mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("mailbox"); @@ -796,7 +796,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchDeeplyNestedFolderWhenLocalFreeWildcardInMiddle() throws Exception { + void isExpressionMatchShouldMatchDeeplyNestedFolderWhenLocalFreeWildcardInMiddle() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub%*mailbox", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("subw.hat.eve.rmailbox"); @@ -805,7 +805,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchFolderWhenMultipleFreeWildcards() throws Exception { + void isExpressionMatchShouldMatchFolderWhenMultipleFreeWildcards() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub*mailbox*sub**", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("submailboxsub"); @@ -814,7 +814,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchDeeplyNestedFolderWhenMultipleFreeWildcardsNotUsed() throws Exception { + void isExpressionMatchShouldMatchDeeplyNestedFolderWhenMultipleFreeWildcardsNotUsed() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub*mailbox*sub**", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub.mailbox.sub"); @@ -823,7 +823,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchDeeplyNestedFolderWhenMultipleFreeWildcardsUsed() throws Exception { + void isExpressionMatchShouldMatchDeeplyNestedFolderWhenMultipleFreeWildcardsUsed() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub*mailbox*sub**", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("subtosh.boshmailboxtosh.boshsubboshtosh"); @@ -832,7 +832,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchDeeplyNestedFolderWhenMultipleFreeWildcardsAndMissingMiddleName() throws Exception { + void isExpressionMatchShouldNotMatchDeeplyNestedFolderWhenMultipleFreeWildcardsAndMissingMiddleName() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub*mailbox*sub**", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub.a.sub"); @@ -841,7 +841,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchDeeplyNestedFolderWhenMultipleFreeWildcardsAndMissingEndName() throws Exception { + void isExpressionMatchShouldNotMatchDeeplyNestedFolderWhenMultipleFreeWildcardsAndMissingEndName() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub*mailbox*sub**", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub.a.submailbox.u"); @@ -850,7 +850,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchDeeplyNestedFolderWhenMultipleFreeWildcardsAndMissingBeginningdName() throws Exception { + void isExpressionMatchShouldNotMatchDeeplyNestedFolderWhenMultipleFreeWildcardsAndMissingBeginningdName() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub*mailbox*sub**", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("utosh.boshmailboxtosh.boshsubasubboshtoshmailboxu"); @@ -859,7 +859,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchFolderWhenMixedLocalFreeWildcardsNotUsed() throws Exception { + void isExpressionMatchShouldMatchFolderWhenMixedLocalFreeWildcardsNotUsed() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub%mailbox*sub", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("submailboxsub"); @@ -868,7 +868,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchSubFolderWhenMixedLocalFreeWildcards() throws Exception { + void isExpressionMatchShouldNotMatchSubFolderWhenMixedLocalFreeWildcards() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub%mailbox*sub", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub.mailboxsub"); @@ -877,7 +877,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchFolderWhenMixedFreeLocalWildcardsNotUsed() throws Exception { + void isExpressionMatchShouldMatchFolderWhenMixedFreeLocalWildcardsNotUsed() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub*mailbox%sub", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("submailboxsub"); @@ -886,7 +886,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchSubFolderWhenMixedFreeLocalWildcards() throws Exception { + void isExpressionMatchShouldMatchSubFolderWhenMixedFreeLocalWildcards() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub*mailbox%sub", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub.mailboxsub"); @@ -895,7 +895,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchSubFolderWhenMixedFreeLocalWildcards() throws Exception { + void isExpressionMatchShouldNotMatchSubFolderWhenMixedFreeLocalWildcards() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub*mailbox%sub", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("submailbox.sub"); @@ -904,7 +904,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchFolderWhenMixedFreeLocalWildcards() throws Exception { + void isExpressionMatchShouldMatchFolderWhenMixedFreeLocalWildcards() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub*mailbox%sub", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("submailboxwhateversub"); @@ -913,7 +913,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchSubFolderEndingWithDelimiterWhenMixedFreeLocalWildcards() throws Exception { + void isExpressionMatchShouldNotMatchSubFolderEndingWithDelimiterWhenMixedFreeLocalWildcards() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub*mailbox%sub", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("submailboxsub.Whatever."); @@ -922,7 +922,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchDeeplyNestedFolderWhenMixedFreeLocalWildcards() throws Exception { + void isExpressionMatchShouldNotMatchDeeplyNestedFolderWhenMixedFreeLocalWildcards() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub*mailbox%sub", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub.mailboxsub.sub"); @@ -931,7 +931,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchSubFoldeWhenMixedFreeLocalWildcards() throws Exception { + void isExpressionMatchShouldMatchSubFoldeWhenMixedFreeLocalWildcards() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub*mailbox%sub", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub.mailboxsub"); @@ -940,7 +940,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchDeeplyNestedFoldeWhenMixedFreeLocalWildcards() throws Exception { + void isExpressionMatchShouldMatchDeeplyNestedFoldeWhenMixedFreeLocalWildcards() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "sub*mailbox%sub", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("sub.whatever.mailbox123sub"); @@ -949,7 +949,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchFolderWhenTwoLocalPathDelimitedWildcards() throws Exception { + void isExpressionMatchShouldNotMatchFolderWhenTwoLocalPathDelimitedWildcards() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "%.%", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("mailbox"); @@ -958,7 +958,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchDeeplyNestedFolderWhenTwoLocalPathDelimitedWildcards() throws Exception { + void isExpressionMatchShouldNotMatchDeeplyNestedFolderWhenTwoLocalPathDelimitedWildcards() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "%.%", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("mailbox.sub.sub"); @@ -967,7 +967,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchSubFolderWhenTwoLocalPathDelimitedWildcards() throws Exception { + void isExpressionMatchShouldMatchSubFolderWhenTwoLocalPathDelimitedWildcards() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "%.%", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("mailbox.sub"); @@ -976,7 +976,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldMatchSubFolderWhenFreeWildcardAndPathDelimiterAtBeginning() throws Exception { + void isExpressionMatchShouldMatchSubFolderWhenFreeWildcardAndPathDelimiterAtBeginning() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "*.test", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("blah.test"); @@ -985,7 +985,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchSubFolderWhenWhenFreeWildcardAndPathDelimiterAtBeginning() throws Exception { + void isExpressionMatchShouldNotMatchSubFolderWhenWhenFreeWildcardAndPathDelimiterAtBeginning() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "*.test", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("blah.test3"); @@ -994,7 +994,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotMatchDeeplyNestedFolderWhenFreeWildcardAndPathDelimiterAtBeginning() throws Exception { + void isExpressionMatchShouldNotMatchDeeplyNestedFolderWhenFreeWildcardAndPathDelimiterAtBeginning() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "*.test", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("blah.test.go"); @@ -1003,7 +1003,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldIgnoreRegexInjection() throws Exception { + void isExpressionMatchShouldIgnoreRegexInjection() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "folder^$!)(%3", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("folder^$!)(123"); @@ -1012,7 +1012,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldIgnoreRegexInjectionWhenUsingEndOfQuoteAndNoMatching() throws Exception { + void isExpressionMatchShouldIgnoreRegexInjectionWhenUsingEndOfQuoteAndNoMatching() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "\\Efo.", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("\\Efol"); @@ -1021,7 +1021,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldIgnoreRegexInjectionWhenUsingEndOfQuoteAndMatching() throws Exception { + void isExpressionMatchShouldIgnoreRegexInjectionWhenUsingEndOfQuoteAndMatching() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "\\Efo.", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("\\Efo."); @@ -1030,7 +1030,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldIgnoreRegexInjectionWhenUsingBeginOfQuoteAndNoMatching() throws Exception { + void isExpressionMatchShouldIgnoreRegexInjectionWhenUsingBeginOfQuoteAndNoMatching() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "\\Qfo?", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("\\Qfol"); @@ -1039,7 +1039,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldIgnoreRegexInjectionWhenUsingBeginOfQuoteAndMatching() throws Exception { + void isExpressionMatchShouldIgnoreRegexInjectionWhenUsingBeginOfQuoteAndMatching() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "\\Qfo?", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("\\Qfo?"); @@ -1048,7 +1048,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotEscapeFreeWildcard() throws Exception { + void isExpressionMatchShouldNotEscapeFreeWildcard() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "folder\\*", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("folder\\123"); @@ -1057,7 +1057,7 @@ public class PrefixedRegexTest { } @Test - public void isExpressionMatchShouldNotEscapeLocalWildcard() throws Exception { + void isExpressionMatchShouldNotEscapeLocalWildcard() { PrefixedRegex testee = new PrefixedRegex(EMPTY_PREFIX, "folder\\%", PATH_DELIMITER); boolean actual = testee.isExpressionMatch("folder\\123"); diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/PrefixedWildcardTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/PrefixedWildcardTest.java index 9f67a64..3ff74cb 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/PrefixedWildcardTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/PrefixedWildcardTest.java @@ -22,7 +22,7 @@ package org.apache.james.mailbox.model.search; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import org.junit.Test; +import org.junit.jupiter.api.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -30,49 +30,49 @@ public class PrefixedWildcardTest { public static final String NAME = "toto"; @Test - public void shouldMatchBeanContract() { + void shouldMatchBeanContract() { EqualsVerifier.forClass(PrefixedWildcard.class) .verify(); } @Test - public void constructorShouldThrowOnNullName() { + void constructorShouldThrowOnNullName() { assertThatThrownBy(() -> new PrefixedWildcard(null)) .isInstanceOf(NullPointerException.class); } @Test - public void isWildShouldReturnTrue() { + void isWildShouldReturnTrue() { assertThat(new PrefixedWildcard(NAME).isWild()) .isTrue(); } @Test - public void getCombinedNameShouldReturnName() { + void getCombinedNameShouldReturnName() { assertThat(new PrefixedWildcard(NAME).getCombinedName()) .isEqualTo(NAME + MailboxNameExpression.FREEWILDCARD); } @Test - public void isExpressionMatchShouldReturnTrueWhenName() { + void isExpressionMatchShouldReturnTrueWhenName() { assertThat(new PrefixedWildcard(NAME).isExpressionMatch(NAME)) .isTrue(); } @Test - public void isExpressionMatchShouldReturnTrueWhenNameAndPostfix() { + void isExpressionMatchShouldReturnTrueWhenNameAndPostfix() { assertThat(new PrefixedWildcard(NAME).isExpressionMatch(NAME + "any")) .isTrue(); } @Test - public void isExpressionMatchShouldReturnFalseWhenOtherValue() { + void isExpressionMatchShouldReturnFalseWhenOtherValue() { assertThat(new PrefixedWildcard(NAME).isExpressionMatch("other")) .isFalse(); } @Test - public void isExpressionMatchShouldThrowOnNullValue() { + void isExpressionMatchShouldThrowOnNullValue() { assertThatThrownBy(() -> new PrefixedWildcard(NAME).isExpressionMatch(null)) .isInstanceOf(NullPointerException.class); } diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/WildcardTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/WildcardTest.java index 1290a39..014c077 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/WildcardTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/search/WildcardTest.java @@ -22,36 +22,36 @@ package org.apache.james.mailbox.model.search; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class WildcardTest { +class WildcardTest { @Test - public void isWildShouldBeTrue() { + void isWildShouldBeTrue() { assertThat(Wildcard.INSTANCE.isWild()) .isTrue(); } @Test - public void getCombinedNameShouldReturnWildcard() { + void getCombinedNameShouldReturnWildcard() { assertThat(Wildcard.INSTANCE.getCombinedName()) .isEqualTo(String.valueOf(MailboxNameExpression.FREEWILDCARD)); } @Test - public void isExpressionMatchShouldMatchAnyValue() { + void isExpressionMatchShouldMatchAnyValue() { assertThat(Wildcard.INSTANCE.isExpressionMatch("any")) .isTrue(); } @Test - public void isExpressionMatchShouldMatchEmptyValue() { + void isExpressionMatchShouldMatchEmptyValue() { assertThat(Wildcard.INSTANCE.isExpressionMatch("")) .isTrue(); } @Test - public void isExpressionMatchShouldThrowOnNullValue() { + void isExpressionMatchShouldThrowOnNullValue() { assertThatThrownBy(() -> Wildcard.INSTANCE.isExpressionMatch(null)) .isInstanceOf(NullPointerException.class); } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org