add some tests of the component viewer

diff --git a/server/sonar-web/src/test/js/source-viewer-coverage.js b/server/sonar-web/src/test/js/source-viewer-coverage.js
new file mode 100644 (file)
index 0000000..4343001
--- /dev/null
+++ b/server/sonar-web/src/test/js/source-viewer-coverage.js
@@ -0,0 +1,66 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+/* global casper:false */
+
+
+var lib = require('../lib'),
+    testName = lib.testName('Source Viewer');
+
+lib.initMessages();
+lib.changeWorkingDirectory('source-viewer-coverage');
+lib.configureCasper();
+
+
+casper.test.begin(testName('Coverage'), 4, function (test) {
+  casper
+      .start(lib.buildUrl('source-viewer'), function () {
+        lib.setDefaultViewport();
+
+        lib.mockRequest('/api/l10n/index', '{}');
+        lib.mockRequestFromFile('/api/components/app', 'app.json');
+        lib.mockRequestFromFile('/api/sources/lines', 'lines.json');
+        lib.mockRequestFromFile('/api/issues/search', 'issues.json');
+        lib.mockRequestFromFile('/api/tests/test_cases', 'test-cases.json');
+      })
+
+      .then(function () {
+        casper.waitForSelector('.source-line');
+      })
+
+      .then(function () {
+        test.assertElementCount('.source-line-covered', 1);
+        casper.click('.source-line-covered');
+        casper.waitForSelector('.bubble-popup');
+      })
+
+      .then(function () {
+        test.assertSelectorContains('.bubble-popup', 'SampleTest');
+        test.assertSelectorContains('.bubble-popup', '2ms');
+        test.assertExists('.bubble-popup .icon-test-status-ok');
+      })
+
+      .then(function () {
+        lib.sendCoverage();
+      })
+
+      .run(function () {
+        test.done();
+      });
+});

diff --git a/server/sonar-web/src/test/js/source-viewer-duplications.js b/server/sonar-web/src/test/js/source-viewer-duplications.js
new file mode 100644 (file)
index 0000000..bff1589
--- /dev/null
+++ b/server/sonar-web/src/test/js/source-viewer-duplications.js
@@ -0,0 +1,70 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+/* global casper:false */
+
+
+var lib = require('../lib'),
+    testName = lib.testName('Source Viewer');
+
+lib.initMessages();
+lib.changeWorkingDirectory('source-viewer-duplications');
+lib.configureCasper();
+
+
+casper.test.begin(testName('Duplications'), 4, function (test) {
+  casper
+      .start(lib.buildUrl('source-viewer'), function () {
+        lib.setDefaultViewport();
+
+        lib.mockRequest('/api/l10n/index', '{}');
+        lib.mockRequestFromFile('/api/components/app', 'app.json');
+        lib.mockRequestFromFile('/api/sources/lines', 'lines.json');
+        lib.mockRequestFromFile('/api/issues/search', 'issues.json');
+        lib.mockRequestFromFile('/api/duplications/show', 'duplications.json');
+      })
+
+      .then(function () {
+        casper.waitForSelector('.source-line');
+      })
+
+      .then(function () {
+        test.assertElementCount('.source-line-duplications.source-line-duplicated', 5);
+        casper.click('.source-line-duplicated');
+        lib.waitForElementCount('.source-line-duplications-extra.source-line-duplicated', 5);
+      })
+
+      .then(function () {
+        casper.waitForSelector('.bubble-popup');
+      })
+
+      .then(function () {
+        test.assertSelectorContains('.bubble-popup', 'Duplicated');
+        test.assertSelectorContains('.bubble-popup', '12');
+        test.assertSelectorContains('.bubble-popup', '16');
+      })
+
+      .then(function () {
+        lib.sendCoverage();
+      })
+
+      .run(function () {
+        test.done();
+      });
+});

