diff options
author | Yuriy Solodkyy <solodkyy@google.com> | 2022-02-14 20:26:38 +0000 |
---|---|---|
committer | Yuriy Solodkyy <solodkyy@google.com> | 2022-02-14 22:08:35 +0000 |
commit | 074c20d9774994e405813ca4defc9aa262b4eb18 (patch) | |
tree | aecd12d1ee666046f27ea87f3ff7362d4ccbe0a9 /android/testSrc | |
parent | 3e1b65133043cdb006652af2f11391345df8bffe (diff) | |
download | idea-074c20d9774994e405813ca4defc9aa262b4eb18.tar.gz |
Shorten test project directory names
(1) Do not add unique suffixes to directories where the base test case
already does it. It was added to `UsefulTestCase` some time ago. This
removes the second unique ID from paths like
`/tmp/unitTest_smth_257F10BiKPVuB5rE4Xi2gwfJ0dn/smth_257F1KbBDIvT33FFtxBQKsQlROi`
making them just `/tmp/unitTest_smth_257F10BiKPVuB5rE4Xi2gwfJ0dn/smth`
(2) Generate shorter names where possible.
(3) Use `AndroidTempDirTestFixture` in `TemplateTestUtils`.
Bug: 199156040
Test: n/a
Change-Id: I820fc71d765a3a7d6adb900308a1c0aceb0a07ee
Diffstat (limited to 'android/testSrc')
2 files changed, 7 insertions, 5 deletions
diff --git a/android/testSrc/com/android/tools/idea/gradle/project/sync/LightSyncBasedTestsWithGradleLikeStructureTest.kt b/android/testSrc/com/android/tools/idea/gradle/project/sync/LightSyncBasedTestsWithGradleLikeStructureTest.kt index cba17eeeaac..e257713f303 100644 --- a/android/testSrc/com/android/tools/idea/gradle/project/sync/LightSyncBasedTestsWithGradleLikeStructureTest.kt +++ b/android/testSrc/com/android/tools/idea/gradle/project/sync/LightSyncBasedTestsWithGradleLikeStructureTest.kt @@ -53,7 +53,7 @@ class LightSyncBasedTestsWithGradleLikeStructureTest : SnapshotComparisonTest { @get:Rule var testName = TestName() - val projectRule = AndroidProjectRule.withAndroidModel(AndroidProjectBuilder()) + val projectRule = AndroidProjectRule.withAndroidModel(AndroidProjectBuilder()).named(this::class.simpleName) @get:Rule val ruleChain = RuleChain.outerRule(projectRule).around(EdtRule())!! @@ -84,7 +84,7 @@ class LightSyncBasedTestsWithCMakeLikeStructureTest : SnapshotComparisonTest { AndroidProjectBuilder( ndkModel = { buildNdkModelStub() } ) - ) + ).named(this::class.simpleName) @get:Rule val ruleChain = RuleChain.outerRule(projectRule).around(EdtRule())!! @@ -106,7 +106,8 @@ class LightSyncBasedTestsWithDefaultTestProjectStructureTest : SnapshotCompariso @get:Rule var testName = TestName() - val projectRule = AndroidProjectRule.withAndroidModel(createAndroidProjectBuilderForDefaultTestProjectStructure()) + val projectRule = + AndroidProjectRule.withAndroidModel(createAndroidProjectBuilderForDefaultTestProjectStructure()).named(this::class.simpleName) @get:Rule val ruleChain = RuleChain.outerRule(projectRule).around(EdtRule())!! @@ -128,7 +129,8 @@ class LightSyncBasedTestsWithMultipleModulesTestProjectStructureTest : SnapshotC @get:Rule var testName = TestName() - val projectRule = AndroidProjectRule.withAndroidModels(rootModuleBuilder, appModuleBuilder, libModuleBuilder) + val projectRule = + AndroidProjectRule.withAndroidModels(rootModuleBuilder, appModuleBuilder, libModuleBuilder).named(this::class.simpleName) @get:Rule val ruleChain = RuleChain.outerRule(projectRule).around(EdtRule())!! diff --git a/android/testSrc/com/android/tools/idea/res/psi/GoToAndroidResourceContributorTest.kt b/android/testSrc/com/android/tools/idea/res/psi/GoToAndroidResourceContributorTest.kt index e415971f92c..ddeb7463128 100644 --- a/android/testSrc/com/android/tools/idea/res/psi/GoToAndroidResourceContributorTest.kt +++ b/android/testSrc/com/android/tools/idea/res/psi/GoToAndroidResourceContributorTest.kt @@ -42,7 +42,7 @@ import org.junit.Test */ @RunsInEdt class GoToAndroidResourceContributorTest { - val projectRule = AndroidProjectRule.withAndroidModel(AndroidProjectBuilder()) + val projectRule = AndroidProjectRule.withAndroidModel(AndroidProjectBuilder()).named(this::class.simpleName) @get:Rule val chain = RuleChain(projectRule, EdtRule()) |