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

Commit 9fd316af authored by Shai Barack's avatar Shai Barack Committed by Android (Google) Code Review
Browse files

Merge changes Icc3084a6,Ibfc68146 into main 

* changes:
  Field used in concurrency test should be volatile
  Fixed expected and actual order in tests.
parents 24879150 a9fcfe02

core/tests/coretests/src/com/android/internal/util/RateLimitingCacheTest.java

+12 −12
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith; 
@RunWith(AndroidJUnit4.class)

public class RateLimitingCacheTest {



    private int mCounter = 0;

    private volatile int mCounter = 0;



    @Before

    public void before() {
@@ -59,12 +59,12 @@ public class RateLimitingCacheTest { 
        TestRateLimitingCache<Integer> s = new TestRateLimitingCache<>(0);



        int first = s.get(mFetcher);

        assertEquals(first, 0);

        assertEquals(0, first);

        int second = s.get(mFetcher);

        assertEquals(second, 1);

        assertEquals(1, second);

        s.advanceTime(20);

        int third = s.get(mFetcher);

        assertEquals(third, 2);

        assertEquals(2, third);

    }



    /**
@@ -76,17 +76,17 @@ public class RateLimitingCacheTest { 
        TestRateLimitingCache<Integer> s = new TestRateLimitingCache<>(100);



        int first = s.get(mFetcher);

        assertEquals(first, 0);

        assertEquals(0, first);

        int second = s.get(mFetcher);

        // Too early to change

        assertEquals(second, 0);

        assertEquals(0, second);

        s.advanceTime(150);

        int third = s.get(mFetcher);

        // Changed by now

        assertEquals(third, 1);

        assertEquals(1, third);

        int fourth = s.get(mFetcher);

        // Too early to change again

        assertEquals(fourth, 1);

        assertEquals(1, fourth);

    }



    /**
@@ -98,11 +98,11 @@ public class RateLimitingCacheTest { 
        TestRateLimitingCache<Integer> s = new TestRateLimitingCache<>(-1);



        int first = s.get(mFetcher);

        assertEquals(first, 0);

        assertEquals(0, first);

        s.advanceTime(200);

        // Should return the original value every time

        int second = s.get(mFetcher);

        assertEquals(second, 0);

        assertEquals(0, second);

    }



    /**
@@ -157,7 +157,7 @@ public class RateLimitingCacheTest { 


        final long periodsElapsed = 1 + ((endTimeMillis - startTimeMillis) / periodMillis);

        final long expected = Math.min(100 + 100, periodsElapsed * maxCountPerPeriod) - 1;

        assertEquals(mCounter, expected);

        assertEquals(expected, mCounter);

    }



    /**
@@ -209,7 +209,7 @@ public class RateLimitingCacheTest { 
        t1.join();

        t2.join();



        assertEquals(counter.get(), 2);

        assertEquals(2, counter.get());

    }



    /**