diff --git a/kaspresso-allure-support/NOTICE.txt b/allure-support/NOTICE.txt similarity index 100% rename from kaspresso-allure-support/NOTICE.txt rename to allure-support/NOTICE.txt diff --git a/kaspresso-allure-support/build.gradle.kts b/allure-support/build.gradle.kts similarity index 100% rename from kaspresso-allure-support/build.gradle.kts rename to allure-support/build.gradle.kts diff --git a/kaspresso-allure-support/src/main/AndroidManifest.xml b/allure-support/src/main/kotlin/AndroidManifest.xml similarity index 100% rename from kaspresso-allure-support/src/main/AndroidManifest.xml rename to allure-support/src/main/kotlin/AndroidManifest.xml diff --git a/kaspresso-allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/AllureSupportKaspressoBuilder.kt b/allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/AllureSupportKaspressoBuilder.kt similarity index 100% rename from kaspresso-allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/AllureSupportKaspressoBuilder.kt rename to allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/AllureSupportKaspressoBuilder.kt diff --git a/kaspresso-allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/files/AttachToReport.kt b/allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/files/AttachToReport.kt similarity index 100% rename from kaspresso-allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/files/AttachToReport.kt rename to allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/files/AttachToReport.kt diff --git a/kaspresso-allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/step/AllureMapperStepInterceptor.kt b/allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/step/AllureMapperStepInterceptor.kt similarity index 76% rename from kaspresso-allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/step/AllureMapperStepInterceptor.kt rename to allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/step/AllureMapperStepInterceptor.kt index 9bc87a62e..2fc6ecc1e 100644 --- a/kaspresso-allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/step/AllureMapperStepInterceptor.kt +++ b/allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/step/AllureMapperStepInterceptor.kt @@ -1,13 +1,5 @@ package com.kaspersky.components.alluresupport.interceptors.step -import com.kaspersky.kaspresso.interceptors.watcher.testcase.StepWatcherInterceptor -import com.kaspersky.kaspresso.testcases.models.info.StepInfo -import io.qameta.allure.kotlin.Allure -import io.qameta.allure.kotlin.model.Status -import io.qameta.allure.kotlin.model.StepResult -import java.util.Stack -import java.util.UUID - class AllureMapperStepInterceptor : StepWatcherInterceptor { private val lifecycle = Allure.lifecycle diff --git a/kaspresso-allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/step/ScreenshotStepInterceptor.kt b/allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/step/ScreenshotStepInterceptor.kt similarity index 69% rename from kaspresso-allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/step/ScreenshotStepInterceptor.kt rename to allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/step/ScreenshotStepInterceptor.kt index 136701f31..97f004644 100644 --- a/kaspresso-allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/step/ScreenshotStepInterceptor.kt +++ b/allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/step/ScreenshotStepInterceptor.kt @@ -1,10 +1,5 @@ package com.kaspersky.components.alluresupport.interceptors.step -import com.kaspersky.components.alluresupport.files.attachScreenshotToAllureReport -import com.kaspersky.kaspresso.device.screenshots.Screenshots -import com.kaspersky.kaspresso.interceptors.watcher.testcase.StepWatcherInterceptor -import com.kaspersky.kaspresso.testcases.models.info.StepInfo - class ScreenshotStepInterceptor( private val screenshots: Screenshots ) : StepWatcherInterceptor { diff --git a/kaspresso-allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/DumpLogcatTestInterceptor.kt b/allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/DumpLogcatTestInterceptor.kt similarity index 59% rename from kaspresso-allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/DumpLogcatTestInterceptor.kt rename to allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/DumpLogcatTestInterceptor.kt index b531a0f89..67f7857c2 100644 --- a/kaspresso-allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/DumpLogcatTestInterceptor.kt +++ b/allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/DumpLogcatTestInterceptor.kt @@ -1,10 +1,5 @@ package com.kaspersky.components.alluresupport.interceptors.testrun -import com.kaspersky.kaspresso.interceptors.watcher.testcase.TestRunWatcherInterceptor -import com.kaspersky.kaspresso.testcases.models.info.TestInfo -import com.kaspersky.components.alluresupport.files.attachLogcatToAllureReport -import com.kaspersky.kaspresso.device.logcat.dumper.LogcatDumper - class DumpLogcatTestInterceptor( private val logcatDumper: LogcatDumper ) : TestRunWatcherInterceptor { diff --git a/kaspresso-allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/DumpViewsTestInterceptor.kt b/allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/DumpViewsTestInterceptor.kt similarity index 75% rename from kaspresso-allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/DumpViewsTestInterceptor.kt rename to allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/DumpViewsTestInterceptor.kt index 8c650904b..dabe07260 100644 --- a/kaspresso-allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/DumpViewsTestInterceptor.kt +++ b/allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/DumpViewsTestInterceptor.kt @@ -1,10 +1,5 @@ package com.kaspersky.components.alluresupport.interceptors.testrun -import com.kaspersky.kaspresso.interceptors.watcher.testcase.TestRunWatcherInterceptor -import com.kaspersky.kaspresso.testcases.models.info.TestInfo -import com.kaspersky.components.alluresupport.files.attachViewHierarchyToAllureReport -import com.kaspersky.kaspresso.device.viewhierarchy.ViewHierarchyDumper - class DumpViewsTestInterceptor( private val viewHierarchyDumper: ViewHierarchyDumper ) : TestRunWatcherInterceptor { diff --git a/kaspresso-allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/HackyVideoRecordingTestInterceptor.kt b/allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/HackyVideoRecordingTestInterceptor.kt similarity index 73% rename from kaspresso-allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/HackyVideoRecordingTestInterceptor.kt rename to allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/HackyVideoRecordingTestInterceptor.kt index 06de688c9..76f528fa9 100644 --- a/kaspresso-allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/HackyVideoRecordingTestInterceptor.kt +++ b/allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/HackyVideoRecordingTestInterceptor.kt @@ -1,11 +1,5 @@ package com.kaspersky.components.alluresupport.interceptors.testrun -import com.kaspersky.components.alluresupport.files.resources.impl.AllureResourceFilesProvider -import com.kaspersky.components.alluresupport.results.AllureResultsHack -import com.kaspersky.kaspresso.device.video.Videos -import com.kaspersky.kaspresso.interceptors.watcher.testcase.TestRunWatcherInterceptor -import com.kaspersky.kaspresso.testcases.models.info.TestInfo - /** * Due to screen recorder bug we have to perform a workaround which requires VideoRecordingTestInterceptor * and MoveReportsInterceptor to be the last two interceptors in allure reports. So if you use VideoRecordingTestInterceptor diff --git a/kaspresso-allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/ScreenshotTestInterceptor.kt b/allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/ScreenshotTestInterceptor.kt similarity index 72% rename from kaspresso-allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/ScreenshotTestInterceptor.kt rename to allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/ScreenshotTestInterceptor.kt index 83221bbc0..c986c6a98 100644 --- a/kaspresso-allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/ScreenshotTestInterceptor.kt +++ b/allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/ScreenshotTestInterceptor.kt @@ -1,10 +1,5 @@ package com.kaspersky.components.alluresupport.interceptors.testrun -import com.kaspersky.kaspresso.interceptors.watcher.testcase.TestRunWatcherInterceptor -import com.kaspersky.kaspresso.testcases.models.info.TestInfo -import com.kaspersky.components.alluresupport.files.attachScreenshotToAllureReport -import com.kaspersky.kaspresso.device.screenshots.Screenshots - class ScreenshotTestInterceptor( private val screenshots: Screenshots ) : TestRunWatcherInterceptor { diff --git a/kaspresso-allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/VideoRecordingTestInterceptor.kt b/allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/VideoRecordingTestInterceptor.kt similarity index 60% rename from kaspresso-allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/VideoRecordingTestInterceptor.kt rename to allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/VideoRecordingTestInterceptor.kt index d54160c53..efe82cc72 100644 --- a/kaspresso-allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/VideoRecordingTestInterceptor.kt +++ b/allure-support/src/main/kotlin/com/kaspersky/components/alluresupport/interceptors/testrun/VideoRecordingTestInterceptor.kt @@ -1,10 +1,5 @@ package com.kaspersky.components.alluresupport.interceptors.testrun -import com.kaspersky.components.alluresupport.files.attachVideoToAllureReport -import com.kaspersky.kaspresso.device.video.Videos -import com.kaspersky.kaspresso.interceptors.watcher.testcase.TestRunWatcherInterceptor -import com.kaspersky.kaspresso.testcases.models.info.TestInfo - class VideoRecordingTestInterceptor( private val videos: Videos ) : TestRunWatcherInterceptor {