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:32 UTC
[james-project] 04/33: [REFACTORING] Get rid of some JUNIT 4 usages
in cassandra-common 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 f33705408353fc1703c22a74b1ff162798579d9f
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sat Feb 6 10:00:28 2021 +0700
[REFACTORING] Get rid of some JUNIT 4 usages in cassandra-common tests
---
.../modules/InitializationOperationsTest.java | 7 ++--
.../org/apache/james/utils/ConfigurablesTest.java | 12 +++----
.../apache/james/utils/GuiceProbeProviderTest.java | 37 ++++++++++------------
3 files changed, 25 insertions(+), 31 deletions(-)
diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/modules/InitializationOperationsTest.java b/server/container/guice/guice-common/src/test/java/org/apache/james/modules/InitializationOperationsTest.java
index 44a8a3f..90f38dd 100644
--- a/server/container/guice/guice-common/src/test/java/org/apache/james/modules/InitializationOperationsTest.java
+++ b/server/container/guice/guice-common/src/test/java/org/apache/james/modules/InitializationOperationsTest.java
@@ -30,17 +30,16 @@ import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.lifecycle.api.Startable;
import org.apache.james.utils.InitializationOperation;
import org.apache.james.utils.InitializationOperations;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Scopes;
import com.google.inject.multibindings.Multibinder;
-public class InitializationOperationsTest {
-
+class InitializationOperationsTest {
@Test
- public void initModulesShouldNotFailWhenBindingsInWrongOrder() throws Exception {
+ void initModulesShouldNotFailWhenBindingsInWrongOrder() throws Exception {
Injector injector = Guice.createInjector(new StartablesModule(),
new UnorderedBindingsModule());
diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/utils/ConfigurablesTest.java b/server/container/guice/guice-common/src/test/java/org/apache/james/utils/ConfigurablesTest.java
index 01f193f..0c5421e 100644
--- a/server/container/guice/guice-common/src/test/java/org/apache/james/utils/ConfigurablesTest.java
+++ b/server/container/guice/guice-common/src/test/java/org/apache/james/utils/ConfigurablesTest.java
@@ -25,20 +25,20 @@ import org.apache.commons.configuration2.HierarchicalConfiguration;
import org.apache.commons.configuration2.ex.ConfigurationException;
import org.apache.commons.configuration2.tree.ImmutableNode;
import org.apache.james.lifecycle.api.Configurable;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class ConfigurablesTest {
private Startables sut;
- @Before
- public void setup() {
+ @BeforeEach
+ void setup() {
sut = new Startables();
}
@Test
- public void addShouldNotStoreTwoTimesWhenSameConfigurable() {
+ void addShouldNotStoreTwoTimesWhenSameConfigurable() {
sut.add(MyConfigurable.class);
sut.add(MyConfigurable.class);
@@ -46,7 +46,7 @@ public class ConfigurablesTest {
}
@Test
- public void configurablesShouldKeepTheAddedElementsOrder() {
+ void configurablesShouldKeepTheAddedElementsOrder() {
sut.add(MyConfigurable.class);
sut.add(MyConfigurable2.class);
diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/utils/GuiceProbeProviderTest.java b/server/container/guice/guice-common/src/test/java/org/apache/james/utils/GuiceProbeProviderTest.java
index 294a525..dd85176 100644
--- a/server/container/guice/guice-common/src/test/java/org/apache/james/utils/GuiceProbeProviderTest.java
+++ b/server/container/guice/guice-common/src/test/java/org/apache/james/utils/GuiceProbeProviderTest.java
@@ -17,52 +17,47 @@
* under the License. *
****************************************************************/
package org.apache.james.utils;
-import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableSet;
public class GuiceProbeProviderTest {
-
private GuiceProbeProvider guiceProbeProvider;
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
private GuiceProbe1 guiceProbe1;
- @Before
- public void setUp() throws Exception {
+ @BeforeEach
+ void setUp() {
guiceProbe1 = new GuiceProbe1();
guiceProbeProvider = new GuiceProbeProvider(ImmutableSet.of(guiceProbe1));
}
@Test
- public void getProveShouldThrowExcpetionWhenNull() {
- expectedException.expect(NullPointerException.class);
-
- guiceProbeProvider.getProbe(null);
+ void getProveShouldThrowExcpetionWhenNull() {
+ assertThatThrownBy(() -> guiceProbeProvider.getProbe(null))
+ .isInstanceOf(NullPointerException.class);
}
@Test
- public void getProbeShouldThrowRuntimeExceptionWhenEmpty() {
- expectedException.expect(RuntimeException.class);
-
- guiceProbeProvider.getProbe(GuiceProbe2.class);
+ void getProbeShouldThrowRuntimeExceptionWhenEmpty() {
+ assertThatThrownBy(() -> guiceProbeProvider.getProbe(GuiceProbe2.class))
+ .isInstanceOf(RuntimeException.class);
}
@Test
- public void getProbeShouldReturnRightProbe() {
+ void getProbeShouldReturnRightProbe() {
assertThat(guiceProbeProvider.getProbe(GuiceProbe1.class)).isEqualTo(guiceProbe1);
}
- class GuiceProbe1 implements GuiceProbe {
+ static class GuiceProbe1 implements GuiceProbe {
}
- class GuiceProbe2 implements GuiceProbe {
+ static class GuiceProbe2 implements GuiceProbe {
}
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org