[james-project] 02/26: [Refactoring] Migrate TestFileProtocolSessionBuilder to JUnit5

[rcordier]

This is an automated email from the ASF dual-hosted git repository.

rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 57c11aae7018f5c249553c179b1497a41840263c
Author: Rene Cordier <rcord...@linagora.com>
AuthorDate: Fri Jul 31 17:01:13 2020 +0700

    [Refactoring] Migrate TestFileProtocolSessionBuilder to JUnit5
---
 .../james/mpt/TestFileProtocolSessionBuilder.java  | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git 
a/mpt/core/src/test/java/org/apache/james/mpt/TestFileProtocolSessionBuilder.java
 
b/mpt/core/src/test/java/org/apache/james/mpt/TestFileProtocolSessionBuilder.java
index bacb76c..47676b8 100644
--- 
a/mpt/core/src/test/java/org/apache/james/mpt/TestFileProtocolSessionBuilder.java
+++ 
b/mpt/core/src/test/java/org/apache/james/mpt/TestFileProtocolSessionBuilder.java
@@ -28,26 +28,26 @@ import java.io.StringReader;
 
 import org.apache.james.mpt.api.ProtocolInteractor;
 import org.apache.james.mpt.protocol.ProtocolSessionBuilder;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-public class TestFileProtocolSessionBuilder {
+class TestFileProtocolSessionBuilder {
 
-    private static final String SCRIPT_WITH_VARIABLES = "HELLO ${not} ${foo} 
WORLD ${bar}";
-    private static final String SCRIPT_WITH_FOO_REPLACED_BY_WHATEVER = "HELLO 
${not} whatever WORLD ${bar}";
-    private static final String SCRIPT_WITH_VARIABLES_INLINED = "HELLO not foo 
WORLD bar";
+    static final String SCRIPT_WITH_VARIABLES = "HELLO ${not} ${foo} WORLD 
${bar}";
+    static final String SCRIPT_WITH_FOO_REPLACED_BY_WHATEVER = "HELLO ${not} 
whatever WORLD ${bar}";
+    static final String SCRIPT_WITH_VARIABLES_INLINED = "HELLO not foo WORLD 
bar";
     
     ProtocolSessionBuilder builder;
     ProtocolInteractor session;
 
-    @Before
-    public void setUp() throws Exception {
+    @BeforeEach
+    void setUp() {
         builder = new ProtocolSessionBuilder();
         session = mock(ProtocolInteractor.class);
     }
 
     @Test
-    public void testShouldPreserveContentsWhenNoVariablesSet() throws 
Exception {
+    void testShouldPreserveContentsWhenNoVariablesSet() throws Exception {
         builder.addProtocolLines("A Script", new 
StringReader(ProtocolSessionBuilder.CLIENT_TAG + " " + SCRIPT_WITH_VARIABLES), 
session);
 
         verify(session, times(1)).cl(-1, SCRIPT_WITH_VARIABLES);
@@ -55,7 +55,7 @@ public class TestFileProtocolSessionBuilder {
     }
 
     @Test
-    public void testShouldReplaceVariableWhenSet() throws Exception {
+    void testShouldReplaceVariableWhenSet() throws Exception {
         builder.setVariable("foo", "whatever");
         builder.addProtocolLines("A Script", new 
StringReader(ProtocolSessionBuilder.CLIENT_TAG + " " + SCRIPT_WITH_VARIABLES), 
session);
 
@@ -64,7 +64,7 @@ public class TestFileProtocolSessionBuilder {
     }
 
     @Test
-    public void testShouldReplaceAllVariablesWhenSet() throws Exception {
+    void testShouldReplaceAllVariablesWhenSet() throws Exception {
         builder.setVariable("bar", "bar");
         builder.setVariable("foo", "foo");
         builder.setVariable("not", "not");
@@ -75,7 +75,7 @@ public class TestFileProtocolSessionBuilder {
     }
 
     @Test
-    public void testShouldReplaceVariableAtBeginningAndEnd() throws Exception {
+    void testShouldReplaceVariableAtBeginningAndEnd() throws Exception {
         builder.setVariable("foo", "whatever");
         builder.addProtocolLines("A Script", new 
StringReader(ProtocolSessionBuilder.CLIENT_TAG + " " + "${foo} Some Other 
Script${foo}${foo}"), session);
 
@@ -84,7 +84,7 @@ public class TestFileProtocolSessionBuilder {
     }
 
     @Test
-    public void testShouldIgnoreNotQuiteVariables() throws Exception {
+    void testShouldIgnoreNotQuiteVariables() throws Exception {
         final String NEARLY = "{foo}${}${foo Some Other Script${foo}";
         builder.setVariable("foo", "whatever");
         builder.addProtocolLines("A Script", new 
StringReader(ProtocolSessionBuilder.CLIENT_TAG + " " + NEARLY), session);


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org