address review comments

Author: vladak

opengrok-indexer/src/main/java/org/opengrok/indexer/history/SCCSRepository.java

@@ -36,6 +36,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.jetbrains.annotations.VisibleForTesting;
 import org.opengrok.indexer.configuration.CommandTimeoutType;
 import org.opengrok.indexer.configuration.RuntimeEnvironment;
 import org.opengrok.indexer.logger.LoggerFactory;
@@ -58,6 +59,7 @@ public class SCCSRepository extends Repository {
      */
     public static final String CMD_FALLBACK = "sccs";
 
+    @VisibleForTesting
     static final String CODEMGR_WSDATA = "Codemgr_wsdata";
 
     public SCCSRepository() {

opengrok-indexer/src/test/java/org/opengrok/indexer/history/SCCSRepositoryTest.java

@@ -22,7 +22,6 @@
  */
 package org.opengrok.indexer.history;
 
-import org.apache.commons.compress.utils.IOUtils;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -99,7 +98,7 @@ private void testIsRepositoryFor(final String fileName, boolean shouldPass) thro
 
     @Test
     void testIsRepositoryForCodemgr1() throws IOException {
-        testIsRepositoryFor("Codemgr_wsdata", true);
+        testIsRepositoryFor(SCCSRepository.CODEMGR_WSDATA, true);
     }
 
     @Test
@@ -222,8 +221,7 @@ void testGetHistoryGet(final GetHistoryTestParams testParams) throws Exception {
         try (InputStream inputStream = sccsRepository.getHistoryGet(repositoryRoot.toString(),
                 "main.c", testParams.revision)) {
             assertNotNull(inputStream);
-            byte[] buffer = new byte[1024];
-            IOUtils.readFully(inputStream, buffer);
+            byte[] buffer = inputStream.readAllBytes();
             String fileContents = new String(buffer);
             final String castedPrintf = "(void)printf";
             if (testParams.shouldContain) {

opengrok-indexer/src/test/java/org/opengrok/indexer/history/SCCSgetTest.java

@@ -47,44 +47,36 @@
 @EnabledForRepository(SCCS)
 class SCCSgetTest {
 
-    private File sccs_file;
-    private File sccs_dir;
+    private File sccsFile;
+    private File sccsDir;
 
     @BeforeEach
     public void setUp() throws IOException {
-        try {
-            sccs_dir = File.createTempFile("s.test", "sccs");
-            assertTrue(sccs_dir.delete());
-            assertTrue(sccs_dir.mkdirs(), "Failed to set up the test-directory");
-            sccs_file = new File(sccs_dir, "s.note.txt");
-            try (InputStream in = getClass().getResourceAsStream("/history/s.note.txt");
-                 FileOutputStream out = new FileOutputStream(sccs_file)) {
-
-                byte[] buffer = new byte[8192];
-                int nr;
-
-                while ((nr = in.read(buffer, 0, buffer.length)) != -1) {
-                    out.write(buffer, 0, nr);
-                }
-                out.flush();
+        sccsDir = File.createTempFile("s.test", "sccs");
+        assertTrue(sccsDir.delete());
+        assertTrue(sccsDir.mkdirs(), "Failed to set up the test-directory");
+        sccsFile = new File(sccsDir, "s.note.txt");
+        try (InputStream in = getClass().getResourceAsStream("/history/s.note.txt");
+             FileOutputStream out = new FileOutputStream(sccsFile)) {
+
+            byte[] buffer = new byte[8192];
+            int nr;
+
+            while ((nr = in.read(buffer, 0, buffer.length)) != -1) {
+                out.write(buffer, 0, nr);
             }
-        } catch (IOException ex) {
-            if (sccs_file != null) {
-                sccs_file.delete();
-                sccs_dir.delete();
-            }
-            throw ex;
+            out.flush();
         }
     }
 
     @AfterEach
     public void tearDown() {
-        if (sccs_file != null) {
-            sccs_file.delete();
+        if (sccsFile != null) {
+            sccsFile.delete();
         }
 
-        if (sccs_dir != null) {
-            sccs_dir.delete();
+        if (sccsDir != null) {
+            sccsDir.delete();
         }
     }
 
@@ -107,19 +99,20 @@ private String readInput(InputStream in) throws IOException {
      */
     @Test
     void getRevision() throws Exception {
-        InputStream inputStream = getClass().getResourceAsStream("/history/sccs-revisions.zip");
-        assertNotNull(inputStream);
-        ZipInputStream zstream = new ZipInputStream(inputStream);
-        ZipEntry entry;
-
-        while ((entry = zstream.getNextEntry()) != null) {
-            String expected = readInput(zstream);
-            InputStream sccs = SCCSget.getRevision("sccs", sccs_file, entry.getName());
-            String got = readInput(sccs);
-            sccs.close();
-            zstream.closeEntry();
-            assertEquals(expected, got);
+        try (InputStream inputStream = getClass().getResourceAsStream("/history/sccs-revisions.zip")) {
+            assertNotNull(inputStream);
+            ZipInputStream zstream = new ZipInputStream(inputStream);
+            ZipEntry entry;
+
+            while ((entry = zstream.getNextEntry()) != null) {
+                String expected = readInput(zstream);
+                InputStream sccs = SCCSget.getRevision("sccs", sccsFile, entry.getName());
+                String got = readInput(sccs);
+                sccs.close();
+                zstream.closeEntry();
+                assertEquals(expected, got);
+            }
+            zstream.close();
         }
-        zstream.close();
     }
 }