X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowjava%2Fopenflow-protocol-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fimpl%2Fcore%2Fconnection%2FSwitchConnectionProviderImplTest.java;h=fee78164daae887f0450475eeebc2db27b0f46e5;hb=777c94332871b8c34f56f7f2010de1536cb759ba;hp=7a8add5072e8c44ea7652760784fe3d0347ad9be;hpb=bc6b7b71b50a6692ba7ad19ae990b1398e3d57b1;p=openflowplugin.git diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SwitchConnectionProviderImplTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SwitchConnectionProviderImplTest.java index 7a8add5072..fee78164da 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SwitchConnectionProviderImplTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SwitchConnectionProviderImplTest.java @@ -8,17 +8,19 @@ package org.opendaylight.openflowjava.protocol.impl.core.connection; -import com.google.common.collect.Lists; import com.google.common.util.concurrent.ListenableFuture; import java.net.InetAddress; import java.net.UnknownHostException; +import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import org.junit.Assert; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; +import org.mockito.junit.MockitoJUnitRunner; +import org.opendaylight.openflowjava.protocol.api.connection.OpenflowDiagStatusProvider; import org.opendaylight.openflowjava.protocol.api.connection.SwitchConnectionHandler; import org.opendaylight.openflowjava.protocol.api.connection.TlsConfiguration; import org.opendaylight.openflowjava.protocol.api.connection.TlsConfigurationImpl; @@ -27,58 +29,60 @@ import org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionPro import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.config.rev140630.KeystoreType; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.config.rev140630.PathType; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.config.rev140630.TransportProtocol; +import org.slf4j.LoggerFactory; /** - * @author michal.polkorab + * Unit tests for SwitchConnectionProviderImpl. * + * @author michal.polkorab */ +@RunWith(MockitoJUnitRunner.class) public class SwitchConnectionProviderImplTest { @Mock SwitchConnectionHandler handler; + @Mock OpenflowDiagStatusProvider openflowPluginDiagStatusProvider; private static final int SWITCH_IDLE_TIMEOUT = 2000; private static final int WAIT_TIMEOUT = 2000; - private InetAddress startupAddress; + private static final int CHANNEL_OUTBOUND_QUEUE_SIZE = 1024; private TlsConfiguration tlsConfiguration; private SwitchConnectionProviderImpl provider; private ConnectionConfigurationImpl config; /** - * Creates new {@link SwitchConnectionProvider} instance for each test + * Creates new {@link SwitchConnectionProvider} instance for each test. * @param protocol communication protocol */ - public void startUp(final TransportProtocol protocol) { - MockitoAnnotations.initMocks(this); + + public void startUp(final TransportProtocol protocol) throws UnknownHostException { config = null; if (protocol != null) { createConfig(protocol); } - provider = new SwitchConnectionProviderImpl(config); + provider = new SwitchConnectionProviderImpl(config, openflowPluginDiagStatusProvider); } - private void createConfig(final TransportProtocol protocol) { - try { - startupAddress = InetAddress.getLocalHost(); - } catch (final UnknownHostException e) { - e.printStackTrace(); - } + private void createConfig(final TransportProtocol protocol) throws UnknownHostException { + InetAddress startupAddress = InetAddress.getLocalHost(); + tlsConfiguration = null; if (protocol.equals(TransportProtocol.TLS)) { tlsConfiguration = new TlsConfigurationImpl(KeystoreType.JKS, "/selfSignedSwitch", PathType.CLASSPATH, KeystoreType.JKS, "/selfSignedController", PathType.CLASSPATH, - Lists.newArrayList("TLS_RSA_WITH_AES_128_CBC_SHA", "TLS_RSA_WITH_AES_128_CBC_SHA256")) ; + List.of("TLS_RSA_WITH_AES_128_CBC_SHA", "TLS_RSA_WITH_AES_128_CBC_SHA256")); } - config = new ConnectionConfigurationImpl(startupAddress, 0, tlsConfiguration, SWITCH_IDLE_TIMEOUT, true, false); + config = new ConnectionConfigurationImpl(startupAddress, 0, tlsConfiguration, SWITCH_IDLE_TIMEOUT, true, + false, CHANNEL_OUTBOUND_QUEUE_SIZE); config.setTransferProtocol(protocol); } /** - * Tests provider startup - without configuration and {@link SwitchConnectionHandler} + * Tests provider startup - without configuration and {@link SwitchConnectionHandler}. */ @Test - public void testStartup1() { - provider = new SwitchConnectionProviderImpl(config); + public void testStartup1() throws UnknownHostException { + startUp(null); final ListenableFuture future = provider.startup(); try { future.get(WAIT_TIMEOUT, TimeUnit.MILLISECONDS); @@ -88,10 +92,10 @@ public class SwitchConnectionProviderImplTest { } /** - * Tests provider startup - without configuration + * Tests provider startup - without configuration. */ @Test - public void testStartup2() { + public void testStartup2() throws UnknownHostException { startUp(null); provider.setSwitchConnectionHandler(handler); final ListenableFuture future = provider.startup(); @@ -103,10 +107,10 @@ public class SwitchConnectionProviderImplTest { } /** - * Tests provider startup - without {@link SwitchConnectionHandler} + * Tests provider startup - without {@link SwitchConnectionHandler}. */ @Test - public void testStartup3() { + public void testStartup3() throws UnknownHostException { startUp(TransportProtocol.TCP); final ListenableFuture future = provider.startup(); try { @@ -118,10 +122,10 @@ public class SwitchConnectionProviderImplTest { } /** - * Tests correct provider startup - over TCP + * Tests correct provider startup - over TCP. */ @Test - public void testStartup4() { + public void testStartup4() throws UnknownHostException { startUp(TransportProtocol.TCP); provider.setSwitchConnectionHandler(handler); try { @@ -132,10 +136,10 @@ public class SwitchConnectionProviderImplTest { } /** - * Tests correct provider startup - over TLS + * Tests correct provider startup - over TLS. */ @Test - public void testStartup5() { + public void testStartup5() throws UnknownHostException { startUp(TransportProtocol.TLS); provider.setSwitchConnectionHandler(handler); try { @@ -146,10 +150,10 @@ public class SwitchConnectionProviderImplTest { } /** - * Tests correct provider startup - over UDP + * Tests correct provider startup - over UDP. */ @Test - public void testStartup6() { + public void testStartup6() throws UnknownHostException { startUp(TransportProtocol.UDP); provider.setSwitchConnectionHandler(handler); try { @@ -157,21 +161,21 @@ public class SwitchConnectionProviderImplTest { } catch (InterruptedException | ExecutionException | TimeoutException e) { Assert.fail(); } - } + } /** - * Tests correct provider shutdown + * Tests correct provider shutdown. */ @Test - public void testShutdown() { + public void testShutdown() throws UnknownHostException { startUp(TransportProtocol.TCP); provider.setSwitchConnectionHandler(handler); try { Assert.assertTrue("Failed to start", provider.startup().get(WAIT_TIMEOUT, TimeUnit.MILLISECONDS)); Assert.assertTrue("Failed to stop", provider.shutdown().get(5 * WAIT_TIMEOUT, TimeUnit.MILLISECONDS)); } catch (InterruptedException | ExecutionException | TimeoutException e) { - e.printStackTrace(); + LoggerFactory.getLogger(SwitchConnectionProviderImplTest.class).error("Unexpected error", e); } } -} \ No newline at end of file +}