tutorials/Android-Tutorial-Test-ShowCase
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue#100 Update to API based logic

Browse source
This commit is contained in:
Gergely Hegedus 2022-07-13 20:18:45 +03:00
parent cc2b745d2e
commit 69f5f15c3a
3 changed files with 13 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gradlescripts/deploy.aar.gradle
View file

@ -23,7 +23,6 @@ afterEvaluate {
from components.release
groupId "$testUtilGroupId"
println("$testUtilArtifactId")
version "$testUtilVersion"
artifactId "$testUtilArtifactId"
artifact sourcesJar

2
gradlescripts/pull-screenshots.gradle
View file

@ -20,7 +20,7 @@ def findAdbFromLocal = {
def sdkDir = properties.getProperty('sdk.dir')
return "$sdkDir/platform-tools/adb"
} else {
System.err.println("WARNING: SDK dir not found by local properties, returning static: $System.env.HOME/Library/Android/sdk/platform-tools/adb")
println("WARNING: SDK dir not found by local properties, returning static: $System.env.HOME/Library/Android/sdk/platform-tools/adb")
return "$System.env.HOME/Library/Android/sdk/platform-tools/adb"
}
}

20
test-util-android/src/main/java/org/fnives/test/showcase/android/testutil/screenshot/basicScreenCaptureProcessor.kt
View file

@ -1,5 +1,6 @@
package org.fnives.test.showcase.android.testutil.screenshot
import android.os.Build
import android.os.Environment
import android.util.Log
import androidx.test.platform.app.InstrumentationRegistry
@ -20,21 +21,16 @@ fun basicScreenCaptureProcessor(subDir: String = "test-screenshots"): ScreenCapt
* see example issue: https://github.com/android/android-test/issues/818
*/
@Suppress("DEPRECATION")
fun getTestPicturesDir(): File? {
fun getTestPicturesDir(): File? =
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S || Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
Log.d(ScreenshotRule.TAG, "internal folder")
InstrumentationRegistry.getInstrumentation().targetContext.getExternalFilesDir(Environment.DIRECTORY_PICTURES)
} else {
val packageName = InstrumentationRegistry.getInstrumentation().targetContext.packageName
val environmentFolder = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES)
val externalFolder = File(environmentFolder, packageName)
if (externalFolder.canWrite()) {
Log.d(ScreenshotRule.TAG, "external folder")
return externalFolder
}
val internalFolder = InstrumentationRegistry.getInstrumentation().targetContext.getExternalFilesDir(Environment.DIRECTORY_PICTURES)
if (internalFolder?.canWrite() == true) {
Log.d(ScreenshotRule.TAG, "internal folder")
return internalFolder
externalFolder
}
Log.d(ScreenshotRule.TAG, "cant find directory the screenshots could be saved into")
return null
}