fix(longevity) - warped data collected (APP-172) (#95)

Author: asurkov

src/main/kotlin/app/hashers/CodeLongevity.kt

@@ -86,7 +86,7 @@ class CodeLine(val repo: Repository,
      * Email address of the line's author.
      */
     val email : String
-        get() = to.commit.authorIdent.emailAddress
+        get() = from.commit.authorIdent.emailAddress
 
     /**
      * True if the line is deleted.
@@ -103,9 +103,11 @@ class CodeLine(val repo: Repository,
         val td = df.format(Date(to.commit.getCommitTime().toLong() * 1000))
         val fc = "${from.commit.getName()} '${from.commit.getShortMessage()}'"
         val tc = "${to.commit.getName()} '${to.commit.getShortMessage()}'"
-        val state = if (isDeleted) "deleted in" else "last known as"
+        val revState = if (isDeleted) "deleted in" else "last known as"
+        val state = if (isDeleted) "deleted" else "alive"
         return "Line '$text' - '${from.file}:${from.line}' added in $fc $fd\n" +
-            "  ${state} '${to.file}:${to.line}' in $tc $td"
+            "  ${revState} '${to.file}:${to.line}' in $tc $td,\n" +
+            "  age: ${age} ms - $state"
     }
 }
 

src/test/kotlin/test/tests/hashers/CodeLongevityTest.kt

@@ -486,4 +486,60 @@ class CodeLongevityTest : Spek({
             testRepo.destroy()
         }
     }
+
+    given("'longevity stats #2'") {
+        val testRepoPath = "../CodeLongevity_lngstats2"
+        val testRepo = TestRepo(testRepoPath)
+        val testRehash = "rehash_lngstats1"
+        val fileName = "test1.txt"
+        val author1 = Author(testRepo.userName, testRepo.userEmail)
+        val author2 = Author("Vasya Pupkin", "[email protected]")
+        val emails = hashSetOf(author1.email, author2.email)
+
+        var serverRepo = Repo(rehash = testRehash)
+        val mockApi = MockApi(mockRepo = serverRepo)
+
+        testRepo.createFile(fileName, listOf("line1", "line2"))
+        testRepo.commit(message = "initial commit",
+                        author = author1,
+                        date = Calendar.Builder().setTimeOfDay(0, 0, 0).build().time)
+
+        testRepo.deleteLines(fileName, 1, 1)
+        testRepo.commit(message = "delete line",
+                        author = author2,
+                        date = Calendar.Builder().setTimeOfDay(0, 1, 0).build().time)
+
+        CodeLongevity(serverRepo, emails, testRepo.git,
+                      { _ -> fail("exception") }).updateStats(mockApi)
+
+        it("'t1'") {
+          println(mockApi.receivedFacts)
+            assertTrue(mockApi.receivedFacts.contains(
+                Fact(repo = serverRepo,
+                     code = FactCodes.LINE_LONGEVITY_REPO,
+                     value = (60).toString())
+            ))
+
+            assertTrue(mockApi.receivedFacts.contains(
+                Fact(repo = serverRepo,
+                     code = FactCodes.LINE_LONGEVITY,
+                     author = author1,
+                     value = (60).toString())
+            ))
+
+            assertTrue(mockApi.receivedFacts.contains(
+                Fact(repo = serverRepo,
+                     code = FactCodes.LINE_LONGEVITY,
+                     author = author2,
+                     value = (0).toString())
+            ))
+        }
+
+        afterGroup {
+            CodeLongevity(
+                Repo(rehash = testRehash), emails, testRepo.git,
+                { _ -> fail("exception") }).dropSavedData()
+            testRepo.destroy()
+        }
+    }
 })

src/test/kotlin/test/tests/hashers/CommitHasherTest.kt

@@ -154,7 +154,7 @@ class CommitHasherTest : Spek({
         val observable = CommitCrawler.getObservable(gitHasher, repo)
         CommitHasher(repo, mockApi, repo.commits.map {it.rehash}, emails)
             .updateFromObservable(observable, { e -> errors.add(e) })
-      
+
         it ("has no errors") {
             assertEquals(0, errors.size)
         }