diff --git a/server/sonar-web/src/test/js/source-viewer-scm.js b/server/sonar-web/src/test/js/source-viewer-scm.js
new file mode 100644 (file)
index 0000000..abf5102
--- /dev/null
+++ b/server/sonar-web/src/test/js/source-viewer-scm.js
@@ -0,0 +1,71 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+/* global casper:false */
+
+
+var lib = require('../lib'),
+    testName = lib.testName('Source Viewer');
+
+lib.initMessages();
+lib.changeWorkingDirectory('source-viewer-scm');
+lib.configureCasper();
+
+
+casper.test.begin(testName('SCM'), 4, function (test) {
+  casper
+      .start(lib.buildUrl('source-viewer'), function () {
+        lib.setDefaultViewport();
+
+        lib.mockRequest('/api/l10n/index', '{}');
+        lib.mockRequestFromFile('/api/components/app', 'app.json');
+        lib.mockRequestFromFile('/api/sources/lines', 'lines.json');
+        lib.mockRequestFromFile('/api/issues/search', 'issues.json');
+      })
+
+      .then(function () {
+        casper.waitForSelector('.source-line');
+      })
+
+      .then(function () {
+        casper.click('.source-line-scm[data-line-number="1"]');
+        casper.waitForSelector('.bubble-popup');
+      })
+
+      .then(function () {
+        test.assertSelectorContains('.bubble-popup', 'sample-author');
+        test.assertSelectorContains('.bubble-popup', 'January 1 2015 1:00 AM');
+        test.assertSelectorContains('.bubble-popup', 'samplerevision');
+      })
+
+      // do not hide popup on click
+      // to allow selecting text by mouse
+      .then(function () {
+        casper.click('.bubble-popup');
+        test.assertExists('.bubble-popup');
+      })
+
+      .then(function () {
+        lib.sendCoverage();
+      })
+
+      .run(function () {
+        test.done();
+      });
+});

diff --git a/server/sonar-web/src/test/json/source-viewer-coverage/app.json b/server/sonar-web/src/test/json/source-viewer-coverage/app.json
new file mode 100644 (file)
index 0000000..bfee785
--- /dev/null
+++ b/server/sonar-web/src/test/json/source-viewer-coverage/app.json
@@ -0,0 +1,19 @@
+{
+  "uuid": "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaaa",
+  "key": "sample:sample",
+  "path": "sample/path",
+  "name": "Sample",
+  "longName": "Sample",
+  "q": "FIL",
+  "subProject": "sample:subproject",
+  "subProjectName": "Sample Sub-Project",
+  "project": "sample:project",
+  "projectName": "Sample Project",
+  "fav": false,
+  "canMarkAsFavourite": true,
+  "canCreateManualIssue": true,
+  "measures": {
+    "lines": "20",
+    "duplicationDensity": "25%"
+  }
+}

diff --git a/server/sonar-web/src/test/json/source-viewer-coverage/issues.json b/server/sonar-web/src/test/json/source-viewer-coverage/issues.json
new file mode 100644 (file)
index 0000000..40edd88
--- /dev/null
+++ b/server/sonar-web/src/test/json/source-viewer-coverage/issues.json
@@ -0,0 +1,14 @@
+{
+  "total": 0,
+  "p": 1,
+  "ps": 100,
+  "issues": [],
+  "maxResultsReached": false,
+  "paging": {
+    "pageIndex": 1,
+    "pageSize": 100,
+    "total": 0,
+    "fTotal": "0",
+    "pages": 1
+  }
+}

diff --git a/server/sonar-web/src/test/json/source-viewer-coverage/lines.json b/server/sonar-web/src/test/json/source-viewer-coverage/lines.json
new file mode 100644 (file)
index 0000000..3b0947a
--- /dev/null
+++ b/server/sonar-web/src/test/json/source-viewer-coverage/lines.json
@@ -0,0 +1,18 @@
+{"sources": [
+  { "line": 1,  "code": "line 1" },
+  { "line": 2,  "code": "line 2" },
+  { "line": 3,  "code": "line 3" },
+  { "line": 4,  "code": "line 4" },
+  { "line": 5,  "code": "line 5" },
+  { "line": 6,  "code": "line 6" },
+  { "line": 7,  "code": "line 7" },
+  { "line": 8,  "code": "line 8" },
+  { "line": 9,  "code": "line 9" },
+  { "line": 10, "code": "line 10" },
+  { "line": 11, "code": "line 11", "utLineHits": 3 },
+  { "line": 16, "code": "line 16" },
+  { "line": 17, "code": "line 17" },
+  { "line": 18, "code": "line 18" },
+  { "line": 19, "code": "line 19" },
+  { "line": 20, "code": "line 20" }
+]}

