DO NOT MERGE: Fixed failing StepsRecordTest and DataMigrationTest tests by applying relevant changes from the main branch.

Fix: 312119336
Test: DataMigrationTest, StepsRecordTest
Change-Id: Ic65df009aa5a4abd0320c73a012060032fac2a38

2 files changed, 5 insertions, 18 deletions

diff --git a/tests/cts/src/android/healthconnect/cts/DataMigrationTest.java b/tests/cts/src/android/healthconnect/cts/DataMigrationTest.java
index 7d9011bd..79b47c49 100644
--- a/tests/cts/src/android/healthconnect/cts/DataMigrationTest.java
+++ b/tests/cts/src/android/healthconnect/cts/DataMigrationTest.java
@@ -900,7 +900,11 @@ public class DataMigrationTest {
                         .setTimeRangeFilter(
                                 new TimeInstantRangeFilter.Builder()
                                         .setStartTime(mStartTime)
-                                        .setEndTime(mEndTime)
+                                        // Some tests in this file are using mEndTime as `time` for
+                                        // instant data points, and HC reads filters data points by
+                                        // [inclusive, exclusive), hence we need to add a positive
+                                        // amount of ms.
+                                        .setEndTime(mEndTime.plusMillis(1))
                                         .build())
                         .build(),
                 mOutcomeExecutor,
diff --git a/tests/cts/src/android/healthconnect/cts/StepsRecordTest.java b/tests/cts/src/android/healthconnect/cts/StepsRecordTest.java
index 33bf5f57..71cdd109 100644
--- a/tests/cts/src/android/healthconnect/cts/StepsRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/StepsRecordTest.java
@@ -19,7 +19,6 @@ package android.healthconnect.cts;
 import static android.health.connect.HealthConnectException.ERROR_INVALID_ARGUMENT;
 import static android.health.connect.datatypes.Metadata.RECORDING_METHOD_ACTIVELY_RECORDED;
 import static android.health.connect.datatypes.StepsRecord.STEPS_COUNT_TOTAL;
-import static android.healthconnect.cts.TestUtils.isHardwareAutomotive;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -52,7 +51,6 @@ import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.After;
 import org.junit.Assert;
-import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -445,21 +443,6 @@ public class StepsRecordTest {
     }
 
     @Test
-    public void testReadStepsRecord_beforePermissionGrant() throws InterruptedException {
-        Assume.assumeFalse(isHardwareAutomotive());
-        List<Record> recordList =
-                Arrays.asList(
-                        getStepsRecord_minusDays(45),
-                        getStepsRecord_minusDays(20),
-                        getStepsRecord(10));
-        TestUtils.insertRecords(recordList);
-        List<StepsRecord> newStepsRecords =
-                TestUtils.readRecords(
-                        new ReadRecordsRequestUsingFilters.Builder<>(StepsRecord.class).build());
-        assertThat(newStepsRecords.size()).isEqualTo(2);
-    }
-
-    @Test
     public void testDeleteStepsRecord_no_filters() throws InterruptedException {
         String id = TestUtils.insertRecordAndGetId(getCompleteStepsRecord());
         TestUtils.verifyDeleteRecords(new DeleteUsingFiltersRequest.Builder().build());