Merge "tracinglib: fix test annotation usage" into main (b6eab990) · Commits · e / os / android_frameworks_libs_systemui

tracinglib/benchmark/src/ThreadLocalMicroBenchmark.kt

+4 −10

Original line number	Diff line number	Diff line
		@@ -27,22 +27,20 @@ import java.util.concurrent.atomic.AtomicInteger
		import org.junit.After
		import org.junit.Assert
		import org.junit.Before
		import org.junit.ClassRule
		import org.junit.Rule
		import org.junit.Test
		import org.junit.runner.RunWith

		@SmallTest
		@RunWith(AndroidJUnit4::class)
		@EnableFlags(Flags.FLAG_COROUTINE_TRACING)
		class ThreadLocalMicroBenchmark {

		@get:Rule val perfStatusReporter = PerfStatusReporter()

		@get:Rule val setFlagsRule = SetFlagsRule()

		companion object {
		@JvmField @ClassRule(order = 1) var ensureDeviceSettingsRule = EnsureDeviceSettingsRule()
		}
		@get:Rule val ensureDeviceSettingsRule = EnsureDeviceSettingsRule()

		@get:Rule val perfStatusReporter = PerfStatusReporter()

		@Before
		fun before() {
		@@ -54,7 +52,6 @@ class ThreadLocalMicroBenchmark {
		Assert.assertTrue(Trace.isEnabled())
		}

		@SmallTest
		@Test
		fun testIntegerIncrement() {
		val state = perfStatusReporter.benchmarkState
		@@ -65,7 +62,6 @@ class ThreadLocalMicroBenchmark {
		}
		}

		@SmallTest
		@Test
		fun testAtomicIntegerIncrement() {
		val state = perfStatusReporter.benchmarkState
		@@ -76,7 +72,6 @@ class ThreadLocalMicroBenchmark {
		}
		}

		@SmallTest
		@Test
		fun testIntArrayIncrement() {
		val state = perfStatusReporter.benchmarkState
		@@ -88,7 +83,6 @@ class ThreadLocalMicroBenchmark {
		}
		}

		@SmallTest
		@Test
		fun testMutableIntIncrement() {
		val state = perfStatusReporter.benchmarkState

+4 −11

Original line number	Diff line number	Diff line
		@@ -35,24 +35,20 @@ import kotlinx.coroutines.yield
		import org.junit.After
		import org.junit.Assert
		import org.junit.Before
		import org.junit.ClassRule
		import org.junit.Rule
		import org.junit.Test
		import org.junit.runner.RunWith

		private val TAG: String = TraceContextMicroBenchmark::class.java.simpleName

		@SmallTest
		@RunWith(AndroidJUnit4::class)
		@EnableFlags(Flags.FLAG_COROUTINE_TRACING)
		class TraceContextMicroBenchmark {

		@get:Rule val perfStatusReporter = PerfStatusReporter()

		@get:Rule val setFlagsRule = SetFlagsRule()

		companion object {
		@JvmField @ClassRule(order = 1) var ensureDeviceSettingsRule = EnsureDeviceSettingsRule()
		}
		@get:Rule val ensureDeviceSettingsRule = EnsureDeviceSettingsRule()

		@get:Rule val perfStatusReporter = PerfStatusReporter()

		@Before
		fun before() {
		@@ -70,7 +66,6 @@ class TraceContextMicroBenchmark {
		state.resumeTiming()
		}

		@SmallTest
		@Test
		fun testSingleTraceSection() {
		val state = perfStatusReporter.benchmarkState
		@@ -81,7 +76,6 @@ class TraceContextMicroBenchmark {
		}
		}

		@SmallTest
		@Test
		fun testNestedContext() {
		val state = perfStatusReporter.benchmarkState
		@@ -108,7 +102,6 @@ class TraceContextMicroBenchmark {
		}
		}

		@SmallTest
		@Test
		fun testInterleavedLaunch() {
		val state = perfStatusReporter.benchmarkState