diff --git a/server/sonar-web/src/test/json/source-viewer-coverage/test-cases.json b/server/sonar-web/src/test/json/source-viewer-coverage/test-cases.json
new file mode 100644 (file)
index 0000000..db0ef3f
--- /dev/null
+++ b/server/sonar-web/src/test/json/source-viewer-coverage/test-cases.json
@@ -0,0 +1,17 @@
+{
+  "tests": [
+    {
+      "name": "sampleTest",
+      "status": "OK",
+      "durationInMs": 2,
+      "_ref": "1"
+    }
+  ],
+  "files": {
+    "1": {
+      "uuid": "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbbb",
+      "key": "test:sample",
+      "longName": "SampleTest"
+    }
+  }
+}

diff --git a/server/sonar-web/src/test/json/source-viewer-duplications/app.json b/server/sonar-web/src/test/json/source-viewer-duplications/app.json
new file mode 100644 (file)
index 0000000..bfee785
--- /dev/null
+++ b/server/sonar-web/src/test/json/source-viewer-duplications/app.json
@@ -0,0 +1,19 @@
+{
+  "uuid": "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaaa",
+  "key": "sample:sample",
+  "path": "sample/path",
+  "name": "Sample",
+  "longName": "Sample",
+  "q": "FIL",
+  "subProject": "sample:subproject",
+  "subProjectName": "Sample Sub-Project",
+  "project": "sample:project",
+  "projectName": "Sample Project",
+  "fav": false,
+  "canMarkAsFavourite": true,
+  "canCreateManualIssue": true,
+  "measures": {
+    "lines": "20",
+    "duplicationDensity": "25%"
+  }
+}

diff --git a/server/sonar-web/src/test/json/source-viewer-duplications/duplications.json b/server/sonar-web/src/test/json/source-viewer-duplications/duplications.json
new file mode 100644 (file)
index 0000000..7da4385
--- /dev/null
+++ b/server/sonar-web/src/test/json/source-viewer-duplications/duplications.json
@@ -0,0 +1,41 @@
+{
+  "duplications": [
+    {
+      "blocks": [
+        {
+          "from": 11,
+          "size": 5,
+          "_ref": "1"
+        },
+        {
+          "from": 12,
+          "size": 5,
+          "_ref": "2"
+        }
+      ]
+    }
+  ],
+  "files": {
+    "2": {
+      "uuid": "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbbb",
+      "key": "duplicated:duplicated",
+      "name": "Duplicated",
+      "q": "FIL",
+      "subProject": "duplicated:subproject",
+      "subProjectName": "Duplicated Sub-Project",
+      "project": "duplicated:project",
+      "projectName": "Duplicated Project"
+    },
+    "1": {
+      "uuid": "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaaa",
+      "key": "sample:sample",
+      "name": "Sample",
+      "longName": "Sample",
+      "q": "FIL",
+      "subProject": "sample:subproject",
+      "subProjectName": "Sample Sub-Project",
+      "project": "sample:project",
+      "projectName": "Sample Project"
+    }
+  }
+}

diff --git a/server/sonar-web/src/test/json/source-viewer-duplications/issues.json b/server/sonar-web/src/test/json/source-viewer-duplications/issues.json
new file mode 100644 (file)
index 0000000..40edd88
--- /dev/null
+++ b/server/sonar-web/src/test/json/source-viewer-duplications/issues.json
@@ -0,0 +1,14 @@
+{
+  "total": 0,
+  "p": 1,
+  "ps": 100,
+  "issues": [],
+  "maxResultsReached": false,
+  "paging": {
+    "pageIndex": 1,
+    "pageSize": 100,
+    "total": 0,
+    "fTotal": "0",
+    "pages": 1
+  }
+}

