PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add new database table and proto for battery usage reattribution (2/5)" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-06-17 11:28:54 +00:00
committed by Android (Google) Code Review
parent c0f7e758d1 f5cf54bcc7
commit a3894e6761
9 changed files with 351 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ConvertUtilsTest.java
View File

@@ -703,4 +703,26 @@ public final class ConvertUtilsTest {
/* taskRootPackageName= */ ""))
.isEqualTo(packageName);
}
@Test
public void decodeBatteryReattribute_returnExpectedResult() {
final BatteryReattribute batteryReattribute =
BatteryReattribute.newBuilder()
.setTimestampStart(100L)
.setTimestampEnd(200L)
.putReattributeData(1001, 0.2f)
.putReattributeData(2001, 0.8f)
.build();
final BatteryReattribute decodeResult = ConvertUtils.decodeBatteryReattribute(
ConvertUtils.encodeBatteryReattribute(batteryReattribute));
assertThat(decodeResult.getTimestampStart()).isEqualTo(100L);
assertThat(decodeResult.getTimestampEnd()).isEqualTo(200L);
final Map<Integer, Float> reattributeDataMap = decodeResult.getReattributeDataMap();
// Verify the reattribute data in the map.
assertThat(reattributeDataMap).hasSize(2);
assertThat(reattributeDataMap.get(1001)).isEqualTo(0.2f);
assertThat(reattributeDataMap.get(2001)).isEqualTo(0.8f);
}
}

118
tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryReattributeDaoTest.java Normal file
View File

@@ -0,0 +1,118 @@
/*
* Copyright (C) 2024 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.fuelgauge.batteryusage.db;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.testutils.BatteryTestUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import java.util.List;
/** Tests for {@link BatteryReattributeDao}. */
@RunWith(RobolectricTestRunner.class)
public final class BatteryReattributeDaoTest {
private Context mContext;
private BatteryStateDatabase mDatabase;
private BatteryReattributeDao mBatteryReattributeDao;
@Before
public void setUp() {
mContext = ApplicationProvider.getApplicationContext();
mDatabase = BatteryTestUtils.setUpBatteryStateDatabase(mContext);
mBatteryReattributeDao = mDatabase.batteryReattributeDao();
insert(100L, 200L, "reattributeData1");
insert(300L, 400L, "reattributeData3");
insert(200L, 300L, "reattributeData2");
insert(400L, 500L, "reattributeData4");
// Ensure there was data inserted into the database.
assertThat(getAllEntityData()).isNotEmpty();
}
@Test
public void getAllAfter_returnExpectedEntityData() {
final List<BatteryReattributeEntity> entityDataList =
mBatteryReattributeDao.getAllAfter(/* timestampStart= */ 300L);
assertThat(entityDataList).hasSize(2);
assertEntity(entityDataList.get(0), 400L, 500L, "reattributeData4");
assertEntity(entityDataList.get(1), 300L, 400L, "reattributeData3");
}
@Test
public void clearAll_clearAllData() {
mBatteryReattributeDao.clearAll();
assertThat(getAllEntityData()).isEmpty();
}
@Test
public void clearAllBefore_clearAllExpectedData() {
mBatteryReattributeDao.clearAllBefore(/* timestampStart= */ 300L);
final List<BatteryReattributeEntity> entityDataList = getAllEntityData();
assertThat(entityDataList).hasSize(1);
assertEntity(entityDataList.get(0), 400L, 500L, "reattributeData4");
}
@Test
public void clearAllAfter_clearAllExpectedData() {
mBatteryReattributeDao.clearAllAfter(/* timestampStart= */ 300L);
final List<BatteryReattributeEntity> entityDataList = getAllEntityData();
assertThat(entityDataList).hasSize(2);
assertEntity(entityDataList.get(0), 200L, 300L, "reattributeData2");
assertEntity(entityDataList.get(1), 100L, 200L, "reattributeData1");
}
@Test
public void insert_samePrimaryKeyEntityData_replaceIntoNewEntityData() {
// Verify the original data before update.
assertEntity(getAllEntityData().get(0), 400L, 500L, "reattributeData4");
insert(400L, 600L, "reattribute4Update");
// Verify the new update entity data.
assertEntity(getAllEntityData().get(0), 400L, 600L, "reattribute4Update");
}
private void insert(long timestampStart, long timestampEnd, String reattributeData) {
mBatteryReattributeDao.insert(
new BatteryReattributeEntity(
timestampStart, timestampEnd, reattributeData));
}
private List<BatteryReattributeEntity> getAllEntityData() {
return mBatteryReattributeDao.getAllAfter(/* timestampStart= */ 0L);
}
private static void assertEntity(BatteryReattributeEntity entity, long timestampStart,
long timestampEnd, String reattributeData) {
assertThat(entity.timestampStart).isEqualTo(timestampStart);
assertThat(entity.timestampEnd).isEqualTo(timestampEnd);
assertThat(entity.reattributeData).isEqualTo(reattributeData);
}
}

54
tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryReattributeEntityTest.java Normal file
View File

@@ -0,0 +1,54 @@
/*
* Copyright (C) 2024 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.fuelgauge.batteryusage.db;
import static com.google.common.truth.Truth.assertThat;
import com.android.settings.fuelgauge.batteryusage.BatteryReattribute;
import com.android.settings.fuelgauge.batteryusage.ConvertUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Tests for {@link BatteryReattributeEntity}. */
@RunWith(RobolectricTestRunner.class)
public final class BatteryReattributeEntityTest {
@Test
public void constructor_createExpectedData() {
final BatteryReattribute batteryReattribute =
BatteryReattribute.newBuilder()
.setTimestampStart(100L)
.setTimestampEnd(200L)
.putReattributeData(1001, 0.2f)
.putReattributeData(2001, 0.8f)
.build();
final BatteryReattributeEntity batteryReattributeEntity =
new BatteryReattributeEntity(batteryReattribute);
assertThat(batteryReattributeEntity.timestampStart)
.isEqualTo(batteryReattribute.getTimestampStart());
assertThat(batteryReattributeEntity.timestampEnd)
.isEqualTo(batteryReattribute.getTimestampEnd());
// Verify the BatteryReattribute data.
final BatteryReattribute decodeResult =
ConvertUtils.decodeBatteryReattribute(batteryReattributeEntity.reattributeData);
assertThat(decodeResult).isEqualTo(batteryReattribute);
}
}