Merge "[SLINGCSCF-1959] Improve test coverage in commit-table module"

commit-table/pom.xml

@@ -21,6 +21,34 @@
       <version>${guava.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <version>${testng.version}</version>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
+  <!--  this create jar file of code from src/test/java so modules with tests can share code -->
+  <build>
+
+    <plugins>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+    </plugins>
+
+  </build>
+
 </project>

commit-table/src/test/java/com/yahoo/omid/committable/NullCommitTableTest.java

@@ -0,0 +1,45 @@
+package com.yahoo.omid.committable;
+
+import org.testng.annotations.Test;
+import static org.testng.Assert.assertNull;
+
+/**
+ * TODO: Remove this class when removing this class from production code
+ */
+public class NullCommitTableTest {
+
+    private static final long TEST_ST = 1L;
+    private static final long TEST_CT = 2L;
+    private static final long TEST_LWM = 1L;
+
+    @Test
+    public void testClientAndWriter() throws Exception {
+
+        CommitTable commitTable = new NullCommitTable();
+
+        try (CommitTable.Client commitTableClient = commitTable.getClient().get();
+             CommitTable.Writer commitTableWriter = commitTable.getWriter().get()) {
+
+            // Test client
+            try {
+                commitTableClient.readLowWatermark().get();
+            } catch (UnsupportedOperationException e) {
+                // expected
+            }
+
+            try {
+                commitTableClient.getCommitTimestamp(TEST_ST).get();
+            } catch (UnsupportedOperationException e) {
+                // expected
+            }
+
+            assertNull(commitTableClient.completeTransaction(TEST_ST).get());
+
+            // Test writer
+            commitTableWriter.updateLowWatermark(TEST_LWM);
+            commitTableWriter.addCommittedTransaction(TEST_ST, TEST_CT);
+            assertNull(commitTableWriter.flush().get());
+        }
+    }
+
+}

hbase-client/pom.xml

@@ -56,6 +56,13 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+          <groupId>com.yahoo.omid</groupId>
+          <artifactId>commit-table</artifactId>
+          <version>${project.version}</version>
+          <scope>test</scope>
+          <classifier>tests</classifier>
+        </dependency>
         <!-- End of Dependencies on Omid modules -->
 
         <!--logging-->

transaction-client/pom.xml

@@ -26,6 +26,13 @@
       <artifactId>commit-table</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.yahoo.omid</groupId>
+      <artifactId>commit-table</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+      <classifier>tests</classifier>
+    </dependency>
     <!-- End of Dependencies on Omid modules -->
 
     <!-- distributed comm -->

tso-server/pom.xml

@@ -93,6 +93,13 @@
       <artifactId>hbase-commit-table</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.yahoo.omid</groupId>
+      <artifactId>commit-table</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+      <classifier>tests</classifier>
+    </dependency>
     <!-- End of Dependencies on Omid modules -->
 
     <!-- Dependencies on Yahoo libraries -->