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
(cherry picked from commit 479f2d891d0b77d7cf94a1895bbc7a4a189c84d0)
(cherry picked from https://android-review.googlesource.com/q/commit:0a2aef6f97a1ac939c79467657ed694af03c2d07)
Merged-In: I5d28dcf6e83d0f24e2c2b63948641ff597d3b81d
Change-Id: I5d28dcf6e83d0f24e2c2b63948641ff597d3b81d
diff --git a/tests/cts/src/android/healthconnect/cts/ActiveCaloriesBurnedRecordTest.java b/tests/cts/src/android/healthconnect/cts/ActiveCaloriesBurnedRecordTest.java
index eecd084..cf93ad7 100644
--- a/tests/cts/src/android/healthconnect/cts/ActiveCaloriesBurnedRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/ActiveCaloriesBurnedRecordTest.java
@@ -153,8 +153,9 @@
new ReadRecordsRequestUsingFilters.Builder<>(
ActiveCaloriesBurnedRecord.class)
.build());
- ActiveCaloriesBurnedRecord testRecord = getCompleteActiveCaloriesBurnedRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+ ActiveCaloriesBurnedRecord testRecord =
+ (ActiveCaloriesBurnedRecord)
+ TestUtils.insertRecord(getCompleteActiveCaloriesBurnedRecord());
List<ActiveCaloriesBurnedRecord> newActiveCaloriesBurnedRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(
@@ -177,8 +178,10 @@
.setStartTime(Instant.now())
.setEndTime(Instant.now().plusMillis(3000))
.build();
- ActiveCaloriesBurnedRecord testRecord = getCompleteActiveCaloriesBurnedRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+
+ ActiveCaloriesBurnedRecord testRecord =
+ (ActiveCaloriesBurnedRecord)
+ TestUtils.insertRecord(getCompleteActiveCaloriesBurnedRecord());
List<ActiveCaloriesBurnedRecord> newActiveCaloriesBurnedRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(
@@ -206,8 +209,9 @@
.setPackageName(context.getPackageName())
.build())
.build());
- ActiveCaloriesBurnedRecord testRecord = getCompleteActiveCaloriesBurnedRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+ ActiveCaloriesBurnedRecord testRecord =
+ (ActiveCaloriesBurnedRecord)
+ TestUtils.insertRecord(getCompleteActiveCaloriesBurnedRecord());
List<ActiveCaloriesBurnedRecord> newActiveCaloriesBurnedRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(
@@ -269,9 +273,9 @@
List.of(
getBaseActiveCaloriesBurnedRecord(),
getCompleteActiveCaloriesBurnedRecord());
- TestUtils.insertRecords(records);
+ List<Record> insertedRecords = TestUtils.insertRecords(records);
- for (Record record : records) {
+ for (Record record : insertedRecords) {
TestUtils.verifyDeleteRecords(
new DeleteUsingFiltersRequest.Builder()
.addRecordType(record.getClass())
@@ -309,12 +313,12 @@
@Test
public void testDeleteActiveCaloriesBurnedRecord_usingIds() throws InterruptedException {
List<Record> records =
- List.of(
- getBaseActiveCaloriesBurnedRecord(),
- getCompleteActiveCaloriesBurnedRecord());
- List<Record> insertedRecord = TestUtils.insertRecords(records);
+ TestUtils.insertRecords(
+ List.of(
+ getBaseActiveCaloriesBurnedRecord(),
+ getCompleteActiveCaloriesBurnedRecord()));
List<RecordIdFilter> recordIds = new ArrayList<>(records.size());
- for (Record record : insertedRecord) {
+ for (Record record : records) {
recordIds.add(RecordIdFilter.fromId(record.getClass(), record.getMetadata().getId()));
}
@@ -545,8 +549,8 @@
assertThat(response.getDeletedLogs().size()).isEqualTo(0);
List<Record> testRecord =
- Collections.singletonList(getCompleteActiveCaloriesBurnedRecord());
- TestUtils.insertRecords(testRecord);
+ TestUtils.insertRecords(
+ Collections.singletonList(getCompleteActiveCaloriesBurnedRecord()));
response = TestUtils.getChangeLogs(changeLogsRequest);
assertThat(response.getUpsertedRecords().size()).isEqualTo(1);
assertThat(
diff --git a/tests/cts/src/android/healthconnect/cts/BasalBodyTemperatureRecordTest.java b/tests/cts/src/android/healthconnect/cts/BasalBodyTemperatureRecordTest.java
index 2aefe73..a485021 100644
--- a/tests/cts/src/android/healthconnect/cts/BasalBodyTemperatureRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/BasalBodyTemperatureRecordTest.java
@@ -139,8 +139,10 @@
new ReadRecordsRequestUsingFilters.Builder<>(
BasalBodyTemperatureRecord.class)
.build());
- BasalBodyTemperatureRecord testRecord = getCompleteBasalBodyTemperatureRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+ List<Record> records =
+ TestUtils.insertRecords(
+ Collections.singletonList(getCompleteBasalBodyTemperatureRecord()));
+ BasalBodyTemperatureRecord testRecord = (BasalBodyTemperatureRecord) records.get(0);
List<BasalBodyTemperatureRecord> newBasalBodyTemperatureRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(
@@ -163,8 +165,9 @@
.setStartTime(Instant.now())
.setEndTime(Instant.now().plusMillis(3000))
.build();
- BasalBodyTemperatureRecord testRecord = getCompleteBasalBodyTemperatureRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+ BasalBodyTemperatureRecord testRecord =
+ (BasalBodyTemperatureRecord)
+ TestUtils.insertRecord(getCompleteBasalBodyTemperatureRecord());
List<BasalBodyTemperatureRecord> newBasalBodyTemperatureRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(
@@ -192,8 +195,10 @@
.setPackageName(context.getPackageName())
.build())
.build());
- BasalBodyTemperatureRecord testRecord = getCompleteBasalBodyTemperatureRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+
+ BasalBodyTemperatureRecord testRecord =
+ (BasalBodyTemperatureRecord)
+ TestUtils.insertRecord(getCompleteBasalBodyTemperatureRecord());
List<BasalBodyTemperatureRecord> newBasalBodyTemperatureRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(
@@ -420,10 +425,10 @@
public void testDeleteBasalBodyTemperatureRecord_recordId_filters()
throws InterruptedException {
List<Record> records =
- List.of(
- getBaseBasalBodyTemperatureRecord(),
- getCompleteBasalBodyTemperatureRecord());
- TestUtils.insertRecords(records);
+ TestUtils.insertRecords(
+ List.of(
+ getBaseBasalBodyTemperatureRecord(),
+ getCompleteBasalBodyTemperatureRecord()));
for (Record record : records) {
TestUtils.verifyDeleteRecords(
@@ -463,12 +468,12 @@
@Test
public void testDeleteBasalBodyTemperatureRecord_usingIds() throws InterruptedException {
List<Record> records =
- List.of(
- getBaseBasalBodyTemperatureRecord(),
- getCompleteBasalBodyTemperatureRecord());
- List<Record> insertedRecord = TestUtils.insertRecords(records);
+ TestUtils.insertRecords(
+ List.of(
+ getBaseBasalBodyTemperatureRecord(),
+ getCompleteBasalBodyTemperatureRecord()));
List<RecordIdFilter> recordIds = new ArrayList<>(records.size());
- for (Record record : insertedRecord) {
+ for (Record record : records) {
recordIds.add(RecordIdFilter.fromId(record.getClass(), record.getMetadata().getId()));
}
@@ -509,8 +514,8 @@
assertThat(response.getDeletedLogs().size()).isEqualTo(0);
List<Record> testRecord =
- Collections.singletonList(getCompleteBasalBodyTemperatureRecord());
- TestUtils.insertRecords(testRecord);
+ TestUtils.insertRecords(
+ Collections.singletonList(getCompleteBasalBodyTemperatureRecord()));
response = TestUtils.getChangeLogs(changeLogsRequest);
assertThat(response.getUpsertedRecords().size()).isEqualTo(1);
assertThat(
diff --git a/tests/cts/src/android/healthconnect/cts/BasalMetabolicRateRecordTest.java b/tests/cts/src/android/healthconnect/cts/BasalMetabolicRateRecordTest.java
index eb97dc2..0a7f971 100644
--- a/tests/cts/src/android/healthconnect/cts/BasalMetabolicRateRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/BasalMetabolicRateRecordTest.java
@@ -145,8 +145,9 @@
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BasalMetabolicRateRecord.class)
.build());
- BasalMetabolicRateRecord testRecord = getCompleteBasalMetabolicRateRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+ BasalMetabolicRateRecord testRecord =
+ (BasalMetabolicRateRecord)
+ TestUtils.insertRecord(getCompleteBasalMetabolicRateRecord());
List<BasalMetabolicRateRecord> newBasalMetabolicRateRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BasalMetabolicRateRecord.class)
@@ -168,8 +169,9 @@
.setStartTime(Instant.now().minus(1, ChronoUnit.DAYS))
.setEndTime(Instant.now().plusMillis(3000))
.build();
- BasalMetabolicRateRecord testRecord = getCompleteBasalMetabolicRateRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+ BasalMetabolicRateRecord testRecord =
+ (BasalMetabolicRateRecord)
+ TestUtils.insertRecord(getCompleteBasalMetabolicRateRecord());
List<BasalMetabolicRateRecord> newBasalMetabolicRateRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BasalMetabolicRateRecord.class)
@@ -195,8 +197,9 @@
.setPackageName(context.getPackageName())
.build())
.build());
- BasalMetabolicRateRecord testRecord = getCompleteBasalMetabolicRateRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+ BasalMetabolicRateRecord testRecord =
+ (BasalMetabolicRateRecord)
+ TestUtils.insertRecord(getCompleteBasalMetabolicRateRecord());
List<BasalMetabolicRateRecord> newBasalMetabolicRateRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BasalMetabolicRateRecord.class)
@@ -252,8 +255,10 @@
@Test
public void testDeleteBasalMetabolicRateRecord_recordId_filters() throws InterruptedException {
List<Record> records =
- List.of(getBaseBasalMetabolicRateRecord(), getCompleteBasalMetabolicRateRecord());
- TestUtils.insertRecords(records);
+ TestUtils.insertRecords(
+ List.of(
+ getBaseBasalMetabolicRateRecord(),
+ getCompleteBasalMetabolicRateRecord()));
for (Record record : records) {
TestUtils.verifyDeleteRecords(
@@ -293,10 +298,12 @@
@Test
public void testDeleteBasalMetabolicRateRecord_usingIds() throws InterruptedException {
List<Record> records =
- List.of(getBaseBasalMetabolicRateRecord(), getCompleteBasalMetabolicRateRecord());
- List<Record> insertedRecord = TestUtils.insertRecords(records);
+ TestUtils.insertRecords(
+ List.of(
+ getBaseBasalMetabolicRateRecord(),
+ getCompleteBasalMetabolicRateRecord()));
List<RecordIdFilter> recordIds = new ArrayList<>(records.size());
- for (Record record : insertedRecord) {
+ for (Record record : records) {
recordIds.add(RecordIdFilter.fromId(record.getClass(), record.getMetadata().getId()));
}
@@ -1131,8 +1138,9 @@
assertThat(response.getUpsertedRecords().size()).isEqualTo(0);
assertThat(response.getDeletedLogs().size()).isEqualTo(0);
- List<Record> testRecord = Collections.singletonList(getCompleteBasalMetabolicRateRecord());
- TestUtils.insertRecords(testRecord);
+ List<Record> testRecord =
+ TestUtils.insertRecords(
+ Collections.singletonList(getCompleteBasalMetabolicRateRecord()));
response = TestUtils.getChangeLogs(changeLogsRequest);
assertThat(response.getUpsertedRecords().size()).isEqualTo(1);
assertThat(
diff --git a/tests/cts/src/android/healthconnect/cts/BloodGlucoseRecordTest.java b/tests/cts/src/android/healthconnect/cts/BloodGlucoseRecordTest.java
index d4e58e0..23dd461 100644
--- a/tests/cts/src/android/healthconnect/cts/BloodGlucoseRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/BloodGlucoseRecordTest.java
@@ -119,8 +119,8 @@
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BloodGlucoseRecord.class)
.build());
- BloodGlucoseRecord testRecord = getCompleteBloodGlucoseRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+ BloodGlucoseRecord testRecord =
+ (BloodGlucoseRecord) TestUtils.insertRecord(getCompleteBloodGlucoseRecord());
List<BloodGlucoseRecord> newBloodGlucoseRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BloodGlucoseRecord.class)
@@ -137,8 +137,8 @@
.setStartTime(Instant.now())
.setEndTime(Instant.now().plusMillis(3000))
.build();
- BloodGlucoseRecord testRecord = getCompleteBloodGlucoseRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+ BloodGlucoseRecord testRecord =
+ (BloodGlucoseRecord) TestUtils.insertRecord(getCompleteBloodGlucoseRecord());
List<BloodGlucoseRecord> newBloodGlucoseRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BloodGlucoseRecord.class)
@@ -161,8 +161,8 @@
.setPackageName(context.getPackageName())
.build())
.build());
- BloodGlucoseRecord testRecord = getCompleteBloodGlucoseRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+ BloodGlucoseRecord insertedRecord =
+ (BloodGlucoseRecord) TestUtils.insertRecord(getCompleteBloodGlucoseRecord());
List<BloodGlucoseRecord> newBloodGlucoseRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BloodGlucoseRecord.class)
@@ -174,11 +174,11 @@
assertThat(newBloodGlucoseRecords.size() - oldBloodGlucoseRecords.size()).isEqualTo(1);
BloodGlucoseRecord newRecord =
newBloodGlucoseRecords.get(newBloodGlucoseRecords.size() - 1);
- assertThat(newRecord.equals(testRecord)).isTrue();
- assertThat(newRecord.getSpecimenSource()).isEqualTo(testRecord.getSpecimenSource());
- assertThat(newRecord.getLevel()).isEqualTo(testRecord.getLevel());
- assertThat(newRecord.getRelationToMeal()).isEqualTo(testRecord.getRelationToMeal());
- assertThat(newRecord.getMealType()).isEqualTo(testRecord.getMealType());
+ assertThat(newRecord.equals(insertedRecord)).isTrue();
+ assertThat(newRecord.getSpecimenSource()).isEqualTo(insertedRecord.getSpecimenSource());
+ assertThat(newRecord.getLevel()).isEqualTo(insertedRecord.getLevel());
+ assertThat(newRecord.getRelationToMeal()).isEqualTo(insertedRecord.getRelationToMeal());
+ assertThat(newRecord.getMealType()).isEqualTo(insertedRecord.getMealType());
}
@Test
@@ -247,8 +247,8 @@
@Test
public void testDeleteBloodGlucoseRecord_recordId_filters() throws InterruptedException {
List<Record> records =
- List.of(getBaseBloodGlucoseRecord(), getCompleteBloodGlucoseRecord());
- TestUtils.insertRecords(records);
+ TestUtils.insertRecords(
+ List.of(getBaseBloodGlucoseRecord(), getCompleteBloodGlucoseRecord()));
for (Record record : records) {
TestUtils.verifyDeleteRecords(
@@ -288,14 +288,14 @@
public void testDeleteBloodGlucoseRecord_usingIds() throws InterruptedException {
List<Record> records =
List.of(getBaseBloodGlucoseRecord(), getCompleteBloodGlucoseRecord());
- List<Record> insertedRecord = TestUtils.insertRecords(records);
+ List<Record> insertedRecords = TestUtils.insertRecords(records);
List<RecordIdFilter> recordIds = new ArrayList<>(records.size());
- for (Record record : insertedRecord) {
+ for (Record record : insertedRecords) {
recordIds.add(RecordIdFilter.fromId(record.getClass(), record.getMetadata().getId()));
}
TestUtils.verifyDeleteRecords(recordIds);
- for (Record record : records) {
+ for (Record record : insertedRecords) {
TestUtils.assertRecordNotFound(record.getMetadata().getId(), record.getClass());
}
}
@@ -486,8 +486,8 @@
assertThat(response.getUpsertedRecords().size()).isEqualTo(0);
assertThat(response.getDeletedLogs().size()).isEqualTo(0);
- List<Record> testRecord = Collections.singletonList(getCompleteBloodGlucoseRecord());
- TestUtils.insertRecords(testRecord);
+ List<Record> testRecord =
+ TestUtils.insertRecords(Collections.singletonList(getCompleteBloodGlucoseRecord()));
response = TestUtils.getChangeLogs(changeLogsRequest);
assertThat(response.getUpsertedRecords().size()).isEqualTo(1);
assertThat(
diff --git a/tests/cts/src/android/healthconnect/cts/BloodPressureRecordTest.java b/tests/cts/src/android/healthconnect/cts/BloodPressureRecordTest.java
index 72420cc..e449493 100644
--- a/tests/cts/src/android/healthconnect/cts/BloodPressureRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/BloodPressureRecordTest.java
@@ -138,8 +138,8 @@
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BloodPressureRecord.class)
.build());
- BloodPressureRecord testRecord = getCompleteBloodPressureRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+ BloodPressureRecord testRecord =
+ (BloodPressureRecord) TestUtils.insertRecord(getCompleteBloodPressureRecord());
List<BloodPressureRecord> newBloodPressureRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BloodPressureRecord.class)
@@ -159,8 +159,8 @@
.setStartTime(Instant.now())
.setEndTime(Instant.now().plusMillis(3000))
.build();
- BloodPressureRecord testRecord = getCompleteBloodPressureRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+ BloodPressureRecord testRecord =
+ (BloodPressureRecord) TestUtils.insertRecord(getCompleteBloodPressureRecord());
List<BloodPressureRecord> newBloodPressureRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BloodPressureRecord.class)
@@ -186,8 +186,8 @@
.setPackageName(context.getPackageName())
.build())
.build());
- BloodPressureRecord testRecord = getCompleteBloodPressureRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+ BloodPressureRecord testRecord =
+ (BloodPressureRecord) TestUtils.insertRecord(getCompleteBloodPressureRecord());
List<BloodPressureRecord> newBloodPressureRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BloodPressureRecord.class)
@@ -273,8 +273,8 @@
@Test
public void testDeleteBloodPressureRecord_recordId_filters() throws InterruptedException {
List<Record> records =
- List.of(getBaseBloodPressureRecord(), getCompleteBloodPressureRecord());
- TestUtils.insertRecords(records);
+ TestUtils.insertRecords(
+ List.of(getBaseBloodPressureRecord(), getCompleteBloodPressureRecord()));
for (Record record : records) {
TestUtils.verifyDeleteRecords(
@@ -313,10 +313,10 @@
@Test
public void testDeleteBloodPressureRecord_usingIds() throws InterruptedException {
List<Record> records =
- List.of(getBaseBloodPressureRecord(), getCompleteBloodPressureRecord());
- List<Record> insertedRecord = TestUtils.insertRecords(records);
+ TestUtils.insertRecords(
+ List.of(getBaseBloodPressureRecord(), getCompleteBloodPressureRecord()));
List<RecordIdFilter> recordIds = new ArrayList<>(records.size());
- for (Record record : insertedRecord) {
+ for (Record record : records) {
recordIds.add(RecordIdFilter.fromId(record.getClass(), record.getMetadata().getId()));
}
@@ -579,8 +579,9 @@
assertThat(response.getUpsertedRecords().size()).isEqualTo(0);
assertThat(response.getDeletedLogs().size()).isEqualTo(0);
- List<Record> testRecord = Collections.singletonList(getCompleteBloodPressureRecord());
- TestUtils.insertRecords(testRecord);
+ List<Record> testRecord =
+ TestUtils.insertRecords(
+ Collections.singletonList(getCompleteBloodPressureRecord()));
response = TestUtils.getChangeLogs(changeLogsRequest);
assertThat(response.getUpsertedRecords().size()).isEqualTo(1);
assertThat(
diff --git a/tests/cts/src/android/healthconnect/cts/BodyFatRecordTest.java b/tests/cts/src/android/healthconnect/cts/BodyFatRecordTest.java
index 978f13c..584f36e 100644
--- a/tests/cts/src/android/healthconnect/cts/BodyFatRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/BodyFatRecordTest.java
@@ -117,8 +117,9 @@
List<BodyFatRecord> oldBodyFatRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BodyFatRecord.class).build());
- BodyFatRecord testRecord = getCompleteBodyFatRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+
+ BodyFatRecord testRecord =
+ (BodyFatRecord) TestUtils.insertRecord(getCompleteBodyFatRecord());
List<BodyFatRecord> newBodyFatRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BodyFatRecord.class).build());
@@ -133,8 +134,8 @@
.setStartTime(Instant.now())
.setEndTime(Instant.now().plusMillis(3000))
.build();
- BodyFatRecord testRecord = getCompleteBodyFatRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+ BodyFatRecord testRecord =
+ (BodyFatRecord) TestUtils.insertRecord(getCompleteBodyFatRecord());
List<BodyFatRecord> newBodyFatRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BodyFatRecord.class)
@@ -155,8 +156,8 @@
.setPackageName(context.getPackageName())
.build())
.build());
- BodyFatRecord testRecord = getCompleteBodyFatRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+ BodyFatRecord testRecord =
+ (BodyFatRecord) TestUtils.insertRecord(getCompleteBodyFatRecord());
List<BodyFatRecord> newBodyFatRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BodyFatRecord.class)
@@ -235,8 +236,9 @@
@Test
public void testDeleteBodyFatRecord_recordId_filters() throws InterruptedException {
- List<Record> records = List.of(getBaseBodyFatRecord(), getCompleteBodyFatRecord());
- TestUtils.insertRecords(records);
+ List<Record> records =
+ TestUtils.insertRecords(
+ List.of(getBaseBodyFatRecord(), getCompleteBodyFatRecord()));
for (Record record : records) {
TestUtils.verifyDeleteRecords(
@@ -273,10 +275,11 @@
@Test
public void testDeleteBodyFatRecord_usingIds() throws InterruptedException {
- List<Record> records = List.of(getBaseBodyFatRecord(), getCompleteBodyFatRecord());
- List<Record> insertedRecord = TestUtils.insertRecords(records);
+ List<Record> records =
+ TestUtils.insertRecords(
+ List.of(getBaseBodyFatRecord(), getCompleteBodyFatRecord()));
List<RecordIdFilter> recordIds = new ArrayList<>(records.size());
- for (Record record : insertedRecord) {
+ for (Record record : records) {
recordIds.add(RecordIdFilter.fromId(record.getClass(), record.getMetadata().getId()));
}
@@ -453,8 +456,8 @@
assertThat(response.getUpsertedRecords().size()).isEqualTo(0);
assertThat(response.getDeletedLogs().size()).isEqualTo(0);
- List<Record> testRecord = Collections.singletonList(getCompleteBodyFatRecord());
- TestUtils.insertRecords(testRecord);
+ List<Record> testRecord =
+ TestUtils.insertRecords(Collections.singletonList(getCompleteBodyFatRecord()));
response = TestUtils.getChangeLogs(changeLogsRequest);
assertThat(response.getUpsertedRecords().size()).isEqualTo(1);
assertThat(
diff --git a/tests/cts/src/android/healthconnect/cts/BodyTemperatureRecordTest.java b/tests/cts/src/android/healthconnect/cts/BodyTemperatureRecordTest.java
index 5089e97..1c47d2b 100644
--- a/tests/cts/src/android/healthconnect/cts/BodyTemperatureRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/BodyTemperatureRecordTest.java
@@ -131,8 +131,9 @@
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BodyTemperatureRecord.class)
.build());
- BodyTemperatureRecord testRecord = getCompleteBodyTemperatureRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+
+ BodyTemperatureRecord testRecord =
+ (BodyTemperatureRecord) TestUtils.insertRecord(getCompleteBodyTemperatureRecord());
List<BodyTemperatureRecord> newBodyTemperatureRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BodyTemperatureRecord.class)
@@ -153,8 +154,9 @@
.setStartTime(Instant.now())
.setEndTime(Instant.now().plusMillis(3000))
.build();
- BodyTemperatureRecord testRecord = getCompleteBodyTemperatureRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+
+ BodyTemperatureRecord testRecord =
+ (BodyTemperatureRecord) TestUtils.insertRecord(getCompleteBodyTemperatureRecord());
List<BodyTemperatureRecord> newBodyTemperatureRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BodyTemperatureRecord.class)
@@ -180,8 +182,9 @@
.setPackageName(context.getPackageName())
.build())
.build());
- BodyTemperatureRecord testRecord = getCompleteBodyTemperatureRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+
+ BodyTemperatureRecord testRecord =
+ (BodyTemperatureRecord) TestUtils.insertRecord(getCompleteBodyTemperatureRecord());
List<BodyTemperatureRecord> newBodyTemperatureRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BodyTemperatureRecord.class)
@@ -266,8 +269,10 @@
@Test
public void testDeleteBodyTemperatureRecord_recordId_filters() throws InterruptedException {
List<Record> records =
- List.of(getBaseBodyTemperatureRecord(), getCompleteBodyTemperatureRecord());
- TestUtils.insertRecords(records);
+ TestUtils.insertRecords(
+ List.of(
+ getBaseBodyTemperatureRecord(),
+ getCompleteBodyTemperatureRecord()));
for (Record record : records) {
TestUtils.verifyDeleteRecords(
@@ -306,10 +311,12 @@
@Test
public void testDeleteBodyTemperatureRecord_usingIds() throws InterruptedException {
List<Record> records =
- List.of(getBaseBodyTemperatureRecord(), getCompleteBodyTemperatureRecord());
- List<Record> insertedRecord = TestUtils.insertRecords(records);
+ TestUtils.insertRecords(
+ List.of(
+ getBaseBodyTemperatureRecord(),
+ getCompleteBodyTemperatureRecord()));
List<RecordIdFilter> recordIds = new ArrayList<>(records.size());
- for (Record record : insertedRecord) {
+ for (Record record : records) {
recordIds.add(RecordIdFilter.fromId(record.getClass(), record.getMetadata().getId()));
}
@@ -485,8 +492,9 @@
assertThat(response.getUpsertedRecords().size()).isEqualTo(0);
assertThat(response.getDeletedLogs().size()).isEqualTo(0);
- List<Record> testRecord = Collections.singletonList(getCompleteBodyTemperatureRecord());
- TestUtils.insertRecords(testRecord);
+ List<Record> testRecord =
+ TestUtils.insertRecords(
+ Collections.singletonList(getCompleteBodyTemperatureRecord()));
response = TestUtils.getChangeLogs(changeLogsRequest);
assertThat(response.getUpsertedRecords().size()).isEqualTo(1);
assertThat(
diff --git a/tests/cts/src/android/healthconnect/cts/BodyWaterMassRecordTest.java b/tests/cts/src/android/healthconnect/cts/BodyWaterMassRecordTest.java
index 12d3a6e..5f29a6c 100644
--- a/tests/cts/src/android/healthconnect/cts/BodyWaterMassRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/BodyWaterMassRecordTest.java
@@ -119,8 +119,9 @@
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BodyWaterMassRecord.class)
.build());
- BodyWaterMassRecord testRecord = getCompleteBodyWaterMassRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+
+ BodyWaterMassRecord testRecord =
+ (BodyWaterMassRecord) TestUtils.insertRecord(getCompleteBodyWaterMassRecord());
List<BodyWaterMassRecord> newBodyWaterMassRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BodyWaterMassRecord.class)
@@ -140,8 +141,9 @@
.setStartTime(Instant.now())
.setEndTime(Instant.now().plusMillis(3000))
.build();
- BodyWaterMassRecord testRecord = getCompleteBodyWaterMassRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+
+ BodyWaterMassRecord testRecord =
+ (BodyWaterMassRecord) TestUtils.insertRecord(getCompleteBodyWaterMassRecord());
List<BodyWaterMassRecord> newBodyWaterMassRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BodyWaterMassRecord.class)
@@ -167,8 +169,9 @@
.setPackageName(context.getPackageName())
.build())
.build());
- BodyWaterMassRecord testRecord = getCompleteBodyWaterMassRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+
+ BodyWaterMassRecord testRecord =
+ (BodyWaterMassRecord) TestUtils.insertRecord(getCompleteBodyWaterMassRecord());
List<BodyWaterMassRecord> newBodyWaterMassRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BodyWaterMassRecord.class)
@@ -222,8 +225,8 @@
@Test
public void testDeleteBodyWaterMassRecord_recordId_filters() throws InterruptedException {
List<Record> records =
- List.of(getBaseBodyWaterMassRecord(), getCompleteBodyWaterMassRecord());
- TestUtils.insertRecords(records);
+ TestUtils.insertRecords(
+ List.of(getBaseBodyWaterMassRecord(), getCompleteBodyWaterMassRecord()));
for (Record record : records) {
TestUtils.verifyDeleteRecords(
@@ -262,10 +265,10 @@
@Test
public void testDeleteBodyWaterMassRecord_usingIds() throws InterruptedException {
List<Record> records =
- List.of(getBaseBodyWaterMassRecord(), getCompleteBodyWaterMassRecord());
- List<Record> insertedRecord = TestUtils.insertRecords(records);
+ TestUtils.insertRecords(
+ List.of(getBaseBodyWaterMassRecord(), getCompleteBodyWaterMassRecord()));
List<RecordIdFilter> recordIds = new ArrayList<>(records.size());
- for (Record record : insertedRecord) {
+ for (Record record : records) {
recordIds.add(RecordIdFilter.fromId(record.getClass(), record.getMetadata().getId()));
}
@@ -465,8 +468,9 @@
assertThat(response.getUpsertedRecords().size()).isEqualTo(0);
assertThat(response.getDeletedLogs().size()).isEqualTo(0);
- List<Record> testRecord = Collections.singletonList(getCompleteBodyWaterMassRecord());
- TestUtils.insertRecords(testRecord);
+ List<Record> testRecord =
+ TestUtils.insertRecords(
+ Collections.singletonList(getCompleteBodyWaterMassRecord()));
response = TestUtils.getChangeLogs(changeLogsRequest);
assertThat(response.getUpsertedRecords().size()).isEqualTo(1);
assertThat(
@@ -511,7 +515,7 @@
assertThat(requestUsingIds.getRecordIdFilters()).isNotNull();
List<BodyWaterMassRecord> result = TestUtils.readRecords(requestUsingIds);
assertThat(result).hasSize(insertedRecords.size());
- assertThat(result).containsExactlyElementsIn(recordList);
+ assertThat(result).containsExactlyElementsIn(insertedRecords);
}
@Test(expected = IllegalArgumentException.class)
diff --git a/tests/cts/src/android/healthconnect/cts/BoneMassRecordTest.java b/tests/cts/src/android/healthconnect/cts/BoneMassRecordTest.java
index 50d9e47..dcd58d1 100644
--- a/tests/cts/src/android/healthconnect/cts/BoneMassRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/BoneMassRecordTest.java
@@ -117,8 +117,9 @@
List<BoneMassRecord> oldBoneMassRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BoneMassRecord.class).build());
- BoneMassRecord testRecord = getCompleteBoneMassRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+
+ BoneMassRecord testRecord =
+ (BoneMassRecord) TestUtils.insertRecord(getCompleteBoneMassRecord());
List<BoneMassRecord> newBoneMassRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BoneMassRecord.class).build());
@@ -134,8 +135,9 @@
.setStartTime(Instant.now())
.setEndTime(Instant.now().plusMillis(3000))
.build();
- BoneMassRecord testRecord = getCompleteBoneMassRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+
+ BoneMassRecord testRecord =
+ (BoneMassRecord) TestUtils.insertRecord(getCompleteBoneMassRecord());
List<BoneMassRecord> newBoneMassRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BoneMassRecord.class)
@@ -158,8 +160,9 @@
.setPackageName(context.getPackageName())
.build())
.build());
- BoneMassRecord testRecord = getCompleteBoneMassRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+
+ BoneMassRecord testRecord =
+ (BoneMassRecord) TestUtils.insertRecord(getCompleteBoneMassRecord());
List<BoneMassRecord> newBoneMassRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(BoneMassRecord.class)
@@ -239,9 +242,9 @@
@Test
public void testDeleteBoneMassRecord_recordId_filters() throws InterruptedException {
List<Record> records = List.of(getBaseBoneMassRecord(), getCompleteBoneMassRecord());
- TestUtils.insertRecords(records);
+ List<Record> insertedRecords = TestUtils.insertRecords(records);
- for (Record record : records) {
+ for (Record record : insertedRecords) {
TestUtils.verifyDeleteRecords(
new DeleteUsingFiltersRequest.Builder()
.addRecordType(record.getClass())
@@ -276,10 +279,11 @@
@Test
public void testDeleteBoneMassRecord_usingIds() throws InterruptedException {
- List<Record> records = List.of(getBaseBoneMassRecord(), getCompleteBoneMassRecord());
- List<Record> insertedRecord = TestUtils.insertRecords(records);
+ List<Record> records =
+ TestUtils.insertRecords(
+ List.of(getBaseBoneMassRecord(), getCompleteBoneMassRecord()));
List<RecordIdFilter> recordIds = new ArrayList<>(records.size());
- for (Record record : insertedRecord) {
+ for (Record record : records) {
recordIds.add(RecordIdFilter.fromId(record.getClass(), record.getMetadata().getId()));
}
@@ -450,8 +454,8 @@
assertThat(response.getUpsertedRecords().size()).isEqualTo(0);
assertThat(response.getDeletedLogs().size()).isEqualTo(0);
- List<Record> testRecord = Collections.singletonList(getCompleteBoneMassRecord());
- TestUtils.insertRecords(testRecord);
+ List<Record> testRecord =
+ TestUtils.insertRecords(Collections.singletonList(getCompleteBoneMassRecord()));
response = TestUtils.getChangeLogs(changeLogsRequest);
assertThat(response.getUpsertedRecords().size()).isEqualTo(1);
assertThat(
diff --git a/tests/cts/src/android/healthconnect/cts/CervicalMucusRecordTest.java b/tests/cts/src/android/healthconnect/cts/CervicalMucusRecordTest.java
index 408a6e8..95bc5c0 100644
--- a/tests/cts/src/android/healthconnect/cts/CervicalMucusRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/CervicalMucusRecordTest.java
@@ -118,8 +118,9 @@
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(CervicalMucusRecord.class)
.build());
- CervicalMucusRecord testRecord = getCompleteCervicalMucusRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+
+ CervicalMucusRecord testRecord =
+ (CervicalMucusRecord) TestUtils.insertRecord(getCompleteCervicalMucusRecord());
List<CervicalMucusRecord> newCervicalMucusRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(CervicalMucusRecord.class)
@@ -139,8 +140,9 @@
.setStartTime(Instant.now())
.setEndTime(Instant.now().plusMillis(3000))
.build();
- CervicalMucusRecord testRecord = getCompleteCervicalMucusRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+
+ CervicalMucusRecord testRecord =
+ (CervicalMucusRecord) TestUtils.insertRecord(getCompleteCervicalMucusRecord());
List<CervicalMucusRecord> newCervicalMucusRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(CervicalMucusRecord.class)
@@ -166,8 +168,9 @@
.setPackageName(context.getPackageName())
.build())
.build());
- CervicalMucusRecord testRecord = getCompleteCervicalMucusRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+
+ CervicalMucusRecord testRecord =
+ (CervicalMucusRecord) TestUtils.insertRecord(getCompleteCervicalMucusRecord());
List<CervicalMucusRecord> newCervicalMucusRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(CervicalMucusRecord.class)
@@ -250,8 +253,8 @@
@Test
public void testDeleteCervicalMucusRecord_recordId_filters() throws InterruptedException {
List<Record> records =
- List.of(getBaseCervicalMucusRecord(), getCompleteCervicalMucusRecord());
- TestUtils.insertRecords(records);
+ TestUtils.insertRecords(
+ List.of(getBaseCervicalMucusRecord(), getCompleteCervicalMucusRecord()));
for (Record record : records) {
TestUtils.verifyDeleteRecords(
@@ -290,10 +293,10 @@
@Test
public void testDeleteCervicalMucusRecord_usingIds() throws InterruptedException {
List<Record> records =
- List.of(getBaseCervicalMucusRecord(), getCompleteCervicalMucusRecord());
- List<Record> insertedRecord = TestUtils.insertRecords(records);
+ TestUtils.insertRecords(
+ List.of(getBaseCervicalMucusRecord(), getCompleteCervicalMucusRecord()));
List<RecordIdFilter> recordIds = new ArrayList<>(records.size());
- for (Record record : insertedRecord) {
+ for (Record record : records) {
recordIds.add(RecordIdFilter.fromId(record.getClass(), record.getMetadata().getId()));
}
@@ -463,8 +466,9 @@
assertThat(response.getUpsertedRecords().size()).isEqualTo(0);
assertThat(response.getDeletedLogs().size()).isEqualTo(0);
- List<Record> testRecord = Collections.singletonList(getCompleteCervicalMucusRecord());
- TestUtils.insertRecords(testRecord);
+ List<Record> testRecord =
+ TestUtils.insertRecords(
+ Collections.singletonList(getCompleteCervicalMucusRecord()));
response = TestUtils.getChangeLogs(changeLogsRequest);
assertThat(response.getUpsertedRecords().size()).isEqualTo(1);
assertThat(
diff --git a/tests/cts/src/android/healthconnect/cts/CyclingPedalingCadenceRecordTest.java b/tests/cts/src/android/healthconnect/cts/CyclingPedalingCadenceRecordTest.java
index ff7a69a..2e6d292 100644
--- a/tests/cts/src/android/healthconnect/cts/CyclingPedalingCadenceRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/CyclingPedalingCadenceRecordTest.java
@@ -146,8 +146,10 @@
new ReadRecordsRequestUsingFilters.Builder<>(
CyclingPedalingCadenceRecord.class)
.build());
- CyclingPedalingCadenceRecord testRecord = getCompleteCyclingPedalingCadenceRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+
+ CyclingPedalingCadenceRecord testRecord =
+ (CyclingPedalingCadenceRecord)
+ TestUtils.insertRecord(getCompleteCyclingPedalingCadenceRecord());
List<CyclingPedalingCadenceRecord> newCyclingPedalingCadenceRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(
@@ -170,8 +172,10 @@
.setStartTime(Instant.now())
.setEndTime(Instant.now().plusMillis(3000))
.build();
- CyclingPedalingCadenceRecord testRecord = getCompleteCyclingPedalingCadenceRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+
+ CyclingPedalingCadenceRecord testRecord =
+ (CyclingPedalingCadenceRecord)
+ TestUtils.insertRecord(getCompleteCyclingPedalingCadenceRecord());
List<CyclingPedalingCadenceRecord> newCyclingPedalingCadenceRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(
@@ -199,8 +203,9 @@
.setPackageName(context.getPackageName())
.build())
.build());
- CyclingPedalingCadenceRecord testRecord = getCompleteCyclingPedalingCadenceRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+ CyclingPedalingCadenceRecord testRecord =
+ (CyclingPedalingCadenceRecord)
+ TestUtils.insertRecord(getCompleteCyclingPedalingCadenceRecord());
List<CyclingPedalingCadenceRecord> newCyclingPedalingCadenceRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(
@@ -272,10 +277,10 @@
public void testDeleteCyclingPedalingCadenceRecord_recordId_filters()
throws InterruptedException {
List<Record> records =
- List.of(
- getBaseCyclingPedalingCadenceRecord(),
- getCompleteCyclingPedalingCadenceRecord());
- TestUtils.insertRecords(records);
+ TestUtils.insertRecords(
+ List.of(
+ getBaseCyclingPedalingCadenceRecord(),
+ getCompleteCyclingPedalingCadenceRecord()));
for (Record record : records) {
TestUtils.verifyDeleteRecords(
@@ -315,12 +320,12 @@
@Test
public void testDeleteCyclingPedalingCadenceRecord_usingIds() throws InterruptedException {
List<Record> records =
- List.of(
- getBaseCyclingPedalingCadenceRecord(),
- getCompleteCyclingPedalingCadenceRecord());
- List<Record> insertedRecords = TestUtils.insertRecords(records);
+ TestUtils.insertRecords(
+ List.of(
+ getBaseCyclingPedalingCadenceRecord(),
+ getCompleteCyclingPedalingCadenceRecord()));
List<RecordIdFilter> recordIds = new ArrayList<>(records.size());
- for (Record record : insertedRecords) {
+ for (Record record : records) {
recordIds.add(RecordIdFilter.fromId(record.getClass(), record.getMetadata().getId()));
}
@@ -507,8 +512,8 @@
assertThat(response.getDeletedLogs().size()).isEqualTo(0);
List<Record> testRecord =
- Collections.singletonList(getCompleteCyclingPedalingCadenceRecord());
- TestUtils.insertRecords(testRecord);
+ TestUtils.insertRecords(
+ Collections.singletonList(getCompleteCyclingPedalingCadenceRecord()));
response = TestUtils.getChangeLogs(changeLogsRequest);
assertThat(response.getUpsertedRecords().size()).isEqualTo(1);
assertThat(
diff --git a/tests/cts/src/android/healthconnect/cts/DistanceRecordTest.java b/tests/cts/src/android/healthconnect/cts/DistanceRecordTest.java
index 547be9f..cf5f32c 100644
--- a/tests/cts/src/android/healthconnect/cts/DistanceRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/DistanceRecordTest.java
@@ -143,8 +143,9 @@
List<DistanceRecord> oldDistanceRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(DistanceRecord.class).build());
- DistanceRecord testRecord = getCompleteDistanceRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+
+ DistanceRecord testRecord =
+ (DistanceRecord) TestUtils.insertRecord(getCompleteDistanceRecord());
List<DistanceRecord> newDistanceRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(DistanceRecord.class).build());
@@ -160,8 +161,9 @@
.setStartTime(Instant.now())
.setEndTime(Instant.now().plusMillis(3000))
.build();
- DistanceRecord testRecord = getCompleteDistanceRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+
+ DistanceRecord testRecord =
+ (DistanceRecord) TestUtils.insertRecord(getCompleteDistanceRecord());
List<DistanceRecord> newDistanceRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(DistanceRecord.class)
@@ -184,8 +186,9 @@
.setPackageName(context.getPackageName())
.build())
.build());
- DistanceRecord testRecord = getCompleteDistanceRecord();
- TestUtils.insertRecords(Collections.singletonList(testRecord));
+
+ DistanceRecord testRecord =
+ (DistanceRecord) TestUtils.insertRecord(getCompleteDistanceRecord());
List<DistanceRecord> newDistanceRecords =
TestUtils.readRecords(
new ReadRecordsRequestUsingFilters.Builder<>(DistanceRecord.class)
@@ -238,8 +241,9 @@
@Test
public void testDeleteDistanceRecord_recordId_filters() throws InterruptedException {
- List<Record> records = List.of(getBaseDistanceRecord(), getCompleteDistanceRecord());
- TestUtils.insertRecords(records);
+ List<Record> records =
+ TestUtils.insertRecords(
+ List.of(getBaseDistanceRecord(), getCompleteDistanceRecord()));
for (Record record : records) {
TestUtils.verifyDeleteRecords(
@@ -276,10 +280,11 @@
@Test
public void testDeleteDistanceRecord_usingIds() throws InterruptedException {
- List<Record> records = List.of(getBaseDistanceRecord(), getCompleteDistanceRecord());
- List<Record> insertedRecord = TestUtils.insertRecords(records);
+ List<Record> records =
+ TestUtils.insertRecords(
+ List.of(getBaseDistanceRecord(), getCompleteDistanceRecord()));
List<RecordIdFilter> recordIds = new ArrayList<>(records.size());
- for (Record record : insertedRecord) {
+ for (Record record : records) {
recordIds.add(RecordIdFilter.fromId(record.getClass(), record.getMetadata().getId()));
}
@@ -532,8 +537,8 @@
assertThat(response.getUpsertedRecords().size()).isEqualTo(0);
assertThat(response.getDeletedLogs().size()).isEqualTo(0);
- List<Record> testRecord = Collections.singletonList(getCompleteDistanceRecord());
- TestUtils.insertRecords(testRecord);
+ List<Record> testRecord =
+ TestUtils.insertRecords(Collections.singletonList(getCompleteDistanceRecord()));
response = TestUtils.getChangeLogs(changeLogsRequest);
assertThat(response.getUpsertedRecords().size()).isEqualTo(1);
assertThat(
diff --git a/tests/cts/utils/HealthConnectTestUtils/src/android/healthconnect/cts/utils/TestUtils.java b/tests/cts/utils/HealthConnectTestUtils/src/android/healthconnect/cts/utils/TestUtils.java
index 17e776f..4185464 100644
--- a/tests/cts/utils/HealthConnectTestUtils/src/android/healthconnect/cts/utils/TestUtils.java
+++ b/tests/cts/utils/HealthConnectTestUtils/src/android/healthconnect/cts/utils/TestUtils.java
@@ -215,6 +215,16 @@
.getId();
}
+ /**
+ * Insert record to the database.
+ *
+ * @param record record to insert
+ * @return inserted record
+ */
+ public static Record insertRecord(Record record) throws InterruptedException {
+ return insertRecords(Collections.singletonList(record)).get(0);
+ }
+
/**
* Inserts records to the database.
*
