Update import/export capabilities and related unit tests

Author: Lenny Halseth

codepulse/src/main/scala/com/secdec/codepulse/tracer/export/ProjectExporter.scala

@@ -124,6 +124,7 @@ object ProjectExporter extends JsonHelpers {
 				for (sourceFileId <- node.sourceFileId) jg.writeNumberField("sourceFileId", sourceFileId)
 				for (sourceLocationCount <- node.sourceLocationCount) jg.writeNumberField("sourceLocationCount", sourceLocationCount)
 				for (methodStartLine <- node.methodStartLine) jg.writeNumberField("methodStartLine", methodStartLine)
+				for (methodEndLine <- node.methodEndLine) jg.writeNumberField("methodEndLine", methodEndLine)
 				for (isSurfaceMethod <- node.isSurfaceMethod) {
 					if (node.isSurfaceMethod.isDefined) jg.writeBooleanField("isSurfaceMethod", isSurfaceMethod)
 				}

codepulse/src/test/resources/com/secdec/codepulse/tracer/export/test/WebApi.v2.1.pulse

@@ -117,7 +117,7 @@ class ExportSuite extends FunSpec with BeforeAndAfter {
       val outputStream = new ByteArrayOutputStream()
       ProjectExporter.exportTo(outputStream, data)
       val contents = unzipExport(outputStream)
-      assert(contents.get("nodes.json").get == "[ {\r\n  \"id\" : 1,\r\n  \"label\" : \"method1\",\r\n  \"kind\" : \"method\",\r\n  \"size\" : 50,\r\n  \"sourceFileId\" : 1,\r\n  \"sourceLocationCount\" : 2,\r\n  \"methodStartLine\" : 3\r\n} ]")
+      assert(contents.get("nodes.json").get == "[ {\r\n  \"id\" : 1,\r\n  \"label\" : \"method1\",\r\n  \"kind\" : \"method\",\r\n  \"size\" : 50,\r\n  \"sourceFileId\" : 1,\r\n  \"sourceLocationCount\" : 2,\r\n  \"methodStartLine\" : 3,\r\n  \"methodEndLine\" : 4\r\n} ]")
     }
 
     it("should reference source file when source file is unavailable") {
@@ -149,6 +149,26 @@ class ExportSuite extends FunSpec with BeforeAndAfter {
       val contents = unzipExport(outputStream)
       assert(contents.get("nodes.json").get == "[ {\r\n  \"id\" : 5,\r\n  \"label\" : \"method1\",\r\n  \"kind\" : \"method\",\r\n  \"size\" : 50,\r\n  \"sourceFileId\" : 10,\r\n  \"sourceLocationCount\" : 42,\r\n  \"isSurfaceMethod\" : true\r\n} ]")
     }
+
+    it("should reference method-start-line") {
+      data.sourceData.importSourceFiles(Map[Int,String]((10, "C:\\code\\program.java")))
+      data.treeNodeData.storeNode(TreeNodeData(5, None, "method1", CodeTreeNodeKind.Mth, Option(50), Option(10), Option(42), Option(1), None, Some(true)))
+
+      val outputStream = new ByteArrayOutputStream()
+      ProjectExporter.exportTo(outputStream, data)
+      val contents = unzipExport(outputStream)
+      assert(contents.get("nodes.json").get == "[ {\r\n  \"id\" : 5,\r\n  \"label\" : \"method1\",\r\n  \"kind\" : \"method\",\r\n  \"size\" : 50,\r\n  \"sourceFileId\" : 10,\r\n  \"sourceLocationCount\" : 42,\r\n  \"methodStartLine\" : 1,\r\n  \"isSurfaceMethod\" : true\r\n} ]")
+    }
+
+    it("should reference method-end-line") {
+      data.sourceData.importSourceFiles(Map[Int,String]((10, "C:\\code\\program.java")))
+      data.treeNodeData.storeNode(TreeNodeData(5, None, "method1", CodeTreeNodeKind.Mth, Option(50), Option(10), Option(42), None, Option(7), Some(true)))
+
+      val outputStream = new ByteArrayOutputStream()
+      ProjectExporter.exportTo(outputStream, data)
+      val contents = unzipExport(outputStream)
+      assert(contents.get("nodes.json").get == "[ {\r\n  \"id\" : 5,\r\n  \"label\" : \"method1\",\r\n  \"kind\" : \"method\",\r\n  \"size\" : 50,\r\n  \"sourceFileId\" : 10,\r\n  \"sourceLocationCount\" : 42,\r\n  \"methodEndLine\" : 7,\r\n  \"isSurfaceMethod\" : true\r\n} ]")
+    }
   }
 
   describe("Encounters of exported project unassociated with a recorcing") {

codepulse/src/test/scala/com/secdec/codepulse/tracer/export/test/ExportSuite.scala

@@ -42,7 +42,7 @@ class ImportSuite extends FunSpec with BeforeAndAfter with MockFactory {
   var projectDb: JdbcBackend.DatabaseDef = _
 
   describe("Version v2.1 of a project export file") {
-    it("should import surface method") {
+    it("should import surface method, start lines, and end lines") {
       val file = new ZipFile(getClass.getResource("WebApi.v2.1.pulse").getPath.replaceAll("%20", " "))
 
       val mockInputStore = mock[InputStore]
@@ -56,17 +56,17 @@ class ImportSuite extends FunSpec with BeforeAndAfter with MockFactory {
         (0,	 None,	     "Classes",                                            "g", None,       None,      None,       None,       None, None),
         (1,	 Option(0),	 "WebApi",                                             "p", None,       None,      None,       None,       None, None),
         (2,	 Option(1),	 "RouteConfig",                                        "c", None,       Option(1), Option(3),  None,       None, None),
-        (3,	 Option(2),	 "public static Void RegisterRoutes(RouteCollection)", "m", Option(13),	Option(1), Option(3),  Option(10), None, None),
+        (3,	 Option(2),	 "public static Void RegisterRoutes(RouteCollection)", "m", Option(13),	Option(1), Option(3),  Option(10), Option(17), None),
         (4,	 Option(1),	 "WebApiConfig",                                       "c", None,       Option(2), Option(3),  None,       None, None),
-        (5,	 Option(4),	 "public static Void Register(HttpConfiguration)",     "m", Option(11),	Option(2), Option(3),  Option(9),  None, None),
+        (5,	 Option(4),	 "public static Void Register(HttpConfiguration)",     "m", Option(11),	Option(2), Option(3),  Option(9),  Option(16), None),
         (6,	 Option(1),	 "WebApiApplication",                                  "c", None,	    Option(3), Option(3),  None,       None, None),
-        (7,	 Option(6),	 "protected Void Application_Start()",                 "m", Option(7),	Option(3), Option(3),  Option(10), None, None),
+        (7,	 Option(6),	 "protected Void Application_Start()",                 "m", Option(7),	Option(3), Option(3),  Option(10), Option(12), None),
         (8,	 Option(1),	 "WebApi.Controllers",                                 "p", None,       None,      None,       None,       None, None),
         (9,	 Option(8),	 "HomeController",                                     "c", None,	    Option(4), Option(1),  None,       None, None),
-        (10, Option(9),	 "public ActionResult Index()",                        "m", Option(3),  Option(4), Option(1),  Option(9),  None, Option(true)),
+        (10, Option(9),	 "public ActionResult Index()",                        "m", Option(3),  Option(4), Option(1),  Option(9),  Option(9), Option(true)),
         (11, Option(8),	 "ValuesController",                                   "c", None,       Option(5), Option(1),  None,       None, None),
-        (12, Option(11), "public HttpResponseMessage Get()",                   "m", Option(6),	Option(5), Option(1),  Option(11), None, Option(true)),
-        (13, Option(11), "private static String GetResponseContent()",         "m", Option(2),	Option(5), Option(1),  Option(16), None, None))
+        (12, Option(11), "public HttpResponseMessage Get()",                   "m", Option(6),	Option(5), Option(1),  Option(11), Option(11), Option(true)),
+        (13, Option(11), "private static String GetResponseContent()",         "m", Option(2),	Option(5), Option(1),  Option(16), Option(16), None))
 
       assertTreeNodeData(treeNodeDataSet)
     }