Skip to content

Commit

Permalink
test(node): Align the names of the result variables in fun tests
Browse files Browse the repository at this point in the history
Signed-off-by: Frank Viernau <[email protected]>
  • Loading branch information
fviernau committed Feb 22, 2024
1 parent 16ae8c9 commit f40ca1d
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ analyzer:
path: ""
vcs_processed:
type: "Git"
url: "ssh://[email protected]/oss-review-toolkit/ort.git"
revision: "25966a02521e899b1d905c16a4caa86974abddbe"
url: "<REPLACE_URL_PROCESSED>"
revision: "<REPLACE_REVISION>"
path: "plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm-workspaces/src/non-workspace/package-c"
homepage_url: ""
scopes:
Expand Down Expand Up @@ -625,13 +625,13 @@ analyzer:
algorithm: ""
vcs:
type: "Git"
url: "[email protected]:oss-review-toolkit/ort.git"
revision: "25966a02521e899b1d905c16a4caa86974abddbe"
url: "<REPLACE_URL>"
revision: "<REPLACE_REVISION>"
path: "plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm-workspaces"
vcs_processed:
type: "Git"
url: "ssh://[email protected]/oss-review-toolkit/ort.git"
revision: "25966a02521e899b1d905c16a4caa86974abddbe"
url: "<REPLACE_URL_PROCESSED>"
revision: "<REPLACE_REVISION>"
path: "plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm-workspaces"
- id: "NPM::require-uncached:2.0.0"
purl: "pkg:npm/[email protected]"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@ class NpmFunTest : WordSpec({
val expectedResult = patchExpectedResult(expectedResultFile, definitionFile)
.fromYaml<ProjectAnalyzerResult>()

val actualResult = create("NPM").resolveSingleProject(definitionFile, resolveScopes = true)
val result = create("NPM").resolveSingleProject(definitionFile, resolveScopes = true)

actualResult.withInvariantIssues() shouldBe expectedResult.withInvariantIssues()
result.withInvariantIssues() shouldBe expectedResult.withInvariantIssues()
}
}
})
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ class NpmVersionUrlFunTest : WordSpec({
val expectedResult = patchExpectedResult(expectedResultFile, definitionFile)
.fromYaml<ProjectAnalyzerResult>()

val actualResult = create("NPM", allowDynamicVersions = true)
val result = create("NPM", allowDynamicVersions = true)
.resolveSingleProject(definitionFile, resolveScopes = true)

actualResult.withInvariantIssues().toYaml() shouldBe expectedResult.withInvariantIssues().toYaml()
result.withInvariantIssues().toYaml() shouldBe expectedResult.withInvariantIssues().toYaml()
}
}
})
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ class PnpmFunTest : WordSpec({
val definitionFile = getAssetFile("projects/synthetic/pnpm-workspaces/packages.json")
val expectedResultFile = getAssetFile("projects/synthetic/pnpm-workspaces-expected-output.yml")

val ortResult = analyze(definitionFile.parentFile, packageManagers = setOf(Pnpm.Factory()))
val result = analyze(definitionFile.parentFile, packageManagers = setOf(Pnpm.Factory()))

patchActualResult(ortResult.toYaml(), patchStartAndEndTime = true) should
patchActualResult(result.toYaml(), patchStartAndEndTime = true) should
matchExpectedResult(expectedResultFile, definitionFile)
}
}
Expand Down

0 comments on commit f40ca1d

Please sign in to comment.