Skip to content

Deprecate FileUtil.deleteOnExit in jssrc2cpg tests #5769

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

Open
SuperUserDone wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Deprecate FileUtil.deleteOnExit in jssrc2cpg tests #5769

Show file tree
Hide file tree
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
85 changes: 43 additions & 42 deletions ...i/frontends/jssrc2cpg/src/test/scala/io/joern/jssrc2cpg/io/JsSrc2CpgHTTPServerTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,19 @@ class JsSrc2CpgHTTPServerTests extends AnyWordSpec with Matchers with BeforeAndA

private var port: Int = -1

private def newProjectUnderTest(index: Option[Int] = None): Path = {
val dir = Files.createTempDirectory("jssrc2cpgTestsHttpTest")
val file = dir / "main.js"
file.createWithParentsIfNotExists(createParents = true)
val indexStr = index.map(_.toString).getOrElse("")
val content = s"""
|function main$indexStr() {
| console.log("Hello World!");
|}
|""".stripMargin
Files.writeString(file, content)
FileUtil.deleteOnExit(file)
FileUtil.deleteOnExit(dir)
dir
private def newProjectUnderTest[T](index: Option[Int] = None)(f: Path => T): T = {
FileUtil.usingTemporaryDirectory("jssrc2cpgTestsHttpTest") { dir =>
val file = dir / "main.js"
file.createWithParentsIfNotExists(createParents = true)
val indexStr = index.map(_.toString).getOrElse("")
val content = s"""
|function main$indexStr() {
| console.log("Hello World!");
|}
|""".stripMargin
Files.writeString(file, content)
f(dir)
}
}

override def beforeAll(): Unit = {
Expand All @@ -45,39 +44,41 @@ class JsSrc2CpgHTTPServerTests extends AnyWordSpec with Matchers with BeforeAndA

"Using jssrc2cpg in server mode" should {
"build CPGs correctly (single test)" in {
val cpgOutFile = FileUtil.newTemporaryFile("jssrc2cpg.bin")
FileUtil.deleteOnExit(cpgOutFile)
val projectUnderTest = newProjectUnderTest()
val input = projectUnderTest.absolutePathAsString
val output = cpgOutFile.toString
val client = FrontendHTTPClient(port)
val req = client.buildRequest(Array(s"input=$input", s"output=$output"))
client.sendRequest(req) match {
case Failure(exception) => fail(exception.getMessage)
case Success(out) =>
out shouldBe output
val cpg = CpgLoader.load(output)
cpg.method.name.l should contain("main")
cpg.call.code.l should contain("""console.log("Hello World!")""")
FileUtil.usingTemporaryFile("jssrc2cpg", ".bin") { cpgOutFile =>
newProjectUnderTest() { projectUnderTest =>
val input = projectUnderTest.absolutePathAsString
val output = cpgOutFile.toString
val client = FrontendHTTPClient(port)
val req = client.buildRequest(Array(s"input=$input", s"output=$output"))
client.sendRequest(req) match {
case Failure(exception) => fail(exception.getMessage)
case Success(out) =>
out shouldBe output
val cpg = CpgLoader.load(output)
cpg.method.name.l should contain("main")
cpg.call.code.l should contain("""console.log("Hello World!")""")
}
}
}
}

"build CPGs correctly (multi-threaded test)" in {
(0 until 10).par.foreach { index =>
val cpgOutFile = FileUtil.newTemporaryFile("jssrc2cpg.bin")
FileUtil.deleteOnExit(cpgOutFile)
val projectUnderTest = newProjectUnderTest(Some(index))
val input = projectUnderTest.absolutePathAsString
val output = cpgOutFile.toString
val client = FrontendHTTPClient(port)
val req = client.buildRequest(Array(s"input=$input", s"output=$output"))
client.sendRequest(req) match {
case Failure(exception) => fail(exception.getMessage)
case Success(out) =>
out shouldBe output
val cpg = CpgLoader.load(output)
cpg.method.name.l should contain(s"main$index")
cpg.call.code.l should contain("""console.log("Hello World!")""")
FileUtil.usingTemporaryFile("jssrc2cpg", ".bin") { cpgOutFile =>
newProjectUnderTest(Some(index)) { projectUnderTest =>
val input = projectUnderTest.absolutePathAsString
val output = cpgOutFile.toString
val client = FrontendHTTPClient(port)
val req = client.buildRequest(Array(s"input=$input", s"output=$output"))
client.sendRequest(req) match {
case Failure(exception) => fail(exception.getMessage)
case Success(out) =>
out shouldBe output
val cpg = CpgLoader.load(output)
cpg.method.name.l should contain(s"main$index")
cpg.call.code.l should contain("""console.log("Hello World!")""")
}
}
}
}
}
Expand Down
4 changes: 0 additions & 4 deletions ...rontends/jssrc2cpg/src/test/scala/io/joern/jssrc2cpg/testfixtures/JsSrc2CpgFrontend.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,12 @@ trait JsSrc2CpgFrontend extends LanguageFrontend {
override type ConfigType = Config

def execute(sourceCodePath: java.io.File): Cpg = {
val cpgOutFile = FileUtil.newTemporaryFile(suffix = "cpg.bin")
FileUtil.deleteOnExit(cpgOutFile)
val jssrc2cpg = new JsSrc2Cpg()
val config = getConfig()
.fold(Config(tsTypes = false))(_.asInstanceOf[Config])
.withInputPath(sourceCodePath.getAbsolutePath)
.withOutputPath(cpgOutFile.toString)
val res = jssrc2cpg.createCpg(config).get
new PostFrontendValidator(res, false).run()
res

}
}
Loading