Merge pull request #5 from MicroFocus/luiza_defect_1107461_skipped_added_to_need_attention

Luiza defect 1107461 skipped added to need attention group

Author: luizaM02

pom.xml

@@ -7,7 +7,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.microfocus.octane.plugins</groupId>
     <artifactId>jira-octane-quality-insight-plugin</artifactId>
-    <version>1.0.7</version>
+    <version>1.0.7.1</version>
     <organization>
         <name>Micro Focus ALM Octane</name>
         <url>https://www.microfocus.com/en-us/products/alm-octane/overview</url>

src/main/java/com/microfocus/octane/plugins/configuration/OctaneRestManager.java

@@ -51,8 +51,8 @@ public static GroupEntityCollection getCoverage(SpaceConfiguration sc, OctaneEnt
         String queryParam = queryBuilder.build();
 
         String responseStr = sc.getRestConnector().httpGet(url, Arrays.asList(queryParam), headers).getResponseData();
-        GroupEntityCollection col = OctaneEntityParser.parseGroupCollection(responseStr);
-        return col;
+
+        return OctaneEntityParser.parseGroupCollection(responseStr);
     }
 
     public static GroupEntityCollection getNativeStatusCoverageForRunsWithoutStatus(SpaceConfiguration sc, OctaneEntity octaneEntity, OctaneEntityTypeDescriptor typeDescriptor, long workspaceId) {

src/main/java/com/microfocus/octane/plugins/views/CoverageUiHelper.java

@@ -98,9 +98,9 @@ private static List<MapBasedObject> getCoverageGroups(SpaceConfiguration sc, Oct
         Map<String, GroupEntity> statusId2group = coverage.getGroups().stream().filter(gr -> gr.getValue() != null).collect(Collectors.toMap(g -> ((OctaneEntity) g.getValue()).getId(), Function.identity()));
         coverage.getGroups().stream().filter(gr -> gr.getValue() == null).findFirst();
 
-        //Octane may return on coverage group without status - it will be assigned to skipped status
-        //if already skipped group exist - we will add count to it
-        //if skipped group not exist - we will create new one
+        //Octane may return on coverage group without status - it will be assigned to need attention status
+        //if need attention group already exists - we will add count to it
+        //if need attention group does not exist - we will create new one
         Optional<GroupEntity> groupWithoutStatusOpt = coverage.getGroups().stream().filter(gr -> gr.getValue() == null).findFirst();
         if (groupWithoutStatusOpt.isPresent()) {
             GroupEntityCollection coverageOfRunsWithoutStatus = OctaneRestManager.getNativeStatusCoverageForRunsWithoutStatus(sc, octaneEntity, typeDescriptor, workspaceId);
@@ -113,11 +113,16 @@ private static List<MapBasedObject> getCoverageGroups(SpaceConfiguration sc, Oct
                     appendCountToExistingGroupOrCreateNewOne(statusId2group, convertedStatus, gr.getCount());
                 });
             } else {
-                //if we receive different numbers -> put all not-statused items to skipped
-                appendCountToExistingGroupOrCreateNewOne(statusId2group, skippedStatus.getLogicalName(), groupWithoutStatusOpt.get().getCount());
+                //if we receive different numbers -> put all not-statused items to need attention
+                appendCountToExistingGroupOrCreateNewOne(statusId2group, needAttentionStatus.getLogicalName(), groupWithoutStatusOpt.get().getCount());
             }
         }
 
+        //in order to align with Octane test coverage tooltip
+        //we add skipped category to requires attention
+        addSkippedToRequiresAttention(statusId2group);
+        statusId2group.remove(skippedStatus.getLogicalName());
+
         int total = statusId2group.values().stream().mapToInt(o -> o.getCount()).sum();
         List<MapBasedObject> groups = statusId2group.entrySet().stream()
                 .map(entry -> convertGroupEntityToUiEntity(testStatusDescriptors.get(entry.getKey()), entry.getValue().getCount(), total))
@@ -127,6 +132,13 @@ private static List<MapBasedObject> getCoverageGroups(SpaceConfiguration sc, Oct
         return groups;
     }
 
+    private static void addSkippedToRequiresAttention(Map<String, GroupEntity> statusId2group) {
+        if (statusId2group.containsKey(skippedStatus.getLogicalName())) {
+            int skippedCount = statusId2group.get(skippedStatus.getLogicalName()).getCount();
+            appendCountToExistingGroupOrCreateNewOne(statusId2group, needAttentionStatus.getLogicalName(), skippedCount);
+        }
+    }
+
     private static void appendCountToExistingGroupOrCreateNewOne(Map<String, GroupEntity> statusId2group, String groupName, int count) {
         if (statusId2group.containsKey(groupName)) {
             GroupEntity grEntity = statusId2group.get(groupName);