Fixed run comparisson

Author: martingrossmann

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

@@ -100,10 +100,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;
                 }

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;