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 12f8f054e79a3f7053e244bc73b96e7a01d771e2
Author: Matthieu Baechler <matth...@apache.org>
AuthorDate: Wed Nov 6 15:31:00 2019 +0100
[Refactoring] port AbstractStatusResponseFactoryTest to junit5
---
.../AbstractStatusResponseFactoryTest.java | 90 +++++++++-------------
.../UnpooledStatusResponseFactoryTest.java | 17 +++-
2 files changed, 51 insertions(+), 56 deletions(-)
diff --git
a/protocols/imap/src/test/java/org/apache/james/imap/api/message/response/AbstractStatusResponseFactoryTest.java
b/protocols/imap/src/test/java/org/apache/james/imap/api/message/response/AbstractStatusResponseFactoryTest.java
index b233dc8..e76e2fe 100644
---
a/protocols/imap/src/test/java/org/apache/james/imap/api/message/response/AbstractStatusResponseFactoryTest.java
+++
b/protocols/imap/src/test/java/org/apache/james/imap/api/message/response/AbstractStatusResponseFactoryTest.java
@@ -23,95 +23,81 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.display.HumanReadableText;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public abstract class AbstractStatusResponseFactoryTest {
+public interface AbstractStatusResponseFactoryTest {
- private static final String TAG = "ATAG";
-
- private static final HumanReadableText KEY = new HumanReadableText(
- "KEY", "TEXT");
-
- private static final StatusResponse.ResponseCode CODE =
StatusResponse.ResponseCode
- .alert();
-
- private ImapCommand command;
-
- StatusResponseFactory factory;
-
- protected abstract StatusResponseFactory createInstance();
-
- @Before
- public void setUp() throws Exception {
- factory = createInstance();
- command = ImapCommand.anyStateCommand("Command");
- }
+ String TAG = "ATAG";
+ HumanReadableText KEY = new HumanReadableText("KEY", "TEXT");
+ StatusResponse.ResponseCode CODE = StatusResponse.ResponseCode.alert();
+ ImapCommand COMMAND = ImapCommand.anyStateCommand("Command");
+ StatusResponseFactory factory();
+
@Test
- public void testTaggedOk() {
- StatusResponse response = factory.taggedOk(TAG, command, KEY);
+ default void testTaggedOk() {
+ StatusResponse response = factory().taggedOk(TAG, COMMAND, KEY);
assertThat(response).isNotNull();
assertThat(response.getServerResponseType()).isEqualTo(StatusResponse.Type.OK);
assertThat(response.getTag()).isEqualTo(TAG);
assertThat(response.getTextKey()).isEqualTo(KEY);
- assertThat(response.getCommand()).isEqualTo(command);
+ assertThat(response.getCommand()).isEqualTo(COMMAND);
assertThat(response.getResponseCode()).isNull();
- response = factory.taggedOk(TAG, command, KEY, CODE);
+ response = factory().taggedOk(TAG, COMMAND, KEY, CODE);
assertThat(response).isNotNull();
assertThat(response.getServerResponseType()).isEqualTo(StatusResponse.Type.OK);
assertThat(response.getTag()).isEqualTo(TAG);
assertThat(response.getTextKey()).isEqualTo(KEY);
assertThat(response.getResponseCode()).isEqualTo(CODE);
- assertThat(response.getCommand()).isEqualTo(command);
+ assertThat(response.getCommand()).isEqualTo(COMMAND);
}
@Test
- public void testTaggedNo() {
- StatusResponse response = factory.taggedNo(TAG, command, KEY);
+ default void testTaggedNo() {
+ StatusResponse response = factory().taggedNo(TAG, COMMAND, KEY);
assertThat(response).isNotNull();
assertThat(response.getServerResponseType()).isEqualTo(StatusResponse.Type.NO);
assertThat(response.getTag()).isEqualTo(TAG);
assertThat(response.getTextKey()).isEqualTo(KEY);
- assertThat(response.getCommand()).isEqualTo(command);
+ assertThat(response.getCommand()).isEqualTo(COMMAND);
assertThat(response.getResponseCode()).isNull();
- response = factory.taggedNo(TAG, command, KEY, CODE);
+ response = factory().taggedNo(TAG, COMMAND, KEY, CODE);
assertThat(response).isNotNull();
assertThat(response.getServerResponseType()).isEqualTo(StatusResponse.Type.NO);
assertThat(response.getTag()).isEqualTo(TAG);
assertThat(response.getTextKey()).isEqualTo(KEY);
assertThat(response.getResponseCode()).isEqualTo(CODE);
- assertThat(response.getCommand()).isEqualTo(command);
+ assertThat(response.getCommand()).isEqualTo(COMMAND);
}
@Test
- public void testTaggedBad() {
- StatusResponse response = factory.taggedBad(TAG, command, KEY);
+ default void testTaggedBad() {
+ StatusResponse response = factory().taggedBad(TAG, COMMAND, KEY);
assertThat(response).isNotNull();
assertThat(response.getServerResponseType()).isEqualTo(StatusResponse.Type.BAD);
assertThat(response.getTag()).isEqualTo(TAG);
assertThat(response.getTextKey()).isEqualTo(KEY);
assertThat(response.getResponseCode()).isNull();
- assertThat(response.getCommand()).isEqualTo(command);
- response = factory.taggedBad(TAG, command, KEY, CODE);
+ assertThat(response.getCommand()).isEqualTo(COMMAND);
+ response = factory().taggedBad(TAG, COMMAND, KEY, CODE);
assertThat(response).isNotNull();
assertThat(response.getServerResponseType()).isEqualTo(StatusResponse.Type.BAD);
assertThat(response.getTag()).isEqualTo(TAG);
assertThat(response.getTextKey()).isEqualTo(KEY);
assertThat(response.getResponseCode()).isEqualTo(CODE);
- assertThat(response.getCommand()).isEqualTo(command);
+ assertThat(response.getCommand()).isEqualTo(COMMAND);
}
@Test
- public void testUntaggedOk() {
- StatusResponse response = factory.untaggedOk(KEY);
+ default void testUntaggedOk() {
+ StatusResponse response = factory().untaggedOk(KEY);
assertThat(response).isNotNull();
assertThat(response.getServerResponseType()).isEqualTo(StatusResponse.Type.OK);
assertThat(response.getTag()).isNull();
assertThat(response.getTextKey()).isEqualTo(KEY);
assertThat(response.getResponseCode()).isNull();
assertThat(response.getCommand()).isNull();
- response = factory.untaggedOk(KEY, CODE);
+ response = factory().untaggedOk(KEY, CODE);
assertThat(response).isNotNull();
assertThat(response.getServerResponseType()).isEqualTo(StatusResponse.Type.OK);
assertThat(response.getTag()).isNull();
@@ -122,15 +108,15 @@ public abstract class AbstractStatusResponseFactoryTest {
@Test
- public void testUntaggedNo() {
- StatusResponse response = factory.untaggedNo(KEY);
+ default void testUntaggedNo() {
+ StatusResponse response = factory().untaggedNo(KEY);
assertThat(response).isNotNull();
assertThat(response.getServerResponseType()).isEqualTo(StatusResponse.Type.NO);
assertThat(response.getTag()).isNull();
assertThat(response.getTextKey()).isEqualTo(KEY);
assertThat(response.getResponseCode()).isNull();
assertThat(response.getCommand()).isNull();
- response = factory.untaggedNo(KEY, CODE);
+ response = factory().untaggedNo(KEY, CODE);
assertThat(response).isNotNull();
assertThat(response.getServerResponseType()).isEqualTo(StatusResponse.Type.NO);
assertThat(response.getTag()).isNull();
@@ -140,15 +126,15 @@ public abstract class AbstractStatusResponseFactoryTest {
}
@Test
- public void testUntaggedBad() {
- StatusResponse response = factory.untaggedBad(KEY);
+ default void testUntaggedBad() {
+ StatusResponse response = factory().untaggedBad(KEY);
assertThat(response).isNotNull();
assertThat(response.getServerResponseType()).isEqualTo(StatusResponse.Type.BAD);
assertThat(response.getTag()).isNull();
assertThat(response.getTextKey()).isEqualTo(KEY);
assertThat(response.getResponseCode()).isNull();
assertThat(response.getCommand()).isNull();
- response = factory.untaggedBad(KEY, CODE);
+ response = factory().untaggedBad(KEY, CODE);
assertThat(response).isNotNull();
assertThat(response.getServerResponseType()).isEqualTo(StatusResponse.Type.BAD);
assertThat(response.getTag()).isNull();
@@ -158,8 +144,8 @@ public abstract class AbstractStatusResponseFactoryTest {
}
@Test
- public void testPreauth() {
- StatusResponse response = factory.preauth(KEY);
+ default void testPreauth() {
+ StatusResponse response = factory().preauth(KEY);
assertThat(response).isNotNull();
assertThat(response
.getServerResponseType()).isEqualTo(StatusResponse.Type.PREAUTH);
@@ -167,7 +153,7 @@ public abstract class AbstractStatusResponseFactoryTest {
assertThat(response.getTextKey()).isEqualTo(KEY);
assertThat(response.getResponseCode()).isNull();
assertThat(response.getCommand()).isNull();
- response = factory.preauth(KEY, CODE);
+ response = factory().preauth(KEY, CODE);
assertThat(response).isNotNull();
assertThat(response
.getServerResponseType()).isEqualTo(StatusResponse.Type.PREAUTH);
@@ -178,15 +164,15 @@ public abstract class AbstractStatusResponseFactoryTest {
}
@Test
- public void testBye() {
- StatusResponse response = factory.bye(KEY);
+ default void testBye() {
+ StatusResponse response = factory().bye(KEY);
assertThat(response).isNotNull();
assertThat(response.getServerResponseType()).isEqualTo(StatusResponse.Type.BYE);
assertThat(response.getTag()).isNull();
assertThat(response.getTextKey()).isEqualTo(KEY);
assertThat(response.getResponseCode()).isNull();
assertThat(response.getCommand()).isNull();
- response = factory.bye(KEY, CODE);
+ response = factory().bye(KEY, CODE);
assertThat(response).isNotNull();
assertThat(response.getServerResponseType()).isEqualTo(StatusResponse.Type.BYE);
assertThat(response.getTag()).isNull();
diff --git
a/protocols/imap/src/test/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactoryTest.java
b/protocols/imap/src/test/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactoryTest.java
index bd5370d..6447354 100644
---
a/protocols/imap/src/test/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactoryTest.java
+++
b/protocols/imap/src/test/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactoryTest.java
@@ -19,15 +19,24 @@
package org.apache.james.imap.message.response;
+import org.apache.james.imap.api.ImapCommand;
import
org.apache.james.imap.api.message.response.AbstractStatusResponseFactoryTest;
import org.apache.james.imap.api.message.response.StatusResponseFactory;
+import org.junit.jupiter.api.BeforeEach;
-public class UnpooledStatusResponseFactoryTest extends
- AbstractStatusResponseFactoryTest {
+class UnpooledStatusResponseFactoryTest implements
AbstractStatusResponseFactoryTest {
+
+ StatusResponseFactory factory;
+
+
+ @BeforeEach
+ void setUp() throws Exception {
+ factory = new UnpooledStatusResponseFactory();
+ }
@Override
- protected StatusResponseFactory createInstance() {
- return new UnpooledStatusResponseFactory();
+ public StatusResponseFactory factory() {
+ return factory;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
