Merge "Call tearDown in tests that extend TelephonyTest" am: cd035e1c83 am: bec343e374 (347bdd9b) · Commits · e / os / android_frameworks_opt_telephony

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 =

+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();
		}