Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix getInstrumentation() before super.onCreate runner, lazy obtain directory for test results (issue #67) #68

Merged
merged 2 commits into from
Mar 1, 2022
Merged

Fix getInstrumentation() before super.onCreate runner, lazy obtain directory for test results (issue #67) #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4aad068
Fix getInstrumentation() before super.onCreate runner, lazy obtain di…
JacobKant Feb 12, 2022
0ab067c
fix tests
JacobKant Mar 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion allure-kotlin-android/src/main/kotlin/io/qameta/allure/android/AllureAndroidLifecycle.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import io.qameta.allure.kotlin.FileSystemResultsWriter
import io.qameta.allure.kotlin.util.PropertiesUtils
import java.io.File

object AllureAndroidLifecycle : AllureLifecycle(writer = FileSystemResultsWriter(obtainResultsDirectory()))
object AllureAndroidLifecycle : AllureLifecycle(writer = FileSystemResultsWriter(::obtainResultsDirectory))

/**
* Obtains results directory as a [File] reference.
Expand Down
2 changes: 1 addition & 1 deletion allure-kotlin-commons/src/main/kotlin/io/qameta/allure/kotlin/AllureLifecycle.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ open class AllureLifecycle @JvmOverloads constructor(

private fun getDefaultWriter(): FileSystemResultsWriter {
val path = PropertiesUtils.resultsDirectoryPath
return FileSystemResultsWriter(File(path))
return FileSystemResultsWriter { File(path) }
}

private fun getDefaultNotifier(): LifecycleNotifier {
Expand Down
5 changes: 4 additions & 1 deletion allure-kotlin-commons/src/main/kotlin/io/qameta/allure/kotlin/FileSystemResultsWriter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ import java.io.IOException
import java.io.InputStream
import java.util.UUID

class FileSystemResultsWriter(private val outputDirectory: File) : AllureResultsWriter {
class FileSystemResultsWriter(private val outputDirectoryProvider: () -> File) : AllureResultsWriter {

private val outputDirectory by lazy { outputDirectoryProvider() }

private val mapper: Json = Json {
prettyPrint = true
useArrayPolymorphism = true
Expand Down
5 changes: 2 additions & 3 deletions allure-kotlin-commons/src/test/kotlin/io/qameta/allure/kotlin/FileSystemResultsWriterTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@ import java.util.*
class FileSystemResultsWriterTest {
@Test
fun shouldNotFailIfNoResultsDirectory(@TempDir folder: File) {
val resolve = folder.resolve("some-directory")
val writer = FileSystemResultsWriter(resolve)
val writer = FileSystemResultsWriter { folder.resolve("some-directory") }
val testResult = generateTestResult()
writer.write(testResult)
}

@Test
fun shouldWriteTestResult(@TempDir folder: File) {
val writer = FileSystemResultsWriter(folder)
val writer = FileSystemResultsWriter { folder }
val uuid = UUID.randomUUID().toString()
val testResult = generateTestResult(uuid)
writer.write(testResult)
Expand Down