Merge pull request #2850 from guwirth/td-24

fix technical debt

cxx-checks/src/test/java/org/sonar/cxx/checks/api/UndocumentedApiCheckTest.java

@@ -29,7 +29,7 @@
 
 class UndocumentedApiCheckTest {
 
-  public CheckMessagesVerifierRule checkMessagesVerifier = new CheckMessagesVerifierRule();
+  private final CheckMessagesVerifierRule checkMessagesVerifier = new CheckMessagesVerifierRule();
 
   @SuppressWarnings("squid:S2699")
   @Test

cxx-checks/src/test/java/org/sonar/cxx/checks/naming/FileNameCheckTest.java

@@ -28,7 +28,7 @@
 
 class FileNameCheckTest {
 
-  public CheckMessagesVerifierRule checkMessagesVerifier = new CheckMessagesVerifierRule();
+  private final CheckMessagesVerifierRule checkMessagesVerifier = new CheckMessagesVerifierRule();
   private final FileNameCheck check = new FileNameCheck();
 
   @Test

cxx-checks/src/test/java/org/sonar/cxx/checks/regex/FixmeTagPresenceCheckTest.java

@@ -28,7 +28,7 @@
 
 class FixmeTagPresenceCheckTest {
 
-  public CheckMessagesVerifierRule checkMessagesVerifier = new CheckMessagesVerifierRule();
+  private final CheckMessagesVerifierRule checkMessagesVerifier = new CheckMessagesVerifierRule();
 
   @Test
   @SuppressWarnings("squid:S2699") // ... verify contains the assertion

cxx-checks/src/test/java/org/sonar/cxx/checks/regex/TodoTagPresenceCheckTest.java

@@ -28,7 +28,7 @@
 
 class TodoTagPresenceCheckTest {
 
-  public CheckMessagesVerifierRule checkMessagesVerifier = new CheckMessagesVerifierRule();
+  private final CheckMessagesVerifierRule checkMessagesVerifier = new CheckMessagesVerifierRule();
 
   @Test
   @SuppressWarnings("squid:S2699") // ... verify contains the assertion

cxx-sensors/src/test/java/org/sonar/cxx/postjobs/FinalReportTest.java

@@ -45,12 +45,12 @@
 class FinalReportTest {
 
   @RegisterExtension
-  public LogTesterJUnit5 logTester = new LogTesterJUnit5();
+  private final LogTesterJUnit5 logTester = new LogTesterJUnit5();
 
   private PostJobContext postJobContext;
 
   @BeforeEach
-  public void scanFile() {
+  public void setUp() {
     postJobContext = Mockito.mock(PostJobContext.class);
   }
 

cxx-sensors/src/test/java/org/sonar/cxx/prejobs/XlstSensorTest.java

@@ -37,7 +37,7 @@
 class XlstSensorTest {
 
   @RegisterExtension
-  public LogTesterJUnit5 logTester = new LogTesterJUnit5();
+  private final LogTesterJUnit5 logTester = new LogTesterJUnit5();
 
   private FileSystem fs;
   private final MapSettings settings = new MapSettings();

cxx-sensors/src/test/java/org/sonar/cxx/sensors/compiler/CxxCompilerSensorTest.java

@@ -37,7 +37,7 @@
 class CxxCompilerSensorTest {
 
   @RegisterExtension
-  public LogTesterJUnit5 logTester = new LogTesterJUnit5();
+  private final LogTesterJUnit5 logTester = new LogTesterJUnit5();
 
   private DefaultFileSystem fs;
   private final MapSettings settings = new MapSettings();
@@ -98,6 +98,7 @@ public CxxCompilerSensorMock(SensorContext context) {
 
     @Override
     public void describe(SensorDescriptor descriptor) {
+      // dummy
     }
 
     public void testExecuteReport(File report) {

cxx-sensors/src/test/java/org/sonar/cxx/sensors/coverage/CxxCoberturaSensorTest.java

@@ -44,7 +44,7 @@
 class CxxCoberturaSensorTest {
 
   @RegisterExtension
-  public LogTesterJUnit5 logTester = new LogTesterJUnit5();
+  private final LogTesterJUnit5 logTester = new LogTesterJUnit5();
 
   private DefaultFileSystem fs;
   private final Map<InputFile, Set<Integer>> linesOfCodeByFile = new HashMap<>();

cxx-sensors/src/test/java/org/sonar/cxx/sensors/coverage/CxxMSCoverageSensorTest.java

@@ -36,7 +36,7 @@
 class CxxMSCoverageSensorTest {
 
   @RegisterExtension
-  public LogTesterJUnit5 logTester = new LogTesterJUnit5();
+  private final LogTesterJUnit5 logTester = new LogTesterJUnit5();
 
   private DefaultFileSystem fs;
   private SensorContextTester context;

cxx-sensors/src/test/java/org/sonar/cxx/sensors/other/CxxOtherSensorTest.java

@@ -36,7 +36,7 @@
 class CxxOtherSensorTest {
 
   @RegisterExtension
-  public LogTesterJUnit5 logTester = new LogTesterJUnit5();
+  private final LogTesterJUnit5 logTester = new LogTesterJUnit5();
 
   private CxxOtherSensor sensor;
   private DefaultFileSystem fs;

cxx-sensors/src/test/java/org/sonar/cxx/sensors/tests/dotnet/NUnitTestResultsFileParserTest.java

@@ -37,7 +37,7 @@ class NUnitTestResultsFileParserTest {
     = "src/test/resources/org/sonar/cxx/sensors/reports-project/xunit-reports/nunit/";
 
   @RegisterExtension
-  public LogTesterJUnit5 logTester = new LogTesterJUnit5();
+  private final LogTesterJUnit5 logTester = new LogTesterJUnit5();
 
   @Test
   void noCounters() {

cxx-sensors/src/test/java/org/sonar/cxx/sensors/tests/dotnet/WildcardPatternFileProviderTest.java

@@ -50,7 +50,7 @@ private static Set<File> listFiles(String pattern, File baseDir) {
   }
 
   @BeforeEach
-  public void init() throws Exception {
+  public void setUp() throws Exception {
     Path root = tempDir.toPath();
 
     Files.createFile(root.resolve("foo.txt"));

cxx-sensors/src/test/java/org/sonar/cxx/sensors/utils/CxxReportSensorTest.java

@@ -39,7 +39,7 @@ class CxxReportSensorTest {
   private final MapSettings settings = new MapSettings();
 
   @BeforeEach
-  public void init() {
+  public void setUp() {
     TestUtils.mockFileSystem();
     try {
       baseDir = new File(getClass().getResource("/org/sonar/cxx/sensors/reports-project/").toURI());

cxx-sensors/src/test/java/org/sonar/cxx/sensors/utils/RulesDefinitionXmlLoaderTest.java

@@ -57,7 +57,7 @@
 import org.sonar.api.server.impl.RulesDefinitionContext;
 import org.sonar.api.server.rule.RulesDefinition;
 
-public class RulesDefinitionXmlLoaderTest {
+class RulesDefinitionXmlLoaderTest {
 
   RulesDefinitionXmlLoader underTest = new RulesDefinitionXmlLoader();
 

cxx-squid-bridge/src/main/java/org/sonar/cxx/squidbridge/annotations/AnnotationBasedRulesDefinition.java

@@ -30,11 +30,16 @@
 import com.google.common.collect.Sets;
 import java.lang.annotation.Annotation;
 import java.net.URL;
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Locale;
+import java.util.ResourceBundle;
+import java.util.Set;
 import org.apache.commons.lang.StringUtils;
-import org.sonar.api.server.rule.*;
+import org.sonar.api.server.rule.RulesDefinition;
 import org.sonar.api.server.rule.RulesDefinition.NewRepository;
 import org.sonar.api.server.rule.RulesDefinition.NewRule;
+import org.sonar.api.server.rule.RulesDefinitionAnnotationLoader;
 import org.sonar.api.utils.AnnotationUtils;
 import org.sonar.check.Cardinality;
 import org.sonar.check.Rule;

cxx-squid-bridge/src/test/java/org/sonar/cxx/squidbridge/api/SourceCodeTest.java

@@ -36,7 +36,7 @@ class SourceCodeTest {
   private SourceCode sourceClass2;
 
   @BeforeEach
-  public void before() {
+  public void setUp() {
     sourceProject = new SourceProject("ProjectKey", "Demo");
     sourceFile1 = new SourceFile("src/test/FileName1.cpp", "FileName1.cpp");
     sourceFile2 = new SourceFile("src/test/FileName2.cpp", "FileName2.cpp");

cxx-squid-bridge/src/test/java/org/sonar/cxx/squidbridge/checks/AbstractCommentRegularExpressionCheckTest.java

@@ -30,7 +30,7 @@
 
 class AbstractCommentRegularExpressionCheckTest {
 
-  public CheckMessagesVerifierRule checkMessagesVerifier = new CheckMessagesVerifierRule();
+  private final CheckMessagesVerifierRule checkMessagesVerifier = new CheckMessagesVerifierRule();
 
   private static class Check extends AbstractCommentRegularExpressionCheck<Grammar> {
 

cxx-squid-bridge/src/test/java/org/sonar/cxx/squidbridge/checks/AbstractOneStatementPerLineCheckTest.java

@@ -32,7 +32,7 @@
 
 class AbstractOneStatementPerLineCheckTest {
 
-  public CheckMessagesVerifierRule checkMessagesVerifier = new CheckMessagesVerifierRule();
+  private final CheckMessagesVerifierRule checkMessagesVerifier = new CheckMessagesVerifierRule();
 
   private static class Check extends AbstractOneStatementPerLineCheck<Grammar> {
 

cxx-squid-bridge/src/test/java/org/sonar/cxx/squidbridge/checks/AbstractXPathCheckTest.java

@@ -30,7 +30,7 @@
 
 class AbstractXPathCheckTest {
 
-  public CheckMessagesVerifierRule checkMessagesVerifier = new CheckMessagesVerifierRule();
+  private final CheckMessagesVerifierRule checkMessagesVerifier = new CheckMessagesVerifierRule();
 
   private static class Check extends AbstractXPathCheck<Grammar> {
 

cxx-squid-bridge/src/test/java/org/sonar/cxx/squidbridge/indexer/SquidIndexTest.java

@@ -41,7 +41,7 @@ class SquidIndexTest {
   private SourceCode sourceClass;
 
   @BeforeEach
-  public void setup() {
+  public void setUp() {
     indexer = new SquidIndex();
     sourceProject = new SourceProject("ProjectKey", "Project Name");
     indexer.index(sourceProject);

cxx-squid-bridge/src/test/java/org/sonar/cxx/squidbridge/test/miniC/fakeChecks/FakeCommentCheckTest.java

@@ -33,7 +33,7 @@
 
 class FakeCommentCheckTest {
 
-  public CheckMessagesVerifierRule checkMessagesVerifier = new CheckMessagesVerifierRule();
+  private final CheckMessagesVerifierRule checkMessagesVerifier = new CheckMessagesVerifierRule();
 
   private class FakeCommentCheck extends SquidCheck<Grammar> implements AstAndTokenVisitor {
 

cxx-squid/src/test/java/org/sonar/cxx/config/CxxSquidConfigurationTest.java

@@ -448,7 +448,8 @@ void shouldHandleSpecificCommonOptionsCorrectly() {
     softly.assertAll();
   }
 
-  public void shouldHandleSpecificCommonWin32OptionsCorrectly() {
+  @Test
+  void shouldHandleSpecificCommonWin32OptionsCorrectly() {
     var squidConfig = new CxxSquidConfiguration();
     var files = new ArrayList<File>();
     files.add(new File("src/test/resources/msbuild/platformCommonWin32.txt"));
@@ -457,7 +458,7 @@ public void shouldHandleSpecificCommonWin32OptionsCorrectly() {
     var softly = new SoftAssertions();
     softly.assertThat(getIncludeDirectories(squidConfig)).isEmpty();
     List<String> defines = getDefines(squidConfig);
-    softly.assertThat(defines).hasSize(3);
+    softly.assertThat(defines).hasSize(16);
     ValidateDefaultAsserts(softly, defines);
     softly.assertThat(defines).contains("_WIN32");
     softly.assertAll();

cxx-squid/src/test/java/org/sonar/cxx/config/MsBuildTest.java

@@ -36,12 +36,12 @@
  */
 class MsBuildTest {
 
-  public static final String REFERENCE_DETAILED_LOG = "src/test/resources/msbuild/msbuild-detailed-en.txt";
-  public static final String UNIQUE_FILE = "C:\\Development\\Source\\Cpp\\Dummy\\src\\main.cpp";
+  private static final String REFERENCE_DETAILED_LOG = "src/test/resources/msbuild/msbuild-detailed-en.txt";
+  private static final String UNIQUE_FILE = "C:\\Development\\Source\\Cpp\\Dummy\\src\\main.cpp";
   private static final String VC_CHARSET = "UTF8";
 
   @BeforeAll
-  public static void init() {
+  public static void setUp() {
     Assumptions.assumeTrue(SystemUtils.IS_OS_WINDOWS);
   }
 

cxx-squid/src/test/java/org/sonar/cxx/lexer/CxxLexerTest.java

@@ -45,7 +45,7 @@ class CxxLexerTest {
   private Lexer lexer;
 
   @BeforeEach
-  public void init() {
+  public void setUp() {
     var file = new File("snippet.cpp").getAbsoluteFile();
     SquidAstVisitorContext<Grammar> context = mock(SquidAstVisitorContext.class);
     when(context.getFile()).thenReturn(file);

cxx-squid/src/test/java/org/sonar/cxx/lexer/CxxLexerWithPreprocessingTest.java

@@ -55,7 +55,7 @@ class CxxLexerWithPreprocessingTest {
   private SquidAstVisitorContext<Grammar> context;
 
   @BeforeEach
-  public void init() {
+  public void setUp() {
     var file = new File("snippet.cpp").getAbsoluteFile();
     context = mock(SquidAstVisitorContext.class);
     when(context.getFile()).thenReturn(file);

cxx-squid/src/test/java/org/sonar/cxx/lexer/CxxLexerWithoutPreprocessorTest.java

@@ -33,7 +33,7 @@ class CxxLexerWithoutPreprocessorTest {
   private Lexer lexer;
 
   @BeforeEach
-  public void init() {
+  public void setUp() {
     lexer = CxxLexerPool.create().getLexer();
   }
 

cxx-squid/src/test/java/org/sonar/cxx/parser/ExpressionTest.java

@@ -164,13 +164,11 @@ void compoundRequirement() {
       .matches("{ expression } noexcept returnTypeRequirement ;");
   }
 
-  public void returnTypeRequirement() {
+  @Test
+  void returnTypeRequirement() {
     setRootRule(CxxGrammarImpl.returnTypeRequirement);
-
     mockRule(CxxGrammarImpl.typeConstraint);
-
-    assertThatParser()
-      .matches("-> typeConstraint");
+    assertThatParser().matches("-> typeConstraint");
   }
 
   @Test

cxx-squid/src/test/java/org/sonar/cxx/utils/CxxReportLocationTest.java

@@ -22,7 +22,7 @@
 import static org.assertj.core.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
-public class CxxReportLocationTest {
+class CxxReportLocationTest {
 
   @Test
   void testConstructor() {

cxx-squid/src/test/java/org/sonar/cxx/visitors/CxxCpdVisitorTest.java

@@ -35,7 +35,7 @@ class CxxCpdVisitorTest {
   private SourceFile sourceFile;
 
   @BeforeEach
-  public void scanFile() throws IOException {
+  public void setUp() throws IOException {
     var tester = CxxFileTesterHelper.create("src/test/resources/visitors/cpd.cc", ".", "");
     var squidConfig = new CxxSquidConfiguration();
     squidConfig

cxx-squid/src/test/java/org/sonar/cxx/visitors/CxxParseErrorLoggerVisitorTest.java

@@ -22,15 +22,15 @@
 import static org.assertj.core.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
-import org.sonar.api.testfixtures.log.LogTesterJUnit5;
 import org.slf4j.event.Level;
+import org.sonar.api.testfixtures.log.LogTesterJUnit5;
 import org.sonar.cxx.CxxAstScanner;
 import org.sonar.cxx.CxxFileTesterHelper;
 
 class CxxParseErrorLoggerVisitorTest {
 
   @RegisterExtension
-  public LogTesterJUnit5 logTester = new LogTesterJUnit5();
+  private final LogTesterJUnit5 logTester = new LogTesterJUnit5();
 
   @Test
   void handleParseErrorTest() throws Exception {

cxx-sslr/sslr-tests/src/test/java/com/sonar/cxx/sslr/impl/ast/AstWalkerTest.java

@@ -59,7 +59,7 @@ class AstWalkerTest {
   private final AstAndTokenVisitor astAndTokenVisitor = mock(AstAndTokenVisitor.class);
 
   @BeforeEach
-  public void init() {
+  public void setUp() {
     token = mock(Token.class);
     when(token.getType()).thenReturn(MockTokenType.WORD);
     when(token.getValue()).thenReturn("word");
@@ -123,6 +123,12 @@ void testAddVisitor() {
 
     walker1.addVisitor(visitor1);
     walker1.addVisitor(visitor2);
+    walker1.walkAndVisit(astNodeWithToken);
+
+    verify(visitor1).visitFile(astNodeWithToken);
+    verify(visitor1).leaveFile(astNodeWithToken);
+    verify(visitor2).visitFile(astNodeWithToken);
+    verify(visitor2).leaveFile(astNodeWithToken);
   }
 
 }

cxx-sslr/sslr-tests/src/test/java/com/sonar/cxx/sslr/test/minic/rules/ExpressionTest.java

@@ -32,7 +32,7 @@ class ExpressionTest extends RuleTest {
 
   @Override
   @BeforeEach
-  public void init() {
+  public void setUp() {
     p.setRootRule(g.rule(MiniCGrammar.EXPRESSION));
   }
 

cxx-sslr/sslr-tests/src/test/java/com/sonar/cxx/sslr/test/minic/rules/RuleTest.java

@@ -37,6 +37,6 @@ public final Rule getTestedRule() {
     return p.getRootRule();
   }
 
-  public abstract void init();
+  public abstract void setUp();
 
 }

cxx-sslr/sslr-tests/src/test/java/com/sonar/cxx/sslr/test/minic/rules/StructTest.java

@@ -32,7 +32,7 @@ class StructTest extends RuleTest {
 
   @Override
   @BeforeEach
-  public void init() {
+  public void setUp() {
     p.setRootRule(g.rule(MiniCGrammar.STRUCT_DEFINITION));
   }
 

cxx-sslr/sslr-tests/src/test/java/com/sonar/cxx/sslr/xpath/BasicQueriesTest.java

@@ -39,7 +39,7 @@ class BasicQueriesTest {
   private AstNode fileNode;
 
   @BeforeEach
-  public void init() {
+  public void setUp() {
     fileNode = parseFile("/xpath/basicQueries.mc");
   }
 

cxx-sslr/sslr-tests/src/test/java/com/sonar/cxx/sslr/xpath/IdentifiersTooLongTest.java

@@ -35,7 +35,7 @@ class IdentifiersTooLongTest {
   private AstNode fileNode;
 
   @BeforeEach
-  public void init() {
+  public void setUp() {
     fileNode = parseFile("/xpath/identifiersTooLong.mc");
   }