Improve test coverage for ovsdb-client module

Signed-off-by: Hechao Li <hechaol@outlook.com>
vmware-archive · May 9, 2018 · 2c5b089 · 2c5b089
1 parent 98547f0
commit 2c5b089
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 13 deletions.
diff --git a/ovsdb-client/src/test/java/com/vmware/ovsdb/service/OvsdbClientActiveConnectionTest.java b/ovsdb-client/src/test/java/com/vmware/ovsdb/service/OvsdbClientActiveConnectionTest.java
@@ -37,6 +37,7 @@ public OvsdbClientActiveConnectionTest() {
 
   @After
   public void tearDown() {
+    super.teardown();
     passiveOvsdbServer.stopListening().join();
   }
 

diff --git a/ovsdb-client/src/test/java/com/vmware/ovsdb/service/OvsdbClientPassiveConnectionTest.java b/ovsdb-client/src/test/java/com/vmware/ovsdb/service/OvsdbClientPassiveConnectionTest.java
@@ -39,6 +39,7 @@ public OvsdbClientPassiveConnectionTest() {
 
   @After
   public void tearDown() {
+    super.teardown();
     activeOvsdbServer.disconnect().join();
     passiveListener.stopListening(PORT).join();
   }

diff --git a/ovsdb-client/src/test/java/com/vmware/ovsdb/service/OvsdbClientTest.java b/ovsdb-client/src/test/java/com/vmware/ovsdb/service/OvsdbClientTest.java
@@ -113,7 +113,19 @@ abstract class OvsdbClientTest {
 
   abstract void setUp(boolean withSsl);
 
-  private void testAll() throws IOException, OvsdbClientException {
+  void teardown() {
+    ovsdbClient.shutdown();
+
+    OvsdbClientException exception = null;
+    try {
+      ovsdbClient.listDatabases();
+    } catch (OvsdbClientException e) {
+      exception = e;
+    }
+    assertNotNull(exception);
+  }
+
+  private void testBasic() throws OvsdbClientException, IOException {
     testListDatabases();
     testGetSchema();
     testInsertTransact();
@@ -128,7 +140,17 @@ private void testAll() throws IOException, OvsdbClientException {
     testConnectionInfo();
     testErrorOperation();
     testLock();
-    testEchoResponse();
+    testEcho();
+  }
+
+  private void testNegative() throws OvsdbClientException, IOException {
+    testInvalidJsonRpcMessage();
+    testInvalidMonitorUpdate();
+  }
+
+  private void testAll() throws IOException, OvsdbClientException {
+    testBasic();
+    testNegative();
   }
 
   void testTcpConnection()
@@ -437,7 +459,7 @@ private void testCancelMonitor() throws OvsdbClientException {
         .monitor("hardware_vtep", monitorId, monitorRequests, monitorCallback);
     f.join();
 
-    expectedRequest = getJsonRequestString("monitor_cancel", "1");
+    expectedRequest = getJsonRequestString("monitor_cancel", monitorId);
     setupOvsdbEmulator(expectedRequest, "{}", null);
     f = ovsdbClient.cancelMonitor(monitorId);
     f.join();
@@ -561,7 +583,7 @@ private void testLock() throws OvsdbClientException {
     verify(lockCallback3, timeout(VERIFY_TIMEOUT_MILLIS)).stolen();
   }
 
-  private void testEchoResponse() {
+  private void testEcho() {
     CompletableFuture<Void> successFuture1 = new CompletableFuture<>();
     final String expectedResponse1 = "{\"result\":[]," + "\"error\":null,\"id\":\"echo\"}";
     ovsdbServerEmulator.registerReadCallback(msg -> {
@@ -593,6 +615,20 @@ private void testEchoResponse() {
     }
   }
 
+  private void testInvalidJsonRpcMessage() throws OvsdbClientException, IOException {
+    // Send an invalid JSON-RPC message
+    ovsdbServerEmulator.write("{\"method\":\"foo\"}");
+    // Make sure it still works after receiving this invalid message.
+    testBasic();
+  }
+
+  private void testInvalidMonitorUpdate() throws OvsdbClientException, IOException {
+    // Send an invalid monitor update message
+    ovsdbServerEmulator.write("{\"method\":\"update\", \"params\":[\"blabla\"], \"id\":null}");
+    // Make sure it still works after processing this invalid message.
+    testBasic();
+  }
+
   private void setupOvsdbEmulator(
       String request, String result, String error
   ) {

diff --git a/pom.xml b/pom.xml
@@ -91,11 +91,6 @@
         <artifactId>jackson-annotations</artifactId>
         <version>${jackson.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>${log4j.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-log4j12</artifactId>
@@ -143,10 +138,6 @@
 
   <dependencies>
     <!-- Common dependencies for all modules -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
@@ -218,6 +209,11 @@
         <artifactId>cobertura-maven-plugin</artifactId>
         <version>${cobertura.plugin.version}</version>
         <configuration>
+          <instrumentation>
+            <excludes>
+              <exclude>**/util/*.class</exclude>
+            </excludes>
+          </instrumentation>
           <check>
             <branchRate>90</branchRate>
             <lineRate>90</lineRate>