diff --git a/server/sonar-web/src/test/json/source-viewer-duplications/lines.json b/server/sonar-web/src/test/json/source-viewer-duplications/lines.json
new file mode 100644 (file)
index 0000000..5fc7b0c
--- /dev/null
+++ b/server/sonar-web/src/test/json/source-viewer-duplications/lines.json
@@ -0,0 +1,22 @@
+{"sources": [
+  { "line": 1,  "code": "line 1" },
+  { "line": 2,  "code": "line 2" },
+  { "line": 3,  "code": "line 3" },
+  { "line": 4,  "code": "line 4" },
+  { "line": 5,  "code": "line 5" },
+  { "line": 6,  "code": "line 6" },
+  { "line": 7,  "code": "line 7" },
+  { "line": 8,  "code": "line 8" },
+  { "line": 9,  "code": "line 9" },
+  { "line": 10, "code": "line 10" },
+  { "line": 11, "code": "line 11", "duplicated": true },
+  { "line": 12, "code": "line 12", "duplicated": true },
+  { "line": 13, "code": "line 13", "duplicated": true },
+  { "line": 14, "code": "line 14", "duplicated": true },
+  { "line": 15, "code": "line 15", "duplicated": true },
+  { "line": 16, "code": "line 16" },
+  { "line": 17, "code": "line 17" },
+  { "line": 18, "code": "line 18" },
+  { "line": 19, "code": "line 19" },
+  { "line": 20, "code": "line 20" }
+]}

diff --git a/server/sonar-web/src/test/json/source-viewer-scm/app.json b/server/sonar-web/src/test/json/source-viewer-scm/app.json
new file mode 100644 (file)
index 0000000..bfee785
--- /dev/null
+++ b/server/sonar-web/src/test/json/source-viewer-scm/app.json
@@ -0,0 +1,19 @@
+{
+  "uuid": "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaaa",
+  "key": "sample:sample",
+  "path": "sample/path",
+  "name": "Sample",
+  "longName": "Sample",
+  "q": "FIL",
+  "subProject": "sample:subproject",
+  "subProjectName": "Sample Sub-Project",
+  "project": "sample:project",
+  "projectName": "Sample Project",
+  "fav": false,
+  "canMarkAsFavourite": true,
+  "canCreateManualIssue": true,
+  "measures": {
+    "lines": "20",
+    "duplicationDensity": "25%"
+  }
+}

diff --git a/server/sonar-web/src/test/json/source-viewer-scm/issues.json b/server/sonar-web/src/test/json/source-viewer-scm/issues.json
new file mode 100644 (file)
index 0000000..40edd88
--- /dev/null
+++ b/server/sonar-web/src/test/json/source-viewer-scm/issues.json
@@ -0,0 +1,14 @@
+{
+  "total": 0,
+  "p": 1,
+  "ps": 100,
+  "issues": [],
+  "maxResultsReached": false,
+  "paging": {
+    "pageIndex": 1,
+    "pageSize": 100,
+    "total": 0,
+    "fTotal": "0",
+    "pages": 1
+  }
+}

diff --git a/server/sonar-web/src/test/json/source-viewer-scm/lines.json b/server/sonar-web/src/test/json/source-viewer-scm/lines.json
new file mode 100644 (file)
index 0000000..c934ddd
--- /dev/null
+++ b/server/sonar-web/src/test/json/source-viewer-scm/lines.json
@@ -0,0 +1,11 @@
+{
+  "sources": [
+    {
+      "line": 1,
+      "code": "line 1",
+      "scmAuthor": "sample-author",
+      "scmDate": "2015-01-01T00:00:00+0000",
+      "scmRevision": "samplerevision"
+    }
+  ]
+}

diff --git a/server/sonar-web/src/test/json/source-viewer-spec/lines.json b/server/sonar-web/src/test/json/source-viewer-spec/lines.json
index e33d02b24652fcf6df0ccda09e0e826e9651202d..2983d8e4728e9a5521b6f3e65b3aa5581b85b09e 100644 (file)
--- a/server/sonar-web/src/test/json/source-viewer-spec/lines.json
+++ b/server/sonar-web/src/test/json/source-viewer-spec/lines.json
@@ -313,7 +313,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 46,
@@ -321,7 +321,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 47,
@@ -329,7 +329,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 48,
@@ -337,7 +337,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 49,
@@ -359,7 +359,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 52,
@@ -367,7 +367,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 53,
@@ -396,7 +396,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 57,
@@ -404,7 +404,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 58,
@@ -433,7 +433,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 62,
@@ -441,7 +441,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 63,
@@ -470,7 +470,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 67,
@@ -478,7 +478,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 68,
@@ -514,7 +514,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 73,
@@ -522,7 +522,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 74,
@@ -530,7 +530,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 75,
@@ -538,7 +538,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 76,
@@ -546,7 +546,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "babb50a4f143c312df1ba45955d3d589ecb2845f",
     "scmDate": "2013-05-29T14:27:38+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 77,
