diff options
author | angel.avila2 | 2019-01-09 02:50:11 +0000 |
---|---|---|
committer | angel.avila2 | 2019-01-09 02:50:11 +0000 |
commit | 6de3bf37e5513cf6799d2e8b03e1c5d0db8df8b3 (patch) | |
tree | 1781a911039cb675e387715338aec8ef15ba7413 | |
parent | ef546442791bfa17558d65ad2deab37a899a2042 (diff) | |
download | org.eclipse.osee-sca_report.tar.gz org.eclipse.osee-sca_report.tar.xz org.eclipse.osee-sca_report.zip |
clean upsca_report
Change-Id: I82932d73651021f703a42ae1730f223745f4b362
-rw-r--r-- | plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/report/ExportSet.java | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/report/ExportSet.java b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/report/ExportSet.java index 6f11b23817f..39910b5eb25 100644 --- a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/report/ExportSet.java +++ b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/report/ExportSet.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 Boeing. + * Copyright (c) 2019 Boeing. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -221,9 +221,6 @@ public class ExportSet { sheetWriter.writeRow((Object[]) headers); for (DispoItem item : items) { - if (item.getName().equals("aiu.mgmt.bit.wrap_bit_results.2.ada.WRAP_BIT_RESULTS")) { - System.out.println(""); - } Map<String, MCDCCoverageData> mcdcToCoverageData = new HashMap<>(); List<DispoAnnotationData> annotations = item.getAnnotationsList(); for (DispoAnnotationData annotation : annotations) { @@ -395,19 +392,14 @@ public class ExportSet { // location ex. 24, 24.T, 24.A.RESULT - extracted(levelToResolutionToCount, levelToUnitsToCovered, unit, resolutionType, mcdcToCoverageData, + calculateTotals(levelToResolutionToCount, levelToUnitsToCovered, unit, resolutionType, mcdcToCoverageData, annotation.getLocationRefs()); } - private void extracted(Map<CoverageLevel, Map<String, WrapInt>> levelToResolutionToCount, Map<CoverageLevel, Map<String, Pair<WrapInt, WrapInt>>> levelToUnitsToCovered, String unit, String resolutionType, Map<String, MCDCCoverageData> mcdcToCoverageData, String location) { + private void calculateTotals(Map<CoverageLevel, Map<String, WrapInt>> levelToResolutionToCount, Map<CoverageLevel, Map<String, Pair<WrapInt, WrapInt>>> levelToUnitsToCovered, String unit, String resolutionType, Map<String, MCDCCoverageData> mcdcToCoverageData, String location) { // Determine what level count to increment by location simple number = C, number.T or number.number.RESULT = B, number.number.T = A CoverageLevel thisAnnotationsLevel = getLevel(location); - // Just for debug - Pair<WrapInt, WrapInt> Apair = levelToUnitsToCovered.get(CoverageLevel.A).get(unit); - Pair<WrapInt, WrapInt> Bpair = levelToUnitsToCovered.get(CoverageLevel.B).get(unit); - Pair<WrapInt, WrapInt> Cpair = levelToUnitsToCovered.get(CoverageLevel.C).get(unit); - switch (thisAnnotationsLevel) { case A: { // Update total pairs count @@ -446,9 +438,6 @@ public class ExportSet { // do nothing } } - - System.out.println(); - } private String getNameFromLocation(String location) { |