diff options
| author | Peter Xu <peterx@google.com> | 2021-01-20 10:20:10 -0800 |
|---|---|---|
| committer | Peter Xu <peterx@google.com> | 2021-01-21 19:00:50 +0000 |
| commit | 8493400ee0321d10a1becb5c257beab3bdc58f84 (patch) | |
| tree | 214649888bb814c8ad156b451f2af44eb37cf0a4 /compilationTests | |
| parent | af72329b92d7f6291e3b296e44c94a25846e918b (diff) | |
| download | data-binding-8493400ee0321d10a1becb5c257beab3bdc58f84.tar.gz | |
Fix compilationTests on mac
By redirecting ANDROID_PREFS_ROOT to a temporarily created directory,
since tests on mac can't access user directory.
Test: this is it.
Fixes: 177948569
Change-Id: I3f14e8aaaf82d01eaa0fd04417472865eae80ed2
Diffstat (limited to 'compilationTests')
3 files changed, 23 insertions, 0 deletions
diff --git a/compilationTests/BUILD.bazel b/compilationTests/BUILD.bazel index 202f5c3d..0b86a71c 100644 --- a/compilationTests/BUILD.bazel +++ b/compilationTests/BUILD.bazel @@ -35,5 +35,6 @@ iml_module( "//tools/adt/idea/android-test-framework:intellij.android.testFramework[module, test]", "//tools/adt/idea/adt-testutils:intellij.android.adt.testutils[module, test]", "//tools/adt/idea/android:intellij.android.core[module, test]", + "//tools/analytics-library/shared:analytics-shared[module, test]", ], ) diff --git a/compilationTests/db-compilationTests.iml b/compilationTests/db-compilationTests.iml index 87da45b2..233f775c 100644 --- a/compilationTests/db-compilationTests.iml +++ b/compilationTests/db-compilationTests.iml @@ -51,5 +51,6 @@ <orderEntry type="module" module-name="intellij.android.testFramework" scope="TEST" /> <orderEntry type="module" module-name="intellij.android.adt.testutils" scope="TEST" /> <orderEntry type="module" module-name="intellij.android.core" scope="TEST" /> + <orderEntry type="module" module-name="analytics-shared" scope="TEST" /> </component> </module>
\ No newline at end of file diff --git a/compilationTests/src/test/java/androidx/databinding/compilationTest/DataBindingCompilationTestCase.kt b/compilationTests/src/test/java/androidx/databinding/compilationTest/DataBindingCompilationTestCase.kt index e25f32f9..97a4fc72 100644 --- a/compilationTests/src/test/java/androidx/databinding/compilationTest/DataBindingCompilationTestCase.kt +++ b/compilationTests/src/test/java/androidx/databinding/compilationTest/DataBindingCompilationTestCase.kt @@ -18,6 +18,8 @@ package androidx.databinding.compilationTest import android.databinding.tool.processing.ScopedErrorReport import android.databinding.tool.store.Location import com.android.testutils.TestUtils +import com.android.tools.analytics.Environment +import com.android.tools.analytics.EnvironmentFakes import com.android.tools.idea.gradle.project.build.invoker.GradleBuildInvoker import com.android.tools.idea.testing.AndroidGradleTestCase import com.android.tools.idea.testing.TestProjectPaths @@ -26,7 +28,11 @@ import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskNotifica import com.intellij.openapi.util.io.FileUtil.toSystemDependentName import com.intellij.util.io.createDirectories import com.intellij.util.io.readText +import org.junit.After import org.junit.Assert +import org.junit.Before +import org.junit.Rule +import org.junit.rules.TemporaryFolder import java.io.File import java.io.IOException import java.nio.charset.StandardCharsets @@ -46,6 +52,21 @@ const val KEY_SETTINGS_INCLUDES = "SETTINGS_INCLUDES" const val DEFAULT_APP_PACKAGE = "com.android.databinding.compilationTest.test" abstract class DataBindingCompilationTestCase : AndroidGradleTestCase() { + @get:Rule + val temporaryFolder = TemporaryFolder() + + @Before + fun setup() { + EnvironmentFakes.setSingleProperty( + Environment.EnvironmentVariable.ANDROID_PREFS_ROOT.key, + temporaryFolder.newFolder().absolutePath + ) + } + + @After + fun restoreSystemProperty() { + EnvironmentFakes.setSystemEnvironment() + } protected fun loadApp() { loadApp(emptyMap()) |