Add tests

Author: BenAlvo1

src/main/java/com/checkmarx/ast/predicate/CustomState.java

@@ -1,16 +1,13 @@
 package com.checkmarx.ast.predicate;
 
+import com.checkmarx.ast.utils.JsonParser;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 import lombok.Value;
-import org.apache.commons.lang3.StringUtils;
 
-import java.io.IOException;
 import java.util.List;
 
 @Value
@@ -31,33 +28,10 @@ public CustomState(@JsonProperty("id") Long id,
     }
 
     public static <T> T fromLine(String line) {
-        return parse(line, TypeFactory.defaultInstance().constructType(CustomState.class));
+        return JsonParser.parse(line, TypeFactory.defaultInstance().constructType(CustomState.class));
     }
 
     public static <T> List<T> listFromLine(String line) {
-        return parse(line, TypeFactory.defaultInstance().constructCollectionType(List.class, CustomState.class));
-    }
-
-    protected static <T> T parse(String line, JavaType type) {
-        T result = null;
-        try {
-            if (!StringUtils.isBlank(line) && isValidJSON(line)) {
-                result = new ObjectMapper().readValue(line, type);
-
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return result;
-    }
-
-    private static boolean isValidJSON(final String json) {
-        try {
-            final ObjectMapper mapper = new ObjectMapper();
-            mapper.readTree(json);
-            return true;
-        } catch (IOException e) {
-            return false;
-        }
+        return JsonParser.parse(line, TypeFactory.defaultInstance().constructCollectionType(List.class, CustomState.class));
     }
 }

src/main/java/com/checkmarx/ast/wrapper/CxConstants.java

@@ -33,6 +33,7 @@ public final class CxConstants {
     static final String CMD_TRIAGE = "triage";
     static final String SUB_CMD_UPDATE = "update";
     static final String SUB_CMD_GET_STATES = "get-states";
+    static final String ALL_STATES_FLAG = "--all";
     static final String CMD_RESULT = "results";
     static final String FORMAT = "--format";
     static final String SCAN_INFO_FORMAT = "--scan-info-format";

src/main/java/com/checkmarx/ast/wrapper/CxWrapper.java

@@ -166,12 +166,15 @@ public List<Predicate> triageShow(@NonNull UUID projectId, String similarityId,
         return Execution.executeCommand(withConfigArguments(arguments), logger, Predicate::listFromLine, Predicate::validator);
     }
 
-    public List<Predicate> triageGetStates() throws IOException, InterruptedException, CxException {
+    public List<Predicate> triageGetStates(boolean all) throws IOException, InterruptedException, CxException {
         this.logger.info("Executing 'triage get-states' command using the CLI.");
 
         List<String> arguments = new ArrayList<>();
         arguments.add(CxConstants.CMD_TRIAGE);
-        arguments.add(CxConstants.SUB_CMD_SHOW);
+        arguments.add(CxConstants.SUB_CMD_GET_STATES);
+        if (all) {
+            arguments.add(CxConstants.ALL_STATES_FLAG);
+        }
 
         return Execution.executeCommand(withConfigArguments(arguments), logger, CustomState::listFromLine);
     }

src/main/java/com/checkmarx/ast/wrapper/Execution.java

@@ -64,7 +64,7 @@ static <T> T executeCommand(List<String> arguments,
                     if (Objects.isNull(customValidator)) {
                         executionResult = areAllFieldsNotNull(parsedLine) ? parsedLine : null;
                     } else {
-                        executionResult = (areAllFieldsNotNull(parsedLine) || customValidator.apply(arguments, parsedLine)) ? parsedLine : null;
+                        executionResult = (customValidator.apply(arguments, parsedLine) || areAllFieldsNotNull(parsedLine)) ? parsedLine : null;
                     }
                 }
             }

src/test/java/com/checkmarx/ast/PredicateTest.java

@@ -5,6 +5,7 @@
 import com.checkmarx.ast.results.result.Result;
 import com.checkmarx.ast.scan.Scan;
 import com.checkmarx.ast.wrapper.CxConstants;
+import org.junit.Ignore;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -44,4 +45,11 @@ void testTriage() throws Exception {
             Assertions.fail("Triage update failed. Should not throw exception");
         }
     }
+
+    @Test
+    @Ignore("Ignore this tests until get states api will be in production")
+    void testGetStates() throws Exception {
+        List<Predicate> states = wrapper.triageGetStates(false);
+        Assertions.assertNotNull(states);
+    }
 }