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)

tests/cts/src/android/healthconnect/cts/BodyWaterMassRecordTest.java

diff --git a/tests/cts/src/android/healthconnect/cts/BodyWaterMassRecordTest.java b/tests/cts/src/android/healthconnect/cts/BodyWaterMassRecordTest.java
index 3fd8dd2..34134a4 100644
--- a/tests/cts/src/android/healthconnect/cts/BodyWaterMassRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/BodyWaterMassRecordTest.java
@@ -88,7 +88,10 @@
     @Test
     public void testReadBodyWaterMassRecord_usingIds() throws InterruptedException {
         List<Record> recordList =
-                Arrays.asList(getCompleteBodyWaterMassRecord(), getCompleteBodyWaterMassRecord());
+                TestUtils.insertRecords(
+                        Arrays.asList(
+                                getCompleteBodyWaterMassRecord(),
+                                getCompleteBodyWaterMassRecord()));
         readBodyWaterMassRecordUsingIds(recordList);
     }
 
@@ -509,9 +512,8 @@
         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) {

tests/cts/src/android/healthconnect/cts/CyclingPedalingCadenceRecordTest.java

diff --git a/tests/cts/src/android/healthconnect/cts/CyclingPedalingCadenceRecordTest.java b/tests/cts/src/android/healthconnect/cts/CyclingPedalingCadenceRecordTest.java
index 7863425..acd0d6b 100644
--- a/tests/cts/src/android/healthconnect/cts/CyclingPedalingCadenceRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/CyclingPedalingCadenceRecordTest.java
@@ -525,9 +525,10 @@
 
     private void testReadCyclingPedalingCadenceRecordIds() throws InterruptedException {
         List<Record> recordList =
-                Arrays.asList(
-                        getCompleteCyclingPedalingCadenceRecord(),
-                        getCompleteCyclingPedalingCadenceRecord());
+                TestUtils.insertRecords(
+                        Arrays.asList(
+                                getCompleteCyclingPedalingCadenceRecord(),
+                                getCompleteCyclingPedalingCadenceRecord()));
         readCyclingPedalingCadenceRecordUsingIds(recordList);
     }
 
@@ -542,9 +543,8 @@
         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) {

tests/cts/src/android/healthconnect/cts/ExerciseRouteDisabledFeatureTest.java

diff --git a/tests/cts/src/android/healthconnect/cts/ExerciseRouteDisabledFeatureTest.java b/tests/cts/src/android/healthconnect/cts/ExerciseRouteDisabledFeatureTest.java
index b124432..33147b4 100644
--- a/tests/cts/src/android/healthconnect/cts/ExerciseRouteDisabledFeatureTest.java
+++ b/tests/cts/src/android/healthconnect/cts/ExerciseRouteDisabledFeatureTest.java
@@ -69,15 +69,15 @@
     @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();

tests/cts/src/android/healthconnect/cts/GetActivityDatesTest.java

diff --git a/tests/cts/src/android/healthconnect/cts/GetActivityDatesTest.java b/tests/cts/src/android/healthconnect/cts/GetActivityDatesTest.java
index b5d1117..426c009 100644
--- a/tests/cts/src/android/healthconnect/cts/GetActivityDatesTest.java
+++ b/tests/cts/src/android/healthconnect/cts/GetActivityDatesTest.java
@@ -83,17 +83,21 @@
     @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++) {
@@ -101,9 +105,12 @@
                     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),

tests/cts/src/android/healthconnect/cts/HealthConnectChangeLogsTests.java

diff --git a/tests/cts/src/android/healthconnect/cts/HealthConnectChangeLogsTests.java b/tests/cts/src/android/healthconnect/cts/HealthConnectChangeLogsTests.java
index 71e38ef..30eaece 100644
--- a/tests/cts/src/android/healthconnect/cts/HealthConnectChangeLogsTests.java
+++ b/tests/cts/src/android/healthconnect/cts/HealthConnectChangeLogsTests.java
@@ -223,8 +223,7 @@
         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);
@@ -250,8 +249,7 @@
         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);
@@ -278,14 +276,14 @@
         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);
@@ -301,8 +299,7 @@
         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());
         response = TestUtils.getChangeLogs(changeLogsRequest);
         assertThat(response.getUpsertedRecords().size()).isEqualTo(1);
     }
