fix report viewer url's

avito-tech · Apr 28, 2021 · 529c7c9 · 529c7c9
1 parent f4fb758
commit 529c7c9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/...strumentation-tests/src/main/kotlin/com/avito/instrumentation/InstrumentationTestsTask.kt b/...strumentation-tests/src/main/kotlin/com/avito/instrumentation/InstrumentationTestsTask.kt
@@ -140,7 +140,11 @@ public abstract class InstrumentationTestsTask @Inject constructor(
 
         val reportViewerData = reportViewerProperty.orNull
         val reportViewerConfig = if (reportViewerData != null) {
-            ReportViewerConfig(reportViewerData.reportApiUrl, reportCoordinates)
+            ReportViewerConfig(
+                apiUrl = reportViewerData.reportApiUrl,
+                viewerUrl = reportViewerData.reportViewerUrl,
+                reportCoordinates = reportCoordinates
+            )
         } else {
             null
         }

diff --git a/...gradle/runner/report/src/main/kotlin/com/avito/android/runner/report/ReportFactoryImpl.kt b/...gradle/runner/report/src/main/kotlin/com/avito/android/runner/report/ReportFactoryImpl.kt
@@ -41,7 +41,7 @@ public class ReportFactoryImpl(
     private fun createAvitoReport(reportViewerConfig: ReportViewerConfig): AvitoReport {
         return AvitoReport(
             reportsApi = ReportsApiFactory.create(
-                host = reportViewerConfig.url,
+                host = reportViewerConfig.apiUrl,
                 loggerFactory = loggerFactory,
                 httpClientProvider = httpClientProvider
             ),
@@ -55,7 +55,7 @@ public class ReportFactoryImpl(
     override fun createReportLinkGenerator(): ReportLinkGenerator {
         return if (reportViewerConfig != null) {
             ReportViewer.Impl(
-                host = reportViewerConfig.url,
+                host = reportViewerConfig.viewerUrl,
                 reportCoordinates = reportViewerConfig.reportCoordinates
             )
         } else {
@@ -66,7 +66,7 @@ public class ReportFactoryImpl(
     override fun createTestSuiteNameGenerator(): TestSuiteNameProvider {
         return if (reportViewerConfig != null) {
             ReportViewer.Impl(
-                host = reportViewerConfig.url,
+                host = reportViewerConfig.viewerUrl,
                 reportCoordinates = reportViewerConfig.reportCoordinates
             )
         } else {

diff --git a/...radle/runner/report/src/main/kotlin/com/avito/android/runner/report/ReportViewerConfig.kt b/...radle/runner/report/src/main/kotlin/com/avito/android/runner/report/ReportViewerConfig.kt
@@ -4,6 +4,7 @@ import com.avito.report.model.ReportCoordinates
 import java.io.Serializable
 
 public data class ReportViewerConfig(
-    val url: String,
+    val apiUrl: String,
+    val viewerUrl: String,
     val reportCoordinates: ReportCoordinates
 ) : Serializable