Merge branch 'feature-shorten-ptai-labels'

Author: ZhukovAN

plugin/src/main/java/org/owasp/benchmarkutils/score/parsers/sarif/PTAIReader.java

@@ -18,14 +18,37 @@
 package org.owasp.benchmarkutils.score.parsers.sarif;
 
 import org.owasp.benchmarkutils.score.CweNumber;
+import org.owasp.benchmarkutils.score.ResultFile;
+import org.owasp.benchmarkutils.score.TestSuiteResults;
 
 public class PTAIReader extends SarifReader {
 
     static final int PTAI_CWE_EXTERNAL_FILEPATH_CONTROL = 73;
     static final int PTAI_CWE_BLIND_XPATH_INJECTION = 91;
 
+    static final String EXPECTED_TOOL_NAME = "Positive Technologies Application Inspector";
+    static final String SHORTENED_TOOL_NAME = "PT Application Inspector";
+
     public PTAIReader() {
-        super("Positive Technologies Application Inspector", true, CweSourceType.FIELD);
+        super(EXPECTED_TOOL_NAME, true, CweSourceType.FIELD);
+    }
+
+    @Override
+    public String toolName(ResultFile resultFile) {
+        return SHORTENED_TOOL_NAME;
+    }
+
+    /**
+     * SARIF report tool version field is too long as it contains build number. Shorten it to X.Y.Z
+     */
+    @Override
+    public void setVersion(ResultFile resultFile, TestSuiteResults testSuiteResults) {
+        super.setVersion(resultFile, testSuiteResults);
+        String version = testSuiteResults.getToolVersion();
+        String[] versionItems = version.split("\\.");
+        if (versionItems.length < 4) return;
+        testSuiteResults.setToolVersion(
+                String.format("%s.%s.%s", versionItems[0], versionItems[1], versionItems[2]));
     }
 
     @Override

plugin/src/test/java/org/owasp/benchmarkutils/score/parsers/sarif/PTAIReaderTest.java

@@ -46,8 +46,8 @@ void readerHandlesGivenResultFile() throws Exception {
 
         assertEquals(TestSuiteResults.ToolType.SAST, result.getToolType());
 
-        assertEquals("Positive Technologies Application Inspector", result.getToolName());
-        assertEquals("4.7.2.36549", result.getToolVersion());
+        assertEquals("PT Application Inspector", result.getToolName());
+        assertEquals("4.7.2", result.getToolVersion());
 
         assertEquals(2, result.getTotalResults());