@@ -317,8 +314,7 @@
         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.hasMorePages()).isTrue();
         assertThat(response.getUpsertedRecords().size()).isEqualTo(1);
@@ -346,8 +342,7 @@
         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());
     }
@@ -364,8 +359,7 @@
         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();

tests/cts/src/android/healthconnect/cts/HeartRateVariabilityRmssdRecordTest.java

diff --git a/tests/cts/src/android/healthconnect/cts/HeartRateVariabilityRmssdRecordTest.java b/tests/cts/src/android/healthconnect/cts/HeartRateVariabilityRmssdRecordTest.java
index 1881fd6..639a185 100644
--- a/tests/cts/src/android/healthconnect/cts/HeartRateVariabilityRmssdRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/HeartRateVariabilityRmssdRecordTest.java
@@ -89,9 +89,10 @@
     @Test
     public void testReadHeartRateVariabilityRmssdRecord_usingIds() throws InterruptedException {
         List<Record> recordList =
-                Arrays.asList(
-                        getCompleteHeartRateVariabilityRmssdRecord(),
-                        getCompleteHeartRateVariabilityRmssdRecord());
+                TestUtils.insertRecords(
+                        Arrays.asList(
+                                getCompleteHeartRateVariabilityRmssdRecord(),
+                                getCompleteHeartRateVariabilityRmssdRecord()));
         readHeartRateVariabilityRmssdRecordUsingIds(recordList);
     }
 
@@ -552,9 +553,8 @@
         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) {

tests/cts/src/android/healthconnect/cts/IntermenstrualBleedingRecordTest.java

diff --git a/tests/cts/src/android/healthconnect/cts/IntermenstrualBleedingRecordTest.java b/tests/cts/src/android/healthconnect/cts/IntermenstrualBleedingRecordTest.java
index 58cbbdd..9e75bf3 100644
--- a/tests/cts/src/android/healthconnect/cts/IntermenstrualBleedingRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/IntermenstrualBleedingRecordTest.java
@@ -89,9 +89,10 @@
     @Test
     public void testReadIntermenstrualBleedingRecord_usingIds() throws InterruptedException {
         List<Record> recordList =
-                Arrays.asList(
-                        getCompleteIntermenstrualBleedingRecord(),
-                        getCompleteIntermenstrualBleedingRecord());
+                TestUtils.insertRecords(
+                        Arrays.asList(
+                                getCompleteIntermenstrualBleedingRecord(),
+                                getCompleteIntermenstrualBleedingRecord()));
         readIntermenstrualBleedingRecordUsingIds(recordList);
     }
 
@@ -541,9 +542,8 @@
         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) {

tests/cts/src/android/healthconnect/cts/MenstruationPeriodRecordTest.java

diff --git a/tests/cts/src/android/healthconnect/cts/MenstruationPeriodRecordTest.java b/tests/cts/src/android/healthconnect/cts/MenstruationPeriodRecordTest.java
index 175acd3..d3dbaf9 100644
--- a/tests/cts/src/android/healthconnect/cts/MenstruationPeriodRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/MenstruationPeriodRecordTest.java
@@ -88,9 +88,10 @@
     @Test
     public void testReadMenstruationPeriodRecord_usingIds() throws InterruptedException {
         List<Record> recordList =
-                Arrays.asList(
-                        getCompleteMenstruationPeriodRecord(),
-                        getCompleteMenstruationPeriodRecord());
+                TestUtils.insertRecords(
+                        Arrays.asList(
+                                getCompleteMenstruationPeriodRecord(),
+                                getCompleteMenstruationPeriodRecord()));
         readMenstruationPeriodRecordUsingIds(recordList);
     }
 
@@ -543,9 +544,8 @@
         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) {

tests/cts/src/android/healthconnect/cts/PowerRecordTest.java

diff --git a/tests/cts/src/android/healthconnect/cts/PowerRecordTest.java b/tests/cts/src/android/healthconnect/cts/PowerRecordTest.java
index ce1b018..72f6360 100644
--- a/tests/cts/src/android/healthconnect/cts/PowerRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/PowerRecordTest.java
@@ -497,7 +497,9 @@
     }
 
     private void testReadPowerRecordIds() throws InterruptedException {
-        List<Record> recordList = Arrays.asList(getCompletePowerRecord(), getCompletePowerRecord());
+        List<Record> recordList =
+                TestUtils.insertRecords(
+                        Arrays.asList(getCompletePowerRecord(), getCompletePowerRecord()));
         readPowerRecordUsingIds(recordList);
     }
 
