GH-510: Fix class name in BuiltinIoServiceFactoryFactories

The class name for the MinaServiceFactoryFactory was not updated in the
refactoring in commit 5cbae28.

Add a test that catches such mistakes, and exclude another test
from being run with the MinaServiceFactoryFactory because it cannot
work with a mocked ExecutorService.

Bug: #510

sshd-core/src/main/java/org/apache/sshd/common/io/BuiltinIoServiceFactoryFactories.java

@@ -34,7 +34,7 @@
  */
 public enum BuiltinIoServiceFactoryFactories implements NamedFactory<IoServiceFactoryFactory>, OptionalFeature {
  NIO2(Nio2ServiceFactoryFactory.class),
- MINA("org.apache.sshd.common.io.mina.MinaServiceFactoryFactory"),
+ MINA("org.apache.sshd.mina.MinaServiceFactoryFactory"),
  NETTY("org.apache.sshd.netty.NettyIoServiceFactoryFactory");
 
  public static final Set<BuiltinIoServiceFactoryFactories> VALUES

sshd-core/src/test/java/org/apache/sshd/common/io/BuiltinIoServiceFactoryFactoriesTest.java

@@ -68,4 +68,19 @@ public void testFromFactoryClass() {
  assertSame(clazz.getSimpleName(), expected, BuiltinIoServiceFactoryFactories.fromFactoryClass(clazz));
  }
  }
+
+ @Test
+ public void testClassNames() {
+ IoServiceFactoryFactory ioServiceProvider = getIoServiceProvider();
+ Class<?> providerClass = ioServiceProvider.getClass();
+ String providerClassName = providerClass.getName();
+ boolean found = false;
+ for (BuiltinIoServiceFactoryFactories builtin : BuiltinIoServiceFactoryFactories.VALUES) {
+ if (providerClassName.equals(builtin.getFactoryClassName())) {
+ found = true;
+ break;
+ }
+ }
+ assertTrue("No BuiltinIoServiceFactoryFactories match for class name " + providerClassName, found);
+ }
 }

sshd-mina/pom.xml

@@ -124,6 +124,8 @@
  <exclude>**/StrictKexInteroperabilityTest.java</exclude>
  <!-- reading files from classpath doesn't work correctly w/ reusable test jar -->
  <exclude>**/OpenSSHCertificateTest.java</exclude>
+ <!-- A MinaServiceFactory cannot be instantiated with a mock CloseableExecutorService. -->
+ <exclude>**/DefaultIoServiceFactoryFactoryTest.java</exclude>
  </excludes>
  <!-- No need to re-run core tests that do not involve session creation -->
  <excludedGroups>org.apache.sshd.util.test.NoIoTestCase</excludedGroups>