From d3396241a4e1ea86e3609c4157be875cb2eb8d17 Mon Sep 17 00:00:00 2001 From: Young Gyu Park Date: Wed, 11 Apr 2018 13:39:02 +0900 Subject: Adding new missing fields on TestSuiteResultEntity. Test: TestSuiteResultEntity on datastore admin console Bug: 77879482 Change-Id: Ibbaaacd59f4ef9b134586a1822217be0412783a0 --- .../com/android/vts/api/TestDataForDevServlet.java | 3 +++ .../vts/api/TestSuiteResultRestServlet.java | 3 +++ .../android/vts/entity/TestSuiteResultEntity.java | 28 +++++++++++++++++++--- .../android/vts/job/VtsSuiteTestJobServlet.java | 3 +++ .../vts/servlet/ShowPlanReleaseServlet.java | 9 ++++--- 5 files changed, 40 insertions(+), 6 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/android/vts/api/TestDataForDevServlet.java b/src/main/java/com/android/vts/api/TestDataForDevServlet.java index 24f2671..09b1df8 100644 --- a/src/main/java/com/android/vts/api/TestDataForDevServlet.java +++ b/src/main/java/com/android/vts/api/TestDataForDevServlet.java @@ -267,8 +267,11 @@ public class TestDataForDevServlet extends HttpServlet { 100), ChronoUnit.DAYS) .getEpochSecond(), + pathInfo.toString(), + "Test Place Name -" + idx, "Suite Test Plan", "Suite Version " + idx, + "Suite Test Name", "Suite Build Number " + idx, rand.nextInt(), rand.nextInt(), diff --git a/src/main/java/com/android/vts/api/TestSuiteResultRestServlet.java b/src/main/java/com/android/vts/api/TestSuiteResultRestServlet.java index 4f53587..3c737c8 100644 --- a/src/main/java/com/android/vts/api/TestSuiteResultRestServlet.java +++ b/src/main/java/com/android/vts/api/TestSuiteResultRestServlet.java @@ -81,8 +81,11 @@ public class TestSuiteResultRestServlet extends HttpServlet { testSuiteFileParent, testSuiteResultMessage.getStartTime(), testSuiteResultMessage.getEndTime(), + testSuiteResultMessage.getResultPath(), + testSuiteResultMessage.getHostName(), testSuiteResultMessage.getSuitePlan(), testSuiteResultMessage.getSuiteVersion(), + testSuiteResultMessage.getSuiteName(), testSuiteResultMessage.getSuiteBuildNumber(), testSuiteResultMessage.getModulesDone(), testSuiteResultMessage.getModulesTotal(), diff --git a/src/main/java/com/android/vts/entity/TestSuiteResultEntity.java b/src/main/java/com/android/vts/entity/TestSuiteResultEntity.java index b5625ca..2e1d5e3 100644 --- a/src/main/java/com/android/vts/entity/TestSuiteResultEntity.java +++ b/src/main/java/com/android/vts/entity/TestSuiteResultEntity.java @@ -39,6 +39,10 @@ import static com.googlecode.objectify.ObjectifyService.ofy; @NoArgsConstructor public class TestSuiteResultEntity { + public enum GROUP_TYPE { + OTA, SIGNED, TOT + } + @Parent Key testSuiteFileEntityKey; @@ -48,13 +52,25 @@ public class TestSuiteResultEntity { /** Test Suite end time field */ @Getter @Setter Long endTime; - /** Test Suite suite plan field */ + /** Test Suite group type OTA, Signed, ToT field */ + @Index @Getter @Setter GROUP_TYPE groupType; + + /** Test Suite result path field */ + @Getter @Setter String resultPath; + + /** Test Suite host name field */ + @Getter @Setter String hostName; + + /** Test Suite plan field */ @Index @Getter @Setter String suitePlan; - /** Test Suite suite version field */ + /** Test Suite version field */ @Getter @Setter String suiteVersion; - /** Test Suite suite build number field */ + /** Test Suite name field */ + @Getter @Setter String suiteName; + + /** Test Suite build number field */ @Getter @Setter String suiteBuildNumber; /** Test Suite test finished module count field */ @@ -95,8 +111,11 @@ public class TestSuiteResultEntity { Key testSuiteFileEntityKey, Long startTime, Long endTime, + String resultPath, + String hostName, String suitePlan, String suiteVersion, + String suiteName, String suiteBuildNumber, int modulesDone, int modulesTotal, @@ -110,8 +129,11 @@ public class TestSuiteResultEntity { this.testSuiteFileEntityKey = testSuiteFileEntityKey; this.startTime = startTime; this.endTime = endTime; + this.resultPath = resultPath; + this.hostName = hostName; this.suitePlan = suitePlan; this.suiteVersion = suiteVersion; + this.suiteName = suiteName; this.suiteBuildNumber = suiteBuildNumber; this.modulesDone = modulesDone; this.modulesTotal = modulesTotal; diff --git a/src/main/java/com/android/vts/job/VtsSuiteTestJobServlet.java b/src/main/java/com/android/vts/job/VtsSuiteTestJobServlet.java index 79f04a1..31c98bc 100644 --- a/src/main/java/com/android/vts/job/VtsSuiteTestJobServlet.java +++ b/src/main/java/com/android/vts/job/VtsSuiteTestJobServlet.java @@ -246,8 +246,11 @@ public class VtsSuiteTestJobServlet extends HttpServlet { testSuiteFileEntityKey, testSuiteResultMessage.getStartTime(), testSuiteResultMessage.getEndTime(), + testSuiteResultMessage.getResultPath(), + testSuiteResultMessage.getHostName(), testSuiteResultMessage.getSuitePlan(), testSuiteResultMessage.getSuiteVersion(), + testSuiteResultMessage.getSuiteName(), testSuiteResultMessage.getSuiteBuildNumber(), testSuiteResultMessage.getModulesDone(), testSuiteResultMessage.getModulesTotal(), diff --git a/src/main/java/com/android/vts/servlet/ShowPlanReleaseServlet.java b/src/main/java/com/android/vts/servlet/ShowPlanReleaseServlet.java index f7b3d58..588c789 100644 --- a/src/main/java/com/android/vts/servlet/ShowPlanReleaseServlet.java +++ b/src/main/java/com/android/vts/servlet/ShowPlanReleaseServlet.java @@ -278,16 +278,19 @@ public class ShowPlanReleaseServlet extends BaseServlet { String testPlan = request.getParameter("plan"); int page = - Objects.isNull(request.getParameter("page")) + request.getParameter("page") == null ? 1 : Integer.valueOf(request.getParameter("page")); String nextPageToken = - Objects.isNull(request.getParameter("nextPageToken")) + request.getParameter("nextPageToken") == null ? "" : request.getParameter("nextPageToken"); com.googlecode.objectify.cmd.Query testSuiteResultEntityQuery = - ofy().load().type(TestSuiteResultEntity.class).filter("suitePlan", testPlan).orderKey(true); + ofy().load() + .type(TestSuiteResultEntity.class) + .filter("suitePlan", testPlan) + .limit(105); Pagination testSuiteResultEntityPagination = new Pagination( -- cgit v1.2.3