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

Commit 69e599a7 authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Merge "Call tearDown in tests that extend TelephonyTest" am: cd035e1c am:... 

Merge "Call tearDown in tests that extend TelephonyTest" am: cd035e1c am: bec343e3 am: 347bdd9b

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1646896

Change-Id: I9a020eedfe4d51f5166e1d9fb09c3675f1934d9d
parents 16f288c4 347bdd9b

tests/telephonytests/src/com/android/internal/telephony/RadioInterfaceCapabilityControllerTest.java

+6 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.telephony.TelephonyManager; 
import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;



import org.junit.After;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -52,6 +53,11 @@ public class RadioInterfaceCapabilityControllerTest extends TelephonyTest { 
        super.setUp(getClass().getSimpleName());

    }



    @After

    public void tearDown() throws Exception {

        super.tearDown();

    }



    @Test

    public void testRadioInterfaceCapabilities() {

        final RadioInterfaceCapabilityController capabilities =

tests/telephonytests/src/com/android/internal/telephony/SlidingWindowEventCounterTest.java

+5 −2
Original line number Diff line number Diff line
@@ -21,15 +21,18 @@ import static org.junit.Assert.assertTrue; 


import android.os.SystemClock;



import androidx.test.runner.AndroidJUnit4;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;



public class SlidingWindowEventCounterTest extends TelephonyTest {

@RunWith(AndroidJUnit4.class)

public class SlidingWindowEventCounterTest {

    long mInitialTime;



    @Before

    public void setUp() throws Exception {

        super.setUp(getClass().getSimpleName());

        mInitialTime = SystemClock.elapsedRealtime();

    }