diff options
author | Young Gyu Park <younggyu@google.com> | 2018-04-27 14:10:21 +0900 |
---|---|---|
committer | Keun Soo Yim <yim@google.com> | 2018-05-02 17:15:57 +0000 |
commit | a00c785f144e5c3a19b1fe91f8e3ff6d4b24eefd (patch) | |
tree | e32f314c97950bccbffe0ae2075bb98bfb61322b /src/main | |
parent | af67870e99758b915a622f64d734c44fa53b8fc1 (diff) | |
download | dashboard-a00c785f144e5c3a19b1fe91f8e3ff6d4b24eefd.tar.gz |
newly added testType field in suite test result entity.android-wear-p-preview-2android-p-preview-3android-p-preview-2android-o-mr1-iot-release-1.0.0
Test: go/vts-web-staging/show_plan_release?plan=vts&type=suite&page=1
Bug: 78661101
Change-Id: I03381c85174fe06a5d2a7e653a65c4f7ac7eed39
Diffstat (limited to 'src/main')
6 files changed, 46 insertions, 24 deletions
diff --git a/src/main/java/com/android/vts/api/TestDataForDevServlet.java b/src/main/java/com/android/vts/api/TestDataForDevServlet.java index b94a2b6..e6a4413 100644 --- a/src/main/java/com/android/vts/api/TestDataForDevServlet.java +++ b/src/main/java/com/android/vts/api/TestDataForDevServlet.java @@ -267,6 +267,7 @@ public class TestDataForDevServlet extends HttpServlet { 100), ChronoUnit.DAYS) .getEpochSecond(), + 1, idx / 2 == 0 ? false : true, pathInfo.toString(), idx / 2 == 0 ? "/error/infra/log" : "", diff --git a/src/main/java/com/android/vts/api/TestSuiteResultRestServlet.java b/src/main/java/com/android/vts/api/TestSuiteResultRestServlet.java index 38734d0..61931cb 100644 --- a/src/main/java/com/android/vts/api/TestSuiteResultRestServlet.java +++ b/src/main/java/com/android/vts/api/TestSuiteResultRestServlet.java @@ -81,6 +81,7 @@ public class TestSuiteResultRestServlet extends HttpServlet { testSuiteFileParent, testSuiteResultMessage.getStartTime(), testSuiteResultMessage.getEndTime(), + testSuiteResultMessage.getTestType(), testSuiteResultMessage.getBootSuccess(), testSuiteResultMessage.getResultPath(), testSuiteResultMessage.getInfraLogPath(), diff --git a/src/main/java/com/android/vts/entity/TestSuiteResultEntity.java b/src/main/java/com/android/vts/entity/TestSuiteResultEntity.java index 1948b57..9c5422a 100644 --- a/src/main/java/com/android/vts/entity/TestSuiteResultEntity.java +++ b/src/main/java/com/android/vts/entity/TestSuiteResultEntity.java @@ -46,10 +46,23 @@ import static com.googlecode.objectify.ObjectifyService.ofy; @NoArgsConstructor public class TestSuiteResultEntity { - public enum GROUP_TYPE { - OTA, - SIGNED, - TOT + public enum TestType { + UNKNOWN(0), + TOT(1), + OTA(1 << 1), + SIGNED(1 << 2), + PRESUBMIT(1 << 3), + MANUAL(1 << 5); + + public int value; + + TestType(int value) { + this.value = value; + } + + public int value() { + return value; + } } @Parent Key<TestSuiteFileEntity> testSuiteFileEntityKey; @@ -60,8 +73,8 @@ public class TestSuiteResultEntity { /** Test Suite end time field */ @Getter @Setter Long endTime; - /** Test Suite group type OTA, Signed, ToT field */ - @Index @Getter @Setter GROUP_TYPE groupType; + /** Test Suite test type field */ + @Index @Getter @Setter int testType; /** Test Suite bootup error field */ @Getter @Setter Boolean bootSuccess; @@ -128,6 +141,7 @@ public class TestSuiteResultEntity { Key<TestSuiteFileEntity> testSuiteFileEntityKey, Long startTime, Long endTime, + int testType, Boolean bootSuccess, String resultPath, String infraLogPath, @@ -176,7 +190,8 @@ public class TestSuiteResultEntity { if (!this.buildVendorFingerprint.isEmpty()) { this.deviceName = this.getDeviceNameFromVendorFpt(); } - this.groupType = this.getGroupType(); + + this.testType = this.getSuiteResultTestType(testType); } /** Saving function for the instance of this class */ @@ -224,14 +239,18 @@ public class TestSuiteResultEntity { return "unknown-version"; } - public GROUP_TYPE getGroupType() { - if (this.getNormalizedVersion(this.buildSystemFingerprint) - != this.getNormalizedVersion(this.buildVendorFingerprint)) { - return GROUP_TYPE.OTA; - } else if (this.buildVendorFingerprint.endsWith("release-keys")) { - return GROUP_TYPE.SIGNED; + public int getSuiteResultTestType(int testType) { + if (testType == TestType.UNKNOWN.value()) { + if (this.getNormalizedVersion(this.buildSystemFingerprint) + != this.getNormalizedVersion(this.buildVendorFingerprint)) { + return TestType.OTA.value(); + } else if (this.buildVendorFingerprint.endsWith("release-keys")) { + return TestType.SIGNED.value(); + } else { + return TestType.TOT.value(); + } } else { - return GROUP_TYPE.TOT; + return testType; } } } diff --git a/src/main/java/com/android/vts/job/VtsSuiteTestJobServlet.java b/src/main/java/com/android/vts/job/VtsSuiteTestJobServlet.java index 137f682..e4989fb 100644 --- a/src/main/java/com/android/vts/job/VtsSuiteTestJobServlet.java +++ b/src/main/java/com/android/vts/job/VtsSuiteTestJobServlet.java @@ -268,6 +268,7 @@ public class VtsSuiteTestJobServlet extends HttpServlet { testSuiteFileEntityKey, testSuiteResultMessage.getStartTime(), testSuiteResultMessage.getEndTime(), + testSuiteResultMessage.getTestType(), testSuiteResultMessage.getBootSuccess(), testSuiteResultMessage.getResultPath(), testSuiteResultMessage.getInfraLogPath(), diff --git a/src/main/java/com/android/vts/servlet/ShowPlanReleaseServlet.java b/src/main/java/com/android/vts/servlet/ShowPlanReleaseServlet.java index 57cd2f8..4b2ac88 100644 --- a/src/main/java/com/android/vts/servlet/ShowPlanReleaseServlet.java +++ b/src/main/java/com/android/vts/servlet/ShowPlanReleaseServlet.java @@ -285,10 +285,10 @@ public class ShowPlanReleaseServlet extends BaseServlet { String PLAN_RELEASE_JSP = "WEB-INF/jsp/show_suite_release.jsp"; String testPlan = request.getParameter("plan"); - String groupType = - request.getParameter("groupType") == null - ? "TOT" - : request.getParameter("groupType"); + String testCategoryType = + request.getParameter("testCategoryType") == null + ? "1" + : request.getParameter("testCategoryType"); int page = request.getParameter("page") == null ? 1 @@ -302,7 +302,7 @@ public class ShowPlanReleaseServlet extends BaseServlet { ofy().load() .type(TestSuiteResultEntity.class) .filter("suitePlan", testPlan) - .filter("groupType", groupType) + .filter("testType", testCategoryType) .orderKey(true); Pagination<TestSuiteResultEntity> testSuiteResultEntityPagination = @@ -334,10 +334,10 @@ public class ShowPlanReleaseServlet extends BaseServlet { logger.log(Level.INFO, "page size => " + testSuiteResultEntityPagination.getPageSize()); logger.log(Level.INFO, "total count => " + testSuiteResultEntityPagination.getTotalCount()); + request.setAttribute("plan", testPlan); request.setAttribute("page", page); request.setAttribute("testType", "suite"); - request.setAttribute("groupType", groupType); - request.setAttribute("plan", testPlan); + request.setAttribute("testCategoryType", testCategoryType); request.setAttribute("testSuiteResultEntityPagination", testSuiteResultEntityPagination); RequestDispatcher dispatcher = request.getRequestDispatcher(PLAN_RELEASE_JSP); return dispatcher; diff --git a/src/main/webapp/WEB-INF/jsp/show_suite_release.jsp b/src/main/webapp/WEB-INF/jsp/show_suite_release.jsp index b144b21..1ad19cc 100644 --- a/src/main/webapp/WEB-INF/jsp/show_suite_release.jsp +++ b/src/main/webapp/WEB-INF/jsp/show_suite_release.jsp @@ -100,13 +100,13 @@ <ul class="tabs"> <li class="tab col s6" id="totTabLink"> - <a class="${groupType == 'TOT' ? 'active' : 'inactive'}" href="${requestScope['javax.servlet.forward.servlet_path']}?plan=${plan}&type=${testType}&groupType=TOT">TOT</a> + <a class="${testCategoryType == '1' ? 'active' : 'inactive'}" href="${requestScope['javax.servlet.forward.servlet_path']}?plan=${plan}&type=${testType}&testCategoryType=1">TOT</a> </li> <li class="tab col s6" id="signedTabLink"> - <a class="${groupType == 'SIGNED' ? 'active' : 'inactive'}" href="${requestScope['javax.servlet.forward.servlet_path']}?plan=${plan}&type=${testType}&groupType=SIGNED">SIGNED</a> + <a class="${testCategoryType == '4' ? 'active' : 'inactive'}" href="${requestScope['javax.servlet.forward.servlet_path']}?plan=${plan}&type=${testType}&testCategoryType=4">SIGNED</a> </li> <li class="tab col s6" id="otaTabLink"> - <a class="${groupType == 'OTA' ? 'active' : 'inactive'}" href="${requestScope['javax.servlet.forward.servlet_path']}?plan=${plan}&type=${testType}&groupType=OTA">OTA</a> + <a class="${testCategoryType == '2' ? 'active' : 'inactive'}" href="${requestScope['javax.servlet.forward.servlet_path']}?plan=${plan}&type=${testType}&testCategoryType=2">OTA</a> </li> </ul> |