fix: updated dep graph fixture

snyk · Nov 16, 2023 · c21d58c · c21d58c
1 parent cf5f3ca
commit c21d58c
Show file tree

Hide file tree

Showing 21 changed files with 82 additions and 76 deletions.
diff --git a/test/fixtures-with-wrappers/basic-with-deps/dep-graph-gradleNormalizeDeps-failed-search.json b/test/fixtures-with-wrappers/basic-with-deps/dep-graph-gradleNormalizeDeps-failed-search.json
@@ -5,9 +5,9 @@
   },
   "pkgs": [
     {
-      "id": ".@unspecified",
+      "id": "basic-with-deps@unspecified",
       "info": {
-        "name": ".",
+        "name": "basic-with-deps",
         "version": "unspecified"
       }
     },
@@ -66,7 +66,7 @@
     "nodes": [
       {
         "nodeId": "root-node",
-        "pkgId": ".@unspecified",
+        "pkgId": "basic-with-deps@unspecified",
         "deps": [
           {
             "nodeId": "unknown:guava-87e0fd1df874ea3cbe577702fe6f17068b790fd8@unknown"

diff --git a/test/fixtures-with-wrappers/basic-with-deps/dep-graph.json b/test/fixtures-with-wrappers/basic-with-deps/dep-graph.json
@@ -5,9 +5,9 @@
   },
   "pkgs": [
     {
-      "id": ".@unspecified",
+      "id": "basic-with-deps@unspecified",
       "info": {
-        "name": ".",
+        "name": "basic-with-deps",
         "version": "unspecified"
       }
     },
@@ -66,7 +66,7 @@
     "nodes": [
       {
         "nodeId": "root-node",
-        "pkgId": ".@unspecified",
+        "pkgId": "basic-with-deps@unspecified",
         "deps": [
           {
             "nodeId": "com.google.guava:guava@30.1.1-jre"

diff --git a/test/fixtures-with-wrappers/basic-with-failed-dep/dep-graph.json b/test/fixtures-with-wrappers/basic-with-failed-dep/dep-graph.json
@@ -5,9 +5,9 @@
   },
   "pkgs": [
     {
-      "id": ".@unspecified",
+      "id": "basic-with-failed-dep@unspecified",
       "info": {
-        "name": ".",
+        "name": "basic-with-failed-dep",
         "version": "unspecified"
       }
     },
@@ -66,7 +66,7 @@
     "nodes": [
       {
         "nodeId": "root-node",
-        "pkgId": ".@unspecified",
+        "pkgId": "basic-with-failed-dep@unspecified",
         "deps": [
           {
             "nodeId": "com.google.guava:guava@30.1.1-jre"

diff --git a/test/fixtures-with-wrappers/configuration-consistency/dep-graph.json b/test/fixtures-with-wrappers/configuration-consistency/dep-graph.json
@@ -5,9 +5,9 @@
   },
   "pkgs": [
     {
-      "id": ".@unspecified",
+      "id": "configuration-consistency@unspecified",
       "info": {
-        "name": ".",
+        "name": "configuration-consistency",
         "version": "unspecified"
       }
     },
@@ -73,7 +73,7 @@
     "nodes": [
       {
         "nodeId": "root-node",
-        "pkgId": ".@unspecified",
+        "pkgId": "configuration-consistency@unspecified",
         "deps": [
           {
             "nodeId": "org.codehaus.groovy:groovy@3.0.1"

diff --git a/test/fixtures-with-wrappers/custom-configuration/dep-graph.json b/test/fixtures-with-wrappers/custom-configuration/dep-graph.json
@@ -5,9 +5,9 @@
   },
   "pkgs": [
     {
-      "id": ".@unspecified",
+      "id": "custom-configuration@unspecified",
       "info": {
-        "name": ".",
+        "name": "custom-configuration",
         "version": "unspecified"
       }
     },
@@ -38,7 +38,7 @@
     "nodes": [
       {
         "nodeId": "root-node",
-        "pkgId": ".@unspecified",
+        "pkgId": "custom-configuration@unspecified",
         "deps": [
           {
             "nodeId": "org.mockito:mockito-core@4.6.1"

diff --git a/test/fixtures-with-wrappers/empty-build-gradle-in-root/dep-graph.json b/test/fixtures-with-wrappers/empty-build-gradle-in-root/dep-graph.json
@@ -5,9 +5,9 @@
   },
   "pkgs": [
     {
-      "id": ".@unspecified",
+      "id": "no-build-gradle-in-root@unspecified",
       "info": {
-        "name": ".",
+        "name": "no-build-gradle-in-root",
         "version": "unspecified"
       }
     }
@@ -17,7 +17,7 @@
     "nodes": [
       {
         "nodeId": "root-node",
-        "pkgId": ".@unspecified",
+        "pkgId": "no-build-gradle-in-root@unspecified",
         "deps": []
       }
     ]

diff --git a/test/fixtures-with-wrappers/empty-project/dep-graph.json b/test/fixtures-with-wrappers/empty-project/dep-graph.json
@@ -5,9 +5,9 @@
   },
   "pkgs": [
     {
-      "id": ".@unspecified",
+      "id": "basic@unspecified",
       "info": {
-        "name": ".",
+        "name": "basic",
         "version": "unspecified"
       }
     }
@@ -17,7 +17,7 @@
     "nodes": [
       {
         "nodeId": "root-node",
-        "pkgId": ".@unspecified",
+        "pkgId": "basic@unspecified",
         "deps": []
       }
     ]

diff --git a/test/fixtures-with-wrappers/kts-basic-with-deps/dep-graph.json b/test/fixtures-with-wrappers/kts-basic-with-deps/dep-graph.json
@@ -5,9 +5,9 @@
   },
   "pkgs": [
     {
-      "id": ".@1.0.0-SNAPSHOT",
+      "id": "kts-basic-with-deps@1.0.0-SNAPSHOT",
       "info": {
-        "name": ".",
+        "name": "kts-basic-with-deps",
         "version": "1.0.0-SNAPSHOT"
       }
     },
@@ -101,7 +101,7 @@
     "nodes": [
       {
         "nodeId": "root-node",
-        "pkgId": ".@1.0.0-SNAPSHOT",
+        "pkgId": "kts-basic-with-deps@1.0.0-SNAPSHOT",
         "deps": [
           {
             "nodeId": "org.jetbrains.kotlin:kotlin-stdlib-jdk8@1.3.21"

diff --git a/test/fixtures-with-wrappers/kts-configuration-consistency/dep-graph.json b/test/fixtures-with-wrappers/kts-configuration-consistency/dep-graph.json
@@ -5,9 +5,9 @@
   },
   "pkgs": [
     {
-      "id": ".@1.0.0-SNAPSHOT",
+      "id": "kts-configuration-consistency@1.0.0-SNAPSHOT",
       "info": {
-        "name": ".",
+        "name": "kts-configuration-consistency",
         "version": "1.0.0-SNAPSHOT"
       }
     },
@@ -101,7 +101,7 @@
     "nodes": [
       {
         "nodeId": "root-node",
-        "pkgId": ".@1.0.0-SNAPSHOT",
+        "pkgId": "kts-configuration-consistency@1.0.0-SNAPSHOT",
         "deps": [
           {
             "nodeId": "org.jetbrains.kotlin:kotlin-stdlib-jdk8@1.3.21"

diff --git a/test/fixtures-with-wrappers/kts-strict-lock-mode/dep-graph.json b/test/fixtures-with-wrappers/kts-strict-lock-mode/dep-graph.json
@@ -5,9 +5,9 @@
   },
   "pkgs": [
     {
-      "id": ".@1.0.0-SNAPSHOT",
+      "id": "kts-strict-lock-mode@1.0.0-SNAPSHOT",
       "info": {
-        "name": ".",
+        "name": "kts-strict-lock-mode",
         "version": "1.0.0-SNAPSHOT"
       }
     },
@@ -101,7 +101,7 @@
     "nodes": [
       {
         "nodeId": "root-node",
-        "pkgId": ".@1.0.0-SNAPSHOT",
+        "pkgId": "kts-strict-lock-mode@1.0.0-SNAPSHOT",
         "deps": [
           {
             "nodeId": "org.jetbrains.kotlin:kotlin-stdlib-jdk8@1.3.21"

diff --git a/test/fixtures-with-wrappers/kts-version-catalog-module/dep-graph.json b/test/fixtures-with-wrappers/kts-version-catalog-module/dep-graph.json
@@ -1,13 +1,13 @@
 {
   "graph": {
-    "nodes": [{ "deps": [], "nodeId": "root-node", "pkgId": ".@1.0" }],
+    "nodes": [{ "deps": [], "nodeId": "root-node", "pkgId": "kts-version-catalog-module@1.0" }],
     "rootNodeId": "root-node"
   },
   "pkgManager": { "name": "gradle" },
   "pkgs": [
     {
-      "id": ".@1.0",
-      "info": { "name": ".", "version": "1.0" }
+      "id": "kts-version-catalog-module@1.0",
+      "info": { "name": "kts-version-catalog-module", "version": "1.0" }
     }
   ],
   "schemaVersion": "1.2.0"

diff --git a/test/fixtures-with-wrappers/platform-project-mvn-bom/dep-graph.json b/test/fixtures-with-wrappers/platform-project-mvn-bom/dep-graph.json
@@ -5,9 +5,9 @@
   },
   "pkgs": [
     {
-      "id": ".@unspecified",
+      "id": "platform-project-mvn-bom@unspecified",
       "info": {
-        "name": ".",
+        "name": "platform-project-mvn-bom",
         "version": "unspecified"
       }
     },
@@ -45,7 +45,7 @@
     "nodes": [
       {
         "nodeId": "root-node",
-        "pkgId": ".@unspecified",
+        "pkgId": "platform-project-mvn-bom@unspecified",
         "deps": [
           {
             "nodeId": "org.springframework.boot:spring-boot-dependencies@1.5.8.RELEASE"

diff --git a/test/fixtures-with-wrappers/repo-content-filtering/dep-graph.json b/test/fixtures-with-wrappers/repo-content-filtering/dep-graph.json
@@ -5,9 +5,9 @@
   },
   "pkgs": [
     {
-      "id": ".@unspecified",
+      "id": "repo-content-filtering@unspecified",
       "info": {
-        "name": ".",
+        "name": "repo-content-filtering",
         "version": "unspecified"
       }
     },
@@ -80,7 +80,7 @@
     "nodes": [
       {
         "nodeId": "root-node",
-        "pkgId": ".@unspecified",
+        "pkgId": "repo-content-filtering@unspecified",
         "deps": [
           {
             "nodeId": "com.google.guava:guava@30.1.1-jre"

diff --git a/test/fixtures-with-wrappers/version-catalog-settings/dep-graph.json b/test/fixtures-with-wrappers/version-catalog-settings/dep-graph.json
@@ -5,9 +5,9 @@
   },
   "pkgs": [
     {
-      "id": ".@unspecified",
+      "id": "version-catalogues@unspecified",
       "info": {
-        "name": ".",
+        "name": "version-catalogues",
         "version": "unspecified"
       }
     },
@@ -38,7 +38,7 @@
     "nodes": [
       {
         "nodeId": "root-node",
-        "pkgId": ".@unspecified",
+        "pkgId": "version-catalogues@unspecified",
         "deps": [
           {
             "nodeId": "org.codehaus.groovy:groovy@3.0.5"

diff --git a/test/fixtures-with-wrappers/version-catalog-toml/dep-graph.json b/test/fixtures-with-wrappers/version-catalog-toml/dep-graph.json
@@ -5,9 +5,9 @@
   },
   "pkgs": [
     {
-      "id": ".@unspecified",
+      "id": "version-catalog-toml@unspecified",
       "info": {
-        "name": ".",
+        "name": "version-catalog-toml",
         "version": "unspecified"
       }
     },
@@ -94,7 +94,7 @@
     "nodes": [
       {
         "nodeId": "root-node",
-        "pkgId": ".@unspecified",
+        "pkgId": "version-catalog-toml@unspecified",
         "deps": [
           {
             "nodeId": "org.mockito:mockito-core@4.5.1"

diff --git a/test/fixtures-with-wrappers/with-lock-file/dep-graph.json b/test/fixtures-with-wrappers/with-lock-file/dep-graph.json
@@ -5,9 +5,9 @@
   },
   "pkgs": [
     {
-      "id": ".@unspecified",
+      "id": "with-lock-file@unspecified",
       "info": {
-        "name": ".",
+        "name": "with-lock-file",
         "version": "unspecified"
       }
     },
@@ -73,7 +73,7 @@
     "nodes": [
       {
         "nodeId": "root-node",
-        "pkgId": ".@unspecified",
+        "pkgId": "with-lock-file@unspecified",
         "deps": [
           {
             "nodeId": "org.codehaus.groovy:groovy@3.0.3"
@@ -144,4 +144,4 @@
       }
     ]
   }
-}
+}
diff --git a/test/fixtures/pruned-spring-app/dep-graph.json b/test/fixtures/pruned-spring-app/dep-graph.json
@@ -5,9 +5,9 @@
   },
   "pkgs": [
     {
-      "id": ".@unspecified",
+      "id": "pruned-spring-app@unspecified",
       "info": {
-        "name": ".",
+        "name": "pruned-spring-app",
         "version": "unspecified"
       }
     },
@@ -45,7 +45,7 @@
     "nodes": [
       {
         "nodeId": "root-node",
-        "pkgId": ".@unspecified",
+        "pkgId": "pruned-spring-app@unspecified",
         "deps": [
           {
             "nodeId": "org.springframework:spring-web@5.3.10"

diff --git a/test/manual/gradle-stdout.spec.ts b/test/manual/gradle-stdout.spec.ts
@@ -5,14 +5,14 @@ describe('findProjectsInExtractedJSON', () => {
   const fakeRootDir = path.join('dev', 'tardis-master');
 
   it.each`
-    rootDir        | targetFile
-    ${''}          | ${'build.gradle'}
-    ${null}        | ${'build.gradle'}
-    ${undefined}   | ${'build.gradle'}
-    ${fakeRootDir} | ${path.join(fakeRootDir, 'build.gradle')}
+    targetFile
+    ${'build.gradle'}
+    ${'build.gradle'}
+    ${'build.gradle'}
+    ${path.join(fakeRootDir, 'build.gradle')}
   `(
     'project with targetFile `$targetFile` have valid name when rootDir is `$rootDir`',
-    async ({ rootDir, targetFile }) => {
+    async ({ targetFile }) => {
       const jsonExtractedFromGradleStdout = {
         defaultProject: 'tardis-master',
         defaultProjectKey: 'tardis-master',

diff --git a/test/system/kotlin.test.ts b/test/system/kotlin.test.ts
@@ -15,7 +15,7 @@ if (isKotlinSupported) {
       '.',
       path.join(fixtureDir('gradle-kts'), 'build.gradle.kts'),
     );
-    expect(result.dependencyGraph.rootPkg.name).toMatch('.');
+    expect(result.dependencyGraph.rootPkg.name).toMatch('gradle-kts');
     expect(result.meta!.gradleProjectName).toMatch('gradle-kts');
     const pkgs = result.dependencyGraph.getDepPkgs();
     const nodeIds: string[] = [];