Merge "API name update caused by newly added function in TestRunEntity" am: aa2350da1d

am: 2176514362

Change-Id: Id06d372986b1406416d2155658b9135f67196ef9

3 files changed, 3 insertions, 10 deletions

diff --git a/src/main/java/com/android/vts/job/VtsCoverageAlertJobServlet.java b/src/main/java/com/android/vts/job/VtsCoverageAlertJobServlet.java
index b0348dd..106ffb5 100644
--- a/src/main/java/com/android/vts/job/VtsCoverageAlertJobServlet.java
+++ b/src/main/java/com/android/vts/job/VtsCoverageAlertJobServlet.java
@@ -22,18 +22,14 @@ import com.android.vts.entity.CodeCoverageEntity;
 import com.android.vts.entity.DeviceInfoEntity;
 import com.android.vts.entity.TestCoverageStatusEntity;
 import com.android.vts.entity.TestRunEntity;
-import com.android.vts.util.DatastoreHelper;
 import com.android.vts.util.EmailHelper;
-import com.google.appengine.api.datastore.DatastoreFailureException;
 import com.google.appengine.api.datastore.DatastoreService;
 import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.DatastoreTimeoutException;
 import com.google.appengine.api.datastore.Entity;
 import com.google.appengine.api.datastore.EntityNotFoundException;
 import com.google.appengine.api.datastore.Key;
 import com.google.appengine.api.datastore.KeyFactory;
 import com.google.appengine.api.datastore.Query;
-import com.google.appengine.api.datastore.Transaction;
 import com.google.appengine.api.taskqueue.Queue;
 import com.google.appengine.api.taskqueue.QueueFactory;
 import com.google.appengine.api.taskqueue.TaskOptions;
@@ -42,7 +38,6 @@ import java.io.UnsupportedEncodingException;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
-import java.util.ConcurrentModificationException;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -50,7 +45,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.mail.Message;
 import javax.mail.MessagingException;
-import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang.StringUtils;
@@ -116,7 +110,7 @@ public class VtsCoverageAlertJobServlet extends BaseJobServlet {
     }
 
     TestRunEntity testRunEntity = TestRunEntity.fromEntity(testRun);
-    if (testRunEntity == null || !testRunEntity.hasCodeCoverage()) {
+        if (testRunEntity == null || !testRunEntity.getHasCodeCoverage()) {
       return null;
     }
     CodeCoverageEntity codeCoverageEntity = testRunEntity.getCodeCoverageEntity();
diff --git a/src/main/java/com/android/vts/util/DatastoreHelper.java b/src/main/java/com/android/vts/util/DatastoreHelper.java
index 4ba19d0..2dbca37 100644
--- a/src/main/java/com/android/vts/util/DatastoreHelper.java
+++ b/src/main/java/com/android/vts/util/DatastoreHelper.java
@@ -57,7 +57,6 @@ import com.google.appengine.api.datastore.Query.FilterPredicate;
 import com.google.appengine.api.datastore.Transaction;
 import com.google.appengine.api.datastore.TransactionOptions;
 import com.google.common.collect.Lists;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.ConcurrentModificationException;
@@ -430,7 +429,7 @@ public class DatastoreHelper {
 
       if (testRunEntity.getType() == TestRunType.POSTSUBMIT.getNumber()) {
         VtsAlertJobServlet.addTask(testRunKey);
-        if (testRunEntity.isHasCodeCoverage()) {
+                if (testRunEntity.getHasCodeCoverage()) {
           VtsCoverageAlertJobServlet.addTask(testRunKey);
         }
         if (profilingPointKeys.size() > 0) {
diff --git a/src/main/java/com/android/vts/util/TestResults.java b/src/main/java/com/android/vts/util/TestResults.java
index 38617c3..adb2a5a 100644
--- a/src/main/java/com/android/vts/util/TestResults.java
+++ b/src/main/java/com/android/vts/util/TestResults.java
@@ -292,7 +292,7 @@ public class TestResults {
 
             long totalLineCount = 0;
             long coveredLineCount = 0;
-            if (testRun.isHasCodeCoverage()) {
+            if (testRun.getHasCodeCoverage()) {
                 totalLineCount = codeCoverageEntity.getTotalLineCount();
                 coveredLineCount = codeCoverageEntity.getCoveredLineCount();
             }