Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d94c620 authored by Hui Yu's avatar Hui Yu
Browse files

Fix the unit test UsageStatsTest. 

Entry is removed from mActivities after event ACTIVITY_STOPPED, unit
test needs to be fixed.

Change-Id: I8ecf2eb75c694478e940fa82a34c6e6948847d96
Fix: 141953236
Test: atest  frameworks/base/core/tests/coretests/src/android/app/usage/UsageStatsTest.java
parent 6c32679a

core/tests/coretests/src/android/app/usage/UsageStatsTest.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -173,7 +173,7 @@ public class UsageStatsTest { 
        left.update("com.test.activity1", 400000, ACTIVITY_STOPPED, 1);

        left.update("com.test.activity1", 400000, ACTIVITY_STOPPED, 1);

        assertEquals(left.mLastTimeUsed, 350000);

        assertEquals(left.mLastTimeUsed, 350000);

        assertEquals(left.mLastTimeVisible, 400000);

        assertEquals(left.mLastTimeVisible, 400000);

        assertEquals(left.mActivities.get(1), ACTIVITY_STOPPED);

        assertTrue(left.mActivities.indexOfKey(1) < 0);

        assertEquals(left.mTotalTimeInForeground, 350000 - 200000);

        assertEquals(left.mTotalTimeInForeground, 350000 - 200000);

        assertEquals(left.mTotalTimeVisible, 400000 - 200000);

        assertEquals(left.mTotalTimeVisible, 400000 - 200000);
@@ -231,7 +231,7 @@ public class UsageStatsTest { 
        left.update("com.test.activity1", 400000, ACTIVITY_STOPPED, 1);

        left.update("com.test.activity1", 400000, ACTIVITY_STOPPED, 1);

        assertEquals(left.mLastTimeUsed, 300000);

        assertEquals(left.mLastTimeUsed, 300000);

        assertEquals(left.mLastTimeVisible, 400000);

        assertEquals(left.mLastTimeVisible, 400000);

        assertEquals(left.mActivities.get(1), ACTIVITY_STOPPED);

        assertTrue(left.mActivities.indexOfKey(1) < 0);

        assertEquals(left.mTotalTimeInForeground, 300000 - 200000);

        assertEquals(left.mTotalTimeInForeground, 300000 - 200000);

        assertEquals(left.mTotalTimeVisible, 400000 - 100000);

        assertEquals(left.mTotalTimeVisible, 400000 - 100000);

    }

    }
@@ -249,7 +249,7 @@ public class UsageStatsTest { 
        left.update("com.test.activity1", 200000, ACTIVITY_STOPPED, 1);

        left.update("com.test.activity1", 200000, ACTIVITY_STOPPED, 1);

        assertEquals(left.mLastTimeUsed, 200000);

        assertEquals(left.mLastTimeUsed, 200000);

        assertEquals(left.mLastTimeVisible, 200000);

        assertEquals(left.mLastTimeVisible, 200000);

        assertEquals(left.mActivities.get(1), ACTIVITY_STOPPED);

        assertTrue(left.mActivities.indexOfKey(1) < 0);

        assertEquals(left.mTotalTimeInForeground, 200000 - 100000);

        assertEquals(left.mTotalTimeInForeground, 200000 - 100000);

        assertEquals(left.mTotalTimeVisible, 200000 - 100000);

        assertEquals(left.mTotalTimeVisible, 200000 - 100000);
@@ -359,14 +359,14 @@ public class UsageStatsTest { 
        left.update("com.test.activity1", 550000, ACTIVITY_STOPPED, 1);

        left.update("com.test.activity1", 550000, ACTIVITY_STOPPED, 1);

        assertEquals(left.mLastTimeUsed, 450000);

        assertEquals(left.mLastTimeUsed, 450000);

        assertEquals(left.mLastTimeVisible, 550000);

        assertEquals(left.mLastTimeVisible, 550000);

        assertEquals(left.mActivities.get(1), ACTIVITY_STOPPED);

        assertTrue(left.mActivities.indexOfKey(1) < 0);

        assertEquals(left.mTotalTimeInForeground, 350000);

        assertEquals(left.mTotalTimeInForeground, 350000);

        assertEquals(left.mTotalTimeVisible, 350000 + 100000 /*550000 - 450000*/);

        assertEquals(left.mTotalTimeVisible, 350000 + 100000 /*550000 - 450000*/);





        left.update("com.test.activity2", 650000, ACTIVITY_STOPPED, 2);

        left.update("com.test.activity2", 650000, ACTIVITY_STOPPED, 2);

        assertEquals(left.mLastTimeUsed, 450000);

        assertEquals(left.mLastTimeUsed, 450000);

        assertEquals(left.mLastTimeVisible, 650000);

        assertEquals(left.mLastTimeVisible, 650000);

        assertEquals(left.mActivities.get(2), ACTIVITY_STOPPED);

        assertTrue(left.mActivities.indexOfKey(2) < 0);

        assertEquals(left.mTotalTimeInForeground, 350000);

        assertEquals(left.mTotalTimeInForeground, 350000);

        assertEquals(left.mTotalTimeVisible, 450000 + 100000 /*650000 - 550000*/);

        assertEquals(left.mTotalTimeVisible, 450000 + 100000 /*650000 - 550000*/);

    }

    }