add back accidentally deleted tests and refactor Scope usage.

Author: soul2zimate

src/main/java/com/redhat/exhort/providers/BaseJavaProvider.java

@@ -25,16 +25,14 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.TreeMap;
-import org.cyclonedx.model.Component;
 
 public abstract class BaseJavaProvider extends Provider {
 
   protected BaseJavaProvider(Ecosystem.Type ecosystem, Path manifest) {
     super(ecosystem, manifest);
   }
 
-  void parseDependencyTree(
-      String src, int srcDepth, String[] lines, Sbom sbom, Component.Scope scope) {
+  void parseDependencyTree(String src, int srcDepth, String[] lines, Sbom sbom, String scope) {
     if (lines.length == 0) {
       return;
     }

src/main/java/com/redhat/exhort/providers/GradleProvider.java

@@ -38,7 +38,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import org.cyclonedx.model.Component;
 import org.tomlj.Toml;
 import org.tomlj.TomlParseResult;
 import org.tomlj.TomlTable;
@@ -52,6 +51,8 @@ public final class GradleProvider extends BaseJavaProvider {
 
   public static String RUNTIME_CLASSPATH = "runtimeClasspath";
   public static String COMPILE_CLASSPATH = "compileClasspath";
+  public static String REQUIRED = "required";
+  public static String OPTIONAL = "optional";
 
   private static final Logger log = LoggersFactory.getLogger(GradleProvider.class.getName());
 
@@ -292,10 +293,8 @@ private Sbom buildSbomFromTextFormat(
       List<String> runtimePreparedLines = prepareLinesForParsingDependencyTree(runtimeConfig);
       List<String> compilePreparedLines = prepareLinesForParsingDependencyTree(compileConfig);
 
-      parseDependencyTree(
-          root, 0, runtimePreparedLines.toArray(new String[0]), sbom, Component.Scope.REQUIRED);
-      parseDependencyTree(
-          root, 0, compilePreparedLines.toArray(new String[0]), sbom, Component.Scope.OPTIONAL);
+      parseDependencyTree(root, 0, runtimePreparedLines.toArray(new String[0]), sbom, REQUIRED);
+      parseDependencyTree(root, 0, compilePreparedLines.toArray(new String[0]), sbom, OPTIONAL);
 
     } else {
       List<ProcessedLine> runtimePreparedLines =
@@ -309,17 +308,15 @@ private Sbom buildSbomFromTextFormat(
           runtimeArrayForSbom.add(line.getLine());
         }
       }
-      parseDependencyTree(
-          root, 0, runtimeArrayForSbom.toArray(new String[0]), sbom, Component.Scope.REQUIRED);
+      parseDependencyTree(root, 0, runtimeArrayForSbom.toArray(new String[0]), sbom, REQUIRED);
 
       List<String> compileArrayForSbom = new ArrayList<>();
       for (ProcessedLine line : compilePreparedLines) {
         if (line.getDepth() == 1) {
           compileArrayForSbom.add(line.getLine());
         }
       }
-      parseDependencyTree(
-          root, 0, compileArrayForSbom.toArray(new String[0]), sbom, Component.Scope.OPTIONAL);
+      parseDependencyTree(root, 0, compileArrayForSbom.toArray(new String[0]), sbom, OPTIONAL);
     }
     return sbom;
   }

src/main/java/com/redhat/exhort/sbom/CycloneDXSbom.java

@@ -216,7 +216,11 @@ private List<String> createIgnoreFilter(List<Dependency> deps, Collection<String
   }
 
   @Override
-  public Sbom addDependency(PackageURL sourceRef, PackageURL targetRef, Component.Scope scope) {
+  public Sbom addDependency(PackageURL sourceRef, PackageURL targetRef, String s) {
+    Component.Scope scope = null;
+    if (s != null) {
+      scope = Component.Scope.valueOf(s.toUpperCase());
+    }
     Component srcComp = newComponent(sourceRef, scope);
     Dependency srcDep;
     if (bom.getComponents().stream().noneMatch(c -> c.getBomRef().equals(srcComp.getBomRef()))) {

src/main/java/com/redhat/exhort/sbom/Sbom.java

@@ -17,7 +17,6 @@
 
 import com.github.packageurl.PackageURL;
 import java.util.Collection;
-import org.cyclonedx.model.Component;
 
 public interface Sbom {
 
@@ -27,7 +26,7 @@ public interface Sbom {
 
   public <T> Sbom filterIgnoredDeps(Collection<T> ignoredDeps);
 
-  public Sbom addDependency(PackageURL sourceRef, PackageURL targetRef, Component.Scope scope);
+  public Sbom addDependency(PackageURL sourceRef, PackageURL targetRef, String scope);
 
   public String getAsJsonString();
 

src/test/java/com/redhat/exhort/providers/Gradle_Provider_Test.java

@@ -46,12 +46,13 @@ abstract class Gradle_Provider_Test extends ExhortTest {
   // - build.gradle: the target manifest for testing
   // - expected_sbom.json: the SBOM expected to be provided
   static Stream<String> testFolders() {
-    return Stream.of("deps_with_ignore_full_specification");
-    //        "deps_with_ignore_named_params",
-    //        "deps_with_ignore_notations",
-    //        "deps_with_no_ignore_common_paths",
-    //        "deps_with_duplicate_no_version",
-    //        "deps_with_duplicate_different_versions");
+    return Stream.of(
+        "deps_with_ignore_full_specification",
+        "deps_with_ignore_named_params",
+        "deps_with_ignore_notations",
+        "deps_with_no_ignore_common_paths",
+        "deps_with_duplicate_no_version",
+        "deps_with_duplicate_different_versions");
   }
 
   @ParameterizedTest