Merge pull request #198 from jenkinsci/59118-GHS-Multi

[JENKINS-59118] Add a test that shows that files are correctly parsed

Author: uhafner

pom.xml

@@ -28,8 +28,8 @@
     <jenkins-test-harness.version>2.49</jenkins-test-harness.version>
 
     <!-- Project Dependencies Configuration -->
-    <analysis-model-api.version>6.0.1</analysis-model-api.version>
-    <analysis-model.version>6.0.1</analysis-model.version>
+    <analysis-model-api.version>6.0.2</analysis-model-api.version>
+    <analysis-model.version>6.0.2</analysis-model.version>
     <forensics-api-plugin.version>0.4.1</forensics-api-plugin.version>
     <git-forensics-plugin.version>0.3.1</git-forensics-plugin.version>
 

src/test/java/io/jenkins/plugins/analysis/warnings/StepsITest.java

@@ -159,6 +159,37 @@ public void shouldFindAllClangIssuesIfConsoleIsAnnotatedWithTimeStamps() {
                 .hasSeverity(Severity.WARNING_HIGH);
     }
 
+    /** Runs the Clang parser on an output file that contains 1 issue. */
+    @Test
+    public void shouldFindAllGhsIssuesIfConsoleIsAnnotatedWithTimeStamps() {
+        WorkflowJob job = createPipelineWithWorkspaceFiles("issue59118.txt");
+        job.setDefinition(asStage(
+                createCatStep("*.txt"),
+                "def issues = scanForIssues tool: ghsMulti()",
+                PUBLISH_ISSUES_STEP));
+
+        AnalysisResult result = scheduleSuccessfulBuild(job);
+
+        assertThat(result).hasTotalSize(2);
+        Report issues = result.getIssues();
+        assertThat(issues.get(0))
+                .hasLineStart(19)
+                .hasMessage("operands of logical && or || must be primary expressions\n"
+                        + "\n"
+                        + "  #if !defined(_STDARG_H) && !defined(_STDIO_H) && !defined(_GHS_WCHAR_H)")
+                .hasFileName("C:/Path/To/bar.h")
+                .hasCategory("#1729-D")
+                .hasSeverity(Severity.WARNING_NORMAL);
+        assertThat(issues.get(1))
+                .hasLineStart(491)
+                .hasMessage("operands of logical && or || must be primary expressions\n"
+                        + "\n"
+                        + "                      if(t_deltaInterval != t_u4Interval && t_deltaInterval != 0)")
+                .hasFileName("../../../../Sources/Foo/Bar/Test.c")
+                .hasCategory("#1729-D")
+                .hasSeverity(Severity.WARNING_NORMAL);
+    }
+
     /**
      * Parses a colored console log that also contains console notes. Verifies that the console notes will be removed
      * before the color codes. Output is from ATH test case

src/test/resources/io/jenkins/plugins/analysis/warnings/issue59118.txt

@@ -0,0 +1,21 @@
+[2019-08-28T08:44:26.749Z] Output from Compiling Foo.c:
+[2019-08-28T08:44:26.749Z] "C:\Path\To\bar.h", line 19: warning #1729-D:
+
+[2019-08-28T08:44:26.749Z]           operands of logical && or || must be primary expressions
+
+[2019-08-28T08:44:26.749Z]   #if !defined(_STDARG_H) && !defined(_STDIO_H) && !defined(_GHS_WCHAR_H)
+
+[2019-08-28T08:44:26.749Z]                           ^
+
+[2019-08-28T08:44:26.749Z]
+
+[2019-08-28T08:44:28.122Z] "..\..\..\..\Sources\Foo\Bar\Test.c", line 491: warning #1729-D:
+
+[2019-08-28T08:44:28.122Z]           operands of logical && or || must be primary expressions
+
+[2019-08-28T08:44:28.122Z]                       if(t_deltaInterval != t_u4Interval && t_deltaInterval != 0)
+
+[2019-08-28T08:44:28.122Z]                                                          ^
+
+
+