Store absolute paths in FILE nodes. (#136)

fabsx00 · web-flow · commit 1ec501bc1dbd · 2019-10-24T19:39:35.000+02:00
diff --git a/src/main/scala/io/shiftleft/fuzzyc2cpg/FuzzyC2Cpg.scala b/src/main/scala/io/shiftleft/fuzzyc2cpg/FuzzyC2Cpg.scala
@@ -117,7 +117,7 @@ class FuzzyC2Cpg(outputModuleFactory: CpgOutputModuleFactory) {
 
     def createFileNode(pathToFile: Path): Node = {
       newNode(NodeType.FILE)
-        .addStringProperty(NodePropertyName.NAME, pathToFile.toString)
+        .addStringProperty(NodePropertyName.NAME, pathToFile.toAbsolutePath.toString)
         .build()
     }
 
diff --git a/src/test/scala/io/shiftleft/fuzzyc2cpg/ProgramStructureTests.scala b/src/test/scala/io/shiftleft/fuzzyc2cpg/ProgramStructureTests.scala
@@ -25,7 +25,8 @@ class ProgramStructureTests extends WordSpec with Matchers {
         .value(NodeKeys.NAME)
         .headOption
       fileName.isDefined shouldBe true
-      fileName.head shouldBe "src/test/resources/testcode/structure/structure.c"
+      fileName.head should not be "src/test/resources/testcode/structure/structure.c"
+      fileName.head should endWith("src/test/resources/testcode/structure/structure.c")
     }
 
     "contain AST edge from file node to namespace block" in {

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ class FuzzyC2Cpg(outputModuleFactory: CpgOutputModuleFactory) {`
`117`	`117`
`118`	`118`	`def createFileNode(pathToFile: Path): Node = {`
`119`	`119`	`newNode(NodeType.FILE)`
`120`		`- .addStringProperty(NodePropertyName.NAME, pathToFile.toString)`
	`120`	`+ .addStringProperty(NodePropertyName.NAME, pathToFile.toAbsolutePath.toString)`
`121`	`121`	`.build()`
`122`	`122`	`}`
`123`	`123`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@ class ProgramStructureTests extends WordSpec with Matchers {`
`25`	`25`	`.value(NodeKeys.NAME)`
`26`	`26`	`.headOption`
`27`	`27`	`fileName.isDefined shouldBe true`
`28`		`- fileName.head shouldBe "src/test/resources/testcode/structure/structure.c"`
	`28`	`+ fileName.head should not be "src/test/resources/testcode/structure/structure.c"`
	`29`	`+ fileName.head should endWith("src/test/resources/testcode/structure/structure.c")`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`"contain AST edge from file node to namespace block" in {`