fixed tests

eyalk007 · Sep 18, 2024 · b37a752 · b37a752
1 parent 33369e6
commit b37a752
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/src/main/java/com/jfrog/ide/idea/inspections/GradleKotlinInspection.java b/src/main/java/com/jfrog/ide/idea/inspections/GradleKotlinInspection.java
@@ -77,7 +77,8 @@ String createComponentName(PsiElement element) {
         List<KtValueArgument> argumentList = ((KtValueArgumentList) element).getArguments();
         if (argumentList.size() == 1) {
             // "commons-collections:commons-collections:3.2.2"
-            return extractArgument(argumentList.get(0));
+            String artifactId = extractArgument(argumentList.get(0));
+            return StringUtils.substringBeforeLast(artifactId, ":");
         }
         if (argumentList.size() >= 3) {
             // "commons-collections", "commons-collections"

diff --git a/src/test/java/com/jfrog/ide/idea/inspections/GradleGroovyInspectionTest.java b/src/test/java/com/jfrog/ide/idea/inspections/GradleGroovyInspectionTest.java
@@ -17,13 +17,13 @@ public class GradleGroovyInspectionTest extends InspectionsTestBase {
     // files as groovy-script.
     private static final String PACKAGE_DESCRIPTOR = "build.groovy";
     private final InspectionTestDependency[] DEPENDENCIES = {
-            new InspectionTestDependency(96, "a", "b:c"),
-            new InspectionTestDependency(139, "d", "e:f"),
-            new InspectionTestDependency(180, "g", "h:i"),
-            new InspectionTestDependency(200, "j", "k:l"),
-            new InspectionTestDependency(225, "m", "n:o"),
-            new InspectionTestDependency(320, "net.lingala.zip4j", "zip4j:2.3.0"),
-            new InspectionTestDependency(390, "org.codehaus.groovy", "groovy-all:3.0.5"),
+            new InspectionTestDependency(96, "a", "b"),
+            new InspectionTestDependency(139, "d", "e"),
+            new InspectionTestDependency(180, "g", "h"),
+            new InspectionTestDependency(200, "j", "k"),
+            new InspectionTestDependency(225, "m", "n"),
+            new InspectionTestDependency(320, "net.lingala.zip4j", "zip4j"),
+            new InspectionTestDependency(390, "org.codehaus.groovy", "groovy-all"),
     };
 
     @SuppressWarnings("MethodDoesntCallSuperMethod")

diff --git a/src/test/java/com/jfrog/ide/idea/inspections/GradleInspectionTest.java b/src/test/java/com/jfrog/ide/idea/inspections/GradleInspectionTest.java
@@ -23,7 +23,7 @@ public static Collection<Object[]> data() {
         return Arrays.asList(new Object[][]{
                 {"a:b:c", "a:b"},
                 {"a:b:c:d", "a:b"},
-                {"a:b", "a:b"},
+                {"a", "a"},
                 {"xyz", "xyz"}
         });
     }

diff --git a/src/test/java/com/jfrog/ide/idea/inspections/GradleKotlinInspectionTest.java b/src/test/java/com/jfrog/ide/idea/inspections/GradleKotlinInspectionTest.java
@@ -11,8 +11,8 @@ public class GradleKotlinInspectionTest extends InspectionsTestBase {
     // files as groovy-script.
     private static final String PACKAGE_DESCRIPTOR = "build.gradle.kts";
     private final InspectionTestDependency[] DEPENDENCIES = {
-            new InspectionTestDependency(119, "a", "b:c"),
-            new InspectionTestDependency(144, "d", "e:f"),
+            new InspectionTestDependency(119, "a", "b"),
+            new InspectionTestDependency(144, "d", "e"),
     };
 
     private final int[] NON_DEPENDENCIES_POSITIONS = {273, 338};

diff --git a/src/test/java/com/jfrog/ide/idea/inspections/MavenInspectionTest.java b/src/test/java/com/jfrog/ide/idea/inspections/MavenInspectionTest.java
@@ -9,9 +9,9 @@ public class MavenInspectionTest extends InspectionsTestBase {
 
     private static final String PACKAGE_DESCRIPTOR = "pom.xml";
     private final InspectionTestDependency[] DEPENDENCIES = {
-            new InspectionTestDependency(550, "a", "b:c"),
-            new InspectionTestDependency(788, "d", "e:f"),
-            new InspectionTestDependency(990, "g", "h:i"),
+            new InspectionTestDependency(550, "a", "b"),
+            new InspectionTestDependency(788, "d", "e"),
+            new InspectionTestDependency(990, "g", "h"),
     };
 
     private final int[] NON_DEPENDENCIES_POSITIONS = {397, 1197, 1258};