Added duration to testmethod list

Author: martingrossmann

.gitignore

@@ -30,3 +30,4 @@ build
 /integration-tests/geckodriver.exe
 /integration-tests/report-pretest-status/
 /publish_*.*
+/gradle.properties

report-ng/app/src/components/classes/classes-table.html

@@ -29,15 +29,23 @@
             <th class="mdc-data-table__header-cell" click.delegate="sortByRunIndex()">
                 <div class="mdc-data-table__header-cell-wrapper">
                     <div class="mdc-data-table__header-cell-label">Run index</div>
-                    <button class="mdc-icon-button material-icons mdc-data-table__sort-icon-button">
+                    <button class="mdc-icon-button material-icons mdc-data-table__sort-icon-button p-sort-button">
                         arrow_upward
                     </button>
                 </div>
             </th>
             <th class="mdc-data-table__header-cell" click.delegate="sortByClass()">
                 <div class="mdc-data-table__header-cell-wrapper">
                     <div class="mdc-data-table__header-cell-label">Class (${uniqueClasses})</div>
-                    <button class="mdc-icon-button material-icons mdc-data-table__sort-icon-button">
+                    <button class="mdc-icon-button material-icons mdc-data-table__sort-icon-button p-sort-button">
+                        arrow_upward
+                    </button>
+                </div>
+            </th>
+            <th class="mdc-data-table__header-cell">
+                <div class="mdc-data-table__header-cell-wrapper">
+                    <div class="mdc-data-table__header-cell-label">Duration</div>
+                    <button class="mdc-icon-button material-icons mdc-data-table__sort-icon-button p-sort-button">
                         arrow_upward
                     </button>
                 </div>
@@ -47,7 +55,7 @@
                     <div class="mdc-data-table__header-cell-label">Method
                         (${filteredMethodDetails.length})
                     </div>
-                    <button class="mdc-icon-button material-icons mdc-data-table__sort-icon-button">
+                    <button class="mdc-icon-button material-icons mdc-data-table__sort-icon-button p-sort-button">
                         arrow_upward
                     </button>
                 </div>
@@ -56,16 +64,20 @@
             </thead>
             <tbody>
             <tr repeat.for="methodDetails of filteredMethodDetails">
+                <!-- Status -->
                 <td class="p1 centered-text">
                     <a class="badge status-${methodDetails.methodContext.resultStatus|statusClass}">${methodDetails.methodContext.resultStatus
                     | statusName}</a>
                 </td>
+                <!-- Run index -->
                 <td class="run-index-cell">${methodDetails.methodContext.methodRunIndex}</td>
                 <td class="p1 wrapable">
                     <a innerhtml.bind="methodDetails.classStatistics.classIdentifier|className:1|highlightText:searchInput"
                        route-href="route: tests; params.bind: withQueryParams({class: methodDetails.classStatistics.classIdentifier})"
                     ></a>
                 </td>
+                <!-- Duration -->
+                <td class="p1">${methodDetails.methodContext.contextValues.endTime-methodDetails.methodContext.contextValues.startTime | durationFormat:"h[h] m[min] s[s]"}</td>
                 <td class="p1 wrapable" mdc-body1>
 
                     <!-- Method name -->

report-ng/app/src/components/classes/classes.scss

@@ -60,3 +60,9 @@ $text-color: #884AB9;
 .mdc-evolution-chip .mdc-evolution-chip__icon {
     color: inherit;     // inherits icon color from font color
 }
+
+.p-sort-button {
+    padding-left: 0;
+    padding-right: 0;
+    width: 28px;
+}

report-ng/app/src/components/history-statistics-card/history-statistics-card.html

@@ -37,7 +37,7 @@
                 <mdc-list-item class="non-interactive" two-line>
                     <mdc-icon class="history-statistics-icon sr1" mdc-list-item-leading>av_timer</mdc-icon>
                     <mdc-list-item-primary-text>
