Improved logging in ScenarioHandler

[openflowjava.git] / openflow-protocol-it / src / test / java / org / opendaylight / openflowjava / protocol / impl / integration / IntegrationTest.java

diff --git a/openflow-protocol-it/src/test/java/org/opendaylight/openflowjava/protocol/impl/integration/IntegrationTest.java b/openflow-protocol-it/src/test/java/org/opendaylight/openflowjava/protocol/impl/integration/IntegrationTest.java
index 75e5a72a6eaba5170c43ffdf39b8d43d8a956e6f..31c9c6354018a56e1fb3083586f59b144d0eed03 100644 (file)
--- a/openflow-protocol-it/src/test/java/org/opendaylight/openflowjava/protocol/impl/integration/IntegrationTest.java
+++ b/openflow-protocol-it/src/test/java/org/opendaylight/openflowjava/protocol/impl/integration/IntegrationTest.java
@@ -28,18 +28,15 @@ import org.slf4j.LoggerFactory;
 \r
 /**\r
  * @author michal.polkorab\r
- *\r
+ * @author timotej.kubas\r
  */\r
 public class IntegrationTest {\r
 \r
-    /** Name of file in which OpenFLow protocol messages are stored in binary format */\r
+    private static final Logger LOGGER = LoggerFactory\r
+            .getLogger(IntegrationTest.class);\r
     private static int port;\r
     private static final FEATURE_SUPPORT DEFAULT_TLS_SUPPORT = FEATURE_SUPPORT.NOT_SUPPORTED;\r
     private static final int SWITCH_IDLE_TIMEOUT = 2000;\r
-\r
-    protected static final Logger LOGGER = LoggerFactory\r
-            .getLogger(IntegrationTest.class);\r
-\r
     private static final long CONNECTION_TIMEOUT = 2000;\r
     private InetAddress startupAddress;\r
     private MockPlugin mockPlugin;\r
@@ -64,13 +61,16 @@ public class IntegrationTest {
         port = server.getPort();\r
     }\r
 \r
+    /**\r
+     * @throws Exception\r
+     */\r
     @After\r
     public void tearDown() throws Exception {\r
         Thread.sleep(500);\r
     }\r
 \r
     /**\r
-     * Library integration and communication test\r
+     * Library integration and communication test with handshake\r
      * @throws Exception \r
      */\r
     @Test\r
@@ -86,7 +86,7 @@ public class IntegrationTest {
     }\r
 \r
     /**\r
-     * Library integration and communication test\r
+     * Library integration and communication test with handshake + echo exchange\r
      * @throws Exception \r
      */\r
     @Test\r
@@ -117,11 +117,10 @@ public class IntegrationTest {
     /**\r
      * @param amountOfCLients \r
      * @return new clients up and running\r
-     * @throws InterruptedException\r
-     * @throws ExecutionException\r
+     * @throws ExecutionException if some client could not start\r
      */\r
     private List<SimpleClient> createAndStartClient(int amountOfCLients, ScenarioHandler scenarioHandler)\r
-            throws InterruptedException, ExecutionException {\r
+            throws ExecutionException {\r
         List<SimpleClient> clientsHorde = new ArrayList<>();\r
         for (int i = 0; i < amountOfCLients; i++) {\r
             LOGGER.debug("startup address in createclient: " + startupAddress.getHostAddress());\r