@@ -513,8 +515,7 @@
         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) {

tests/cts/src/android/healthconnect/cts/SessionDatatypeDisabledFeatureTest.java

diff --git a/tests/cts/src/android/healthconnect/cts/SessionDatatypeDisabledFeatureTest.java b/tests/cts/src/android/healthconnect/cts/SessionDatatypeDisabledFeatureTest.java
index 76662da..2847125 100644
--- a/tests/cts/src/android/healthconnect/cts/SessionDatatypeDisabledFeatureTest.java
+++ b/tests/cts/src/android/healthconnect/cts/SessionDatatypeDisabledFeatureTest.java
@@ -81,11 +81,11 @@
     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();
     }
@@ -108,12 +108,12 @@
     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();
     }

tests/cts/src/android/healthconnect/cts/StepsCadenceRecordTest.java

diff --git a/tests/cts/src/android/healthconnect/cts/StepsCadenceRecordTest.java b/tests/cts/src/android/healthconnect/cts/StepsCadenceRecordTest.java
index d885801..f5b33d5 100644
--- a/tests/cts/src/android/healthconnect/cts/StepsCadenceRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/StepsCadenceRecordTest.java
@@ -473,7 +473,9 @@
 
     private void testReadStepsCadenceRecordIds() throws InterruptedException {
         List<Record> recordList =
-                Arrays.asList(getCompleteStepsCadenceRecord(), getCompleteStepsCadenceRecord());
+                TestUtils.insertRecords(
+                        Arrays.asList(
+                                getCompleteStepsCadenceRecord(), getCompleteStepsCadenceRecord()));
         readStepsCadenceRecordUsingIds(recordList);
     }
 
@@ -489,9 +491,8 @@
         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) {

tests/cts/src/android/healthconnect/cts/TotalCaloriesBurnedRecordTest.java

diff --git a/tests/cts/src/android/healthconnect/cts/TotalCaloriesBurnedRecordTest.java b/tests/cts/src/android/healthconnect/cts/TotalCaloriesBurnedRecordTest.java
index c414c90..caaff68 100644
--- a/tests/cts/src/android/healthconnect/cts/TotalCaloriesBurnedRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/TotalCaloriesBurnedRecordTest.java
@@ -94,9 +94,10 @@
     @Test
     public void testReadTotalCaloriesBurnedRecord_usingIds() throws InterruptedException {
         List<Record> recordList =
-                Arrays.asList(
-                        getCompleteTotalCaloriesBurnedRecord(),
-                        getCompleteTotalCaloriesBurnedRecord());
+                TestUtils.insertRecords(
+                        Arrays.asList(
+                                getCompleteTotalCaloriesBurnedRecord(),
+                                getCompleteTotalCaloriesBurnedRecord()));
         readTotalCaloriesBurnedRecordUsingIds(recordList);
     }
 
@@ -463,9 +464,8 @@
         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) {

tests/cts/src/android/healthconnect/cts/WheelchairPushesRecordTest.java

diff --git a/tests/cts/src/android/healthconnect/cts/WheelchairPushesRecordTest.java b/tests/cts/src/android/healthconnect/cts/WheelchairPushesRecordTest.java
index 3e49aaf..ce5ba0c 100644
--- a/tests/cts/src/android/healthconnect/cts/WheelchairPushesRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/WheelchairPushesRecordTest.java
@@ -90,8 +90,10 @@
     @Test
     public void testReadWheelchairPushesRecord_usingIds() throws InterruptedException {
         List<Record> recordList =
-                Arrays.asList(
-                        getCompleteWheelchairPushesRecord(), getCompleteWheelchairPushesRecord());
+                TestUtils.insertRecords(
+                        Arrays.asList(
+                                getCompleteWheelchairPushesRecord(),
+                                getCompleteWheelchairPushesRecord()));
         readWheelchairPushesRecordUsingIds(recordList);
     }
 
@@ -457,9 +459,8 @@
         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) {