[mina-sshd] 05/07: [SSHD-842] Moved KexProposalOptionTest from core to common module

[lgoldstein]

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

lgoldstein pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git

commit 15b74e9eab394cb804e8bd9dbe4d40509c9c9380
Author: Lyor Goldstein <lgoldst...@apache.org>
AuthorDate: Thu Oct 17 11:58:48 2019 +0300

    [SSHD-842] Moved KexProposalOptionTest from core to common module
---
 .../apache/sshd/common/kex/KexProposalOptionTest.java   | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git 
a/sshd-core/src/test/java/org/apache/sshd/common/kex/KexProposalOptionTest.java 
b/sshd-common/src/test/java/org/apache/sshd/common/kex/KexProposalOptionTest.java
similarity index 90%
rename from 
sshd-core/src/test/java/org/apache/sshd/common/kex/KexProposalOptionTest.java
rename to 
sshd-common/src/test/java/org/apache/sshd/common/kex/KexProposalOptionTest.java
index f6adc8d..4008dac 100644
--- 
a/sshd-core/src/test/java/org/apache/sshd/common/kex/KexProposalOptionTest.java
+++ 
b/sshd-common/src/test/java/org/apache/sshd/common/kex/KexProposalOptionTest.java
@@ -26,7 +26,7 @@ import java.util.EnumSet;
 
 import org.apache.sshd.common.kex.KexProposalOption.Constants;
 import org.apache.sshd.common.util.GenericUtils;
-import org.apache.sshd.util.test.BaseTestSupport;
+import org.apache.sshd.util.test.JUnitTestSupport;
 import org.apache.sshd.util.test.NoIoTestCase;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
@@ -38,18 +38,21 @@ import org.junit.runners.MethodSorters;
  */
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @Category({ NoIoTestCase.class })
-public class KexProposalOptionTest extends BaseTestSupport {
+public class KexProposalOptionTest extends JUnitTestSupport {
     public KexProposalOptionTest() {
         super();
     }
 
     @Test
-    public void testFromName() {
+    public void testFromUnmatchedName() {
         for (String n : new String[]{null, "", getCurrentTestName()}) {
             KexProposalOption o = KexProposalOption.fromName(n);
             assertNull("Unexpected value for name='" + n + "'", o);
         }
+    }
 
+    @Test
+    public void testFromMatchedName() {
         for (KexProposalOption expected : KexProposalOption.VALUES) {
             String n = expected.name();
 
@@ -62,12 +65,15 @@ public class KexProposalOptionTest extends BaseTestSupport {
     }
 
     @Test
-    public void testFromProposalIndex() {
+    public void testFromUnmatchedProposalIndex() {
         for (int index : new int[]{-1, KexProposalOption.VALUES.size()}) {
             KexProposalOption o = KexProposalOption.fromProposalIndex(index);
             assertNull("Unexpected value for index=" + index, o);
         }
+    }
 
+    @Test
+    public void testFromMatchedProposalIndex() {
         for (KexProposalOption expected : KexProposalOption.VALUES) {
             int index = expected.getProposalIndex();
             KexProposalOption actual = 
KexProposalOption.fromProposalIndex(index);
@@ -95,7 +101,8 @@ public class KexProposalOptionTest extends BaseTestSupport {
     public void testAllConstantsCovered() throws Exception {
         Field[] fields = Constants.class.getFields();
 
-        Collection<KexProposalOption> options = 
EnumSet.allOf(KexProposalOption.class);
+        Collection<KexProposalOption> options =
+            EnumSet.allOf(KexProposalOption.class);
         for (Field f : fields) {
             int mods = f.getModifiers();
             if (!Modifier.isStatic(mods)) {