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

Commit 03182153 authored by Felipe Leme's avatar Felipe Leme
Browse files

Fixed regex on TimingsTraceAndSlogTest. 

Test: atest FrameworksMockingServicesTests:TimingsTraceAndSlogTest
Fixes: 418404066
Flag: TEST_ONLY

Change-Id: I3a2b259fca7c4fbab08bc4212d850fee3ac2f666
parent 28ab5a14

services/tests/mockingservicestests/src/com/android/server/utils/TimingsTraceAndSlogTest.java

+25 −1
Original line number Diff line number Diff line
@@ -28,7 +28,9 @@ import static org.mockito.ArgumentMatchers.matches; 
import static org.mockito.Mockito.never;

import static org.mockito.Mockito.times;



import android.os.SystemClock;

import android.os.Trace;

import android.util.Log;

import android.util.Slog;



import androidx.test.filters.SmallTest;
@@ -53,6 +55,9 @@ import java.util.List; 
@RunWith(AndroidJUnit4.class)

public final class TimingsTraceAndSlogTest {



    // Used to log staments during the test

    private static final String DA_REAL_TAG = TimingsTraceAndSlogTest.class.getSimpleName();



    private static final String TAG = "TEST";



    @Rule
@@ -118,14 +123,33 @@ public final class TimingsTraceAndSlogTest { 


    @Test

    public void testOneLevel() throws Exception {

        testOneLevel(/* sleepTimeMs= */ 0);

    }



    @Test

    public void testOneLevel_sleepsTwoDigits() throws Exception {

        testOneLevel(/* sleepTimeMs= */ 10);

    }



    @Test

    public void testOneLevel_sleepsThreeDigits() throws Exception {

        testOneLevel(/* sleepTimeMs= */ 100);

    }



    private void testOneLevel(int sleepTimeMs) throws Exception {

        TimingsTraceAndSlog log = new TimingsTraceAndSlog(TAG, TRACE_TAG_APP);

        log.traceBegin("test");

        if (sleepTimeMs > 0) {

            // Sleep to make sure logged duration have more than 0 digits

            Log.v(DA_REAL_TAG, "Sleeping " + sleepTimeMs + " ms");

            SystemClock.sleep(sleepTimeMs);

        }

        log.traceEnd();



        verify((MockedVoidMethod) () -> Trace.traceBegin(TRACE_TAG_APP, "test"));

        verify((MockedVoidMethod) () -> Trace.traceEnd(TRACE_TAG_APP));

        verify((MockedVoidMethod) () -> Slog.d(TAG, "test"));

        verify((MockedVoidMethod) () -> Slog.v(eq(TAG), matches("test took to complete: \\dms")));

        verify((MockedVoidMethod) () -> Slog.v(eq(TAG), matches("test took to complete: \\d+ms")));

    }



    @Test