Display failed test modules at the top of plan run

Show all test modules within a plan run that have failures at the top of
the list, followed by all test modules that are 100% passing.

Test: staging
Bug: 63706143
Change-Id: I593df7d57d319166e02515fa63d39042553390b5

1 files changed, 9 insertions, 3 deletions

diff --git a/src/main/java/com/android/vts/servlet/ShowPlanRunServlet.java b/src/main/java/com/android/vts/servlet/ShowPlanRunServlet.java
index 16beb9a..442d428 100644
--- a/src/main/java/com/android/vts/servlet/ShowPlanRunServlet.java
+++ b/src/main/java/com/android/vts/servlet/ShowPlanRunServlet.java
@@ -86,7 +86,8 @@ public class ShowPlanRunServlet extends BaseServlet {
             resultNames.add(r.name());
         }
 
-        List<TestRunMetadata> testRunMetadata = new ArrayList<>();
+        List<JsonObject> passingTestObjects = new ArrayList<>();
+        List<JsonObject> failingTestObjects = new ArrayList<>();
         List<JsonObject> testRunObjects = new ArrayList<>();
 
         Key planKey = KeyFactory.createKey(TestPlanEntity.KIND, plan);
@@ -121,12 +122,17 @@ public class ShowPlanRunServlet extends BaseServlet {
                 }
                 TestRunMetadata metadata =
                         new TestRunMetadata(key.getParent().getName(), testRunEntity, devices);
-                testRunMetadata.add(metadata);
-                testRunObjects.add(metadata.toJson());
+                if (metadata.testRun.failCount > 0) {
+                    failingTestObjects.add(metadata.toJson());
+                } else {
+                    passingTestObjects.add(metadata.toJson());
+                }
             }
         } catch (EntityNotFoundException e) {
             // Invalid parameters
         }
+        testRunObjects.addAll(failingTestObjects);
+        testRunObjects.addAll(passingTestObjects);
 
         int[] topBuildResultCounts = new int[TestCaseResult.values().length];
         topBuildResultCounts[TestCaseResult.TEST_CASE_RESULT_PASS.getNumber()] = passCount;