You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2021/02/09 04:29:36 UTC
[james-project] 08/33: [REFACTORING] Get rid of some JUNIT 4 usages
in guice-mailet tests
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 4651973290022a6fcd59ca61f79a8b5561c9dbae
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sat Feb 6 10:12:19 2021 +0700
[REFACTORING] Get rid of some JUNIT 4 usages in guice-mailet tests
---
.../apache/james/utils/GuiceMailetLoaderTest.java | 56 ++++++++++------------
.../apache/james/utils/GuiceMatcherLoaderTest.java | 49 +++++++++----------
2 files changed, 48 insertions(+), 57 deletions(-)
diff --git a/server/container/guice/mailet/src/test/java/org/apache/james/utils/GuiceMailetLoaderTest.java b/server/container/guice/mailet/src/test/java/org/apache/james/utils/GuiceMailetLoaderTest.java
index 43c2434..5b8937b 100644
--- a/server/container/guice/mailet/src/test/java/org/apache/james/utils/GuiceMailetLoaderTest.java
+++ b/server/container/guice/mailet/src/test/java/org/apache/james/utils/GuiceMailetLoaderTest.java
@@ -24,6 +24,7 @@ import static org.apache.james.filesystem.api.FileSystemFixture.RECURSIVE_CLASSP
import static org.apache.james.filesystem.api.FileSystemFixture.THROWING_FILE_SYSTEM;
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 javax.mail.MessagingException;
@@ -33,22 +34,17 @@ import org.apache.mailet.Mailet;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.FakeMailContext;
import org.apache.mailet.base.test.FakeMailetConfig;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Guice;
-public class GuiceMailetLoaderTest {
-
+class GuiceMailetLoaderTest {
public static final ImmutableSet<MailetConfigurationOverride> NO_MAILET_CONFIG_OVERRIDES = ImmutableSet.of();
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
@Test
- public void getMailetShouldLoadClass() throws Exception {
+ void getMailetShouldLoadClass() throws Exception {
GuiceGenericLoader genericLoader = GuiceGenericLoader.forTesting(new ExtendedClassLoader(THROWING_FILE_SYSTEM));
GuiceMailetLoader guiceMailetLoader = new GuiceMailetLoader(genericLoader, NO_MAILET_CONFIG_OVERRIDES);
@@ -61,7 +57,7 @@ public class GuiceMailetLoaderTest {
}
@Test
- public void getMailetShouldLoadClassWhenInSubPackageFromDefaultPackage() throws Exception {
+ void getMailetShouldLoadClassWhenInSubPackageFromDefaultPackage() throws Exception {
GuiceGenericLoader genericLoader = GuiceGenericLoader.forTesting(new ExtendedClassLoader(THROWING_FILE_SYSTEM));
GuiceMailetLoader guiceMailetLoader = new GuiceMailetLoader(genericLoader, NO_MAILET_CONFIG_OVERRIDES);
@@ -74,20 +70,20 @@ public class GuiceMailetLoaderTest {
}
@Test
- public void getMailetShouldThrowOnBadType() throws Exception {
+ void getMailetShouldThrowOnBadType() {
GuiceGenericLoader genericLoader = GuiceGenericLoader.forTesting(new ExtendedClassLoader(THROWING_FILE_SYSTEM));
GuiceMailetLoader guiceMailetLoader = new GuiceMailetLoader(genericLoader, NO_MAILET_CONFIG_OVERRIDES);
- expectedException.expect(MessagingException.class);
-
- guiceMailetLoader.getMailet(FakeMailetConfig.builder()
- .mailetName("org.apache.james.transport.matchers.SizeGreaterThan")
- .mailetContext(FakeMailContext.defaultContext())
- .build());
+ assertThatThrownBy(() ->
+ guiceMailetLoader.getMailet(FakeMailetConfig.builder()
+ .mailetName("org.apache.james.transport.matchers.SizeGreaterThan")
+ .mailetContext(FakeMailContext.defaultContext())
+ .build()))
+ .isInstanceOf(MessagingException.class);
}
@Test
- public void getMailetShouldLoadClassWhenInExtensionsJars() throws Exception {
+ void getMailetShouldLoadClassWhenInExtensionsJars() throws Exception {
GuiceGenericLoader genericLoader = GuiceGenericLoader.forTesting(new ExtendedClassLoader(CLASSPATH_FILE_SYSTEM));
GuiceMailetLoader guiceMailetLoader = new GuiceMailetLoader(genericLoader, NO_MAILET_CONFIG_OVERRIDES);
@@ -101,7 +97,7 @@ public class GuiceMailetLoaderTest {
}
@Test
- public void getMailetShouldBrowseRecursivelyExtensionsJars() throws Exception {
+ void getMailetShouldBrowseRecursivelyExtensionsJars() throws Exception {
GuiceGenericLoader genericLoader = GuiceGenericLoader.forTesting(new ExtendedClassLoader(RECURSIVE_CLASSPATH_FILE_SYSTEM));
GuiceMailetLoader guiceMailetLoader = new GuiceMailetLoader(genericLoader, NO_MAILET_CONFIG_OVERRIDES);
@@ -115,7 +111,7 @@ public class GuiceMailetLoaderTest {
}
@Test
- public void getMailedShouldAllowCustomPackages() throws Exception {
+ void getMailedShouldAllowCustomPackages() throws Exception {
GuiceGenericLoader genericLoader = GuiceGenericLoader.forTesting(new ExtendedClassLoader(CLASSPATH_FILE_SYSTEM));
GuiceMailetLoader guiceMailetLoader = new GuiceMailetLoader(genericLoader, NO_MAILET_CONFIG_OVERRIDES);
@@ -129,20 +125,20 @@ public class GuiceMailetLoaderTest {
}
@Test
- public void getMailetShouldThrowOnUnknownMailet() throws Exception {
+ void getMailetShouldThrowOnUnknownMailet() {
GuiceGenericLoader genericLoader = GuiceGenericLoader.forTesting(new ExtendedClassLoader(CLASSPATH_FILE_SYSTEM));
GuiceMailetLoader guiceMailetLoader = new GuiceMailetLoader(genericLoader, NO_MAILET_CONFIG_OVERRIDES);
- expectedException.expect(MessagingException.class);
-
- guiceMailetLoader.getMailet(FakeMailetConfig.builder()
- .mailetName("org.apache.james.transport.mailets.Unknown")
- .mailetContext(FakeMailContext.defaultContext())
- .build());
+ assertThatThrownBy(() ->
+ guiceMailetLoader.getMailet(FakeMailetConfig.builder()
+ .mailetName("org.apache.james.transport.mailets.Unknown")
+ .mailetContext(FakeMailContext.defaultContext())
+ .build()))
+ .isInstanceOf(MessagingException.class);
}
@Test
- public void getMailetShouldLoadMailetsWithCustomDependencyInConstructor() throws Exception {
+ void getMailetShouldLoadMailetsWithCustomDependencyInConstructor() throws Exception {
GuiceGenericLoader genericLoader = GuiceGenericLoader.forTesting(new ExtendedClassLoader(RECURSIVE_CLASSPATH_FILE_SYSTEM));
GuiceMailetLoader guiceMailetLoader = new GuiceMailetLoader(genericLoader, NO_MAILET_CONFIG_OVERRIDES);
@@ -156,7 +152,7 @@ public class GuiceMailetLoaderTest {
}
@Test
- public void getMailetShouldLoadMailetsWithCustomDependencyInService() throws Exception {
+ void getMailetShouldLoadMailetsWithCustomDependencyInService() throws Exception {
GuiceGenericLoader genericLoader = GuiceGenericLoader.forTesting(new ExtendedClassLoader(RECURSIVE_CLASSPATH_FILE_SYSTEM));
GuiceMailetLoader guiceMailetLoader = new GuiceMailetLoader(genericLoader, NO_MAILET_CONFIG_OVERRIDES);
@@ -169,7 +165,7 @@ public class GuiceMailetLoaderTest {
}
@Test
- public void getMailetShouldAllowCustomInjections() throws Exception {
+ void getMailetShouldAllowCustomInjections() throws Exception {
GuiceGenericLoader genericLoader = new GuiceGenericLoader(
Guice.createInjector(),
new ExtendedClassLoader(RECURSIVE_CLASSPATH_FILE_SYSTEM),
@@ -185,7 +181,7 @@ public class GuiceMailetLoaderTest {
}
@Test
- public void allMailetsShouldShareTheSameSingleton() throws Exception {
+ void allMailetsShouldShareTheSameSingleton() throws Exception {
GuiceGenericLoader genericLoader = new GuiceGenericLoader(
Guice.createInjector(),
new ExtendedClassLoader(RECURSIVE_CLASSPATH_FILE_SYSTEM),
diff --git a/server/container/guice/mailet/src/test/java/org/apache/james/utils/GuiceMatcherLoaderTest.java b/server/container/guice/mailet/src/test/java/org/apache/james/utils/GuiceMatcherLoaderTest.java
index f3e110f..711a8ae 100644
--- a/server/container/guice/mailet/src/test/java/org/apache/james/utils/GuiceMatcherLoaderTest.java
+++ b/server/container/guice/mailet/src/test/java/org/apache/james/utils/GuiceMatcherLoaderTest.java
@@ -23,6 +23,7 @@ import static org.apache.james.filesystem.api.FileSystemFixture.CLASSPATH_FILE_S
import static org.apache.james.filesystem.api.FileSystemFixture.RECURSIVE_CLASSPATH_FILE_SYSTEM;
import static org.apache.james.filesystem.api.FileSystemFixture.THROWING_FILE_SYSTEM;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import javax.mail.MessagingException;
@@ -30,17 +31,11 @@ import org.apache.james.transport.matchers.All;
import org.apache.mailet.Matcher;
import org.apache.mailet.base.test.FakeMailContext;
import org.apache.mailet.base.test.FakeMatcherConfig;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-public class GuiceMatcherLoaderTest {
-
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
+import org.junit.jupiter.api.Test;
+class GuiceMatcherLoaderTest {
@Test
- public void getMatcherShouldLoadClass() throws Exception {
+ void getMatcherShouldLoadClass() throws Exception {
GuiceGenericLoader genericLoader = GuiceGenericLoader.forTesting(new ExtendedClassLoader(THROWING_FILE_SYSTEM));
GuiceMatcherLoader guiceMailetLoader = new GuiceMatcherLoader(genericLoader);
@@ -53,7 +48,7 @@ public class GuiceMatcherLoaderTest {
}
@Test
- public void getMatcherShouldLoadClassWhenInSubPackageFromDefaultPackage() throws Exception {
+ void getMatcherShouldLoadClassWhenInSubPackageFromDefaultPackage() throws Exception {
GuiceGenericLoader genericLoader = GuiceGenericLoader.forTesting(new ExtendedClassLoader(THROWING_FILE_SYSTEM));
GuiceMatcherLoader guiceMailetLoader = new GuiceMatcherLoader(genericLoader);
@@ -66,20 +61,20 @@ public class GuiceMatcherLoaderTest {
}
@Test
- public void getMatcherShouldThrowOnBadType() throws Exception {
+ void getMatcherShouldThrowOnBadType() {
GuiceGenericLoader genericLoader = GuiceGenericLoader.forTesting(new ExtendedClassLoader(THROWING_FILE_SYSTEM));
GuiceMatcherLoader guiceMatcherLoader = new GuiceMatcherLoader(genericLoader);
- expectedException.expect(MessagingException.class);
-
- guiceMatcherLoader.getMatcher(FakeMatcherConfig.builder()
- .matcherName("org.apache.james.transport.mailets.Null")
- .mailetContext(FakeMailContext.defaultContext())
- .build());
+ assertThatThrownBy(() ->
+ guiceMatcherLoader.getMatcher(FakeMatcherConfig.builder()
+ .matcherName("org.apache.james.transport.mailets.Null")
+ .mailetContext(FakeMailContext.defaultContext())
+ .build()))
+ .isInstanceOf(MessagingException.class);
}
@Test
- public void getMatcherShouldLoadClassWhenInExtensionsJars() throws Exception {
+ void getMatcherShouldLoadClassWhenInExtensionsJars() throws Exception {
GuiceGenericLoader genericLoader = GuiceGenericLoader.forTesting(new ExtendedClassLoader(CLASSPATH_FILE_SYSTEM));
GuiceMatcherLoader guiceMatcherLoader = new GuiceMatcherLoader(genericLoader);
@@ -93,7 +88,7 @@ public class GuiceMatcherLoaderTest {
}
@Test
- public void getMatcherShouldBrowseRecursivelyExtensionJars() throws Exception {
+ void getMatcherShouldBrowseRecursivelyExtensionJars() throws Exception {
GuiceGenericLoader genericLoader = GuiceGenericLoader.forTesting(new ExtendedClassLoader(RECURSIVE_CLASSPATH_FILE_SYSTEM));
GuiceMatcherLoader guiceMatcherLoader = new GuiceMatcherLoader(genericLoader);
@@ -107,7 +102,7 @@ public class GuiceMatcherLoaderTest {
}
@Test
- public void getMatcherShouldAllowCustomPackages() throws Exception {
+ void getMatcherShouldAllowCustomPackages() throws Exception {
GuiceGenericLoader genericLoader = GuiceGenericLoader.forTesting(new ExtendedClassLoader(RECURSIVE_CLASSPATH_FILE_SYSTEM));
GuiceMatcherLoader guiceMatcherLoader = new GuiceMatcherLoader(genericLoader);
@@ -121,16 +116,16 @@ public class GuiceMatcherLoaderTest {
}
@Test
- public void getMatcherShouldThrowOnUnknownMailet() throws Exception {
+ void getMatcherShouldThrowOnUnknownMailet() {
GuiceGenericLoader genericLoader = GuiceGenericLoader.forTesting(new ExtendedClassLoader(CLASSPATH_FILE_SYSTEM));
GuiceMatcherLoader guiceMatcherLoader = new GuiceMatcherLoader(genericLoader);
- expectedException.expect(MessagingException.class);
-
- guiceMatcherLoader.getMatcher(FakeMatcherConfig.builder()
- .matcherName("org.apache.james.transport.matchers.Unknown")
- .mailetContext(FakeMailContext.defaultContext())
- .build());
+ assertThatThrownBy(() ->
+ guiceMatcherLoader.getMatcher(FakeMatcherConfig.builder()
+ .matcherName("org.apache.james.transport.matchers.Unknown")
+ .mailetContext(FakeMailContext.defaultContext())
+ .build()))
+ .isInstanceOf(MessagingException.class);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org