junit and docker file sonar issue fixes (#4447)

---------

Signed-off-by: Gino Augustine <[email protected]>
Co-authored-by: Vladimir Kotal <[email protected]>

Author: ginoaugustine

Dockerfile

@@ -1,7 +1,7 @@
 # Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
 # Portions Copyright (c) 2020, Chris Fraire <[email protected]>.
 
-FROM ubuntu:jammy as build
+FROM ubuntu:jammy AS build
 
 # hadolint ignore=DL3008
 RUN apt-get update && apt-get install --no-install-recommends -y openjdk-17-jdk python3 python3-venv && \

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/PendingTokenTest.java

@@ -24,6 +24,10 @@
 package org.opengrok.indexer.analysis;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -50,28 +54,17 @@ void testEquals2() {
         assertTrue(result, "PendingToken instance equivalence false");
     }
 
-    @Test
-    void testNotEquals1() {
-        PendingToken instance1 = new PendingToken("", 0, 0);
-        PendingToken instance2 = new PendingToken("", 0, 1); // nonsense but ok
-        boolean result = instance1.equals(instance2);
-        assertFalse(result, "PendingToken equals() only 2 immutables match");
-    }
-
-    @Test
-    void testNotEquals2() {
+    @ParameterizedTest
+    @MethodSource
+    void testNotEquals(PendingToken instance2) {
         PendingToken instance1 = new PendingToken("", 0, 0);
-        PendingToken instance2 = new PendingToken("", 1, 0); // nonsense but ok
         boolean result = instance1.equals(instance2);
         assertFalse(result, "PendingToken equals() only 2 immutables match");
     }
-
-    @Test
-    void testNotEquals3() {
-        PendingToken instance1 = new PendingToken("", 0, 0);
-        PendingToken instance2 = new PendingToken("a", 0, 0); // nonsense but ok
-        boolean result = instance1.equals(instance2);
-        assertFalse(result, "PendingToken equals() only 2 immutables match");
+    static Stream<PendingToken> testNotEquals() {
+        return Stream.of(new PendingToken("", 0, 1),
+                new PendingToken("", 1, 0),
+                new PendingToken("a", 0, 0));
     }
 
     @Test

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/ScopesTest.java

@@ -50,20 +50,20 @@ void testGetScope() {
         instance.addScope(new Scope(80, 90, "scope5", "ns"));
         instance.addScope(new Scope(91, 100, "scope6", "ns"));
 
-        assertEquals(instance.size(), 6);
-        assertEquals(instance.getScope(1), globalScope);
-        assertEquals(instance.getScope(10).getName(), "scope1");
-        assertEquals(instance.getScope(15).getName(), "scope1");
-        assertEquals(instance.getScope(20).getName(), "scope1");
-        assertEquals(instance.getScope(21), globalScope);
-        assertEquals(instance.getScope(24), globalScope);
-        assertEquals(instance.getScope(39), globalScope);
-        assertEquals(instance.getScope(40).getName(), "scope3");
-        assertEquals(instance.getScope(41), globalScope);
-        assertEquals(instance.getScope(90).getName(), "scope5");
-        assertEquals(instance.getScope(100).getName(), "scope6");
-        assertEquals(instance.getScope(101), globalScope);
-        assertEquals(instance.getScope(500), globalScope);
+        assertEquals(6, instance.size());
+        assertEquals(globalScope, instance.getScope(1));
+        assertEquals("scope1", instance.getScope(10).getName());
+        assertEquals("scope1", instance.getScope(15).getName());
+        assertEquals("scope1", instance.getScope(20).getName());
+        assertEquals(globalScope, instance.getScope(21));
+        assertEquals(globalScope, instance.getScope(24));
+        assertEquals(globalScope, instance.getScope(39));
+        assertEquals("scope3", instance.getScope(40).getName());
+        assertEquals(globalScope, instance.getScope(41));
+        assertEquals("scope5", instance.getScope(90).getName());
+        assertEquals("scope6", instance.getScope(100).getName());
+        assertEquals(globalScope, instance.getScope(101));
+        assertEquals(globalScope, instance.getScope(500));
     }
 
     @Test

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/ada/AdaXrefTest.java

@@ -33,6 +33,7 @@
 class AdaXrefTest extends XrefTestBase {
 
     @Test
+    @SuppressWarnings("squid:S2699")
     void sampleTest() throws IOException {
         writeAndCompare(new AdaAnalyzerFactory(),
                 "analysis/ada/sample.adb",

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/c/CXrefTest.java

@@ -35,6 +35,7 @@
 class CXrefTest extends XrefTestBase {
 
     @Test
+    @SuppressWarnings("squid:S2699")
     void sampleTest() throws IOException {
         writeAndCompare(new CAnalyzerFactory(),
                 "analysis/c/sample.c",

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/c/CxxXrefTest.java

@@ -35,6 +35,7 @@
 class CxxXrefTest extends XrefTestBase {
 
     @Test
+    @SuppressWarnings("squid:S2699")
     void sampleTest() throws IOException {
         writeAndCompare(new CxxAnalyzerFactory(),
                 "analysis/c/sample.cc",

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/clojure/ClojureXrefTest.java

@@ -35,6 +35,7 @@
 class ClojureXrefTest extends XrefTestBase {
 
     @Test
+    @SuppressWarnings("squid:S2699")
     void sampleTest() throws IOException {
         writeAndCompare(new ClojureAnalyzerFactory(),
                 "analysis/clojure/sample.clj",
@@ -43,6 +44,7 @@ void sampleTest() throws IOException {
     }
 
     @Test
+    @SuppressWarnings("squid:S2699")
     void shouldCloseTruncatedStringSpan() throws IOException {
         writeAndCompare(new ClojureAnalyzerFactory(),
                 "analysis/clojure/truncated.clj",

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/csharp/CSharpXrefTest.java

@@ -35,6 +35,7 @@
 class CSharpXrefTest extends XrefTestBase {
 
     @Test
+    @SuppressWarnings("squid:S2699")
     void sampleTest() throws IOException {
         writeAndCompare(new CSharpAnalyzerFactory(),
                 "analysis/csharp/sample.cs",
@@ -43,6 +44,7 @@ void sampleTest() throws IOException {
     }
 
     @Test
+    @SuppressWarnings("squid:S2699")
     void shouldCloseTruncatedStringSpan() throws IOException {
         writeAndCompare(new CSharpAnalyzerFactory(),
                 "analysis/csharp/truncated.cs",

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/document/TroffAnalyzerTest.java

@@ -38,6 +38,7 @@
 import org.opengrok.indexer.util.TestRepository;
 import org.opengrok.indexer.web.Util;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -99,11 +100,11 @@ public static void tearDownAfterClass() throws Exception {
     void testAnalyze() throws Exception {
         Document doc = new Document();
         StringWriter xrefOut = new StringWriter();
-        analyzer.analyze(doc, new StreamSource() {
+        assertDoesNotThrow(() -> analyzer.analyze(doc, new StreamSource() {
             @Override
             public InputStream getStream() throws IOException {
                 return new ByteArrayInputStream(content.getBytes());
             }
-        }, xrefOut);
+        }, xrefOut));
     }
 }

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/document/TroffXrefTest.java

@@ -33,6 +33,7 @@
 class TroffXrefTest extends XrefTestBase {
 
     @Test
+    @SuppressWarnings("squid:S2699")
     void sampleTest() throws IOException {
         writeAndCompare(new TroffAnalyzerFactory(),
                 "analysis/document/sync.1m",