-                        <span>${average_run_duration | durationFormat:"h[h] m[min] s[s] S[ms]"}</span>
+                        <span>${average_run_duration | durationFormat}</span>
                     </mdc-list-item-primary-text>
                     <mdc-list-item-secondary-text>
                         <span>Average run duration</span>

report-ng/app/src/components/history/duration-history/duration-history.html

@@ -43,7 +43,7 @@
                                 <span>Run ${run.value[0]} (${run.value[2]} test cases)</span>
                             </mdc-list-item-primary-text>
                             <mdc-list-item-secondary-text>
-                                <span>${run.value[1] | durationFormat:"h[h] m[min] s[s] S[ms]"}</span>
+                                <span>${run.value[1] | durationFormat}</span>
                             </mdc-list-item-secondary-text>
                         </mdc-list-item>
                     </mdc-list>
@@ -70,7 +70,7 @@
                                 <span>${method.statistics.identifier}</span>
                             </mdc-list-item-primary-text>
                             <mdc-list-item-secondary-text>
-                                <span>${method.averageDuration | durationFormat:"h[h] m[min] s[s] S[ms]"}</span>
+                                <span>${method.averageDuration | durationFormat}</span>
                             </mdc-list-item-secondary-text>
                         </mdc-list-item>
                     </mdc-list>

report-ng/app/src/components/print-dialog/printable.html

@@ -43,7 +43,7 @@
                     <div class="row">
                         <p>Duration</p>
                         <ul>
-                            <li> Duration: ${_duration | durationFormat:"h[h] m[min] s[s] S[ms]"}</li>
+                            <li> Duration: ${_duration | durationFormat}</li>
                             <li> Started: ${_started | dateFormat}</li>
                             <li> Ended: ${_ended | dateFormat}</li>
                         </ul>

report-ng/app/src/components/run-overview-card/run-overview-card.html

@@ -48,7 +48,7 @@
                     <mdc-list-item class="non-interactive" two-line>
                         <mdc-icon class="history-statistics-icon sr1" mdc-list-item-leading>timer</mdc-icon>
                         <mdc-list-item-primary-text>
-                            <span>${run_duration | durationFormat:"h[h] m[min] s[s] S[ms]"}</span>
+                            <span>${run_duration | durationFormat}</span>
                         </mdc-list-item-primary-text>
                         <mdc-list-item-secondary-text>
                             <span>Run duration</span>

report-ng/app/src/components/test-duration-card/test-duration-card.html

@@ -25,7 +25,7 @@
         <mdc-list-divider></mdc-list-divider>
 
         <div class="card-content vcenter hcenter" mdc-headline5>
-          <mdc-icon class="sr1">timer</mdc-icon>${_duration|durationFormat:"h[h] m[min] s[s] S[ms]"}
+          <mdc-icon class="sr1">timer</mdc-icon>${_duration|durationFormat}
         </div>
         <mdc-list-divider></mdc-list-divider>
         <ul class="mdc-list mdc-list--dense timings" mdc-caption>

report-ng/app/src/main.ts

@@ -24,6 +24,7 @@ import {PLATFORM} from 'aurelia-pal';
 import {Config} from "./services/config-dev";
 import {IntlDateFormatValueConverter} from "t-systems-aurelia-components/src/value-converters/intl-date-format-value-converter"
 import {ObjectStorage} from "t-systems-aurelia-components/src/utils/object-storage";
+import {DurationFormatValueConverter} from "t-systems-aurelia-components/src/value-converters/duration-format-value-converter";
 
 export function configure(aurelia: Aurelia) {
 
@@ -121,6 +122,9 @@ export function configure(aurelia: Aurelia) {
         hour12: false,
     });
 
+    const durationFormatter = aurelia.container.get(DurationFormatValueConverter);
+    durationFormatter.setDefaultFormat("h[h] m[min] s[s] S[ms]");
+
     const objectStorage = aurelia.container.get(ObjectStorage);
     objectStorage.setStorage(localStorage);