Merge pull request #484 from telekom/fix/history-compare

Fix/history compare

Author: martingrossmann

report-ng/app/src/components/history/run-comparison/method-table.html

@@ -66,6 +66,7 @@
                     ></a>
                     <a if.bind="!methodHistory.methodRunId && !methodHistory.methodHistoryAvailable"
                        innerhtml.bind="methodHistory.methodIdentifier"></a>
+                    <div if.bind="!methodHistory.currentStatus">(${methodHistory.methodIdentifier})</div>
                     <div
                         if.bind="methodHistory.changedFailureAspect && methodHistory.pastStatus === methodHistory.currentStatus"
                         class="st1"

report-ng/app/src/components/history/run-comparison/method-table.ts

@@ -24,6 +24,7 @@ import {bindable} from "aurelia-templating";
 import {bindingMode} from "aurelia-binding";
 import "./method-table.scss";
 import {IComparableMethod} from "./run-comparison";
+import {ClassName, ClassNameValueConverter} from "../../../value-converters/class-name-value-converter";
 
 @autoinject()
 export class MethodTable {
@@ -37,4 +38,18 @@ export class MethodTable {
 
     constructor() {
     }
+
+    methodsChanged() {
+        if (this.methods) {
+            let converter = new ClassNameValueConverter();
+            this.methods = this.methods.sort((a, b) => {
+                const aClass = converter.toView(a.classIdentifier, ClassName.simpleName);
+                const bClass = converter.toView(b.classIdentifier, ClassName.simpleName);
+                if (aClass < bClass) return -1;
+                if (aClass > bClass) return 1;
+                return 0;
+            });
+        }
+
+    }
 }

report-ng/app/src/components/history/run-comparison/run-comparison.ts

@@ -36,6 +36,12 @@ export interface IComparableMethod {
     methodHistoryAvailable: boolean
 }
 
+interface IRunToCompare {
+    historyIndex: number,
+    startTime: number
+}
+
+
 @autoinject()
 export class RunComparison extends AbstractViewModel {
     private _historyStatistics: HistoryStatistics;
@@ -100,10 +106,14 @@ export class RunComparison extends AbstractViewModel {
                     pastStatus = pastRun.context.resultStatus;
                 }
 
-                if (currentStatus === ResultStatusType.PASSED && pastStatus === ResultStatusType.PASSED) {
+                if (
+                    (currentStatus === ResultStatusType.PASSED && pastStatus === ResultStatusType.PASSED)
+                    || pastStatus === ResultStatusType.FAILED_RETRIED
+                    || currentStatus === ResultStatusType.FAILED_RETRIED) {
                     return null;
                 }
 
+
                 if (method.runs.length > 1) {
                     methodHistoryAvailable = true;
                 }
@@ -143,7 +153,3 @@ export class RunComparison extends AbstractViewModel {
     }
 }
 
-interface IRunToCompare {
-    historyIndex: number,
-    startTime: number
-}

report-ng/app/src/services/statistic-models.ts

@@ -229,14 +229,18 @@ export class HistoryStatistics {
 
                 clsStat.methods.forEach((method) => {
                     let methodHistory = classHistory.methods.find(
-                        methodHistoryStatistics => methodHistoryStatistics.identifier === method.identifier && this._compareRelatedMethods(methodHistoryStatistics.relatedMethods, method.relatedMethods)
+                        methodHistoryStatistics => {
+                            // Retried methods have the same identifier, so we have duplicates in related methods array.
+                            const uniqueHistoryRelatedMethods = this._filterUniqueItems(methodHistoryStatistics.relatedMethods);
+                            const uniqueRelatedMethods = this._filterUniqueItems(method.relatedMethods);
+                            return methodHistoryStatistics.identifier === method.identifier
+                                && this._compareRelatedMethods(uniqueHistoryRelatedMethods, uniqueRelatedMethods);
+                        }
                     );
-
                     if (!methodHistory) {
                         methodHistory = new MethodHistoryStatistics(method);
                         classHistory.addMethod(methodHistory);
                     }
-
                     methodHistory.addRun(method, currentHistoryIndex);
                 });
             });
@@ -245,6 +249,11 @@ export class HistoryStatistics {
         this._classHistory = Array.from(classHistoryMap.values());
     }
 
+    private _filterUniqueItems(arr: string[]): string[] {
+        const uniqueItems = new Set(arr);
+        return Array.from(uniqueItems);
+    }
+
     private _compareRelatedMethods(arr1: string[], arr2: string[]): boolean {
         if (arr1.length !== arr2.length) {
             return false;

report-ng/app/src/value-converters/class-name-value-converter.ts

@@ -28,13 +28,13 @@ export class ClassNameValueConverter {
         switch (mode) {
             case ClassName.package:
                 if (value.lastIndexOf('.') > 0) {
-                    return value.substr(0, value.lastIndexOf('.'));
+                    return value.substring(0, value.lastIndexOf('.'));
                 } else {
                     return '';
                 }
             case ClassName.simpleName:
                 if (value.lastIndexOf('.') > 0) {
-                    return value.substr(value.lastIndexOf('.') + 1);
+                    return value.substring(value.lastIndexOf('.') + 1);
                 }
             case ClassName.full:
                 return value;