@@ -603,7 +603,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 85,
@@ -611,7 +611,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 86,
@@ -668,7 +668,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 94,
@@ -676,7 +676,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 95,
@@ -733,7 +733,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 103,
@@ -741,7 +741,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 104,
@@ -798,7 +798,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 112,
@@ -806,7 +806,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 113,
@@ -856,7 +856,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 120,
@@ -864,9 +864,9 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 1,
-    "conditions": 2,
-    "coveredConditions": 2
+    "utLineHits": 1,
+    "utConditions": 2,
+    "utCoveredConditions": 2
   },
   {
     "line": 121,
@@ -874,7 +874,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 122,
@@ -889,7 +889,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 124,
@@ -897,7 +897,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 125,
@@ -912,7 +912,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "babb50a4f143c312df1ba45955d3d589ecb2845f",
     "scmDate": "2013-05-29T14:27:38+0200",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 127,
@@ -948,7 +948,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 132,
@@ -956,7 +956,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 133,
@@ -985,7 +985,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 137,
@@ -993,7 +993,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 138,
@@ -1022,7 +1022,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 142,
@@ -1030,7 +1030,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 143,
@@ -1059,7 +1059,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 147,
@@ -1067,7 +1067,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 148,
@@ -1103,7 +1103,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e108f5de333cf36aff978aa03940590f9caca9fc",
     "scmDate": "2013-10-10T12:18:02+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 153,
@@ -1111,7 +1111,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e108f5de333cf36aff978aa03940590f9caca9fc",
     "scmDate": "2013-10-10T12:18:02+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 154,
@@ -1119,7 +1119,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e108f5de333cf36aff978aa03940590f9caca9fc",
     "scmDate": "2013-10-10T12:18:02+0200",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 155,
@@ -1134,7 +1134,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e108f5de333cf36aff978aa03940590f9caca9fc",
     "scmDate": "2013-10-10T12:18:02+0200",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 157,
@@ -1170,7 +1170,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 162,
@@ -1178,7 +1178,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 163,
@@ -1207,7 +1207,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 167,
@@ -1215,7 +1215,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 168,
@@ -1244,7 +1244,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 172,
@@ -1252,7 +1252,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 173,
@@ -1281,7 +1281,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 177,
@@ -1289,7 +1289,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 178,
@@ -1325,7 +1325,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "6f1161efb92298ace498df544e38f6f97216ec36",
     "scmDate": "2013-04-26T15:19:16+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 183,
@@ -1333,7 +1333,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 184,
@@ -1348,7 +1348,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "babb50a4f143c312df1ba45955d3d589ecb2845f",
     "scmDate": "2013-05-29T14:27:38+0200",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 186,
@@ -1419,7 +1419,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 196,
@@ -1427,7 +1427,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 197,
@@ -1456,7 +1456,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 201,
@@ -1464,7 +1464,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 202,
@@ -1493,7 +1493,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 206,
@@ -1501,7 +1501,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 207,
@@ -1530,7 +1530,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 211,
@@ -1538,7 +1538,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 212,
@@ -1574,7 +1574,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 217,
@@ -1582,7 +1582,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 218,
@@ -1590,7 +1590,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 219,
@@ -1598,7 +1598,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 220,
@@ -1606,7 +1606,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 221,
@@ -1614,7 +1614,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 222,
@@ -1678,7 +1678,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 231,
@@ -1686,7 +1686,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 232,
@@ -1694,7 +1694,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 233,
@@ -1702,7 +1702,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 234,
@@ -1710,7 +1710,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 235,
@@ -1718,7 +1718,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 236,
@@ -1803,7 +1803,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 248,
@@ -1811,7 +1811,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 249,
@@ -1819,7 +1819,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 250,
@@ -1827,7 +1827,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 251,
@@ -1835,7 +1835,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 252,
@@ -1843,9 +1843,9 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 1,
-    "conditions": 2,
-    "coveredConditions": 2
+    "utLineHits": 1,
+    "utConditions": 2,
+    "utCoveredConditions": 2
   },
   {
     "line": 253,
@@ -1853,7 +1853,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 254,
@@ -1868,7 +1868,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 256,
@@ -1876,7 +1876,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 257,
@@ -1884,7 +1884,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "babb50a4f143c312df1ba45955d3d589ecb2845f",
     "scmDate": "2013-05-29T14:27:38+0200",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 258,
@@ -1934,7 +1934,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 265,
@@ -1942,7 +1942,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 266,
@@ -1950,7 +1950,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 267,
@@ -1958,7 +1958,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 268,
@@ -1966,7 +1966,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 269,
@@ -1974,7 +1974,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 270,
@@ -1982,9 +1982,9 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1,
-    "conditions": 2,
-    "coveredConditions": 2
+    "utLineHits": 1,
+    "utConditions": 2,
+    "utCoveredConditions": 2
   },
   {
     "line": 271,
@@ -1992,7 +1992,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 272,
@@ -2007,7 +2007,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 274,
@@ -2015,7 +2015,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 275,
@@ -2023,7 +2023,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 276,
@@ -2101,7 +2101,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 287,
@@ -2109,7 +2109,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 288,
@@ -2117,7 +2117,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 289,
@@ -2125,7 +2125,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 290,
@@ -2133,9 +2133,9 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1,
-    "conditions": 2,
-    "coveredConditions": 2
+    "utLineHits": 1,
+    "utConditions": 2,
+    "utCoveredConditions": 2
   },
   {
     "line": 291,
@@ -2143,7 +2143,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 292,
@@ -2158,7 +2158,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 294,
@@ -2166,7 +2166,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 295,
@@ -2174,7 +2174,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 296,
@@ -2238,7 +2238,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "171cd79c0b5152461434951ed5d6e5e58849a7b7",
     "scmDate": "2014-04-23T14:41:32+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 305,
@@ -2246,7 +2246,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "171cd79c0b5152461434951ed5d6e5e58849a7b7",
     "scmDate": "2014-04-23T14:41:32+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 306,
@@ -2254,7 +2254,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "171cd79c0b5152461434951ed5d6e5e58849a7b7",
     "scmDate": "2014-04-23T14:41:32+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 307,
@@ -2262,7 +2262,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 308,
@@ -2270,7 +2270,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 309,
@@ -2278,7 +2278,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "171cd79c0b5152461434951ed5d6e5e58849a7b7",
     "scmDate": "2014-04-23T14:41:32+0200",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 310,
@@ -2286,7 +2286,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "904b462c56317b1fb5a616534bd58aa9c9097d0b",
     "scmDate": "2014-06-20T14:13:01+0200",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 311,
@@ -2322,7 +2322,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "904b462c56317b1fb5a616534bd58aa9c9097d0b",
     "scmDate": "2014-06-20T14:13:01+0200",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 316,
@@ -2379,7 +2379,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 324,
@@ -2387,7 +2387,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 325,
@@ -2395,7 +2395,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 326,
@@ -2403,7 +2403,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 327,
@@ -2411,7 +2411,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 328,
@@ -2419,7 +2419,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "46395126b184c343df5471a147cdb48133f59f6f",
     "scmDate": "2014-04-23T14:41:32+0200",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 329,
@@ -2427,7 +2427,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "904b462c56317b1fb5a616534bd58aa9c9097d0b",
     "scmDate": "2014-06-20T14:13:01+0200",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 330,
@@ -2491,7 +2491,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 339,
@@ -2499,7 +2499,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 340,
@@ -2507,7 +2507,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 341,
@@ -2515,7 +2515,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 342,
@@ -2523,7 +2523,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "26edff10d133e29e7013f803e7ef0d69ff593aeb",
     "scmDate": "2013-04-16T17:26:34+0200",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 343,
@@ -2531,7 +2531,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "904b462c56317b1fb5a616534bd58aa9c9097d0b",
     "scmDate": "2014-06-20T14:13:01+0200",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 344,
@@ -2567,7 +2567,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "b5eb47872b34aa9d017dca62abfe49b2fd7af61b",
     "scmDate": "2013-04-17T10:35:23+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 349,
@@ -2575,7 +2575,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 350,
@@ -2583,7 +2583,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 351,
@@ -2612,7 +2612,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 355,
@@ -2620,7 +2620,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 356,
@@ -2628,7 +2628,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 357,
@@ -2657,7 +2657,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 361,
@@ -2665,7 +2665,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 362,
@@ -2673,7 +2673,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 363,
@@ -2695,7 +2695,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 366,
@@ -2703,7 +2703,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 367,
@@ -2711,7 +2711,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 368,
@@ -2733,7 +2733,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 371,
@@ -2741,7 +2741,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 372,
@@ -2749,7 +2749,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 373,
@@ -2771,7 +2771,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 376,
@@ -2779,9 +2779,9 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 0,
-    "conditions": 2,
-    "coveredConditions": 0
+    "utLineHits": 0,
+    "utConditions": 2,
+    "utCoveredConditions": 0
   },
   {
     "line": 377,
@@ -2789,7 +2789,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 378,
@@ -2804,7 +2804,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "b5eb47872b34aa9d017dca62abfe49b2fd7af61b",
     "scmDate": "2013-04-17T10:35:23+0200",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 380,
@@ -2868,7 +2868,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 389,
@@ -2876,7 +2876,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 390,
@@ -2884,7 +2884,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "babb50a4f143c312df1ba45955d3d589ecb2845f",
     "scmDate": "2013-05-29T14:27:38+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 391,
@@ -2913,7 +2913,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "babb50a4f143c312df1ba45955d3d589ecb2845f",
     "scmDate": "2013-05-29T14:27:38+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 395,
@@ -2970,7 +2970,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 403,
@@ -2978,7 +2978,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "babb50a4f143c312df1ba45955d3d589ecb2845f",
     "scmDate": "2013-05-29T14:27:38+0200",
-    "lineHits": 1,
+    "utLineHits": 1,
     "duplicated": true
   },
   {
@@ -2987,7 +2987,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1,
+    "utLineHits": 1,
     "duplicated": true
   },
   {
@@ -2996,7 +2996,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "babb50a4f143c312df1ba45955d3d589ecb2845f",
     "scmDate": "2013-05-29T14:27:38+0200",
-    "lineHits": 1,
+    "utLineHits": 1,
     "duplicated": true
   },
   {
@@ -3037,7 +3037,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1,
+    "utLineHits": 1,
     "duplicated": true
   },
   {
@@ -3046,7 +3046,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "babb50a4f143c312df1ba45955d3d589ecb2845f",
     "scmDate": "2013-05-29T14:27:38+0200",
-    "lineHits": 0,
+    "utLineHits": 0,
     "duplicated": true
   },
   {
@@ -3055,7 +3055,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "babb50a4f143c312df1ba45955d3d589ecb2845f",
     "scmDate": "2013-05-29T14:27:38+0200",
-    "lineHits": 0,
+    "utLineHits": 0,
     "duplicated": true
   },
   {
@@ -3118,7 +3118,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 421,
@@ -3126,7 +3126,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 422,
@@ -3134,7 +3134,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 423,
@@ -3142,7 +3142,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 424,
@@ -3150,9 +3150,9 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "babb50a4f143c312df1ba45955d3d589ecb2845f",
     "scmDate": "2013-05-29T14:27:38+0200",
-    "lineHits": 1,
-    "conditions": 2,
-    "coveredConditions": 1
+    "utLineHits": 1,
+    "utConditions": 2,
+    "utCoveredConditions": 1
   },
   {
     "line": 425,
@@ -3160,7 +3160,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 426,
@@ -3175,7 +3175,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 428,
@@ -3211,7 +3211,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "34cce8e330192c56a159a856ebd8072d38299087",
     "scmDate": "2014-02-24T14:21:50+0100",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 433,
@@ -3261,7 +3261,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 440,
@@ -3269,7 +3269,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 441,
@@ -3277,7 +3277,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "b5eb47872b34aa9d017dca62abfe49b2fd7af61b",
     "scmDate": "2013-04-17T10:35:23+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 442,
@@ -3306,7 +3306,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "b5eb47872b34aa9d017dca62abfe49b2fd7af61b",
     "scmDate": "2013-04-17T10:35:23+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 446,
@@ -3363,7 +3363,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 454,
@@ -3371,7 +3371,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "b5eb47872b34aa9d017dca62abfe49b2fd7af61b",
     "scmDate": "2013-04-17T10:35:23+0200",
-    "lineHits": 1,
+    "utLineHits": 1,
     "duplicated": true
   },
   {
@@ -3380,7 +3380,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1,
+    "utLineHits": 1,
     "duplicated": true
   },
   {
@@ -3389,7 +3389,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "b5eb47872b34aa9d017dca62abfe49b2fd7af61b",
     "scmDate": "2013-04-17T10:35:23+0200",
-    "lineHits": 1,
+    "utLineHits": 1,
     "duplicated": true
   },
   {
@@ -3430,7 +3430,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1,
+    "utLineHits": 1,
     "duplicated": true
   },
   {
@@ -3439,7 +3439,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "b5eb47872b34aa9d017dca62abfe49b2fd7af61b",
     "scmDate": "2013-04-17T10:35:23+0200",
-    "lineHits": 0,
+    "utLineHits": 0,
     "duplicated": true
   },
   {
@@ -3448,7 +3448,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "b5eb47872b34aa9d017dca62abfe49b2fd7af61b",
     "scmDate": "2013-04-17T10:35:23+0200",
-    "lineHits": 0,
+    "utLineHits": 0,
     "duplicated": true
   },
   {
@@ -3511,7 +3511,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 472,
@@ -3519,7 +3519,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 473,
@@ -3527,7 +3527,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 474,
@@ -3535,7 +3535,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "b5eb47872b34aa9d017dca62abfe49b2fd7af61b",
     "scmDate": "2013-04-17T10:35:23+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 475,
@@ -3543,9 +3543,9 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1,
-    "conditions": 2,
-    "coveredConditions": 1
+    "utLineHits": 1,
+    "utConditions": 2,
+    "utCoveredConditions": 1
   },
   {
     "line": 476,
@@ -3553,7 +3553,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 477,
@@ -3561,7 +3561,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "b5eb47872b34aa9d017dca62abfe49b2fd7af61b",
     "scmDate": "2013-04-17T10:35:23+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 478,
@@ -3569,7 +3569,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 479,
@@ -3577,9 +3577,9 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1,
-    "conditions": 2,
-    "coveredConditions": 2
+    "utLineHits": 1,
+    "utConditions": 2,
+    "utCoveredConditions": 2
   },
   {
     "line": 480,
@@ -3587,7 +3587,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 481,
@@ -3602,7 +3602,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 483,
@@ -3617,7 +3617,7 @@
     "scmAuthor": "julien.henry@sonarsource.com",
     "scmRevision": "cc071cc29e8c4d4592282313a3ca2ec376fd7f71",
     "scmDate": "2014-05-01T00:00:12+0200",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 485,
@@ -3653,7 +3653,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "34cce8e330192c56a159a856ebd8072d38299087",
     "scmDate": "2014-02-24T14:21:50+0100",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 490,
@@ -3710,7 +3710,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "e486fe02a0a38d3d9fb70690f7870c77e2265254",
     "scmDate": "2014-02-20T07:23:08+0100",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 498,
@@ -3718,7 +3718,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "b5eb47872b34aa9d017dca62abfe49b2fd7af61b",
     "scmDate": "2013-04-17T10:35:23+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 499,
@@ -3726,7 +3726,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "b5eb47872b34aa9d017dca62abfe49b2fd7af61b",
     "scmDate": "2013-04-17T10:35:23+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 500,
@@ -3734,7 +3734,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "b5eb47872b34aa9d017dca62abfe49b2fd7af61b",
     "scmDate": "2013-04-17T10:35:23+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 501,
@@ -3756,7 +3756,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "b5eb47872b34aa9d017dca62abfe49b2fd7af61b",
     "scmDate": "2013-04-17T10:35:23+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 504,
@@ -3792,7 +3792,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "b5eb47872b34aa9d017dca62abfe49b2fd7af61b",
     "scmDate": "2013-04-17T10:35:23+0200",
-    "lineHits": 1
+    "utLineHits": 1
   },
   {
     "line": 509,
@@ -3828,7 +3828,7 @@
     "scmAuthor": "simon.brandhof@gmail.com",
     "scmRevision": "b5eb47872b34aa9d017dca62abfe49b2fd7af61b",
     "scmDate": "2013-04-17T10:35:23+0200",
-    "lineHits": 0
+    "utLineHits": 0
   },
   {
     "line": 514,