Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
platform_packages_modules_Connectivity
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LMODroid
platform_packages_modules_Connectivity
Commits
6dfb7c7c
Commit
6dfb7c7c
authored
1 year ago
by
Treehugger Robot
Committed by
Gerrit Code Review
1 year ago
Browse files
Options
Downloads
Plain Diff
Merge "Address comments on aosp/2765367" into main
parents
a51221f0
2aa44125
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
staticlibs/testutils/devicetests/com/android/testutils/DevSdkIgnoreRunner.kt
+2
-2
2 additions, 2 deletions
...s/devicetests/com/android/testutils/DevSdkIgnoreRunner.kt
with
2 additions
and
2 deletions
staticlibs/testutils/devicetests/com/android/testutils/DevSdkIgnoreRunner.kt
+
2
−
2
View file @
6dfb7c7c
...
@@ -42,7 +42,7 @@ import org.junit.runners.Parameterized
...
@@ -42,7 +42,7 @@ import org.junit.runners.Parameterized
* the whole class if they do not match the development SDK as defined in [DevSdkIgnoreRule].
* the whole class if they do not match the development SDK as defined in [DevSdkIgnoreRule].
* Otherwise, it will delegate to [AndroidJUnit4] to run the test as usual.
* Otherwise, it will delegate to [AndroidJUnit4] to run the test as usual.
*
*
* This class automatically uses the Parameterized runner as its base runner, so the
* This class automatically uses the Parameterized runner as its base runner
when needed
, so the
* @Parameterized.Parameters annotation and its friends can be used in tests using this runner.
* @Parameterized.Parameters annotation and its friends can be used in tests using this runner.
*
*
* Example usage:
* Example usage:
...
@@ -69,7 +69,7 @@ class DevSdkIgnoreRunner(private val klass: Class<*>) : Runner(), Filterable, So
...
@@ -69,7 +69,7 @@ class DevSdkIgnoreRunner(private val klass: Class<*>) : Runner(), Filterable, So
null
null
}
else
if
(
it
.
hasParameterizedMethod
())
{
}
else
if
(
it
.
hasParameterizedMethod
())
{
// Parameterized throws if there is no static method annotated with @Parameters, which
// Parameterized throws if there is no static method annotated with @Parameters, which
// isn't too useful. Use i
f
i
t
there are, otherwise use its base AndroidJUnit4 runner.
// isn't too useful. Use i
t
i
f
there are, otherwise use its base AndroidJUnit4 runner.
RunnerWrapper
(
Parameterized
(
klass
))
RunnerWrapper
(
Parameterized
(
klass
))
}
else
{
}
else
{
RunnerWrapper
(
AndroidJUnit4
(
klass
))
RunnerWrapper
(
AndroidJUnit4
(
klass
))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment