Use response from calls to insertRecords in tests

Most tests assert the initial record passed into insertRecords. Since we mutate the inserted records to add the uuid this currently works, but in a follow up change we'll update the insertRecords API so it no longer mutates the metadata. This requires changes to most of the cts tests.

Bug: 314128192
Test: atest
Change-Id: Ia1c87e12566fd89d437f703d04da4c1b86ec99d3
Merged-In: Ia1c87e12566fd89d437f703d04da4c1b86ec99d3
(cherry picked from commit f0f1f43a17c5e0c76f8d4e42859274ca9061150b)

13 files changed, 83 insertions, 79 deletions

diff --git a/tests/cts/src/android/healthconnect/cts/BodyWaterMassRecordTest.java b/tests/cts/src/android/healthconnect/cts/BodyWaterMassRecordTest.java
index 5f29a6c0..e892bf32 100644
--- a/tests/cts/src/android/healthconnect/cts/BodyWaterMassRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/BodyWaterMassRecordTest.java
@@ -81,7 +81,10 @@ public class BodyWaterMassRecordTest {
     @Test
     public void testReadBodyWaterMassRecord_usingIds() throws InterruptedException {
         List<Record> recordList =
-                Arrays.asList(getCompleteBodyWaterMassRecord(), getCompleteBodyWaterMassRecord());
+                TestUtils.insertRecords(
+                        Arrays.asList(
+                                getCompleteBodyWaterMassRecord(),
+                                getCompleteBodyWaterMassRecord()));
         readBodyWaterMassRecordUsingIds(recordList);
     }
 
@@ -502,9 +505,8 @@ public class BodyWaterMassRecordTest {
         assertThat(result).containsExactlyElementsIn(insertedRecord);
     }
 
-    private void readBodyWaterMassRecordUsingIds(List<Record> recordList)
+    private void readBodyWaterMassRecordUsingIds(List<Record> insertedRecords)
             throws InterruptedException {
-        List<Record> insertedRecords = TestUtils.insertRecords(recordList);
         ReadRecordsRequestUsingIds.Builder<BodyWaterMassRecord> request =
                 new ReadRecordsRequestUsingIds.Builder<>(BodyWaterMassRecord.class);
         for (Record record : insertedRecords) {
diff --git a/tests/cts/src/android/healthconnect/cts/CyclingPedalingCadenceRecordTest.java b/tests/cts/src/android/healthconnect/cts/CyclingPedalingCadenceRecordTest.java
index 2e6d2924..a36f2657 100644
--- a/tests/cts/src/android/healthconnect/cts/CyclingPedalingCadenceRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/CyclingPedalingCadenceRecordTest.java
@@ -576,9 +576,10 @@ public class CyclingPedalingCadenceRecordTest {
 
     private void testReadCyclingPedalingCadenceRecordIds() throws InterruptedException {
         List<Record> recordList =
-                Arrays.asList(
-                        getCompleteCyclingPedalingCadenceRecord(),
-                        getCompleteCyclingPedalingCadenceRecord());
+                TestUtils.insertRecords(
+                        Arrays.asList(
+                                getCompleteCyclingPedalingCadenceRecord(),
+                                getCompleteCyclingPedalingCadenceRecord()));
         readCyclingPedalingCadenceRecordUsingIds(recordList);
     }
 
@@ -593,9 +594,8 @@ public class CyclingPedalingCadenceRecordTest {
         assertThat(result.containsAll(insertedRecords)).isTrue();
     }
 
-    private void readCyclingPedalingCadenceRecordUsingIds(List<Record> recordList)
+    private void readCyclingPedalingCadenceRecordUsingIds(List<Record> insertedRecords)
             throws InterruptedException {
-        List<Record> insertedRecords = TestUtils.insertRecords(recordList);
         ReadRecordsRequestUsingIds.Builder<CyclingPedalingCadenceRecord> request =
                 new ReadRecordsRequestUsingIds.Builder<>(CyclingPedalingCadenceRecord.class);
         for (Record record : insertedRecords) {
diff --git a/tests/cts/src/android/healthconnect/cts/ExerciseRouteDisabledFeatureTest.java b/tests/cts/src/android/healthconnect/cts/ExerciseRouteDisabledFeatureTest.java
index 2c9045a6..2a7a83f6 100644
--- a/tests/cts/src/android/healthconnect/cts/ExerciseRouteDisabledFeatureTest.java
+++ b/tests/cts/src/android/healthconnect/cts/ExerciseRouteDisabledFeatureTest.java
@@ -62,15 +62,15 @@ public class ExerciseRouteDisabledFeatureTest {
     @Test
     public void testReadRoute_insertAndRead_routeIsNotAvailable() throws InterruptedException {
         List<Record> records = List.of(TestUtils.buildExerciseSession());
-        TestUtils.insertRecords(records);
+        List<Record> insertedRecords = TestUtils.insertRecords(records);
         setExerciseRouteFeatureEnabledFlag(false);
-        ExerciseSessionRecord insertedRecord = (ExerciseSessionRecord) records.get(0);
+        ExerciseSessionRecord insertedRecord = (ExerciseSessionRecord) insertedRecords.get(0);
         assertThat(insertedRecord.hasRoute()).isTrue();
         assertThat(insertedRecord.getRoute()).isNotNull();
 
         ReadRecordsRequestUsingIds.Builder<ExerciseSessionRecord> request =
                 new ReadRecordsRequestUsingIds.Builder<>(ExerciseSessionRecord.class);
-        request.addId(records.get(0).getMetadata().getId());
+        request.addId(insertedRecords.get(0).getMetadata().getId());
         ExerciseSessionRecord readRecord = TestUtils.readRecords(request.build()).get(0);
         assertThat(readRecord.hasRoute()).isFalse();
         assertThat(readRecord.getRoute()).isNull();
diff --git a/tests/cts/src/android/healthconnect/cts/GetActivityDatesTest.java b/tests/cts/src/android/healthconnect/cts/GetActivityDatesTest.java
index ff009ba8..51eb1378 100644
--- a/tests/cts/src/android/healthconnect/cts/GetActivityDatesTest.java
+++ b/tests/cts/src/android/healthconnect/cts/GetActivityDatesTest.java
@@ -84,17 +84,21 @@ public class GetActivityDatesTest {
     @Test
     public void testGetActivityDates_onUpdate() throws InterruptedException {
         List<Record> records = getTestRecords();
-        TestUtils.insertRecords(records);
+        List<Record> insertedRecords = TestUtils.insertRecords(records);
         // Wait for some time, as activity dates are updated in the background so might take some
         // additional time.
         Thread.sleep(500);
         List<LocalDate> activityDates =
                 TestUtils.getActivityDates(
-                        records.stream().map(Record::getClass).collect(Collectors.toList()));
+                        insertedRecords.stream()
+                                .map(Record::getClass)
+                                .collect(Collectors.toList()));
         assertThat(activityDates.size()).isGreaterThan(1);
         assertThat(activityDates)
                 .containsExactlyElementsIn(
-                        records.stream().map(this::getRecordDate).collect(Collectors.toSet()));
+                        insertedRecords.stream()
+                                .map(this::getRecordDate)
+                                .collect(Collectors.toSet()));
         List<Record> updatedRecords = getTestRecords();
 
         for (int itr = 0; itr < updatedRecords.size(); itr++) {
@@ -102,9 +106,12 @@ public class GetActivityDatesTest {
                     itr,
                     new StepsRecord.Builder(
                                     new Metadata.Builder()
-                                            .setId(records.get(itr).getMetadata().getId())
+                                            .setId(insertedRecords.get(itr).getMetadata().getId())
                                             .setDataOrigin(
-                                                    records.get(itr).getMetadata().getDataOrigin())
+                                                    insertedRecords
+                                                            .get(itr)
+                                                            .getMetadata()
+                                                            .getDataOrigin())
                                             .build(),
                                     Instant.now().minusSeconds(5000 + itr * 2L),
                                     Instant.now().minusSeconds(itr * 2L),
diff --git a/tests/cts/src/android/healthconnect/cts/HealthConnectChangeLogsTests.java b/tests/cts/src/android/healthconnect/cts/HealthConnectChangeLogsTests.java
index bba64988..dc7f410a 100644
--- a/tests/cts/src/android/healthconnect/cts/HealthConnectChangeLogsTests.java
+++ b/tests/cts/src/android/healthconnect/cts/HealthConnectChangeLogsTests.java
@@ -85,8 +85,7 @@ public class HealthConnectChangeLogsTests {
         assertThat(response.getUpsertedRecords().size()).isEqualTo(0);
         assertThat(response.getDeletedLogs().size()).isEqualTo(0);
 
-        List<Record> testRecord = TestUtils.getTestRecords();
-        TestUtils.insertRecords(testRecord);
+        List<Record> testRecord = TestUtils.insertRecords(TestUtils.getTestRecords());
         response = TestUtils.getChangeLogs(changeLogsRequest);
         assertThat(response.getUpsertedRecords().size()).isEqualTo(testRecord.size());
         assertThat(response.getDeletedLogs().size()).isEqualTo(0);
@@ -108,8 +107,7 @@ public class HealthConnectChangeLogsTests {
         assertThat(response.getUpsertedRecords().size()).isEqualTo(0);
         assertThat(response.getDeletedLogs().size()).isEqualTo(0);
 
-        List<Record> testRecord = TestUtils.getTestRecords();
-        TestUtils.insertRecords(testRecord);
+        TestUtils.insertRecords(TestUtils.getTestRecords());
         response = TestUtils.getChangeLogs(changeLogsRequest);
         assertThat(response.getUpsertedRecords().size()).isEqualTo(0);
         assertThat(response.getDeletedLogs().size()).isEqualTo(0);
@@ -134,8 +132,7 @@ public class HealthConnectChangeLogsTests {
         assertThat(response.getUpsertedRecords().size()).isEqualTo(0);
         assertThat(response.getDeletedLogs().size()).isEqualTo(0);
 
-        List<Record> testRecord = TestUtils.getTestRecords();
-        TestUtils.insertRecords(testRecord);
+        List<Record> testRecord = TestUtils.insertRecords(TestUtils.getTestRecords());
         response = TestUtils.getChangeLogs(changeLogsRequest);
         assertThat(response.getUpsertedRecords().size()).isEqualTo(testRecord.size());
         assertThat(response.getDeletedLogs().size()).isEqualTo(0);
@@ -159,13 +156,13 @@ public class HealthConnectChangeLogsTests {
         assertThat(response.getUpsertedRecords().size()).isEqualTo(0);
         assertThat(response.getDeletedLogs().size()).isEqualTo(0);
 
-        List<Record> testRecord = Collections.singletonList(TestUtils.getStepsRecord());
-        TestUtils.insertRecords(testRecord);
+        List<Record> testRecord =
+                TestUtils.insertRecords(Collections.singletonList(TestUtils.getStepsRecord()));
         response = TestUtils.getChangeLogs(changeLogsRequest);
         assertThat(response.getUpsertedRecords().size()).isEqualTo(1);
         assertThat(response.getDeletedLogs().size()).isEqualTo(0);
-        testRecord = Collections.singletonList(TestUtils.getHeartRateRecord());
-        TestUtils.insertRecords(testRecord);
+        testRecord =
+                TestUtils.insertRecords(Collections.singletonList(TestUtils.getHeartRateRecord()));
         response = TestUtils.getChangeLogs(changeLogsRequest);
         assertThat(response.getUpsertedRecords().size()).isEqualTo(1);
         assertThat(response.getDeletedLogs().size()).isEqualTo(0);
@@ -180,8 +177,7 @@ public class HealthConnectChangeLogsTests {
         ChangeLogsResponse response = TestUtils.getChangeLogs(changeLogsRequest);
         assertThat(response.getUpsertedRecords().size()).isEqualTo(0);
 
-        List<Record> testRecord = TestUtils.getTestRecords();
-        TestUtils.insertRecords(testRecord);
+        List<Record> testRecord = TestUtils.insertRecords(TestUtils.getTestRecords());
         TestUtils.deleteRecords(testRecord);
         response = TestUtils.getChangeLogs(changeLogsRequest);
         assertThat(response.getUpsertedRecords().size()).isEqualTo(0);
@@ -207,11 +203,11 @@ public class HealthConnectChangeLogsTests {
         assertThat(response.getUpsertedRecords().size()).isEqualTo(0);
 
         List<Record> testRecord =
-                Arrays.asList(
-                        StepsRecordTest.getStepsRecord_minusDays(45),
-                        StepsRecordTest.getStepsRecord_minusDays(20),
-                        StepsRecordTest.getStepsRecord_minusDays(5));
-        TestUtils.insertRecords(testRecord);
+                TestUtils.insertRecords(
+                        Arrays.asList(
+                                StepsRecordTest.getStepsRecord_minusDays(45),
+                                StepsRecordTest.getStepsRecord_minusDays(20),
+                                StepsRecordTest.getStepsRecord_minusDays(5)));
         response = TestUtils.getChangeLogs(changeLogsRequest);
         assertThat(response.getUpsertedRecords().size()).isEqualTo(2);
         assertThat(response.getDeletedLogs().size()).isEqualTo(0);
@@ -237,8 +233,7 @@ public class HealthConnectChangeLogsTests {
         ChangeLogsResponse response = TestUtils.getChangeLogs(changeLogsRequest);
         assertThat(response.getUpsertedRecords().size()).isEqualTo(0);
 
-        List<Record> testRecord = TestUtils.getTestRecords();
-        TestUtils.insertRecords(testRecord);
+        List<Record> testRecord = TestUtils.insertRecords(TestUtils.getTestRecords());
         TestUtils.deleteRecords(testRecord);
         response = TestUtils.getChangeLogs(changeLogsRequest);
         assertThat(response.getUpsertedRecords().size()).isEqualTo(0);
@@ -264,8 +259,7 @@ public class HealthConnectChangeLogsTests {
         ChangeLogsResponse response = TestUtils.getChangeLogs(changeLogsRequest);
         assertThat(response.getUpsertedRecords().size()).isEqualTo(0);
 
-        List<Record> testRecord = TestUtils.getTestRecords();
-        TestUtils.insertRecords(testRecord);
+        List<Record> testRecord = TestUtils.insertRecords(TestUtils.getTestRecords());
         TestUtils.deleteRecords(testRecord);
         response = TestUtils.getChangeLogs(changeLogsRequest);
         assertThat(response.getUpsertedRecords().size()).isEqualTo(0);
@@ -292,14 +286,14 @@ public class HealthConnectChangeLogsTests {
         assertThat(response.getUpsertedRecords().size()).isEqualTo(0);
         assertThat(response.getDeletedLogs().size()).isEqualTo(0);
 
-        List<Record> testRecord = Collections.singletonList(TestUtils.getStepsRecord());
-        TestUtils.insertRecords(testRecord);
+        List<Record> testRecord =
+                TestUtils.insertRecords(Collections.singletonList(TestUtils.getStepsRecord()));
         TestUtils.deleteRecords(testRecord);
         response = TestUtils.getChangeLogs(changeLogsRequest);
         assertThat(response.getUpsertedRecords().size()).isEqualTo(0);
         assertThat(response.getDeletedLogs().size()).isEqualTo(1);
-        testRecord = Collections.singletonList(TestUtils.getHeartRateRecord());
-        TestUtils.insertRecords(testRecord);
+        testRecord =
+                TestUtils.insertRecords(Collections.singletonList(TestUtils.getHeartRateRecord()));
         TestUtils.deleteRecords(testRecord);
         response = TestUtils.getChangeLogs(changeLogsRequest);
         assertThat(response.getUpsertedRecords().size()).isEqualTo(0);
@@ -360,8 +354,7 @@ public class HealthConnectChangeLogsTests {
         ChangeLogsResponse response = TestUtils.getChangeLogs(changeLogsRequest);
         assertThat(response.getUpsertedRecords().size()).isEqualTo(0);
         assertThat(response.hasMorePages()).isFalse();
-        List<Record> testRecord = TestUtils.getTestRecords();
-        TestUtils.insertRecords(testRecord);
+        List<Record> testRecord = TestUtils.insertRecords(TestUtils.getTestRecords());
         ChangeLogsResponse newResponse = TestUtils.getChangeLogs(changeLogsRequest);
         assertThat(newResponse.getUpsertedRecords().size()).isEqualTo(testRecord.size());
     }
@@ -378,8 +371,7 @@ public class HealthConnectChangeLogsTests {
         ChangeLogsResponse response = TestUtils.getChangeLogs(changeLogsRequest);
         assertThat(response.getUpsertedRecords().size()).isEqualTo(0);
         assertThat(response.hasMorePages()).isFalse();
-        List<Record> testRecord = TestUtils.getTestRecords();
-        TestUtils.insertRecords(testRecord);
+        List<Record> testRecord = TestUtils.insertRecords(TestUtils.getTestRecords());
         response = TestUtils.getChangeLogs(changeLogsRequest);
         assertThat(response.getUpsertedRecords().size()).isEqualTo(testRecord.size());
         assertThat(response.hasMorePages()).isFalse();
diff --git a/tests/cts/src/android/healthconnect/cts/HeartRateVariabilityRmssdRecordTest.java b/tests/cts/src/android/healthconnect/cts/HeartRateVariabilityRmssdRecordTest.java
index 72a0fbb9..58312da9 100644
--- a/tests/cts/src/android/healthconnect/cts/HeartRateVariabilityRmssdRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/HeartRateVariabilityRmssdRecordTest.java
@@ -82,9 +82,10 @@ public class HeartRateVariabilityRmssdRecordTest {
     @Test
     public void testReadHeartRateVariabilityRmssdRecord_usingIds() throws InterruptedException {
         List<Record> recordList =
-                Arrays.asList(
-                        getCompleteHeartRateVariabilityRmssdRecord(),
-                        getCompleteHeartRateVariabilityRmssdRecord());
+                TestUtils.insertRecords(
+                        Arrays.asList(
+                                getCompleteHeartRateVariabilityRmssdRecord(),
+                                getCompleteHeartRateVariabilityRmssdRecord()));
         readHeartRateVariabilityRmssdRecordUsingIds(recordList);
     }
 
@@ -538,9 +539,8 @@ public class HeartRateVariabilityRmssdRecordTest {
         assertThat(result).containsExactlyElementsIn(insertedRecord);
     }
 
-    private void readHeartRateVariabilityRmssdRecordUsingIds(List<Record> recordList)
+    private void readHeartRateVariabilityRmssdRecordUsingIds(List<Record> insertedRecords)
             throws InterruptedException {
-        List<Record> insertedRecords = TestUtils.insertRecords(recordList);
         ReadRecordsRequestUsingIds.Builder<HeartRateVariabilityRmssdRecord> request =
                 new ReadRecordsRequestUsingIds.Builder<>(HeartRateVariabilityRmssdRecord.class);
         for (Record record : insertedRecords) {
diff --git a/tests/cts/src/android/healthconnect/cts/IntermenstrualBleedingRecordTest.java b/tests/cts/src/android/healthconnect/cts/IntermenstrualBleedingRecordTest.java
index f706f88a..b3a7f200 100644
--- a/tests/cts/src/android/healthconnect/cts/IntermenstrualBleedingRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/IntermenstrualBleedingRecordTest.java
@@ -82,9 +82,10 @@ public class IntermenstrualBleedingRecordTest {
     @Test
     public void testReadIntermenstrualBleedingRecord_usingIds() throws InterruptedException {
         List<Record> recordList =
-                Arrays.asList(
-                        getCompleteIntermenstrualBleedingRecord(),
-                        getCompleteIntermenstrualBleedingRecord());
+                TestUtils.insertRecords(
+                        Arrays.asList(
+                                getCompleteIntermenstrualBleedingRecord(),
+                                getCompleteIntermenstrualBleedingRecord()));
         readIntermenstrualBleedingRecordUsingIds(recordList);
     }
 
@@ -528,9 +529,8 @@ public class IntermenstrualBleedingRecordTest {
         readIntermenstrualBleedingRecordUsingIds(insertedRecords);
     }
 
-    private void readIntermenstrualBleedingRecordUsingIds(List<Record> recordList)
+    private void readIntermenstrualBleedingRecordUsingIds(List<Record> insertedRecords)
             throws InterruptedException {
-        List<Record> insertedRecords = TestUtils.insertRecords(recordList);
         ReadRecordsRequestUsingIds.Builder<IntermenstrualBleedingRecord> request =
                 new ReadRecordsRequestUsingIds.Builder<>(IntermenstrualBleedingRecord.class);
         for (Record record : insertedRecords) {
diff --git a/tests/cts/src/android/healthconnect/cts/MenstruationPeriodRecordTest.java b/tests/cts/src/android/healthconnect/cts/MenstruationPeriodRecordTest.java
index f87fd26c..5379cb27 100644
--- a/tests/cts/src/android/healthconnect/cts/MenstruationPeriodRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/MenstruationPeriodRecordTest.java
@@ -81,9 +81,10 @@ public class MenstruationPeriodRecordTest {
     @Test
     public void testReadMenstruationPeriodRecord_usingIds() throws InterruptedException {
         List<Record> recordList =
-                Arrays.asList(
-                        getCompleteMenstruationPeriodRecord(),
-                        getCompleteMenstruationPeriodRecord());
+                TestUtils.insertRecords(
+                        Arrays.asList(
+                                getCompleteMenstruationPeriodRecord(),
+                                getCompleteMenstruationPeriodRecord()));
         readMenstruationPeriodRecordUsingIds(recordList);
     }
 
@@ -525,9 +526,8 @@ public class MenstruationPeriodRecordTest {
         assertThat(result).containsExactlyElementsIn(insertedRecord);
     }
 
-    private void readMenstruationPeriodRecordUsingIds(List<Record> recordList)
+    private void readMenstruationPeriodRecordUsingIds(List<Record> insertedRecords)
             throws InterruptedException {
-        List<Record> insertedRecords = TestUtils.insertRecords(recordList);
         ReadRecordsRequestUsingIds.Builder<MenstruationPeriodRecord> request =
                 new ReadRecordsRequestUsingIds.Builder<>(MenstruationPeriodRecord.class);
         for (Record record : insertedRecords) {
diff --git a/tests/cts/src/android/healthconnect/cts/PowerRecordTest.java b/tests/cts/src/android/healthconnect/cts/PowerRecordTest.java
index 1d7936ba..65eeb615 100644
--- a/tests/cts/src/android/healthconnect/cts/PowerRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/PowerRecordTest.java
@@ -496,7 +496,9 @@ public class PowerRecordTest {
     }
 
     private void testReadPowerRecordIds() throws InterruptedException {
-        List<Record> recordList = Arrays.asList(getCompletePowerRecord(), getCompletePowerRecord());
+        List<Record> recordList =
+                TestUtils.insertRecords(
+                        Arrays.asList(getCompletePowerRecord(), getCompletePowerRecord()));
         readPowerRecordUsingIds(recordList);
     }
 
@@ -512,8 +514,7 @@ public class PowerRecordTest {
         assertThat(result).containsExactlyElementsIn(insertedRecord);
     }
 
-    private void readPowerRecordUsingIds(List<Record> recordList) throws InterruptedException {
-        List<Record> insertedRecords = TestUtils.insertRecords(recordList);
+    private void readPowerRecordUsingIds(List<Record> insertedRecords) throws InterruptedException {
         ReadRecordsRequestUsingIds.Builder<PowerRecord> request =
                 new ReadRecordsRequestUsingIds.Builder<>(PowerRecord.class);
         for (Record record : insertedRecords) {
diff --git a/tests/cts/src/android/healthconnect/cts/SessionDatatypeDisabledFeatureTest.java b/tests/cts/src/android/healthconnect/cts/SessionDatatypeDisabledFeatureTest.java
index cfe1f155..d736c901 100644
--- a/tests/cts/src/android/healthconnect/cts/SessionDatatypeDisabledFeatureTest.java
+++ b/tests/cts/src/android/healthconnect/cts/SessionDatatypeDisabledFeatureTest.java
@@ -74,11 +74,11 @@ public class SessionDatatypeDisabledFeatureTest {
     public void testReadExerciseSession_insertAndRead_sessionIsNotAvailable()
             throws InterruptedException {
         List<Record> records = List.of(TestUtils.buildExerciseSession());
-        TestUtils.insertRecords(records);
+        List<Record> insertedRecords = TestUtils.insertRecords(records);
         setSessionDatatypesFeatureEnabledFlag(false);
         ReadRecordsRequestUsingIds.Builder<ExerciseSessionRecord> request =
                 new ReadRecordsRequestUsingIds.Builder<>(ExerciseSessionRecord.class);
-        request.addId(records.get(0).getMetadata().getId());
+        request.addId(insertedRecords.get(0).getMetadata().getId());
         List<ExerciseSessionRecord> readRecords = TestUtils.readRecords(request.build());
         assertThat(readRecords).isEmpty();
     }
@@ -101,12 +101,12 @@ public class SessionDatatypeDisabledFeatureTest {
     public void testReadSleepSession_insertAndRead_sessionIsNotAvailable()
             throws InterruptedException {
         List<Record> records = List.of(TestUtils.buildSleepSession());
-        TestUtils.insertRecords(records);
+        List<Record> insertedRecords = TestUtils.insertRecords(records);
         setSessionDatatypesFeatureEnabledFlag(false);
 
         ReadRecordsRequestUsingIds.Builder<SleepSessionRecord> request =
                 new ReadRecordsRequestUsingIds.Builder<>(SleepSessionRecord.class);
-        request.addId(records.get(0).getMetadata().getId());
+        request.addId(insertedRecords.get(0).getMetadata().getId());
         List<SleepSessionRecord> readRecords = TestUtils.readRecords(request.build());
         assertThat(readRecords).isEmpty();
     }
diff --git a/tests/cts/src/android/healthconnect/cts/StepsCadenceRecordTest.java b/tests/cts/src/android/healthconnect/cts/StepsCadenceRecordTest.java
index 6e0bffab..8afe4e12 100644
--- a/tests/cts/src/android/healthconnect/cts/StepsCadenceRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/StepsCadenceRecordTest.java
@@ -484,7 +484,9 @@ public class StepsCadenceRecordTest {
 
     private void testReadStepsCadenceRecordIds() throws InterruptedException {
         List<Record> recordList =
-                Arrays.asList(getCompleteStepsCadenceRecord(), getCompleteStepsCadenceRecord());
+                TestUtils.insertRecords(
+                        Arrays.asList(
+                                getCompleteStepsCadenceRecord(), getCompleteStepsCadenceRecord()));
         readStepsCadenceRecordUsingIds(recordList);
     }
 
@@ -500,9 +502,8 @@ public class StepsCadenceRecordTest {
         assertThat(result).containsExactlyElementsIn(insertedRecord);
     }
 
-    private void readStepsCadenceRecordUsingIds(List<Record> recordList)
+    private void readStepsCadenceRecordUsingIds(List<Record> insertedRecords)
             throws InterruptedException {
-        List<Record> insertedRecords = TestUtils.insertRecords(recordList);
         ReadRecordsRequestUsingIds.Builder<StepsCadenceRecord> request =
                 new ReadRecordsRequestUsingIds.Builder<>(StepsCadenceRecord.class);
         for (Record record : insertedRecords) {
diff --git a/tests/cts/src/android/healthconnect/cts/TotalCaloriesBurnedRecordTest.java b/tests/cts/src/android/healthconnect/cts/TotalCaloriesBurnedRecordTest.java
index abefafb0..61981e92 100644
--- a/tests/cts/src/android/healthconnect/cts/TotalCaloriesBurnedRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/TotalCaloriesBurnedRecordTest.java
@@ -93,9 +93,10 @@ public class TotalCaloriesBurnedRecordTest {
     @Test
     public void testReadTotalCaloriesBurnedRecord_usingIds() throws InterruptedException {
         List<Record> recordList =
-                Arrays.asList(
-                        getCompleteTotalCaloriesBurnedRecord(),
-                        getCompleteTotalCaloriesBurnedRecord());
+                TestUtils.insertRecords(
+                        Arrays.asList(
+                                getCompleteTotalCaloriesBurnedRecord(),
+                                getCompleteTotalCaloriesBurnedRecord()));
         readTotalCaloriesBurnedRecordUsingIds(recordList);
     }
 
@@ -462,9 +463,8 @@ public class TotalCaloriesBurnedRecordTest {
         assertThat(result).containsExactlyElementsIn(insertedRecord);
     }
 
-    private void readTotalCaloriesBurnedRecordUsingIds(List<Record> recordList)
+    private void readTotalCaloriesBurnedRecordUsingIds(List<Record> insertedRecords)
             throws InterruptedException {
-        List<Record> insertedRecords = TestUtils.insertRecords(recordList);
         ReadRecordsRequestUsingIds.Builder<TotalCaloriesBurnedRecord> request =
                 new ReadRecordsRequestUsingIds.Builder<>(TotalCaloriesBurnedRecord.class);
         for (Record record : insertedRecords) {
diff --git a/tests/cts/src/android/healthconnect/cts/WheelchairPushesRecordTest.java b/tests/cts/src/android/healthconnect/cts/WheelchairPushesRecordTest.java
index 64885b94..e31b8c49 100644
--- a/tests/cts/src/android/healthconnect/cts/WheelchairPushesRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/WheelchairPushesRecordTest.java
@@ -89,8 +89,10 @@ public class WheelchairPushesRecordTest {
     @Test
     public void testReadWheelchairPushesRecord_usingIds() throws InterruptedException {
         List<Record> recordList =
-                Arrays.asList(
-                        getCompleteWheelchairPushesRecord(), getCompleteWheelchairPushesRecord());
+                TestUtils.insertRecords(
+                        Arrays.asList(
+                                getCompleteWheelchairPushesRecord(),
+                                getCompleteWheelchairPushesRecord()));
         readWheelchairPushesRecordUsingIds(recordList);
     }
 
@@ -456,9 +458,8 @@ public class WheelchairPushesRecordTest {
         assertThat(result).containsExactlyElementsIn(insertedRecord);
     }
 
-    private void readWheelchairPushesRecordUsingIds(List<Record> recordList)
+    private void readWheelchairPushesRecordUsingIds(List<Record> records)
             throws InterruptedException {
-        List<Record> records = TestUtils.insertRecords(recordList);
         ReadRecordsRequestUsingIds.Builder<WheelchairPushesRecord> request =
                 new ReadRecordsRequestUsingIds.Builder<>(WheelchairPushesRecord.class);
         for (Record record : records) {