Skip to content

fix: avoid resource file updates in test #1773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tgodzik merged 1 commit into from
Aug 4, 2022
Merged

fix: avoid resource file updates in test #1773

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions frontend/src/test/scala/bloop/testing/BloopHelpers.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,7 @@ trait BloopHelpers {
val all = files.map { f =>
Task {
val configFile = f.path.underlying
val oldWorkspace = AbsolutePath(baseDir)
loadTestProjectFromDisk(configFile, oldWorkspace.syntax, workspace.syntax)
loadTestProjectFromDisk(configFile, workspace.syntax)
}
}

Expand All @@ -117,25 +116,28 @@ trait BloopHelpers {

private def loadTestProjectFromDisk(
configFile: Path,
previousBaseDir: String,
newBaseDir: String
): TestProject = {
val bytes = Files.readAllBytes(configFile)
val contents = new String(bytes, StandardCharsets.UTF_8)
val newContents = contents.replace(previousBaseDir, newBaseDir)
import java.nio.file.StandardOpenOption
Files.write(
configFile,
newContents.getBytes(StandardCharsets.UTF_8),
StandardOpenOption.TRUNCATE_EXISTING,
StandardOpenOption.SYNC,
StandardOpenOption.WRITE
)

bloop.config.read(newContents.getBytes(StandardCharsets.UTF_8)) match {
val contents = new String(bytes)

bloop.config.read(contents.getBytes()).flatMap { cfg =>
import java.nio.file.StandardOpenOption
val previousBaseDir = cfg.project.workspaceDir.get.toString()
val newContents = contents.replace(previousBaseDir, newBaseDir)
Files.write(
configFile,
newContents.getBytes,
StandardOpenOption.TRUNCATE_EXISTING,
StandardOpenOption.SYNC,
StandardOpenOption.WRITE
)
bloop.config.read(newContents.getBytes())
} match {
case Left(error) => throw error
case Right(file) => TestProject(file.project, None)
}

}

final class TestState(val state: State) {
Expand Down