diff --git a/subprojects/android-test/keep-for-testing/src/main/kotlin/com/avito/android/test/KeepForTesting.kt b/subprojects/android-test/keep-for-testing/src/main/kotlin/com/avito/android/test/KeepForTesting.kt index f6c28b0115..bc427474f3 100644 --- a/subprojects/android-test/keep-for-testing/src/main/kotlin/com/avito/android/test/KeepForTesting.kt +++ b/subprojects/android-test/keep-for-testing/src/main/kotlin/com/avito/android/test/KeepForTesting.kt @@ -1,6 +1,6 @@ package com.avito.android.test -//see TestMinimized.md +// see TestMinimized.md /** * An analog of [androidx.annotation.Keep] diff --git a/subprojects/android-test/snackbar-rule/src/main/kotlin/com/avito/android/test/app/second/SnackbarRule.kt b/subprojects/android-test/snackbar-rule/src/main/kotlin/com/avito/android/test/app/second/SnackbarRule.kt index 6a8b9afbf9..7a707f76c1 100644 --- a/subprojects/android-test/snackbar-rule/src/main/kotlin/com/avito/android/test/app/second/SnackbarRule.kt +++ b/subprojects/android-test/snackbar-rule/src/main/kotlin/com/avito/android/test/app/second/SnackbarRule.kt @@ -74,7 +74,5 @@ class SnackbarRule() : SimpleRule(), SnackbarAsserts { // look at snackbar.setText private val Snackbar.text: String get() = view.findViewById(google_R.id.snackbar_text).text.toString() - } - } diff --git a/subprojects/android-test/test-inhouse-runner/src/main/kotlin/com/avito/android/monitoring/StatsdHttpTracker.kt b/subprojects/android-test/test-inhouse-runner/src/main/kotlin/com/avito/android/monitoring/StatsdHttpTracker.kt index 96137d7e2b..323d84fb96 100644 --- a/subprojects/android-test/test-inhouse-runner/src/main/kotlin/com/avito/android/monitoring/StatsdHttpTracker.kt +++ b/subprojects/android-test/test-inhouse-runner/src/main/kotlin/com/avito/android/monitoring/StatsdHttpTracker.kt @@ -14,7 +14,7 @@ class StatsdHttpTracker(private val statsd: StatsDSender) : HttpTracker { val urlKey = convertUrlToMetricKey(response.request.url) statsd.send( - "test.http.${urlKey}", + "test.http.$urlKey", CountMetric(response.code.toString()) ) statsd.send( diff --git a/subprojects/android-test/test-inhouse-runner/src/main/kotlin/com/avito/android/rule/ActivityRule.kt b/subprojects/android-test/test-inhouse-runner/src/main/kotlin/com/avito/android/rule/ActivityRule.kt index 42f121680a..4b1b659541 100644 --- a/subprojects/android-test/test-inhouse-runner/src/main/kotlin/com/avito/android/rule/ActivityRule.kt +++ b/subprojects/android-test/test-inhouse-runner/src/main/kotlin/com/avito/android/rule/ActivityRule.kt @@ -6,9 +6,9 @@ import androidx.test.rule.ActivityTestRule import com.avito.android.test.Intents.stubEverything internal class ActivityRule(aClass: Class) : ActivityTestRule( - aClass, - /*initialTouchMode*/ true, - /*launchActivity*/ false + aClass, + true, // initialTouchMode + false // launchActivity ) { override fun afterActivityLaunched() { @@ -21,4 +21,4 @@ internal class ActivityRule(aClass: Class) : ActivityTestRule { instrumentationArguments.putString( - annotationResolver.key, //TODO: protect against accidental collision in keys + annotationResolver.key, // TODO: protect against accidental collision in keys switchResolution.replacement ) } diff --git a/subprojects/android-test/test-inhouse-runner/src/main/kotlin/com/avito/android/test/AbstractLaunchRule.kt b/subprojects/android-test/test-inhouse-runner/src/main/kotlin/com/avito/android/test/AbstractLaunchRule.kt index f9fe4f724c..79f557eebd 100644 --- a/subprojects/android-test/test-inhouse-runner/src/main/kotlin/com/avito/android/test/AbstractLaunchRule.kt +++ b/subprojects/android-test/test-inhouse-runner/src/main/kotlin/com/avito/android/test/AbstractLaunchRule.kt @@ -3,8 +3,8 @@ package com.avito.android.test import android.annotation.SuppressLint import android.content.Intent import android.net.Uri -import androidx.test.platform.app.InstrumentationRegistry import android.util.Log +import androidx.test.platform.app.InstrumentationRegistry import com.avito.android.runner.checkPlayServices import com.avito.android.test.util.getCurrentActivity import org.junit.rules.TestRule diff --git a/subprojects/android-test/test-inhouse-runner/src/main/kotlin/com/avito/android/util/DeviceSettingsChecker.kt b/subprojects/android-test/test-inhouse-runner/src/main/kotlin/com/avito/android/util/DeviceSettingsChecker.kt index cb82dfa5bb..8fca206dac 100644 --- a/subprojects/android-test/test-inhouse-runner/src/main/kotlin/com/avito/android/util/DeviceSettingsChecker.kt +++ b/subprojects/android-test/test-inhouse-runner/src/main/kotlin/com/avito/android/util/DeviceSettingsChecker.kt @@ -21,10 +21,12 @@ class DeviceSettingsChecker(private val context: Context) { ) if (warnings.isNotEmpty()) { // TODO: Try to fix them of fail MBS-7355 - Log.e("UITestRunner", "=== ERROR=== \n" + - "Emulator has incorrect settings which cause flakiness:\n" + - warnings.joinToString(separator = "") { "- $it\n" } + - "\nSee https://avito-tech.github.io/avito-android/docs/ci/containers/#android-emulator-images" + Log.e( + "UITestRunner", + "=== ERROR=== \n" + + "Emulator has incorrect settings which cause flakiness:\n" + + warnings.joinToString(separator = "") { "- $it\n" } + + "\nSee https://avito-tech.github.io/avito-android/docs/ci/containers/#android-emulator-images" ) } } @@ -44,7 +46,13 @@ class DeviceSettingsChecker(private val context: Context) { } private fun checkTransitionAnimationScale(): String? { - return if (Settings.Global.getFloat(context.contentResolver, Settings.Global.TRANSITION_ANIMATION_SCALE, 1f) > 0) { + return if ( + Settings.Global.getFloat( + context.contentResolver, + Settings.Global.TRANSITION_ANIMATION_SCALE, + 1f + ) > 0 + ) { "Transition animation scale must be turned off" } else { null @@ -66,5 +74,4 @@ class DeviceSettingsChecker(private val context: Context) { null } } - } diff --git a/subprojects/android-test/test-inhouse-runner/src/test/kotlin/com/avito/android/runner/annotation/resolver/MethodStringRepresentationTest.kt b/subprojects/android-test/test-inhouse-runner/src/test/kotlin/com/avito/android/runner/annotation/resolver/MethodStringRepresentationTest.kt index ff2d15204f..e786142006 100644 --- a/subprojects/android-test/test-inhouse-runner/src/test/kotlin/com/avito/android/runner/annotation/resolver/MethodStringRepresentationTest.kt +++ b/subprojects/android-test/test-inhouse-runner/src/test/kotlin/com/avito/android/runner/annotation/resolver/MethodStringRepresentationTest.kt @@ -30,7 +30,8 @@ class MethodStringRepresentationTest { @Test fun `parseString - resolution method - for class#method string`() { assertResolution( - "com.test.fixtures.ClassWithMethod#method", Method( + "com.test.fixtures.ClassWithMethod#method", + Method( ClassWithMethod::class.java, ClassWithMethod::class.java.getMethod("method") ) diff --git a/subprojects/android-test/test-instrumentation-runner/src/main/kotlin/com/avito/android/runner/Context.kt b/subprojects/android-test/test-instrumentation-runner/src/main/kotlin/com/avito/android/runner/Context.kt index 0a2845829d..563f806a01 100644 --- a/subprojects/android-test/test-instrumentation-runner/src/main/kotlin/com/avito/android/runner/Context.kt +++ b/subprojects/android-test/test-instrumentation-runner/src/main/kotlin/com/avito/android/runner/Context.kt @@ -2,4 +2,4 @@ package com.avito.android.runner interface Context { val errorsReporter: ErrorsReporter -} \ No newline at end of file +} diff --git a/subprojects/android-test/test-instrumentation-runner/src/main/kotlin/com/avito/android/runner/DefaultTestInstrumentationContext.kt b/subprojects/android-test/test-instrumentation-runner/src/main/kotlin/com/avito/android/runner/DefaultTestInstrumentationContext.kt index d357cfcce4..da1a40b2ed 100644 --- a/subprojects/android-test/test-instrumentation-runner/src/main/kotlin/com/avito/android/runner/DefaultTestInstrumentationContext.kt +++ b/subprojects/android-test/test-instrumentation-runner/src/main/kotlin/com/avito/android/runner/DefaultTestInstrumentationContext.kt @@ -2,4 +2,4 @@ package com.avito.android.runner class DefaultTestInstrumentationContext( override val errorsReporter: ErrorsReporter -) : Context \ No newline at end of file +) : Context diff --git a/subprojects/android-test/test-instrumentation-runner/src/main/kotlin/com/avito/android/runner/ErrorsReporter.kt b/subprojects/android-test/test-instrumentation-runner/src/main/kotlin/com/avito/android/runner/ErrorsReporter.kt index 0b08619c28..31cfe3ddab 100644 --- a/subprojects/android-test/test-instrumentation-runner/src/main/kotlin/com/avito/android/runner/ErrorsReporter.kt +++ b/subprojects/android-test/test-instrumentation-runner/src/main/kotlin/com/avito/android/runner/ErrorsReporter.kt @@ -2,4 +2,4 @@ package com.avito.android.runner interface ErrorsReporter { fun reportError(error: Throwable) -} \ No newline at end of file +} diff --git a/subprojects/android-test/test-instrumentation-runner/src/main/kotlin/com/avito/android/runner/InstrumentationDelegate.kt b/subprojects/android-test/test-instrumentation-runner/src/main/kotlin/com/avito/android/runner/InstrumentationDelegate.kt index 36458a73b7..040dc076a1 100644 --- a/subprojects/android-test/test-instrumentation-runner/src/main/kotlin/com/avito/android/runner/InstrumentationDelegate.kt +++ b/subprojects/android-test/test-instrumentation-runner/src/main/kotlin/com/avito/android/runner/InstrumentationDelegate.kt @@ -11,4 +11,4 @@ class InstrumentationDelegate( fun beforeOnStart() { systemDialogsManager.closeSystemDialogs() } -} \ No newline at end of file +} diff --git a/subprojects/android-test/test-instrumentation-runner/src/main/kotlin/com/avito/android/runner/LogErrorsReporter.kt b/subprojects/android-test/test-instrumentation-runner/src/main/kotlin/com/avito/android/runner/LogErrorsReporter.kt index db991b1e48..800a9e8d53 100644 --- a/subprojects/android-test/test-instrumentation-runner/src/main/kotlin/com/avito/android/runner/LogErrorsReporter.kt +++ b/subprojects/android-test/test-instrumentation-runner/src/main/kotlin/com/avito/android/runner/LogErrorsReporter.kt @@ -9,4 +9,4 @@ class LogErrorsReporter( override fun reportError(error: Throwable) { Log.e(tag, "ERROR", error) } -} \ No newline at end of file +} diff --git a/subprojects/android-test/test-library/build.gradle.kts b/subprojects/android-test/test-library/build.gradle.kts index 7d6703c296..f64343f6ce 100644 --- a/subprojects/android-test/test-library/build.gradle.kts +++ b/subprojects/android-test/test-library/build.gradle.kts @@ -23,10 +23,12 @@ android { } } -dependencies(delegateClosureOf { +dependencies( + delegateClosureOf { - implementation(Dependencies.appcompat) + implementation(Dependencies.appcompat) - androidTestImplementation(project(":android-test:ui-testing-core")) - androidTestUtil(Dependencies.AndroidTest.orchestrator) -}) + androidTestImplementation(project(":android-test:ui-testing-core")) + androidTestUtil(Dependencies.AndroidTest.orchestrator) + } +) diff --git a/subprojects/android-test/test-report/build.gradle.kts b/subprojects/android-test/test-report/build.gradle.kts index 83fabb42f5..33390e7b96 100644 --- a/subprojects/android-test/test-report/build.gradle.kts +++ b/subprojects/android-test/test-report/build.gradle.kts @@ -20,7 +20,7 @@ dependencies { implementation(Dependencies.kotson) implementation(Dependencies.funktionaleTry) implementation(Dependencies.okhttp) - implementation(Dependencies.sentryAndroid) //todo use common:sentry + implementation(Dependencies.sentryAndroid) // todo use common:sentry testImplementation(project(":common:junit-utils")) testImplementation(project(":common:logger-test-fixtures")) diff --git a/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/ArgsProvider.kt b/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/ArgsProvider.kt index e4ea2c07f8..cc2a50e7ce 100644 --- a/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/ArgsProvider.kt +++ b/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/ArgsProvider.kt @@ -3,7 +3,7 @@ package com.avito.android.test.report import android.os.Bundle import java.io.Serializable -//TODO: consider of using as a wrapper above "bundle" to protect from collisions, empty values, ... +// TODO: consider of using as a wrapper above "bundle" to protect from collisions, empty values, ... interface ArgsProvider { /** @@ -37,7 +37,7 @@ class BundleArgsProvider( val result: String? = bundle.getString(name) if (result == null || result.isBlank()) { throw ReporterException( - "$name is a mandatory argument; all values=${bundle}" + "$name is a mandatory argument; all values=$bundle" ) } else { return result diff --git a/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/ReportImplementation.kt b/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/ReportImplementation.kt index 5967fcfff7..fdcf032c21 100644 --- a/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/ReportImplementation.kt +++ b/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/ReportImplementation.kt @@ -55,7 +55,6 @@ class ReportImplementation( TestLifecycleListener by TestLifecycleNotifier, PreconditionLifecycleListener by PreconditionLifecycleNotifier { - /** * Entries that occurred before first step/precondition */ @@ -73,7 +72,6 @@ class ReportImplementation( override val isFirstStepOrPrecondition: Boolean get() = state.isFirstStepOrPrecondition - @Synchronized override fun initTestCase(testMetadata: TestMetadata) = methodExecutionTracing("initTestCase") { checkStateIs() @@ -279,7 +277,6 @@ class ReportImplementation( futureUploads.add(html) } - @Synchronized override fun addComment(comment: String) { addEntry(Entry.Comment(comment, timeProvider.nowInSeconds())) diff --git a/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/ReportViewerHttpInterceptor.kt b/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/ReportViewerHttpInterceptor.kt index 98629e9ad8..1d4a859c33 100644 --- a/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/ReportViewerHttpInterceptor.kt +++ b/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/ReportViewerHttpInterceptor.kt @@ -4,7 +4,13 @@ import com.avito.filestorage.RemoteStorage import com.avito.http.isPlaintext import com.github.salomonbrys.kotson.fromJson import com.google.gson.GsonBuilder -import okhttp3.* +import okhttp3.Headers +import okhttp3.HttpUrl +import okhttp3.Interceptor +import okhttp3.MediaType +import okhttp3.Request +import okhttp3.Response +import okhttp3.ResponseBody import okhttp3.internal.http.promisesBody import okio.Buffer import java.nio.charset.Charset @@ -90,11 +96,7 @@ class ReportViewerHttpInterceptor( while (requestHeadersIndex < requestHeadersCount) { val name = headers.name(requestHeadersIndex) // Skip headers from the request body as they are explicitly logged above. - if (!"Content-Type".equals(name, ignoreCase = true) && !"Content-Length".equals( - name, - ignoreCase = true - ) - ) { + if (!"Content-Type".equals(name, ignoreCase = true) && !"Content-Length".equals(name, ignoreCase = true)) { result.appendln(name + ": " + headers.value(requestHeadersIndex)) } requestHeadersIndex++ diff --git a/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/ReportViewerWebsocketReporter.kt b/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/ReportViewerWebsocketReporter.kt index 80525d4abb..5b0c6d24b9 100644 --- a/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/ReportViewerWebsocketReporter.kt +++ b/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/ReportViewerWebsocketReporter.kt @@ -131,5 +131,4 @@ class ReportViewerWebsocketReporter(private val reportProvider: ReportProvider) class RpcRequest(val id: String, val method: String, override val prettyJson: String) : OutgoingMessage() class Unknown(override val prettyJson: String) : OutgoingMessage() } - } diff --git a/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/Step.kt b/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/Step.kt index a2bf74e818..78b52d319e 100644 --- a/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/Step.kt +++ b/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/Step.kt @@ -52,7 +52,7 @@ inline fun dataSet( ) { report.updateTestCase { dataSet = value - //todo почему -1 это вообще валидное значение? попробовать использовать unsigned тип данных + // todo почему -1 это вообще валидное значение? попробовать использовать unsigned тип данных require(testMetadata.dataSetNumber != null && testMetadata.dataSetNumber != -1) { "Please specify @DataSetNumber(Int) for test ${testMetadata.className}.${testMetadata.methodName}" } @@ -185,9 +185,11 @@ class StepException( fun data(isPrecondition: Boolean, action: String, assertion: String?): String { return "${slug(isPrecondition).capitalize()}:\n${action.prependIndent()}" .let { - if (assertion != null) + if (assertion != null) { "$it\nПроверка:\n${assertion.prependIndent()}" - else it + } else { + it + } } } } diff --git a/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/listener/TestLifecycleListener.kt b/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/listener/TestLifecycleListener.kt index 5e1c3755c4..4e7c0d716a 100644 --- a/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/listener/TestLifecycleListener.kt +++ b/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/listener/TestLifecycleListener.kt @@ -6,35 +6,35 @@ import com.avito.report.model.Incident interface TestLifecycleListener { fun beforeTestStart(state: ReportState.Initialized.Started) { - //do nothing + // do nothing } fun beforeTestUpdate(state: ReportState.Initialized.Started) { - //do nothing + // do nothing } fun afterTestUpdate(state: ReportState.Initialized.Started) { - //do nothing + // do nothing } fun afterTestStop(state: ReportState.Initialized.Started) { - //do nothing + // do nothing } fun beforeTestWrite(state: ReportState.Initialized.Started) { - //do nothing + // do nothing } fun testWriteError(error: Throwable) { - //do nothing + // do nothing } fun afterIncident(incident: Incident) { - //do nothing + // do nothing } fun screenshotUploadError(error: Throwable) { - //do nothing + // do nothing } } diff --git a/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/screenshot/ScreenshotCapturer.kt b/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/screenshot/ScreenshotCapturer.kt index 4ac7dfebb8..4c8b882880 100644 --- a/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/screenshot/ScreenshotCapturer.kt +++ b/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/screenshot/ScreenshotCapturer.kt @@ -45,7 +45,7 @@ interface ScreenshotCapturer { ) : ScreenshotCapturer { override fun captureBitmap(): Try> { - //todo use di: pass activity getter as constructor argument + // todo use di: pass activity getter as constructor argument val activity = getCurrentActivityOrNull() return if (activity != null) { Try { diff --git a/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/screenshot/ScreenshotUploader.kt b/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/screenshot/ScreenshotUploader.kt index 5e1ee3c1f8..5d4cd2b4bc 100644 --- a/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/screenshot/ScreenshotUploader.kt +++ b/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/screenshot/ScreenshotUploader.kt @@ -31,12 +31,14 @@ interface ScreenshotUploader { ), comment = comment ) - }) + } + ) }, { error -> logger.warn("Unable to make screenshot: ${error.message}", error) null - }) + } + ) } } } diff --git a/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/transport/ExternalStorageTransport.kt b/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/transport/ExternalStorageTransport.kt index 8eb4469c77..ccd860b775 100644 --- a/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/transport/ExternalStorageTransport.kt +++ b/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/transport/ExternalStorageTransport.kt @@ -51,7 +51,7 @@ class ExternalStorageTransport(private val gson: Gson) : Transport, PreTransport } companion object { - //todo наверное можно прокинуть в instrumentation params + // todo наверное можно прокинуть в instrumentation params private const val RUNNER_OUTPUT_FOLDER = "runner" private const val REPORT_FILE_NAME = "report.json" private const val TAG = "StorageJsonTransport" diff --git a/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/transport/LocalRunTransport.kt b/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/transport/LocalRunTransport.kt index d9df5eea6b..4f8aa51654 100644 --- a/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/transport/LocalRunTransport.kt +++ b/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/transport/LocalRunTransport.kt @@ -71,7 +71,7 @@ class LocalRunTransport( startTime = state.startTime, endTime = state.endTime ), - //local runs already has logcat in place + // local runs already has logcat in place stdout = "", stderr = "" ) @@ -83,9 +83,8 @@ class LocalRunTransport( @Suppress("ControlFlowWithEmptyBody") if (reportCoordinates.runId.contains("local", ignoreCase = true)) { - //todo find a way to display info in user context, it's a secret knowledge about logcat line + // todo find a way to display info in user context, it's a secret knowledge about logcat line } - } catch (e: Exception) { logger.warn("Report send failed", e) } diff --git a/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/video/VideoCapturer.kt b/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/video/VideoCapturer.kt index 07a6d87f2a..67dbe1e7db 100644 --- a/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/video/VideoCapturer.kt +++ b/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/test/report/video/VideoCapturer.kt @@ -141,7 +141,6 @@ class VideoCapturerImpl( } } - private fun testVideoFile(testName: String) = File( outputDirectory.value, "$testName.mp4" @@ -219,7 +218,7 @@ class VideoCapturerImpl( try { outputDescriptor.close() } catch (ignore: IOException) { - //ignore + // ignore } } diff --git a/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/util/AndroidExt.kt b/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/util/AndroidExt.kt index 8ec6fed87d..c8d14803ab 100644 --- a/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/util/AndroidExt.kt +++ b/subprojects/android-test/test-report/src/main/kotlin/com/avito/android/util/AndroidExt.kt @@ -25,4 +25,3 @@ fun Bitmap.toPng(): InputStream { val png = outputStream.toByteArray() return ByteArrayInputStream(png) } - diff --git a/subprojects/android-test/test-report/src/test/kotlin/com/avito/android/test/report/NestedStepsTest.kt b/subprojects/android-test/test-report/src/test/kotlin/com/avito/android/test/report/NestedStepsTest.kt index f3edd373b9..22bd714700 100644 --- a/subprojects/android-test/test-report/src/test/kotlin/com/avito/android/test/report/NestedStepsTest.kt +++ b/subprojects/android-test/test-report/src/test/kotlin/com/avito/android/test/report/NestedStepsTest.kt @@ -23,7 +23,6 @@ class NestedStepsTest { val error = assertThrows(StepException::class.java) { step("Outer step", report, false) { step("Inner step", report, false) { - } } } @@ -38,7 +37,6 @@ class NestedStepsTest { val error = assertThrows(StepException::class.java) { step("Outer step", report, false) { precondition("precondition", report, false) { - } } } diff --git a/subprojects/android-test/test-report/src/test/kotlin/com/avito/android/test/report/ReportSyntheticStepsTest.kt b/subprojects/android-test/test-report/src/test/kotlin/com/avito/android/test/report/ReportSyntheticStepsTest.kt index 4e6e4aff4d..c0114239e5 100644 --- a/subprojects/android-test/test-report/src/test/kotlin/com/avito/android/test/report/ReportSyntheticStepsTest.kt +++ b/subprojects/android-test/test-report/src/test/kotlin/com/avito/android/test/report/ReportSyntheticStepsTest.kt @@ -91,7 +91,6 @@ class ReportSyntheticStepsTest { addAssertion(assertionMessage) } - private fun ReportState.Initialized.Started.assertThat( stepsCount: Int, syntheticStepIndex: Int, diff --git a/subprojects/android-test/test-report/src/test/kotlin/com/avito/android/test/report/ReportTest.kt b/subprojects/android-test/test-report/src/test/kotlin/com/avito/android/test/report/ReportTest.kt index b63233c9b7..70872a07c2 100644 --- a/subprojects/android-test/test-report/src/test/kotlin/com/avito/android/test/report/ReportTest.kt +++ b/subprojects/android-test/test-report/src/test/kotlin/com/avito/android/test/report/ReportTest.kt @@ -38,7 +38,8 @@ class ReportTest { "Тапнуть по кнопка", null, AssertionError("No views in hierarchy found matching: with id: com.avito.android.dev:id/variant_list") - ), null + ), + null ) val reportPackage = report.reportTestCase() diff --git a/subprojects/android-test/test-screenshot/src/main/java/com/avito/android/test/screenshot_test/internal/Screenshot.kt b/subprojects/android-test/test-screenshot/src/main/java/com/avito/android/test/screenshot_test/internal/Screenshot.kt index f542e70f6a..9cf9f73390 100644 --- a/subprojects/android-test/test-screenshot/src/main/java/com/avito/android/test/screenshot_test/internal/Screenshot.kt +++ b/subprojects/android-test/test-screenshot/src/main/java/com/avito/android/test/screenshot_test/internal/Screenshot.kt @@ -63,7 +63,7 @@ internal class ScreenshotDirectory( @SuppressLint("SetWorldWritable") private fun setWorldWriteable(dir: File) { - dir.setWritable( /* writeable = */true, /* ownerOnly = */false) + dir.setWritable( /* writeable = */true, /* ownerOnly = */false) } private fun Context.getResolution(): String { diff --git a/subprojects/android-test/test-screenshot/src/main/java/com/avito/android/test/screenshot_test/internal/ScreenshotComparisonReporter.kt b/subprojects/android-test/test-screenshot/src/main/java/com/avito/android/test/screenshot_test/internal/ScreenshotComparisonReporter.kt index 8f133cfe01..daaa727ccd 100644 --- a/subprojects/android-test/test-screenshot/src/main/java/com/avito/android/test/screenshot_test/internal/ScreenshotComparisonReporter.kt +++ b/subprojects/android-test/test-screenshot/src/main/java/com/avito/android/test/screenshot_test/internal/ScreenshotComparisonReporter.kt @@ -59,6 +59,5 @@ internal class ScreenshotComparisonReporter( .replace("%referenceImage%", referenceUrl) .replace("%generatedImage%", generatedUrl) } - } } diff --git a/subprojects/android-test/test-screenshot/src/main/java/com/avito/android/test/screenshot_test/internal/ViewSaver.kt b/subprojects/android-test/test-screenshot/src/main/java/com/avito/android/test/screenshot_test/internal/ViewSaver.kt index c2aa218b50..fca5e9d306 100644 --- a/subprojects/android-test/test-screenshot/src/main/java/com/avito/android/test/screenshot_test/internal/ViewSaver.kt +++ b/subprojects/android-test/test-screenshot/src/main/java/com/avito/android/test/screenshot_test/internal/ViewSaver.kt @@ -9,7 +9,6 @@ import android.view.PixelCopy import android.view.View import androidx.annotation.RequiresApi - internal class ViewScreenshotMaker( private val activity: Activity, private val screenshot: Screenshot, @@ -31,7 +30,9 @@ internal class ViewScreenshotMaker( locationOfViewInWindow[1], locationOfViewInWindow[0] + width, locationOfViewInWindow[1] + height - ), bitmap, { copyResult -> + ), + bitmap, + { copyResult -> if (copyResult == PixelCopy.SUCCESS) { bitmapSaver.save(bitmap, screenshot) } else { diff --git a/subprojects/android-test/test-screenshot/src/main/java/com/avito/android/test/screenshot_test/test/BaseScreenshotTest.kt b/subprojects/android-test/test-screenshot/src/main/java/com/avito/android/test/screenshot_test/test/BaseScreenshotTest.kt index cac2345e2e..d3d2e904de 100644 --- a/subprojects/android-test/test-screenshot/src/main/java/com/avito/android/test/screenshot_test/test/BaseScreenshotTest.kt +++ b/subprojects/android-test/test-screenshot/src/main/java/com/avito/android/test/screenshot_test/test/BaseScreenshotTest.kt @@ -3,7 +3,6 @@ package com.avito.android.test.screenshot_test.test import android.Manifest import android.content.Context import android.os.Build -import android.util.Log import android.view.ContextThemeWrapper import android.view.View import android.view.ViewGroup @@ -154,7 +153,7 @@ abstract class BaseScreenshotTest( } private fun compareScreens() { - //the only purpose of this line is to freeze work if countingIdlingResource requires + // the only purpose of this line is to freeze work if countingIdlingResource requires Espresso.onIdle() val context = InstrumentationRegistry.getInstrumentation().context screenshotNames.forEach { screenshotName -> diff --git a/subprojects/android-test/test-screenshot/src/main/java/com/avito/android/test/screenshot_test/test/IdlieableActivity.kt b/subprojects/android-test/test-screenshot/src/main/java/com/avito/android/test/screenshot_test/test/IdlieableActivity.kt index 177dcfff30..20f4ded353 100644 --- a/subprojects/android-test/test-screenshot/src/main/java/com/avito/android/test/screenshot_test/test/IdlieableActivity.kt +++ b/subprojects/android-test/test-screenshot/src/main/java/com/avito/android/test/screenshot_test/test/IdlieableActivity.kt @@ -3,6 +3,6 @@ package com.avito.android.test.screenshot_test.test import androidx.appcompat.app.AppCompatActivity import androidx.test.espresso.idling.CountingIdlingResource -abstract class IdlieableActivity: AppCompatActivity() { +abstract class IdlieableActivity : AppCompatActivity() { abstract val countingIdlingResource: CountingIdlingResource } diff --git a/subprojects/android-test/test-screenshot/src/main/java/com/avito/android/test/screenshot_test/test/TestTheme.kt b/subprojects/android-test/test-screenshot/src/main/java/com/avito/android/test/screenshot_test/test/TestTheme.kt index cb9edcd2ae..d9e3efd67c 100644 --- a/subprojects/android-test/test-screenshot/src/main/java/com/avito/android/test/screenshot_test/test/TestTheme.kt +++ b/subprojects/android-test/test-screenshot/src/main/java/com/avito/android/test/screenshot_test/test/TestTheme.kt @@ -2,4 +2,4 @@ package com.avito.android.test.screenshot_test.test import androidx.annotation.StyleRes -class TestTheme(val name: String, @StyleRes val theme: Int) \ No newline at end of file +class TestTheme(val name: String, @StyleRes val theme: Int) diff --git a/subprojects/android-test/ui-testing-core/build.gradle.kts b/subprojects/android-test/ui-testing-core/build.gradle.kts index 3a62a32a5b..c0d50548e9 100644 --- a/subprojects/android-test/ui-testing-core/build.gradle.kts +++ b/subprojects/android-test/ui-testing-core/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { api(Dependencies.recyclerView) api(Dependencies.material) - //todo implementation, waitForAssertion used in app + // todo implementation, waitForAssertion used in app api(project(":common:waiter")) implementation(Dependencies.Test.hamcrestLib) diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/InteractionContext.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/InteractionContext.kt index 9638271ed4..d37a6ae4e8 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/InteractionContext.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/InteractionContext.kt @@ -38,12 +38,14 @@ class SimpleInteractionContext( override fun perform(vararg actions: ViewAction) { runPrecondition() - interaction.waitToPerform(actions.map { action -> - ActionInterceptor.Proxy( - action, - UITestConfig.actionInterceptors - ) - }) + interaction.waitToPerform( + actions.map { action -> + ActionInterceptor.Proxy( + action, + UITestConfig.actionInterceptors + ) + } + ) } override fun check(assertion: ViewAssertion) { diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/action/OnViewActionsDriver.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/action/OnViewActionsDriver.kt index bfe9e81290..8d87a58df6 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/action/OnViewActionsDriver.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/action/OnViewActionsDriver.kt @@ -16,11 +16,13 @@ class OnViewActionsDriver(private val matcher: Matcher) : ActionsDriver { get() = Espresso.onView(matcher) override fun perform(vararg actions: ViewAction) { - interaction.waitToPerform(actions.map { action -> - ActionInterceptor.Proxy( - action, - UITestConfig.actionInterceptors - ) - }) + interaction.waitToPerform( + actions.map { action -> + ActionInterceptor.Proxy( + action, + UITestConfig.actionInterceptors + ) + } + ) } } diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/checks/Checks.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/checks/Checks.kt index 405a80ee6f..cde2fe4a9b 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/checks/Checks.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/checks/Checks.kt @@ -71,8 +71,10 @@ interface Checks : LabelChecks { fun withChildCountEquals(count: Int) - @Deprecated(message = "Checking that element does not exist by matcher is fragile. " + - "Positive scenario for the expected state is more reliable") + @Deprecated( + message = "Checking that element does not exist by matcher is fragile. " + + "Positive scenario for the expected state is more reliable" + ) fun doesNotExist() fun exists() diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/element/field/TextFieldAction.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/element/field/TextFieldAction.kt index 0c8609bf9b..f308962c0f 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/element/field/TextFieldAction.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/element/field/TextFieldAction.kt @@ -25,7 +25,6 @@ interface FieldActions : Actions { fun append(text: String) } - internal class TextFieldAction( private val interactionContext: InteractionContext ) : FieldActions, diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/element/field/TextFieldChecks.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/element/field/TextFieldChecks.kt index 9b40880e3f..3d6696ad69 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/element/field/TextFieldChecks.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/element/field/TextFieldChecks.kt @@ -19,4 +19,4 @@ internal class TextFieldChecksImpl( override fun withHintText(text: String) { interactionContext.check(ViewAssertions.matches(ViewMatchers.withHint(text))) } -} \ No newline at end of file +} diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/element/field/actions/TypeText.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/element/field/actions/TypeText.kt index 9184c1c0aa..bbd30713a5 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/element/field/actions/TypeText.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/element/field/actions/TypeText.kt @@ -138,5 +138,4 @@ internal open class SimpleTextWatcher : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {} override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {} - } diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/EspressoActions.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/EspressoActions.kt index 3db204b001..890dbbf3a6 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/EspressoActions.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/EspressoActions.kt @@ -6,6 +6,7 @@ import android.view.View import androidx.test.espresso.PerformException import androidx.test.espresso.UiController import androidx.test.espresso.ViewAction +import androidx.test.espresso.action.CoordinatesProvider import androidx.test.espresso.action.GeneralClickAction import androidx.test.espresso.action.GeneralSwipeAction import androidx.test.espresso.action.PrecisionDescriber @@ -16,7 +17,6 @@ import androidx.test.espresso.action.Swiper import androidx.test.espresso.action.Tap import androidx.test.espresso.action.ViewActions import androidx.test.espresso.action.ViewActions.actionWithAssertions -import androidx.test.espresso.action.CoordinatesProvider import com.avito.android.test.UITestConfig import com.avito.android.test.element.field.actions.TypeText import com.avito.android.test.espresso.action.ActionOnClickableElement @@ -89,7 +89,8 @@ object EspressoActions { } is UITestConfig.ClickType.EspressoClick.ClickRollbackPolicy.Fail -> defaultEspressoClickAction( - coordinatesProvider, object : ViewAction { + coordinatesProvider, + object : ViewAction { override fun getDescription(): String = "fake fail action after click interpreted as long click" diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/ActionOnEnabledElement.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/ActionOnEnabledElement.kt index 1782def754..d8f4c8d447 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/ActionOnEnabledElement.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/ActionOnEnabledElement.kt @@ -21,4 +21,4 @@ class ActionOnEnabledElement( override fun perform(uiController: UiController, view: View) { action.perform(uiController, view) } -} \ No newline at end of file +} diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/ActionOnLongClickableElement.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/ActionOnLongClickableElement.kt index 812f41ce97..3a3684534a 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/ActionOnLongClickableElement.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/ActionOnLongClickableElement.kt @@ -21,4 +21,4 @@ class ActionOnLongClickableElement( override fun perform(uiController: UiController, view: View) { action.perform(uiController, view) } -} \ No newline at end of file +} diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/GroupedViewAction.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/GroupedViewAction.kt index 4d4fb927a5..60dfe438ab 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/GroupedViewAction.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/GroupedViewAction.kt @@ -23,4 +23,4 @@ class GroupedViewAction( override fun perform(uiController: UiController, view: View) { actions.forEach { it.perform(uiController, view) } } -} \ No newline at end of file +} diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/RatingBarAction.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/RatingBarAction.kt index 80d8b0b23e..899879df08 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/RatingBarAction.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/RatingBarAction.kt @@ -1,10 +1,10 @@ package com.avito.android.test.espresso.action +import android.view.View +import androidx.appcompat.widget.AppCompatRatingBar import androidx.test.espresso.UiController import androidx.test.espresso.ViewAction import androidx.test.espresso.matcher.ViewMatchers -import androidx.appcompat.widget.AppCompatRatingBar -import android.view.View import org.hamcrest.Matcher class RatingBarAction(private val rating: Float) : ViewAction { @@ -18,5 +18,4 @@ class RatingBarAction(private val rating: Float) : ViewAction { ratingBar.rating = rating uiController.loopMainThreadUntilIdle() } - } diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/click/ClickVisualization.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/click/ClickVisualization.kt index ad93f6602e..4cc12597dd 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/click/ClickVisualization.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/click/ClickVisualization.kt @@ -39,7 +39,6 @@ internal class ClickVisualization( private fun Int.toPx(): Float = this * Resources.getSystem().displayMetrics.density } - private class VisualizationDrawable( val originalForeground: Drawable?, val x: Float, @@ -68,4 +67,4 @@ private class VisualizationDrawable( originalForeground?.colorFilter = colorFilter paint.colorFilter = colorFilter } -} \ No newline at end of file +} diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/recycler/RecyclerItemMatching.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/recycler/RecyclerItemMatching.kt index e9042d8c59..0e16cf65f9 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/recycler/RecyclerItemMatching.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/recycler/RecyclerItemMatching.kt @@ -98,8 +98,12 @@ internal class RecyclerItemsMatcher( get() = "No matched item in recycler at position $atPosition. ${createNearItemsDescription()}" private fun createNearItemsDescription() = - "Search near items from $searchFrom to $searchTo ${if (nearMatchedItems.isEmpty()) "doesn't have matches" else "has matches at positions: [${nearMatchedItems.map { it.position } - .joinToString()}"}]" + "Search near items from $searchFrom to $searchTo ${ + if (nearMatchedItems.isEmpty()) "doesn't have matches" else "has matches at positions: [${ + nearMatchedItems.map { it.position } + .joinToString() + }" + }]" } } @@ -128,8 +132,10 @@ internal class RecyclerItemsMatcher( item = MatchedItem( position = position, description = HumanReadables.getViewHierarchyErrorMessage( - holder.itemView, null, - "\n\n*** Matched ViewHolder item at position: $position ***", null + holder.itemView, + null, + "\n\n*** Matched ViewHolder item at position: $position ***", + null ) ) ) @@ -152,8 +158,10 @@ internal class RecyclerItemsMatcher( item = MatchedItem( position = atPosition, description = HumanReadables.getViewHierarchyErrorMessage( - viewHolderAtPosition.itemView, null, - "\n\n*** Matched ViewHolder item at position: $atPosition ***", null + viewHolderAtPosition.itemView, + null, + "\n\n*** Matched ViewHolder item at position: $atPosition ***", + null ) ) ) @@ -172,8 +180,10 @@ internal class RecyclerItemsMatcher( MatchedItem( position = position, description = HumanReadables.getViewHierarchyErrorMessage( - holder.itemView, null, - "\n\n*** Matched ViewHolder item at position: $atPosition ***", null + holder.itemView, + null, + "\n\n*** Matched ViewHolder item at position: $atPosition ***", + null ) ) } @@ -182,8 +192,10 @@ internal class RecyclerItemsMatcher( Result.NoItemAtPosition( atPosition = atPosition, itemAtPosition = HumanReadables.getViewHierarchyErrorMessage( - viewHolderAtPosition.itemView, null, - "\n\n*** Matched ViewHolder item at position: $atPosition ***", null + viewHolderAtPosition.itemView, + null, + "\n\n*** Matched ViewHolder item at position: $atPosition ***", + null ), nearMatchedItems = nearMatchedItems, searchFrom = searchFrom, @@ -194,7 +206,6 @@ internal class RecyclerItemsMatcher( } } - private fun getViewHolder(atPosition: Int): RecyclerView.ViewHolder { var viewHolder = recyclerView.findViewHolderForAdapterPosition(atPosition) if (viewHolder == null) { diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/recycler/RecyclerViewActions.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/recycler/RecyclerViewActions.kt index 94aba928ad..1753961e12 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/recycler/RecyclerViewActions.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/espresso/action/recycler/RecyclerViewActions.kt @@ -12,7 +12,6 @@ import org.hamcrest.Matcher import org.hamcrest.Matchers.allOf import org.hamcrest.TypeSafeMatcher - private class ViewDoesNotExistInRecyclerCheckHack constructor( private val match: RecyclerItemsMatcher.Match, private val viewAction: ViewAction diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/matcher/BottomSheetCollapsedMatcher.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/matcher/BottomSheetCollapsedMatcher.kt index 173619b923..3a5d126c7d 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/matcher/BottomSheetCollapsedMatcher.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/matcher/BottomSheetCollapsedMatcher.kt @@ -1,9 +1,9 @@ package com.avito.android.test.matcher +import android.view.View +import androidx.test.espresso.matcher.BoundedMatcher import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPSED -import androidx.test.espresso.matcher.BoundedMatcher -import android.view.View import org.hamcrest.Description class BottomSheetCollapsedMatcher : BoundedMatcher(View::class.java) { @@ -14,5 +14,4 @@ class BottomSheetCollapsedMatcher : BoundedMatcher(View::class.java) override fun matchesSafely(view: View): Boolean = BottomSheetBehavior.from(view).state == STATE_COLLAPSED - } diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/matcher/BottomSheetExpandedMatcher.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/matcher/BottomSheetExpandedMatcher.kt index 3c73b58407..24d2471182 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/matcher/BottomSheetExpandedMatcher.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/matcher/BottomSheetExpandedMatcher.kt @@ -1,9 +1,9 @@ package com.avito.android.test.matcher +import android.view.View +import androidx.test.espresso.matcher.BoundedMatcher import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED -import androidx.test.espresso.matcher.BoundedMatcher -import android.view.View import org.hamcrest.Description class BottomSheetExpandedMatcher : BoundedMatcher(View::class.java) { @@ -14,5 +14,4 @@ class BottomSheetExpandedMatcher : BoundedMatcher(View::class.java) override fun matchesSafely(view: View): Boolean = BottomSheetBehavior.from(view).state == STATE_EXPANDED - } diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/matcher/CanBeLongClickedMatcher.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/matcher/CanBeLongClickedMatcher.kt index 9db2abfe7c..87535c4c0b 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/matcher/CanBeLongClickedMatcher.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/matcher/CanBeLongClickedMatcher.kt @@ -24,4 +24,4 @@ internal class CanBeLongClickedMatcher : TypeSafeMatcher() { else -> false } } -} \ No newline at end of file +} diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/matcher/CompoundDrawableMatcher.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/matcher/CompoundDrawableMatcher.kt index 25a959c136..84e2d59b1e 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/matcher/CompoundDrawableMatcher.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/matcher/CompoundDrawableMatcher.kt @@ -37,8 +37,8 @@ class CompoundDrawableMatcher( } return matchDrawable(context, source = compoundDrawables[LEFT], sourceTint = tintList, otherId = left, otherTint = tint) && - matchDrawable(context, source = compoundDrawables[RIGHT], sourceTint = tintList,otherId = right, otherTint = tint) && - matchDrawable(context, source = compoundDrawables[TOP], sourceTint = tintList,otherId = top, otherTint = tint) && + matchDrawable(context, source = compoundDrawables[RIGHT], sourceTint = tintList, otherId = right, otherTint = tint) && + matchDrawable(context, source = compoundDrawables[TOP], sourceTint = tintList, otherId = top, otherTint = tint) && matchDrawable(context, source = compoundDrawables[BOTTOM], sourceTint = tintList, otherId = bottom, otherTint = tint) } diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/matcher/OverlapMatcher.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/matcher/OverlapMatcher.kt index be1617c093..2ec3393e8b 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/matcher/OverlapMatcher.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/matcher/OverlapMatcher.kt @@ -26,5 +26,4 @@ class OverlapMatcher : TypeSafeMatcher() { higherZOrderView.getRect().intersect(viewRect) } } - } diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/matcher/ViewGroupMatcher.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/matcher/ViewGroupMatcher.kt index bd3cfa34f7..b42b5ca1f3 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/matcher/ViewGroupMatcher.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/matcher/ViewGroupMatcher.kt @@ -30,8 +30,9 @@ class ViewGroupMatcher { } override fun matchesSafely(view: View): Boolean { - if (view.parent !is ViewGroup) + if (view.parent !is ViewGroup) { return false + } val parent = view.parent as ViewGroup diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/ListElement.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/ListElement.kt index 6e71bd95d4..2dbea638be 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/ListElement.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/ListElement.kt @@ -185,31 +185,39 @@ open class ListElement(interactionContext: InteractionContext) : ViewElement(int * Refreshes recycler view by pressing in it's center and pulling down. Note: it does not perform * [scrollToPosition] operation before - developer should do it himself! */ - fun pullToRefresh() = actions.swipe(object : SwipeDirection { - override fun toCoordinateProvider(): Pair { - return GeneralLocation.CENTER to GeneralLocation.BOTTOM_CENTER - } - }, Swipe.SLOW, Press.FINGER) + fun pullToRefresh() = actions.swipe( + object : SwipeDirection { + override fun toCoordinateProvider(): Pair { + return GeneralLocation.CENTER to GeneralLocation.BOTTOM_CENTER + } + }, + Swipe.SLOW, + Press.FINGER + ) override fun swipe( direction: SwipeDirection, speed: Swiper, precision: PrecisionDescriber ) { - actions.swipe(object : SwipeDirection { - override fun toCoordinateProvider(): - Pair { - return when (direction) { - TOP_TO_BOTTOM -> GeneralLocation.CENTER to GeneralLocation.BOTTOM_CENTER - BOTTOM_TO_TOP -> GeneralLocation.CENTER to GeneralLocation.TOP_CENTER - LEFT_TO_RIGHT -> GeneralLocation.CENTER to GeneralLocation.CENTER_RIGHT - RIGHT_TO_LEFT -> GeneralLocation.CENTER to GeneralLocation.CENTER_LEFT - else -> throw IllegalArgumentException( - "Can't do \"swipe\". Argument $direction is not supported" - ) + actions.swipe( + object : SwipeDirection { + override fun toCoordinateProvider(): + Pair { + return when (direction) { + TOP_TO_BOTTOM -> GeneralLocation.CENTER to GeneralLocation.BOTTOM_CENTER + BOTTOM_TO_TOP -> GeneralLocation.CENTER to GeneralLocation.TOP_CENTER + LEFT_TO_RIGHT -> GeneralLocation.CENTER to GeneralLocation.CENTER_RIGHT + RIGHT_TO_LEFT -> GeneralLocation.CENTER to GeneralLocation.CENTER_LEFT + else -> throw IllegalArgumentException( + "Can't do \"swipe\". Argument $direction is not supported" + ) + } } - } - }, Swipe.FAST, Press.FINGER) + }, + Swipe.FAST, + Press.FINGER + ) } /** diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/PageObject.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/PageObject.kt index ba37cd614b..7ba2281654 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/PageObject.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/PageObject.kt @@ -38,7 +38,6 @@ abstract class PageObject { val constructor = T::class.java.getConstructor(InteractionContext::class.java) return constructor.newInstance(this.interactionContext) } - } /** diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/PageObjectElement.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/PageObjectElement.kt index b4b1aa4467..171011c66b 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/PageObjectElement.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/PageObjectElement.kt @@ -14,4 +14,3 @@ abstract class PageObjectElement : PageObject(), Actions { abstract val actions: Actions abstract val checks: Checks } - diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/ProgressBarElement.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/ProgressBarElement.kt index 71feffa507..b197e2edba 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/ProgressBarElement.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/ProgressBarElement.kt @@ -32,17 +32,19 @@ class ProgressBarChecksImpl( Checks by ChecksImpl(driver) { override fun withProgress(progress: Int) { - driver.check(ViewAssertion { view, _ -> - when (view) { - is ProgressBar -> { - if (view.progress != progress) { - throw AssertionFailedError( - "Current progress is: ${view.progress}. Checked is $progress" - ) + driver.check( + ViewAssertion { view, _ -> + when (view) { + is ProgressBar -> { + if (view.progress != progress) { + throw AssertionFailedError( + "Current progress is: ${view.progress}. Checked is $progress" + ) + } } + else -> throw AssertionFailedError("Matched view with is not ProgressBar") } - else -> throw AssertionFailedError("Matched view with is not ProgressBar") } - }) + ) } } diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/RatingBarElement.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/RatingBarElement.kt index 3b91293d10..3bd522544f 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/RatingBarElement.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/RatingBarElement.kt @@ -7,7 +7,6 @@ import androidx.test.espresso.ViewAction import androidx.test.espresso.ViewAssertion import androidx.test.espresso.matcher.ViewMatchers import com.avito.android.test.InteractionContext -import com.avito.android.test.SimpleInteractionContext import com.avito.android.test.action.ActionsDriver import com.avito.android.test.checks.Checks import com.avito.android.test.checks.ChecksDriver @@ -46,18 +45,20 @@ class RatingBarChecksImpl( Checks by ChecksImpl(driver) { override fun withRating(rating: Float) { - driver.check(ViewAssertion { view, _ -> - when (view) { - is RatingBar -> { - if (view.rating != rating) { - throw AssertionFailedError( - "Current rating is: ${view.rating}. Checked is $rating" - ) + driver.check( + ViewAssertion { view, _ -> + when (view) { + is RatingBar -> { + if (view.rating != rating) { + throw AssertionFailedError( + "Current rating is: ${view.rating}. Checked is $rating" + ) + } } + else -> throw AssertionFailedError("Matched view with is not RatingBar") } - else -> throw AssertionFailedError("Matched view with is not RatingBar") } - }) + ) } } diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/SnackbarElement.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/SnackbarElement.kt index 8e8e472422..65dcaa2f4a 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/SnackbarElement.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/SnackbarElement.kt @@ -24,24 +24,30 @@ class SnackbarElement(interactionContext: InteractionContext) : ViewElement(inte constructor() : this(SimpleInteractionContext(snackbarLayoutMatcher())) // TODO: migrate to HandleParentContext - constructor(textMatcher: Matcher? = null) : this(SimpleInteractionContext( - if (textMatcher == null) { - snackbarLayoutMatcher() - } else { - Matchers.allOf( - snackbarLayoutMatcher(), - ViewMatchers.hasDescendant(ViewMatchers.withText(textMatcher)) - ) - } - )) - - val message = ViewElement(interactionContext.provideChildContext( - ViewMatchers.withId(R.id.snackbar_text) - )) - - val button = ViewElement(interactionContext.provideChildContext( - ViewMatchers.withId(R.id.snackbar_action) - )) + constructor(textMatcher: Matcher? = null) : this( + SimpleInteractionContext( + if (textMatcher == null) { + snackbarLayoutMatcher() + } else { + Matchers.allOf( + snackbarLayoutMatcher(), + ViewMatchers.hasDescendant(ViewMatchers.withText(textMatcher)) + ) + } + ) + ) + + val message = ViewElement( + interactionContext.provideChildContext( + ViewMatchers.withId(R.id.snackbar_text) + ) + ) + + val button = ViewElement( + interactionContext.provideChildContext( + ViewMatchers.withId(R.id.snackbar_action) + ) + ) fun swipeOut() = EspressoActions.swipe(RIGHT_TO_LEFT) } diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/SwitchElement.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/SwitchElement.kt index 01ef171913..b0495b0b49 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/SwitchElement.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/SwitchElement.kt @@ -6,7 +6,6 @@ import androidx.test.espresso.UiController import androidx.test.espresso.ViewAction import androidx.test.espresso.matcher.ViewMatchers import com.avito.android.test.InteractionContext -import com.avito.android.test.SimpleInteractionContext import com.avito.android.test.action.ActionsDriver import org.hamcrest.Matcher diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/TabLayoutElement.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/TabLayoutElement.kt index a14c744cc7..fde173f0dc 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/TabLayoutElement.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/TabLayoutElement.kt @@ -8,7 +8,6 @@ import androidx.test.espresso.assertion.ViewAssertions.matches import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom import androidx.test.espresso.util.HumanReadables import com.avito.android.test.InteractionContext -import com.avito.android.test.SimpleInteractionContext import com.avito.android.test.action.ActionsDriver import com.avito.android.test.checks.Checks import com.avito.android.test.checks.ChecksDriver diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/TextElement.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/TextElement.kt index d6a9b74708..c501225e1e 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/TextElement.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/TextElement.kt @@ -10,7 +10,6 @@ import androidx.test.espresso.ViewAction import androidx.test.espresso.action.CoordinatesProvider import androidx.test.espresso.util.HumanReadables import com.avito.android.test.InteractionContext -import com.avito.android.test.SimpleInteractionContext import com.avito.android.test.action.Actions import com.avito.android.test.action.ActionsDriver import com.avito.android.test.action.ActionsImpl diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/ToolbarElement.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/ToolbarElement.kt index 01383ee23e..88762930de 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/ToolbarElement.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/page_object/ToolbarElement.kt @@ -32,8 +32,8 @@ import com.avito.android.test.matcher.ToolbarSubTitleResMatcher import com.avito.android.test.matcher.ToolbarSubtitleMatcher import com.avito.android.test.matcher.ToolbarTitleMatcher import com.avito.android.test.matcher.ToolbarTitleResMatcher -import com.avito.android.waiter.waitFor import com.avito.android.test.waitToPerform +import com.avito.android.waiter.waitFor import org.hamcrest.Description import org.hamcrest.Matcher import org.hamcrest.MatcherAssert.assertThat @@ -102,7 +102,8 @@ open class ToolbarElement(interactionContext: InteractionContext) : override val checks get() = OverflowMenuChecksImpl( - toolbarMatcher, titleMatcher, + toolbarMatcher, + titleMatcher, ChecksImpl(OverflowMenuDriver(toolbarMatcher, titleMatcher, overflowMenuButton)) ) diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/util/ClickTypeRule.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/util/ClickTypeRule.kt index 0f1bf89bb5..6961342170 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/util/ClickTypeRule.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/util/ClickTypeRule.kt @@ -8,25 +8,25 @@ import org.junit.runners.model.Statement class ClicksTypeRule(private val clickType: UITestConfig.ClickType) : TestRule { override fun apply(base: Statement, description: Description): Statement = - object : Statement() { - override fun evaluate() { - val enabled = description - .annotations - .filterIsInstance() - .isNotEmpty() + object : Statement() { + override fun evaluate() { + val enabled = description + .annotations + .filterIsInstance() + .isNotEmpty() + if (enabled) { + UITestConfig.clicksType = clickType + } + try { + base.evaluate() + } finally { if (enabled) { - UITestConfig.clicksType = clickType - } - try { - base.evaluate() - } finally { - if (enabled) { - UITestConfig.clicksType = UITestConfig.defaultClicksType - } + UITestConfig.clicksType = UITestConfig.defaultClicksType } } } + } } -annotation class ChangeClickType \ No newline at end of file +annotation class ChangeClickType diff --git a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/util/Drawables.kt b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/util/Drawables.kt index 5ac725443a..d4cabdbf7f 100644 --- a/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/util/Drawables.kt +++ b/subprojects/android-test/ui-testing-core/src/main/kotlin/com/avito/android/test/util/Drawables.kt @@ -102,7 +102,8 @@ fun Drawable.toBitmap(): Bitmap { val bitmap = Bitmap.createBitmap( drawable.intrinsicWidth, - drawable.intrinsicHeight, Bitmap.Config.ARGB_8888 + drawable.intrinsicHeight, + Bitmap.Config.ARGB_8888 ) val canvas = Canvas(bitmap) drawable.setBounds(0, 0, canvas.width, canvas.height) diff --git a/subprojects/build.gradle.kts b/subprojects/build.gradle.kts index 1f3edaa2fa..bd636e6dfb 100644 --- a/subprojects/build.gradle.kts +++ b/subprojects/build.gradle.kts @@ -71,8 +71,10 @@ repositories { jcenter() } filter { - //all for detekt + // all for detekt includeGroup("io.gitlab.arturbosch.detekt") + includeGroup("com.pinterest.ktlint") + includeGroup("org.ec4j.core") includeGroupByRegex("org.jetbrains.*") includeModule("com.beust", "jcommander") includeModule("org.yaml", "snakeyaml") @@ -80,6 +82,10 @@ repositories { } } +dependencies { + detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.15.0-RC1") +} + subprojects { repositories { @@ -98,9 +104,6 @@ subprojects { forRepository { google() } - forRepository { - mavenCentral() - } filter { includeModuleByRegex("com\\.android.*", "(?!r8).*") includeModuleByRegex("com\\.google\\.android.*", ".*") @@ -196,7 +199,7 @@ subprojects { extensions.getByType().run { publications { - //todo should not depend on ordering + // todo should not depend on ordering if (plugins.hasPlugin("kotlin")) { val publicationName = "maven" @@ -256,7 +259,7 @@ subprojects { configureJunit5Tests() } - //todo more precise configuration for gradle plugins, no need for gradle testing in common kotlin modules + // todo more precise configuration for gradle plugins, no need for gradle testing in common kotlin modules plugins.withId("kotlin") { configureJunit5Tests() @@ -276,8 +279,10 @@ subprojects { * IDEA добавляет специальный init script, по нему понимаем что запустили в IDE * используется в `:test-project` */ - systemProperty("isInvokedFromIde", - gradle.startParameter.allInitScripts.find { it.name.contains("ijtestinit") } != null) + systemProperty( + "isInvokedFromIde", + gradle.startParameter.allInitScripts.find { it.name.contains("ijtestinit") } != null + ) } } @@ -314,7 +319,7 @@ subprojects { } tasks.withType { - //sources unavailable with BIN until https://youtrack.jetbrains.com/issue/IDEA-231667 resolved + // sources unavailable with BIN until https://youtrack.jetbrains.com/issue/IDEA-231667 resolved distributionType = Wrapper.DistributionType.ALL gradleVersion = "6.7" } @@ -336,7 +341,7 @@ fun Project.getOptionalExtra(key: String): String? { fun Project.configureBintray(vararg publications: String) { extensions.findByType()?.run { - //todo fail fast with meaningful error message + // todo fail fast with meaningful error message user = getOptionalExtra("avito.bintray.user") key = getOptionalExtra("avito.bintray.key") @@ -349,17 +354,21 @@ fun Project.configureBintray(vararg publications: String) { // - NoHttpResponseException: api.bintray.com:443 failed to respond (https://github.com/bintray/gradle-bintray-plugin/issues/325) // - Could not upload to 'https://api.bintray.com/...': HTTP/1.1 405 Not Allowed 405 Not Allowed405 Not Allowednginx override = false - pkg(closureOf { - repo = "maven" - userOrg = "avito" - name = "avito-android" - setLicenses("mit") - vcsUrl = "https://github.com/avito-tech/avito-android.git" - - version(closureOf { - name = finalProjectVersion - }) - }) + pkg( + closureOf { + repo = "maven" + userOrg = "avito" + name = "avito-android" + setLicenses("mit") + vcsUrl = "https://github.com/avito-tech/avito-android.git" + + version( + closureOf { + name = finalProjectVersion + } + ) + } + ) } tasks.named(publishReleaseTaskName).configure { diff --git a/subprojects/ci/k8s-deployments-cleaner/build.gradle.kts b/subprojects/ci/k8s-deployments-cleaner/build.gradle.kts index b0b6dbb5e3..c7535262f7 100644 --- a/subprojects/ci/k8s-deployments-cleaner/build.gradle.kts +++ b/subprojects/ci/k8s-deployments-cleaner/build.gradle.kts @@ -9,7 +9,7 @@ dependencies { } // todo add if ci -//if(project.buildEnvironment is com.avito.utils.gradle.BuildEnvironment.CI) { +// if(project.buildEnvironment is com.avito.utils.gradle.BuildEnvironment.CI) { if (project.getOptionalStringProperty("ci", "false").toBoolean()) { tasks.register("clearByNamespaces", JavaExec::class.java) { main = "com.avito.ci.ClearK8SDeploymentsMain" diff --git a/subprojects/ci/k8s-deployments-cleaner/src/main/kotlin/com.avito.ci/ClearK8SDeploymentsMain.kt b/subprojects/ci/k8s-deployments-cleaner/src/main/kotlin/com.avito.ci/ClearK8SDeploymentsMain.kt index a2d854d44b..ea5d7b9f51 100644 --- a/subprojects/ci/k8s-deployments-cleaner/src/main/kotlin/com.avito.ci/ClearK8SDeploymentsMain.kt +++ b/subprojects/ci/k8s-deployments-cleaner/src/main/kotlin/com.avito.ci/ClearK8SDeploymentsMain.kt @@ -13,7 +13,8 @@ import kotlinx.cli.required object ClearK8SDeploymentsMain { @OptIn(ExperimentalCli::class) abstract class ClearDeployments( - name: String, description: String + name: String, + description: String ) : Subcommand(name, description) { protected val teamcityUrl: String by option(type = ArgType.String) .required() diff --git a/subprojects/ci/k8s-deployments-cleaner/src/main/kotlin/com.avito.ci/DeleteK8SDeploymentsByNames.kt b/subprojects/ci/k8s-deployments-cleaner/src/main/kotlin/com.avito.ci/DeleteK8SDeploymentsByNames.kt index bc515b391c..0806041b52 100644 --- a/subprojects/ci/k8s-deployments-cleaner/src/main/kotlin/com.avito.ci/DeleteK8SDeploymentsByNames.kt +++ b/subprojects/ci/k8s-deployments-cleaner/src/main/kotlin/com.avito.ci/DeleteK8SDeploymentsByNames.kt @@ -19,7 +19,7 @@ class DeleteK8SDeploymentsByNames( .withName(deployment) .delete() } catch (e: Throwable) { - throw RuntimeException("Error when delete deployment=${deployment}", e) + throw RuntimeException("Error when delete deployment=$deployment", e) } } } catch (e: Throwable) { diff --git a/subprojects/ci/k8s-deployments-cleaner/src/main/kotlin/com.avito.ci/DeploymentEnvironment.kt b/subprojects/ci/k8s-deployments-cleaner/src/main/kotlin/com.avito.ci/DeploymentEnvironment.kt index c8d6ff896c..20768e1639 100644 --- a/subprojects/ci/k8s-deployments-cleaner/src/main/kotlin/com.avito.ci/DeploymentEnvironment.kt +++ b/subprojects/ci/k8s-deployments-cleaner/src/main/kotlin/com.avito.ci/DeploymentEnvironment.kt @@ -33,4 +33,4 @@ val Deployment.environment: DeploymentEnvironment } else -> DeploymentEnvironment.Unknown } - } \ No newline at end of file + } diff --git a/subprojects/common/composite-exception/src/main/kotlin/com/avito/composite_exception/throwableCompositeExt.kt b/subprojects/common/composite-exception/src/main/kotlin/com/avito/composite_exception/throwableCompositeExt.kt index 9d54631194..8a2f5379a5 100644 --- a/subprojects/common/composite-exception/src/main/kotlin/com/avito/composite_exception/throwableCompositeExt.kt +++ b/subprojects/common/composite-exception/src/main/kotlin/com/avito/composite_exception/throwableCompositeExt.kt @@ -4,7 +4,7 @@ fun Throwable?.composeWith(throwable: Throwable?): Throwable? { return when { this != null -> { if (throwable != null) { - val message = "${message}. \n ${throwable.message}" + val message = "$message. \n ${throwable.message}" CompositeException( message, arrayOf(this, throwable) diff --git a/subprojects/common/file-storage/src/main/kotlin/com/avito/filestorage/HttpRemoteStorage.kt b/subprojects/common/file-storage/src/main/kotlin/com/avito/filestorage/HttpRemoteStorage.kt index c6d5f795f4..c848c0c806 100644 --- a/subprojects/common/file-storage/src/main/kotlin/com/avito/filestorage/HttpRemoteStorage.kt +++ b/subprojects/common/file-storage/src/main/kotlin/com/avito/filestorage/HttpRemoteStorage.kt @@ -55,59 +55,61 @@ class HttpRemoteStorage( content = uploadRequest.content ) } - .enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { - logger.warn(getUploadRequestErrorMessage(uploadRequest), t) + .enqueue( + object : Callback { + override fun onFailure(call: Call, t: Throwable) { + logger.warn(getUploadRequestErrorMessage(uploadRequest), t) - deleteUploadedFile( - uploadRequest = uploadRequest, - deleteOnUpload = deleteOnUpload - ) + deleteUploadedFile( + uploadRequest = uploadRequest, + deleteOnUpload = deleteOnUpload + ) - futureValue.set(RemoteStorage.Result.Error(t)) - } + futureValue.set(RemoteStorage.Result.Error(t)) + } - override fun onResponse(call: Call, response: Response) { - val result = when { - response.isSuccessful && !response.body().isNullOrEmpty() -> { - val url = response.body()!! - - logUploaded( - uploadRequest = uploadRequest, - url = url - ) - - RemoteStorage.Result.Success( - comment = comment, - url = url, - timeInSeconds = timestamp, - uploadRequest = uploadRequest - ) - } - response.isSuccessful && response.body().isNullOrEmpty() -> { - val exception = IllegalStateException("Uploading failed response body is absent") - logger.warn(getUploadRequestErrorMessage(uploadRequest, response.body()), exception) - RemoteStorage.Result.Error( - t = exception - ) - } - else -> { - val exception = RuntimeException("Uploading failed with response: ${response.body()}") - logger.warn(getUploadRequestErrorMessage(uploadRequest, response.body()), exception) - RemoteStorage.Result.Error( - t = exception - ) + override fun onResponse(call: Call, response: Response) { + val result = when { + response.isSuccessful && !response.body().isNullOrEmpty() -> { + val url = response.body()!! + + logUploaded( + uploadRequest = uploadRequest, + url = url + ) + + RemoteStorage.Result.Success( + comment = comment, + url = url, + timeInSeconds = timestamp, + uploadRequest = uploadRequest + ) + } + response.isSuccessful && response.body().isNullOrEmpty() -> { + val exception = IllegalStateException("Uploading failed response body is absent") + logger.warn(getUploadRequestErrorMessage(uploadRequest, response.body()), exception) + RemoteStorage.Result.Error( + t = exception + ) + } + else -> { + val exception = RuntimeException("Uploading failed with response: ${response.body()}") + logger.warn(getUploadRequestErrorMessage(uploadRequest, response.body()), exception) + RemoteStorage.Result.Error( + t = exception + ) + } } - } - deleteUploadedFile( - uploadRequest = uploadRequest, - deleteOnUpload = deleteOnUpload - ) + deleteUploadedFile( + uploadRequest = uploadRequest, + deleteOnUpload = deleteOnUpload + ) - futureValue.set(result) + futureValue.set(result) + } } - }) + ) return futureValue } diff --git a/subprojects/common/graphite-test-fixtures/src/main/kotlin/com/avito/android/graphite/FakeGraphiteSender.kt b/subprojects/common/graphite-test-fixtures/src/main/kotlin/com/avito/android/graphite/FakeGraphiteSender.kt index 60f990d889..41c9465fa0 100644 --- a/subprojects/common/graphite-test-fixtures/src/main/kotlin/com/avito/android/graphite/FakeGraphiteSender.kt +++ b/subprojects/common/graphite-test-fixtures/src/main/kotlin/com/avito/android/graphite/FakeGraphiteSender.kt @@ -1,8 +1,6 @@ package com.avito.android.graphite -import com.avito.android.graphite.GraphiteSender - -class FakeGraphiteSender: GraphiteSender { +class FakeGraphiteSender : GraphiteSender { val metrics = mutableListOf() diff --git a/subprojects/common/graphite/src/main/kotlin/com/avito/android/graphite/GraphiteSender.kt b/subprojects/common/graphite/src/main/kotlin/com/avito/android/graphite/GraphiteSender.kt index 6db3904883..87877ae5be 100644 --- a/subprojects/common/graphite/src/main/kotlin/com/avito/android/graphite/GraphiteSender.kt +++ b/subprojects/common/graphite/src/main/kotlin/com/avito/android/graphite/GraphiteSender.kt @@ -4,7 +4,6 @@ import com.avito.logger.Logger import java.io.DataOutputStream import java.net.Socket - interface GraphiteSender { /** @@ -30,9 +29,9 @@ interface GraphiteSender { val dos = DataOutputStream(socket.getOutputStream()) dos.writeBytes(message) } - logger.debug("$LOG_TAG: $message") + logger.debug("$tag: $message") } catch (e: Exception) { - logger.warn("$LOG_TAG: $message", e) + logger.warn("$tag: $message", e) } } @@ -51,6 +50,6 @@ interface GraphiteSender { private fun socket(): Socket = Socket(config.host, config.port) - private val LOG_TAG = "graphite" + private val tag = "graphite" } } diff --git a/subprojects/common/junit-utils/src/main/java/com/avito/android/util/Hamcrest.kt b/subprojects/common/junit-utils/src/main/java/com/avito/android/util/Hamcrest.kt index 3431df27c2..860f823cf1 100644 --- a/subprojects/common/junit-utils/src/main/java/com/avito/android/util/Hamcrest.kt +++ b/subprojects/common/junit-utils/src/main/java/com/avito/android/util/Hamcrest.kt @@ -5,14 +5,20 @@ import org.hamcrest.Matchers.anyOf import org.hamcrest.Matchers.not import org.hamcrest.core.Is -@Suppress("HasPlatformType", "FunctionName") // unspecified return type is required to allow compiler to infer type in caller code +@Suppress( + "HasPlatformType", + "FunctionName" +) // unspecified return type is required to allow compiler to infer type in caller code fun Is(matcher: Matcher) = Is.`is`(matcher) -@Suppress("HasPlatformType", "FunctionName") // unspecified return type is required to allow compiler to infer type in caller code +@Suppress( + "HasPlatformType", + "FunctionName" +) // unspecified return type is required to allow compiler to infer type in caller code fun Is(value: T) = Is.`is`(value) fun isNot(value: T) = Is(not(value)) fun isNot(matcher: Matcher) = Is(not(matcher)) -fun anyOf(values: List): Matcher = anyOf(values.map { Is(it) }) \ No newline at end of file +fun anyOf(values: List): Matcher = anyOf(values.map { Is(it) }) diff --git a/subprojects/common/junit-utils/src/main/java/com/avito/android/util/SerializeUtils.kt b/subprojects/common/junit-utils/src/main/java/com/avito/android/util/SerializeUtils.kt index c09751c931..819617f300 100644 --- a/subprojects/common/junit-utils/src/main/java/com/avito/android/util/SerializeUtils.kt +++ b/subprojects/common/junit-utils/src/main/java/com/avito/android/util/SerializeUtils.kt @@ -1,13 +1,12 @@ package com.avito.android.util +import org.junit.Assert.assertEquals import java.io.ByteArrayInputStream import java.io.ByteArrayOutputStream import java.io.ObjectInputStream import java.io.ObjectOutputStream import java.io.Serializable -import org.junit.Assert.assertEquals - object SerializeUtils { @Throws(Exception::class) diff --git a/subprojects/common/junit-utils/src/main/java/com/avito/android/util/matcher/DeepCauseMatcher.kt b/subprojects/common/junit-utils/src/main/java/com/avito/android/util/matcher/DeepCauseMatcher.kt index 62f4b48c20..cff0933c4f 100644 --- a/subprojects/common/junit-utils/src/main/java/com/avito/android/util/matcher/DeepCauseMatcher.kt +++ b/subprojects/common/junit-utils/src/main/java/com/avito/android/util/matcher/DeepCauseMatcher.kt @@ -79,8 +79,9 @@ class DeepCauseMatcher( return DeepCauseMatcher( CoreMatchers.instanceOf(type), - containsString(partOfExpectedMessage), maxDepth + containsString(partOfExpectedMessage), + maxDepth ) } } -} \ No newline at end of file +} diff --git a/subprojects/common/junit-utils/src/main/java/com/avito/android/util/matcher/MapMatchers.kt b/subprojects/common/junit-utils/src/main/java/com/avito/android/util/matcher/MapMatchers.kt index f37dd6be9b..2b6edcde12 100644 --- a/subprojects/common/junit-utils/src/main/java/com/avito/android/util/matcher/MapMatchers.kt +++ b/subprojects/common/junit-utils/src/main/java/com/avito/android/util/matcher/MapMatchers.kt @@ -17,4 +17,3 @@ object MapMatchers { return MapContainsMapMatcher(map) } } - diff --git a/subprojects/common/junit-utils/src/main/java/ru/avito/util/Asserts.kt b/subprojects/common/junit-utils/src/main/java/ru/avito/util/Asserts.kt index 0dba8b05e3..9ef00a33a3 100644 --- a/subprojects/common/junit-utils/src/main/java/ru/avito/util/Asserts.kt +++ b/subprojects/common/junit-utils/src/main/java/ru/avito/util/Asserts.kt @@ -24,4 +24,4 @@ inline fun assertThrows(executable: () -> Unit): T { val expectedType = T::class.java @Suppress("DEPRECATION") return assertThrows(expectedType, executable) -} \ No newline at end of file +} diff --git a/subprojects/common/junit-utils/src/main/java/ru/avito/util/Assets.kt b/subprojects/common/junit-utils/src/main/java/ru/avito/util/Assets.kt index 56b28b82ba..13aed3af48 100644 --- a/subprojects/common/junit-utils/src/main/java/ru/avito/util/Assets.kt +++ b/subprojects/common/junit-utils/src/main/java/ru/avito/util/Assets.kt @@ -8,7 +8,7 @@ object Assets { @Throws(IOException::class) fun readAsset(path: String): String { val inputStream = Assets::class.java.classLoader.getResourceAsStream(path) - ?: throw FileNotFoundException("File [$path] not found.") + ?: throw FileNotFoundException("File [$path] not found.") return inputStream.bufferedReader().readText() } -} \ No newline at end of file +} diff --git a/subprojects/common/junit-utils/src/main/java/ru/avito/util/Hamcrest.kt b/subprojects/common/junit-utils/src/main/java/ru/avito/util/Hamcrest.kt index 91d767d24c..db5f0ab6c5 100644 --- a/subprojects/common/junit-utils/src/main/java/ru/avito/util/Hamcrest.kt +++ b/subprojects/common/junit-utils/src/main/java/ru/avito/util/Hamcrest.kt @@ -14,4 +14,4 @@ fun Is(value: T) = Is.`is`(value) fun IsNot(matcher: Matcher) = IsNot.`not`(matcher) @Suppress("HasPlatformType") -fun IsNot(value: T) = IsNot.`not`(value) \ No newline at end of file +fun IsNot(value: T) = IsNot.`not`(value) diff --git a/subprojects/common/junit-utils/src/main/java/ru/avito/util/Matchers.kt b/subprojects/common/junit-utils/src/main/java/ru/avito/util/Matchers.kt index 29a4ac7fe2..313f95c7fc 100644 --- a/subprojects/common/junit-utils/src/main/java/ru/avito/util/Matchers.kt +++ b/subprojects/common/junit-utils/src/main/java/ru/avito/util/Matchers.kt @@ -7,4 +7,4 @@ import org.hamcrest.CoreMatchers @Suppress("HasPlatformType") // unspecified return type is required to allow compiler to infer type in caller code inline fun instanceOf() = CoreMatchers.instanceOf(T::class.java) -inline infix fun T1.classEquals(other: T2): Boolean = this::class == other::class \ No newline at end of file +inline infix fun T1.classEquals(other: T2): Boolean = this::class == other::class diff --git a/subprojects/common/junit-utils/src/main/java/ru/avito/util/matcher/ContainsValueWithTypeMatcher.kt b/subprojects/common/junit-utils/src/main/java/ru/avito/util/matcher/ContainsValueWithTypeMatcher.kt index bef2c67cdc..f6b8d9305a 100644 --- a/subprojects/common/junit-utils/src/main/java/ru/avito/util/matcher/ContainsValueWithTypeMatcher.kt +++ b/subprojects/common/junit-utils/src/main/java/ru/avito/util/matcher/ContainsValueWithTypeMatcher.kt @@ -4,7 +4,6 @@ import org.hamcrest.Description import org.hamcrest.TypeSafeMatcher import kotlin.reflect.KClass - class ContainsValueWithTypeMatcher(private val klass: KClass) : TypeSafeMatcher>() { override fun matchesSafely(item: Iterable): Boolean { @@ -17,4 +16,4 @@ class ContainsValueWithTypeMatcher(private val klass: KClass) : Type } } -inline fun containsValueWithType() = ContainsValueWithTypeMatcher(T::class) \ No newline at end of file +inline fun containsValueWithType() = ContainsValueWithTypeMatcher(T::class) diff --git a/subprojects/common/junit-utils/src/main/java/ru/avito/util/matcher/UniqueMatcher.kt b/subprojects/common/junit-utils/src/main/java/ru/avito/util/matcher/UniqueMatcher.kt index e6fe684e70..a3b97966c7 100644 --- a/subprojects/common/junit-utils/src/main/java/ru/avito/util/matcher/UniqueMatcher.kt +++ b/subprojects/common/junit-utils/src/main/java/ru/avito/util/matcher/UniqueMatcher.kt @@ -33,4 +33,4 @@ class UniqueMatcher : TypeSafeMatcher>() { } } -fun containsOnlyUniqueElements() = UniqueMatcher() \ No newline at end of file +fun containsOnlyUniqueElements() = UniqueMatcher() diff --git a/subprojects/common/junit-utils/src/test/java/com/avito/android/util/matcher/AbstractMatcherTest.kt b/subprojects/common/junit-utils/src/test/java/com/avito/android/util/matcher/AbstractMatcherTest.kt index c0625a05ee..4a99ac78bf 100644 --- a/subprojects/common/junit-utils/src/test/java/com/avito/android/util/matcher/AbstractMatcherTest.kt +++ b/subprojects/common/junit-utils/src/test/java/com/avito/android/util/matcher/AbstractMatcherTest.kt @@ -3,7 +3,6 @@ package com.avito.android.util.matcher import org.hamcrest.Matcher import org.junit.jupiter.api.Test - abstract class AbstractMatcherTest { protected abstract fun createMatcher(): Matcher<*> @@ -17,5 +16,4 @@ abstract class AbstractMatcherTest { fun `test copes with unknown types`() { createMatcher().matches(UnknownType()) } - } diff --git a/subprojects/common/junit-utils/src/test/java/com/avito/android/util/matcher/IsEqualIgnoringAllWhiteSpaceTest.kt b/subprojects/common/junit-utils/src/test/java/com/avito/android/util/matcher/IsEqualIgnoringAllWhiteSpaceTest.kt index fb22f5ad74..242ba22ae0 100644 --- a/subprojects/common/junit-utils/src/test/java/com/avito/android/util/matcher/IsEqualIgnoringAllWhiteSpaceTest.kt +++ b/subprojects/common/junit-utils/src/test/java/com/avito/android/util/matcher/IsEqualIgnoringAllWhiteSpaceTest.kt @@ -53,7 +53,8 @@ class IsEqualIgnoringAllWhiteSpaceTest : AbstractMatcherTest() { fun `has a readable description`() { assertDescription( "a string equal to \" Hello World$THIN_SPACE how\n" + - " are we? \" ignoring all white spaces", matcher + " are we? \" ignoring all white spaces", + matcher ) } } diff --git a/subprojects/common/junit-utils/src/test/java/com/avito/android/util/matcher/MatcherTests.kt b/subprojects/common/junit-utils/src/test/java/com/avito/android/util/matcher/MatcherTests.kt index 84bb1ac72a..f1648d9111 100644 --- a/subprojects/common/junit-utils/src/test/java/com/avito/android/util/matcher/MatcherTests.kt +++ b/subprojects/common/junit-utils/src/test/java/com/avito/android/util/matcher/MatcherTests.kt @@ -4,7 +4,6 @@ import org.hamcrest.Matcher import org.hamcrest.StringDescription import org.junit.Assert - fun assertMatches(matcher: Matcher, arg: T) { assertMatches("Expected match, but mismatched", matcher, arg) } @@ -48,7 +47,6 @@ fun assertUnknownTypeSafe(matcher: Matcher<*>) { } catch (e: Exception) { Assert.fail("Matcher was not unknown type safe, because: " + e) } - } private fun mismatchDescription(matcher: Matcher, arg: T): String { diff --git a/subprojects/common/junit-utils/src/test/java/ru/avito/test/matcher/UniqueMatcherTest.kt b/subprojects/common/junit-utils/src/test/java/ru/avito/test/matcher/UniqueMatcherTest.kt index b419dd8734..013c4686b8 100644 --- a/subprojects/common/junit-utils/src/test/java/ru/avito/test/matcher/UniqueMatcherTest.kt +++ b/subprojects/common/junit-utils/src/test/java/ru/avito/test/matcher/UniqueMatcherTest.kt @@ -34,6 +34,5 @@ class UniqueMatcherTest { } assertThat(error.message, containsString("contains duplicated item: <1>")) - } } diff --git a/subprojects/common/logger-test-fixtures/src/main/kotlin/com/avito/logger/NoOpLogger.kt b/subprojects/common/logger-test-fixtures/src/main/kotlin/com/avito/logger/NoOpLogger.kt index 8daee3cde7..54f7d0afd1 100644 --- a/subprojects/common/logger-test-fixtures/src/main/kotlin/com/avito/logger/NoOpLogger.kt +++ b/subprojects/common/logger-test-fixtures/src/main/kotlin/com/avito/logger/NoOpLogger.kt @@ -1,6 +1,6 @@ package com.avito.logger -object NoOpLogger: Logger { +object NoOpLogger : Logger { override fun debug(msg: String) {} diff --git a/subprojects/common/okhttp/src/main/kotlin/com/avito/http/Files.kt b/subprojects/common/okhttp/src/main/kotlin/com/avito/http/Files.kt index 671c933425..7e8a94c9ea 100644 --- a/subprojects/common/okhttp/src/main/kotlin/com/avito/http/Files.kt +++ b/subprojects/common/okhttp/src/main/kotlin/com/avito/http/Files.kt @@ -4,7 +4,6 @@ package com.avito.http import okhttp3.MediaType.Companion.toMediaType import okhttp3.MultipartBody -import okhttp3.RequestBody import okhttp3.RequestBody.Companion.asRequestBody import java.io.File diff --git a/subprojects/common/okhttp/src/main/kotlin/com/avito/http/RetryInterceptor.kt b/subprojects/common/okhttp/src/main/kotlin/com/avito/http/RetryInterceptor.kt index 94662b478e..c3d2a5eac7 100644 --- a/subprojects/common/okhttp/src/main/kotlin/com/avito/http/RetryInterceptor.kt +++ b/subprojects/common/okhttp/src/main/kotlin/com/avito/http/RetryInterceptor.kt @@ -18,7 +18,7 @@ class RetryInterceptor constructor( 500, // internal error 502, // bad gateway 503, // unavailable - 504 // gateway timeout + 504 // gateway timeout ), private val delayMs: Long = TimeUnit.SECONDS.toMillis(1), private val useIncreasingDelay: Boolean = true, diff --git a/subprojects/common/report-viewer-test-fixtures/src/main/kotlin/com/avito/report/FakeReportsApi.kt b/subprojects/common/report-viewer-test-fixtures/src/main/kotlin/com/avito/report/FakeReportsApi.kt index 8e978ff335..d3376fe4cc 100644 --- a/subprojects/common/report-viewer-test-fixtures/src/main/kotlin/com/avito/report/FakeReportsApi.kt +++ b/subprojects/common/report-viewer-test-fixtures/src/main/kotlin/com/avito/report/FakeReportsApi.kt @@ -4,7 +4,6 @@ import com.avito.report.model.AndroidTest import com.avito.report.model.CreateResult import com.avito.report.model.CrossDeviceSuite import com.avito.report.model.GetReportResult -import com.avito.report.model.PerformanceTest import com.avito.report.model.Report import com.avito.report.model.ReportCoordinates import com.avito.report.model.SimpleRunTest diff --git a/subprojects/common/report-viewer-test-fixtures/src/main/kotlin/com/avito/report/MockReportsApi.kt b/subprojects/common/report-viewer-test-fixtures/src/main/kotlin/com/avito/report/MockReportApi.kt similarity index 100% rename from subprojects/common/report-viewer-test-fixtures/src/main/kotlin/com/avito/report/MockReportsApi.kt rename to subprojects/common/report-viewer-test-fixtures/src/main/kotlin/com/avito/report/MockReportApi.kt diff --git a/subprojects/common/report-viewer/build.gradle.kts b/subprojects/common/report-viewer/build.gradle.kts index 7ac9ec883c..04f0c05985 100644 --- a/subprojects/common/report-viewer/build.gradle.kts +++ b/subprojects/common/report-viewer/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { implementation(Dependencies.okhttpLogging) implementation(Dependencies.kotson) - testImplementation(project(":gradle:test-project")) //todo remove, we need to extract fileFromJarResources() to other module + testImplementation(project(":gradle:test-project")) // todo remove, we need to extract fileFromJarResources() to other module testImplementation(project(":common:test-okhttp")) testImplementation(project(":common:logger-test-fixtures")) testImplementation(project(":common:report-viewer-test-fixtures")) diff --git a/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/ReportViewerQuery.kt b/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/ReportViewerQuery.kt index 8ddadee3e0..64e88c9d16 100644 --- a/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/ReportViewerQuery.kt +++ b/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/ReportViewerQuery.kt @@ -9,7 +9,7 @@ import java.util.Base64 class ReportViewerQuery { - //todo use a universal encoder (android / jvm) + // todo use a universal encoder (android / jvm) private val encoder by lazy { Base64.getEncoder() } /** diff --git a/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/ReportsAddApiImpl.kt b/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/ReportsAddApiImpl.kt index 9c1cb9bf39..41e903bd3e 100644 --- a/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/ReportsAddApiImpl.kt +++ b/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/ReportsAddApiImpl.kt @@ -46,8 +46,8 @@ internal class ReportsAddApiImpl(private val requestProvider: JsonRpcRequestProv startTime = null, endTime = null, dataSetData = null, - preconditionList = emptyList(), //todo в теории можем достать проанализировав код теста, - stepList = emptyList() //todo в теории можем достать проанализировав код теста + preconditionList = emptyList(), // todo в теории можем достать проанализировав код теста, + stepList = emptyList() // todo в теории можем достать проанализировав код теста ) is AndroidTest.Lost -> createAddFullRequest( reportCoordinates = reportCoordinates, @@ -61,14 +61,14 @@ internal class ReportsAddApiImpl(private val requestProvider: JsonRpcRequestProv startTime = test.startTime, endTime = test.lastSignalTime, dataSetData = null, - preconditionList = emptyList(), //todo в теории можем достать проанализировав код теста, - stepList = emptyList() //todo в теории можем достать проанализировав код теста + preconditionList = emptyList(), // todo в теории можем достать проанализировав код теста, + stepList = emptyList() // todo в теории можем достать проанализировав код теста ) is AndroidTest.Completed -> createAddFullRequest( reportCoordinates = reportCoordinates, buildId = buildId, test = test, - status = null, //определяется на бэке для success/fail по наличию incident, отправляем остальные статусы самостоятельно + status = null, // определяется на бэке для success/fail по наличию incident, отправляем остальные статусы самостоятельно stdout = test.stdout, stderr = test.stderr, incident = test.incident, @@ -94,7 +94,7 @@ internal class ReportsAddApiImpl(private val requestProvider: JsonRpcRequestProv return addTests(reportCoordinates, buildId, listOf(test)).map { it.first() } } - //todo use only AndroidTest + // todo use only AndroidTest private fun createAddFullRequest( reportCoordinates: ReportCoordinates, buildId: String?, @@ -150,7 +150,7 @@ internal class ReportsAddApiImpl(private val requestProvider: JsonRpcRequestProv if (test.testCaseId == null) { report["grouping_key"] = test.name.className } - //Для консистентности можно также посылать здесь testCaseId, но бэкенд умеет обрабатывать это + // Для консистентности можно также посылать здесь testCaseId, но бэкенд умеет обрабатывать это } require(!(test.dataSetNumber == null && !dataSetData.isNullOrEmpty())) { "DataSet data without DataSetNumber doesn't make sense!" } @@ -208,10 +208,10 @@ internal class ReportsAddApiImpl(private val requestProvider: JsonRpcRequestProv "run_id" to reportCoordinates.runId, "environment" to test.device.name, "report" to report, - //тут происходит магия "с помощью оператора добавляется в массив новое значение билда" - //todo узнать у Жени как можно это лучше сделать + // тут происходит магия "с помощью оператора добавляется в массив новое значение билда" + // todo узнать у Жени как можно это лучше сделать "report_data" to reportData, - //todo onlyIf present + // todo onlyIf present "console" to mapOf( "stdout" to stdout, "stderr" to stderr diff --git a/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/ReportsApiImpl.kt b/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/ReportsApiImpl.kt index c793540f45..dfff80dc37 100644 --- a/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/ReportsApiImpl.kt +++ b/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/ReportsApiImpl.kt @@ -108,7 +108,8 @@ internal class ReportsApiImpl( return Try { requestProvider.jsonRpcRequest( RfcRpcRequest( - method = "Run.PushPreparedData", params = mapOf( + method = "Run.PushPreparedData", + params = mapOf( "id" to reportId, "analyzer_key" to analyzerKey, "prepared_data" to preparedData diff --git a/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/ReportsFetchApi.kt b/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/ReportsFetchApi.kt index 262a27ac60..3927ab87c9 100644 --- a/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/ReportsFetchApi.kt +++ b/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/ReportsFetchApi.kt @@ -2,7 +2,6 @@ package com.avito.report import com.avito.report.model.CrossDeviceSuite import com.avito.report.model.GetReportResult -import com.avito.report.model.PerformanceTest import com.avito.report.model.Report import com.avito.report.model.ReportCoordinates import com.avito.report.model.SimpleRunTest diff --git a/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/ReportsFetchApiImpl.kt b/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/ReportsFetchApiImpl.kt index 41ae0c4e6f..0c9591b078 100644 --- a/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/ReportsFetchApiImpl.kt +++ b/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/ReportsFetchApiImpl.kt @@ -9,7 +9,6 @@ import com.avito.report.internal.model.ListResult import com.avito.report.internal.model.RfcRpcRequest import com.avito.report.internal.model.RpcResult import com.avito.report.internal.model.Run -import com.avito.report.internal.model.RunTest import com.avito.report.internal.model.TestStatus import com.avito.report.model.CrossDeviceRunTest import com.avito.report.model.CrossDeviceStatus @@ -135,7 +134,6 @@ internal class ReportsFetchApiImpl( runs.deviceFailures() ) - else -> CrossDeviceStatus.Inconsistent } CrossDeviceRunTest(TestName(testName), status) @@ -203,7 +201,7 @@ internal class ReportsFetchApiImpl( } else { val verdict = reportModel.preparedData?.lastOrNull()?.verdict if (verdict.isNullOrBlank()) { - //todo fallback + // todo fallback logger.debug("Can't get verdict for test: $reportModel") Status.Failure( "Can't get verdict", @@ -216,7 +214,7 @@ internal class ReportsFetchApiImpl( } TestStatus.OTHER, TestStatus.PANIC, TestStatus.LOST, null -> Status.Lost TestStatus.MANUAL -> Status.Manual - TestStatus.SKIP -> Status.Skipped("test ignored") //todo нужен более подробный reason + TestStatus.SKIP -> Status.Skipped("test ignored") // todo нужен более подробный reason } } diff --git a/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/internal/HttpClientProvider.kt b/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/internal/HttpClientProvider.kt index 0df0df8967..b19c6e4fe9 100644 --- a/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/internal/HttpClientProvider.kt +++ b/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/internal/HttpClientProvider.kt @@ -27,17 +27,22 @@ fun getHttpClient( request.newBuilder() .url(fallbackUrl) .build() - }) + } + ) ) } } .apply { if (verbose) { - addInterceptor(HttpLoggingInterceptor(object : HttpLoggingInterceptor.Logger { - override fun log(message: String) { - logger.debug(message) - } - }).setLevel(Level.BODY)) + addInterceptor( + HttpLoggingInterceptor( + object : HttpLoggingInterceptor.Logger { + override fun log(message: String) { + logger.debug(message) + } + } + ).setLevel(Level.BODY) + ) } } .build() diff --git a/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/internal/JsonRpcRequestProvider.kt b/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/internal/JsonRpcRequestProvider.kt index e28e7549a2..669ce0e6d4 100644 --- a/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/internal/JsonRpcRequestProvider.kt +++ b/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/internal/JsonRpcRequestProvider.kt @@ -3,11 +3,9 @@ package com.avito.report.internal import com.avito.report.internal.model.RfcRpcRequest import com.github.salomonbrys.kotson.fromJson import com.google.gson.Gson -import okhttp3.MediaType import okhttp3.MediaType.Companion.toMediaType import okhttp3.OkHttpClient import okhttp3.Request -import okhttp3.RequestBody import okhttp3.RequestBody.Companion.toRequestBody internal class JsonRpcRequestProvider( diff --git a/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/model/CrossDeviceStatus.kt b/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/model/CrossDeviceStatus.kt index 30f733c29e..2a6beeb256 100644 --- a/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/model/CrossDeviceStatus.kt +++ b/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/model/CrossDeviceStatus.kt @@ -14,7 +14,6 @@ sealed class CrossDeviceStatus { object Inconsistent : CrossDeviceStatus() } - interface HasFailures { val failures: List } diff --git a/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/model/FailureOnDevice.kt b/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/model/FailureOnDevice.kt index 0ba455e412..9c293d1673 100644 --- a/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/model/FailureOnDevice.kt +++ b/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/model/FailureOnDevice.kt @@ -3,4 +3,4 @@ package com.avito.report.model data class FailureOnDevice( val device: String, val failureMessage: String -) \ No newline at end of file +) diff --git a/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/model/Flakiness.kt b/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/model/Flakiness.kt index ade602ee46..d27c21c610 100644 --- a/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/model/Flakiness.kt +++ b/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/model/Flakiness.kt @@ -8,5 +8,4 @@ sealed class Flakiness { class Flaky(val reason: String) : Flakiness() object Stable : Flakiness() - } diff --git a/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/model/HistoryTest.kt b/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/model/HistoryTest.kt index 2c6f564e08..7c74351420 100644 --- a/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/model/HistoryTest.kt +++ b/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/model/HistoryTest.kt @@ -4,7 +4,7 @@ data class HistoryTest( val id: String, val tags: List ) { - //Строка имеет вид "buildCommit:gitHash" + // Строка имеет вид "buildCommit:gitHash" fun getBuildCommit(): String? { return tags.findLast { it.startsWith("buildCommit") } ?.split(":") diff --git a/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/model/PerformanceTest.kt b/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/model/PerformanceTest.kt index ebcf3dad35..a80916a4ad 100644 --- a/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/model/PerformanceTest.kt +++ b/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/model/PerformanceTest.kt @@ -1,6 +1,6 @@ package com.avito.report.model -//todo extends CompletedTest? +// todo extends CompletedTest? class PerformanceTest( val testName: String, val id: String, diff --git a/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/model/TestName.kt b/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/model/TestName.kt index e5986ac06d..6cecd2ba2d 100644 --- a/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/model/TestName.kt +++ b/subprojects/common/report-viewer/src/main/kotlin/com/avito/report/model/TestName.kt @@ -16,7 +16,7 @@ data class TestName(val className: String, val methodName: String) { override fun toString(): String = name } -//todo дать возможность указать юнит в аннотации +// todo дать возможность указать юнит в аннотации val TestName.team: Team get() = when { packageName.startsWith(domofondPrefix) -> Team("domofond") @@ -31,7 +31,7 @@ val TestName.team: Team else -> Team.UNDEFINED } -//todo убрать определение features из пакета, будут явно указаны в аннотации к тесту +// todo убрать определение features из пакета, будут явно указаны в аннотации к тесту val TestName.features: List get() = when { packageName.startsWith(domofondPrefix) -> { diff --git a/subprojects/common/report-viewer/src/test/kotlin/com/avito/report/FlakinessTest.kt b/subprojects/common/report-viewer/src/test/kotlin/com/avito/report/FlakinessTest.kt index 6ccb725fa9..8e56ab68eb 100644 --- a/subprojects/common/report-viewer/src/test/kotlin/com/avito/report/FlakinessTest.kt +++ b/subprojects/common/report-viewer/src/test/kotlin/com/avito/report/FlakinessTest.kt @@ -63,4 +63,4 @@ class FlakinessTest { ) ) } -} \ No newline at end of file +} diff --git a/subprojects/common/report-viewer/src/test/kotlin/com/avito/report/KindTest.kt b/subprojects/common/report-viewer/src/test/kotlin/com/avito/report/KindTest.kt index 2bf97fe1f5..34387842aa 100644 --- a/subprojects/common/report-viewer/src/test/kotlin/com/avito/report/KindTest.kt +++ b/subprojects/common/report-viewer/src/test/kotlin/com/avito/report/KindTest.kt @@ -1,6 +1,10 @@ package com.avito.report -import com.avito.report.model.* +import com.avito.report.model.AndroidTest +import com.avito.report.model.Kind +import com.avito.report.model.ReportCoordinates +import com.avito.report.model.TestStaticDataPackage +import com.avito.report.model.createStubInstance import com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath import org.hamcrest.Matchers import org.junit.jupiter.api.Test diff --git a/subprojects/common/report-viewer/src/test/kotlin/com/avito/report/ReportsApiTest.kt b/subprojects/common/report-viewer/src/test/kotlin/com/avito/report/ReportsApiTest.kt index a29ac07676..9e2405a961 100644 --- a/subprojects/common/report-viewer/src/test/kotlin/com/avito/report/ReportsApiTest.kt +++ b/subprojects/common/report-viewer/src/test/kotlin/com/avito/report/ReportsApiTest.kt @@ -8,7 +8,6 @@ import com.avito.test.http.MockWebServerFactory import com.github.salomonbrys.kotson.jsonObject import com.google.common.truth.Truth.assertThat import okhttp3.mockwebserver.MockResponse -import okhttp3.mockwebserver.MockWebServer import org.funktionale.tries.Try import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.BeforeEach diff --git a/subprojects/common/report-viewer/src/test/kotlin/com/avito/report/model/TestRuntimeDataPackageTest.kt b/subprojects/common/report-viewer/src/test/kotlin/com/avito/report/model/TestRuntimeDataPackageTest.kt index 9013dacd8a..b54f36d616 100644 --- a/subprojects/common/report-viewer/src/test/kotlin/com/avito/report/model/TestRuntimeDataPackageTest.kt +++ b/subprojects/common/report-viewer/src/test/kotlin/com/avito/report/model/TestRuntimeDataPackageTest.kt @@ -16,4 +16,4 @@ internal class TestRuntimeDataPackageTest { val result = gson.fromJson(json) Truth.assertThat(result).isEqualTo(testRuntimeDataPackage) } -} \ No newline at end of file +} diff --git a/subprojects/common/retrace/src/main/kotlin/com/avito/retrace/ProguardRetracer.kt b/subprojects/common/retrace/src/main/kotlin/com/avito/retrace/ProguardRetracer.kt index ab83650289..ade3ebb901 100644 --- a/subprojects/common/retrace/src/main/kotlin/com/avito/retrace/ProguardRetracer.kt +++ b/subprojects/common/retrace/src/main/kotlin/com/avito/retrace/ProguardRetracer.kt @@ -35,5 +35,4 @@ interface ProguardRetracer { return resultWriter.toString() } } - -} \ No newline at end of file +} diff --git a/subprojects/common/retrace/src/test/kotlin/com/avito/retrace/ProguardRetracerTest.kt b/subprojects/common/retrace/src/test/kotlin/com/avito/retrace/ProguardRetracerTest.kt index 1a91096fe2..cd00040341 100644 --- a/subprojects/common/retrace/src/test/kotlin/com/avito/retrace/ProguardRetracerTest.kt +++ b/subprojects/common/retrace/src/test/kotlin/com/avito/retrace/ProguardRetracerTest.kt @@ -56,4 +56,4 @@ private const val STACKTRACE = """ 07-06 13:15:56.784 4604 4604 E ReportUncaughtHandler: at com.android.internal.os.RuntimeInit${'$'}MethodAndArgsCaller.run(RuntimeInit.java:493) 07-06 13:15:56.784 4604 4604 E ReportUncaughtHandler: at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:858) 07-06 13:15:56.784 4604 4604 E ReportUncaughtHandler: Error during reporting test after global exception handling -""" \ No newline at end of file +""" diff --git a/subprojects/common/statsd-test-fixtures/src/main/kotlin/com/avito/android/stats/FakeStatsDSender.kt b/subprojects/common/statsd-test-fixtures/src/main/kotlin/com/avito/android/stats/FakeStatsdSender.kt similarity index 100% rename from subprojects/common/statsd-test-fixtures/src/main/kotlin/com/avito/android/stats/FakeStatsDSender.kt rename to subprojects/common/statsd-test-fixtures/src/main/kotlin/com/avito/android/stats/FakeStatsdSender.kt diff --git a/subprojects/common/teamcity-common/src/main/kotlin/com/avito/teamcity/TeamcityApi.kt b/subprojects/common/teamcity-common/src/main/kotlin/com/avito/teamcity/TeamcityApi.kt index fd1fe81adc..f7567c6b5b 100644 --- a/subprojects/common/teamcity-common/src/main/kotlin/com/avito/teamcity/TeamcityApi.kt +++ b/subprojects/common/teamcity-common/src/main/kotlin/com/avito/teamcity/TeamcityApi.kt @@ -127,7 +127,7 @@ interface TeamcityApi { when (branchSpec) { BranchSpec.DefaultBranch -> { - //do nothing + // do nothing } BranchSpec.AllBranches -> buildLocator.withAllBranches() is BranchSpec.SpecificBranch -> buildLocator.withBranch(branchSpec.branchName) diff --git a/subprojects/common/teamcity-common/src/main/kotlin/com/avito/teamcity/TeamcityCredentials.kt b/subprojects/common/teamcity-common/src/main/kotlin/com/avito/teamcity/TeamcityCredentials.kt index 30af68ff37..f26ed919e4 100644 --- a/subprojects/common/teamcity-common/src/main/kotlin/com/avito/teamcity/TeamcityCredentials.kt +++ b/subprojects/common/teamcity-common/src/main/kotlin/com/avito/teamcity/TeamcityCredentials.kt @@ -6,4 +6,4 @@ data class TeamcityCredentials( val url: String, val user: String, val password: String -) : Serializable \ No newline at end of file +) : Serializable diff --git a/subprojects/common/test-annotations/src/main/kotlin/com/avito/android/test/annotations/TestType.kt b/subprojects/common/test-annotations/src/main/kotlin/com/avito/android/test/annotations/TestType.kt index 207da955a9..96ed8cdeb3 100644 --- a/subprojects/common/test-annotations/src/main/kotlin/com/avito/android/test/annotations/TestType.kt +++ b/subprojects/common/test-annotations/src/main/kotlin/com/avito/android/test/annotations/TestType.kt @@ -63,4 +63,4 @@ annotation class ScreenshotTest @Retention(AnnotationRetention.RUNTIME) @Target(AnnotationTarget.FUNCTION, AnnotationTarget.CLASS) -annotation class SyntheticMonitoringTest \ No newline at end of file +annotation class SyntheticMonitoringTest diff --git a/subprojects/common/test-okhttp/src/main/kotlin/com/avito/test/http/FormUrlEncodedBodyChecks.kt b/subprojects/common/test-okhttp/src/main/kotlin/com/avito/test/http/FormUrlEncodedBodyChecks.kt index a80f0062da..0fede97afb 100644 --- a/subprojects/common/test-okhttp/src/main/kotlin/com/avito/test/http/FormUrlEncodedBodyChecks.kt +++ b/subprojects/common/test-okhttp/src/main/kotlin/com/avito/test/http/FormUrlEncodedBodyChecks.kt @@ -61,8 +61,9 @@ class FormUrlEncodedBodyChecks( if (keyErrors.isNotBlank()) { errorMessage.appendln() errorMessage.appendln("Request should contain these keys, but its not: $keyErrors") - errorMessage.appendln("Actual request keys are:" + - actualParameters.keys.joinToString(separator = ", ") { decode(it) } + errorMessage.appendln( + "Actual request keys are:" + + actualParameters.keys.joinToString(separator = ", ") { decode(it) } ) } diff --git a/subprojects/common/test-okhttp/src/main/kotlin/com/avito/test/http/MockDispatcher.kt b/subprojects/common/test-okhttp/src/main/kotlin/com/avito/test/http/MockDispatcher.kt index fb519ae090..2f2579487e 100644 --- a/subprojects/common/test-okhttp/src/main/kotlin/com/avito/test/http/MockDispatcher.kt +++ b/subprojects/common/test-okhttp/src/main/kotlin/com/avito/test/http/MockDispatcher.kt @@ -69,7 +69,7 @@ fun MockResponse.setBodyFromFile(fileName: String): MockResponse { if (fileName.endsWith(".json")) { val exception = validateJson(text) if (exception != null) { - throw IllegalArgumentException("$fileName contains invalid json", exception) + throw IllegalArgumentException("$fileName contains invalid json", exception) } } setBody(text) diff --git a/subprojects/common/test-okhttp/src/main/kotlin/com/avito/test/http/MockWebServerFactory.kt b/subprojects/common/test-okhttp/src/main/kotlin/com/avito/test/http/MockWebServerFactory.kt index a742eedbf0..932612da1e 100644 --- a/subprojects/common/test-okhttp/src/main/kotlin/com/avito/test/http/MockWebServerFactory.kt +++ b/subprojects/common/test-okhttp/src/main/kotlin/com/avito/test/http/MockWebServerFactory.kt @@ -17,5 +17,4 @@ class MockWebServerFactory { companion object { fun create(): MockWebServer = MockWebServerFactory().create() } - -} \ No newline at end of file +} diff --git a/subprojects/common/test-okhttp/src/test/kotlin/com/avito/test/http/MockDispatcherTest.kt b/subprojects/common/test-okhttp/src/test/kotlin/com/avito/test/http/MockDispatcherTest.kt index 602546bbca..d677dd2536 100644 --- a/subprojects/common/test-okhttp/src/test/kotlin/com/avito/test/http/MockDispatcherTest.kt +++ b/subprojects/common/test-okhttp/src/test/kotlin/com/avito/test/http/MockDispatcherTest.kt @@ -14,11 +14,13 @@ import java.nio.charset.Charset internal class MockDispatcherTest { - //todo create TestLogger for it - private val devNull = PrintStream(object : OutputStream() { - override fun write(b: Int) { + // todo create TestLogger for it + private val devNull = PrintStream( + object : OutputStream() { + override fun write(b: Int) { + } } - }) + ) private val isLocalRun: Boolean by lazy { val command: String? = System.getProperty("sun.java.command") @@ -125,9 +127,10 @@ private fun buildRequest( body = if (body == null) Buffer() else Buffer().writeString(body, Charset.forName("UTF-8")), sequenceNumber = -1, socket = FakeSocket( - InetAddress.getByAddress( + inetAddress = InetAddress.getByAddress( "127.0.0.1", byteArrayOf(127, 0, 0, 1) - ), 80 + ), + localPort = 80 ) ) diff --git a/subprojects/common/time/src/main/kotlin/com/avito/time/DefaultTimeProvider.kt b/subprojects/common/time/src/main/kotlin/com/avito/time/DefaultTimeProvider.kt index fa573056bb..d662025545 100644 --- a/subprojects/common/time/src/main/kotlin/com/avito/time/DefaultTimeProvider.kt +++ b/subprojects/common/time/src/main/kotlin/com/avito/time/DefaultTimeProvider.kt @@ -4,7 +4,7 @@ import java.util.Calendar import java.util.Date import java.util.concurrent.TimeUnit -//todo java8 api +// todo java8 api class DefaultTimeProvider : TimeProvider { override fun isSameDay(date1: Date, date2: Date): Boolean { diff --git a/subprojects/detekt.yml b/subprojects/detekt.yml index d26f64b610..821aaa8aa9 100644 --- a/subprojects/detekt.yml +++ b/subprojects/detekt.yml @@ -41,7 +41,7 @@ output-reports: comments: active: false - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ] AbsentOrWrongFileLicense: active: false licenseTemplateFile: 'license.template' @@ -79,10 +79,10 @@ complexity: ignoreSingleWhenExpression: false ignoreSimpleWhenEntries: false ignoreNestingFunctions: false - nestingFunctions: [run, let, apply, with, also, use, forEach, isNotNull, ifNull] + nestingFunctions: [ run, let, apply, with, also, use, forEach, isNotNull, ifNull ] LabeledExpression: active: false - ignoredLabels: [] + ignoredLabels: [ ] LargeClass: active: true threshold: 600 @@ -95,7 +95,7 @@ complexity: constructorThreshold: 7 ignoreDefaultParameters: false ignoreDataClasses: true - ignoreAnnotated: [] + ignoreAnnotated: [ ] MethodOverloading: active: false threshold: 6 @@ -109,14 +109,14 @@ complexity: active: false StringLiteralDuplication: active: false - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ] threshold: 3 ignoreAnnotation: true excludeStringsWithLessThan5Characters: true ignoreStringsRegex: '$^' TooManyFunctions: active: true - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ] thresholdInFiles: 11 thresholdInClasses: 11 thresholdInInterfaces: 11 @@ -174,10 +174,10 @@ exceptions: active: false ExceptionRaisedInUnexpectedLocation: active: false - methodNames: [toString, hashCode, equals, finalize] + methodNames: [ toString, hashCode, equals, finalize ] InstanceOfCheckForException: active: false - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ] NotImplementedDeclaration: active: false PrintStackTrace: @@ -201,7 +201,7 @@ exceptions: active: false ThrowingExceptionsWithoutMessageOrCause: active: false - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ] exceptions: - IllegalArgumentException - IllegalStateException @@ -210,7 +210,7 @@ exceptions: active: false TooGenericExceptionCaught: active: true - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ] exceptionNames: - ArrayIndexOutOfBoundsException - Error @@ -230,211 +230,204 @@ exceptions: - RuntimeException formatting: - active: false - android: false - autoCorrect: true + active: true + android: true + autoCorrect: false + + # todo rise an issue: false positive on kotlin @file annotations AnnotationOnSeparateLine: active: false - autoCorrect: true AnnotationSpacing: - active: false - autoCorrect: true + active: true ArgumentListWrapping: - active: false - autoCorrect: true - ChainWrapping: active: true - autoCorrect: true + # questionable rule; && and || goes to the end of line, instead of beginning a new line as we do right now + ChainWrapping: + active: false CommentSpacing: active: true - autoCorrect: true + # duplicate of naming:EnumNaming EnumEntryNameCase: active: false - autoCorrect: true + # todo what is it? Filename: - active: true + active: false FinalNewline: active: true - autoCorrect: true - insertFinalNewLine: true + insertFinalNewLine: false ImportOrdering: - active: false - autoCorrect: true + active: true layout: 'idea' + # blocked by bugs: https://github.com/pinterest/ktlint/issues?q=is%3Aissue+is%3Aopen+Indentation Indentation: active: false - autoCorrect: true indentSize: 4 continuationIndentSize: 4 + # todo fix and enable MaximumLineLength: - active: true + active: false maxLineLength: 120 + # https://ktlint.github.io/#rule-modifier-order ModifierOrdering: active: true - autoCorrect: true MultiLineIfElse: active: true - autoCorrect: true NoBlankLineBeforeRbrace: active: true - autoCorrect: true + # https://ktlint.github.io/#rule-blank NoConsecutiveBlankLines: active: true - autoCorrect: true + # https://ktlint.github.io/#rule-empty-class-body NoEmptyClassBody: active: true - autoCorrect: true + # questionable rule, it is good idea to have some visual space after function declaration NoEmptyFirstLineInMethodBlock: active: false - autoCorrect: true NoLineBreakAfterElse: active: true - autoCorrect: true NoLineBreakBeforeAssignment: active: true - autoCorrect: true NoMultipleSpaces: active: true - autoCorrect: true + # https://ktlint.github.io/#rule-semi NoSemicolons: active: true - autoCorrect: true + # https://ktlint.github.io/#rule-trailing-whitespaces NoTrailingSpaces: active: true - autoCorrect: true NoUnitReturn: active: true - autoCorrect: true + + # https://ktlint.github.io/#rule-import NoUnusedImports: active: true - autoCorrect: true NoWildcardImports: active: true + + # duplicate of naming:PackageNaming rule PackageName: - active: true - autoCorrect: true + active: false ParameterListWrapping: active: true - autoCorrect: true indentSize: 4 + + # https://ktlint.github.io/#rule-spacing SpacingAroundColon: active: true - autoCorrect: true SpacingAroundComma: active: true - autoCorrect: true SpacingAroundCurly: active: true - autoCorrect: true SpacingAroundDot: active: true - autoCorrect: true SpacingAroundDoubleColon: - active: false - autoCorrect: true + active: true SpacingAroundKeyword: active: true - autoCorrect: true SpacingAroundOperators: active: true - autoCorrect: true SpacingAroundParens: active: true - autoCorrect: true SpacingAroundRangeOperator: active: true - autoCorrect: true SpacingBetweenDeclarationsWithAnnotations: - active: false - autoCorrect: true + active: true SpacingBetweenDeclarationsWithComments: - active: false - autoCorrect: true + active: true + + # https://ktlint.github.io/#rule-string-template StringTemplate: active: true - autoCorrect: true naming: - active: false + active: true + # https://detekt.github.io/detekt/naming.html#classnaming ClassNaming: active: true - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ] classPattern: '[A-Z][a-zA-Z0-9]*' + # https://detekt.github.io/detekt/naming.html#constructorparameternaming ConstructorParameterNaming: active: true - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ] parameterPattern: '[a-z][A-Za-z0-9]*' privateParameterPattern: '[a-z][A-Za-z0-9]*' excludeClassPattern: '$^' ignoreOverridden: true EnumNaming: - active: true - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] + active: false + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ] enumEntryPattern: '[A-Z][_a-zA-Z0-9]*' ForbiddenClassName: active: false - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] - forbiddenName: [] + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ] + forbiddenName: [ ] FunctionMaxLength: active: false - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ] maximumFunctionNameLength: 30 + # blocked by `Is` functions FunctionMinLength: active: false - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ] minimumFunctionNameLength: 3 + # blocked by `Is` functions FunctionNaming: - active: true - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] + active: false + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ] functionPattern: '([a-z][a-zA-Z0-9]*)|(`.*`)' excludeClassPattern: '$^' ignoreOverridden: true - ignoreAnnotated: ['Composable'] + ignoreAnnotated: [ 'Composable' ] FunctionParameterNaming: - active: true - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] + active: false + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ] parameterPattern: '[a-z][A-Za-z0-9]*' excludeClassPattern: '$^' ignoreOverridden: true + # blocked by https://github.com/detekt/detekt/issues/2539 InvalidPackageDeclaration: active: false rootPackage: '' + # https://detekt.github.io/detekt/naming.html#matchingdeclarationname MatchingDeclarationName: active: true mustBeFirst: true + # https://detekt.github.io/detekt/naming.html#membernameequalsclassname MemberNameEqualsClassName: - active: true + active: false ignoreOverridden: true NonBooleanPropertyPrefixedWithIs: active: false - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ] ObjectPropertyNaming: - active: true - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] + active: false + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ] constantPattern: '[A-Za-z][_A-Za-z0-9]*' propertyPattern: '[A-Za-z][_A-Za-z0-9]*' privatePropertyPattern: '(_)?[A-Za-z][_A-Za-z0-9]*' PackageNaming: - active: true - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] + active: false + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ] packagePattern: '[a-z]+(\.[a-z][A-Za-z0-9]*)*' TopLevelPropertyNaming: - active: true - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] + active: false + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ] constantPattern: '[A-Z][_A-Z0-9]*' propertyPattern: '[A-Za-z][_A-Za-z0-9]*' privatePropertyPattern: '_?[A-Za-z][_A-Za-z0-9]*' VariableMaxLength: active: false - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ] maximumVariableNameLength: 64 VariableMinLength: active: false - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ] minimumVariableNameLength: 1 + # https://detekt.github.io/detekt/naming.html#variablenaming VariableNaming: active: true - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ] variablePattern: '[a-z][A-Za-z0-9]*' privateVariablePattern: '(_)?[a-z][A-Za-z0-9]*' excludeClassPattern: '$^' @@ -446,10 +439,10 @@ performance: active: true ForEachOnRange: active: true - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ] SpreadOperator: active: true - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ] UnnecessaryTemporaryInstantiation: active: true @@ -458,44 +451,44 @@ potential-bugs: Deprecation: active: false DuplicateCaseInWhenExpression: - active: true + active: false EqualsAlwaysReturnsTrueOrFalse: - active: true + active: false EqualsWithHashCodeExist: - active: true + active: false ExplicitGarbageCollectionCall: - active: true + active: false HasPlatformType: active: false IgnoredReturnValue: active: false restrictToAnnotatedMethods: true - returnValueAnnotations: ['*.CheckReturnValue', '*.CheckResult'] + returnValueAnnotations: [ '*.CheckReturnValue', '*.CheckResult' ] ImplicitDefaultLocale: active: false ImplicitUnitReturnType: active: false allowExplicitReturnType: true InvalidRange: - active: true + active: false IteratorHasNextCallsNextMethod: - active: true + active: false IteratorNotThrowingNoSuchElementException: - active: true + active: false LateinitUsage: active: false - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] - excludeAnnotatedProperties: [] + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ] + excludeAnnotatedProperties: [ ] ignoreOnClassesPattern: '' MapGetWithNotNullAssertionOperator: active: false MissingWhenCase: - active: true + active: false allowElseExpression: true NullableToStringCall: active: false RedundantElseInWhen: - active: true + active: false UnconditionalJumpStatementInLoop: active: false UnnecessaryNotNullOperator: @@ -503,15 +496,15 @@ potential-bugs: UnnecessarySafeCall: active: false UnreachableCode: - active: true + active: false UnsafeCallOnNullableType: - active: true + active: false UnsafeCast: active: false UselessPostfixExpression: active: false WrongEqualsTypeParameter: - active: true + active: false style: active: true @@ -537,18 +530,18 @@ style: includeLineWrapping: false ForbiddenComment: active: false - values: ['TODO:', 'FIXME:', 'STOPSHIP:'] + values: [ 'TODO:', 'FIXME:', 'STOPSHIP:' ] allowedPatterns: '' ForbiddenImport: active: false - imports: [] + imports: [ ] forbiddenPatterns: '' ForbiddenMethodCall: active: false - methods: ['kotlin.io.println', 'kotlin.io.print'] + methods: [ 'kotlin.io.println', 'kotlin.io.print' ] ForbiddenPublicDataClass: active: false - ignorePackages: ['*.internal', '*.internal.*'] + ignorePackages: [ '*.internal', '*.internal.*' ] ForbiddenVoid: active: false ignoreOverridden: false @@ -557,7 +550,7 @@ style: active: false ignoreOverridableFunction: true excludedFunctions: 'describeContents' - excludeAnnotatedFunction: ['dagger.Provides'] + excludeAnnotatedFunction: [ 'dagger.Provides' ] LibraryCodeMustSpecifyReturnType: active: false LibraryEntitiesShouldNotBePublic: @@ -567,8 +560,8 @@ style: maxJumpCount: 1 MagicNumber: active: false - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] - ignoreNumbers: ['-1', '0', '1', '2'] + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ] + ignoreNumbers: [ '-1', '0', '1', '2' ] ignoreHashCodeFunction: true ignorePropertyDeclaration: false ignoreLocalVariableDeclaration: false @@ -637,7 +630,7 @@ style: acceptableDecimalLength: 5 UnnecessaryAbstractClass: active: false - excludeAnnotatedClasses: ['dagger.Module'] + excludeAnnotatedClasses: [ 'dagger.Module' ] UnnecessaryAnnotationUseSiteTarget: active: false UnnecessaryApply: @@ -665,7 +658,7 @@ style: active: false UseDataClass: active: false - excludeAnnotatedClasses: [] + excludeAnnotatedClasses: [ ] allowVars: false UseEmptyCounterpart: active: false @@ -685,5 +678,5 @@ style: active: false WildcardImport: active: false - excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] - excludeImports: ['java.util.*', 'kotlinx.android.synthetic.*'] + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ] + excludeImports: [ 'java.util.*', 'kotlinx.android.synthetic.*' ] diff --git a/subprojects/gradle/android/src/main/kotlin/com/avito/android/AndroidSdk.kt b/subprojects/gradle/android/src/main/kotlin/com/avito/android/AndroidSdk.kt index 86e8ddaee3..16b3ced4b6 100644 --- a/subprojects/gradle/android/src/main/kotlin/com/avito/android/AndroidSdk.kt +++ b/subprojects/gradle/android/src/main/kotlin/com/avito/android/AndroidSdk.kt @@ -62,7 +62,8 @@ class AndroidSdk( val path = if (fromEnv.isNullOrBlank()) { androidHomeFromLocalProperties( localPropertiesLocation = File(projectRootDir, "local.properties"), - logger = { logger.error(it) }) + logger = { logger.error(it) } + ) ?: error("Can't find ANDROID_HOME") } else { fromEnv diff --git a/subprojects/gradle/android/src/main/kotlin/com/avito/android/PackageAndroidArtifactExtensions.kt b/subprojects/gradle/android/src/main/kotlin/com/avito/android/PackageAndroidArtifactExtensions.kt index 115d94945f..61fd7a2968 100644 --- a/subprojects/gradle/android/src/main/kotlin/com/avito/android/PackageAndroidArtifactExtensions.kt +++ b/subprojects/gradle/android/src/main/kotlin/com/avito/android/PackageAndroidArtifactExtensions.kt @@ -23,7 +23,7 @@ fun Directory.getApk(): File? { fun Directory.getApkOrThrow(): File { return requireNotNull(getApk()) { - "APK not found in ${asFile}. Files in dir: ${asFile.dumpFiles()}" + "APK not found in $asFile. Files in dir: ${asFile.dumpFiles()}" } } diff --git a/subprojects/gradle/android/src/main/kotlin/com/avito/android/ProjectExtensions.kt b/subprojects/gradle/android/src/main/kotlin/com/avito/android/ProjectExtensions.kt index 39b2e5820b..de3f3fdf54 100644 --- a/subprojects/gradle/android/src/main/kotlin/com/avito/android/ProjectExtensions.kt +++ b/subprojects/gradle/android/src/main/kotlin/com/avito/android/ProjectExtensions.kt @@ -1,7 +1,6 @@ package com.avito.android import com.android.build.api.component.ComponentIdentity -import com.android.build.api.dsl.AndroidSourceSet import com.android.build.api.dsl.CommonExtension import com.android.build.gradle.AppExtension import com.android.build.gradle.AppPlugin diff --git a/subprojects/gradle/artifactory-app-backup/src/main/kotlin/com/avito/android/plugin/artifactory/ArtifactoryAppBackupExtension.kt b/subprojects/gradle/artifactory-app-backup/src/main/kotlin/com/avito/android/plugin/artifactory/ArtifactoryAppBackupExtension.kt index cfaa5ff8b5..6d15683908 100644 --- a/subprojects/gradle/artifactory-app-backup/src/main/kotlin/com/avito/android/plugin/artifactory/ArtifactoryAppBackupExtension.kt +++ b/subprojects/gradle/artifactory-app-backup/src/main/kotlin/com/avito/android/plugin/artifactory/ArtifactoryAppBackupExtension.kt @@ -61,7 +61,6 @@ private class DefaultBackupBuilder( ) ) } - } interface ArtifactoryBackupExtension { diff --git a/subprojects/gradle/artifactory-app-backup/src/main/kotlin/com/avito/android/plugin/artifactory/ArtifactoryAppBackupPlugin.kt b/subprojects/gradle/artifactory-app-backup/src/main/kotlin/com/avito/android/plugin/artifactory/ArtifactoryAppBackupPlugin.kt index 1378155f2f..84de8eae19 100644 --- a/subprojects/gradle/artifactory-app-backup/src/main/kotlin/com/avito/android/plugin/artifactory/ArtifactoryAppBackupPlugin.kt +++ b/subprojects/gradle/artifactory-app-backup/src/main/kotlin/com/avito/android/plugin/artifactory/ArtifactoryAppBackupPlugin.kt @@ -87,4 +87,3 @@ class ArtifactoryAppBackupPlugin : Plugin { } } } - diff --git a/subprojects/gradle/artifactory-app-backup/src/test/kotlin/com/avito/android/plugin/artifactory/ArtifactoryAppBackupPluginTest.kt b/subprojects/gradle/artifactory-app-backup/src/test/kotlin/com/avito/android/plugin/artifactory/ArtifactoryAppBackupPluginTest.kt index 03127e31f2..3a4e86e22d 100644 --- a/subprojects/gradle/artifactory-app-backup/src/test/kotlin/com/avito/android/plugin/artifactory/ArtifactoryAppBackupPluginTest.kt +++ b/subprojects/gradle/artifactory-app-backup/src/test/kotlin/com/avito/android/plugin/artifactory/ArtifactoryAppBackupPluginTest.kt @@ -78,7 +78,7 @@ internal class ArtifactoryAppBackupPluginTest { val result = ciRun( projectDir, - ":$moduleName:${artifactoryAppBackupTaskName}", + ":$moduleName:$artifactoryAppBackupTaskName", "-PartifactoryUrl=${mockWebServer.url("/")}", "-Partifactory_deployer=xxx", "-Partifactory_deployer_password=xxx" @@ -123,14 +123,16 @@ internal class ArtifactoryAppBackupPluginTest { name = "$backupName" type = "$backupType" version = "$backupVersion" - ${artifacts.map { (id, path) -> - """ + ${ + artifacts.map { (id, path) -> + """ artifact { id = "$id" path = "$path" } - """.trimIndent() - }.joinToString(separator = "\n")} + """.trimIndent() + }.joinToString(separator = "\n") + } } } """.trimIndent() @@ -162,7 +164,7 @@ internal class ArtifactoryAppBackupPluginTest { val result = ciRun( projectDir, - ":$moduleName:${artifactoryAppBackupTaskName}", + ":$moduleName:$artifactoryAppBackupTaskName", "-PartifactoryUrl=${mockWebServer.url("/")}", "-Partifactory_deployer=xxx", "-Partifactory_deployer_password=xxx" diff --git a/subprojects/gradle/artifactory-app-backup/src/test/kotlin/com/avito/android/plugin/artifactory/MavenArtifactsToCdBuildResultArtifactMapperTest.kt b/subprojects/gradle/artifactory-app-backup/src/test/kotlin/com/avito/android/plugin/artifactory/MavenArtifactsToCdBuildResultArtifactMapperTest.kt index fe2b82ffe4..4755b39995 100644 --- a/subprojects/gradle/artifactory-app-backup/src/test/kotlin/com/avito/android/plugin/artifactory/MavenArtifactsToCdBuildResultArtifactMapperTest.kt +++ b/subprojects/gradle/artifactory-app-backup/src/test/kotlin/com/avito/android/plugin/artifactory/MavenArtifactsToCdBuildResultArtifactMapperTest.kt @@ -113,4 +113,3 @@ class MavenArtifactsToCdBuildResultArtifactMapperTest { ) } } - diff --git a/subprojects/gradle/bitbucket/src/main/kotlin/com/avito/bitbucket/BitbucketImpl.kt b/subprojects/gradle/bitbucket/src/main/kotlin/com/avito/bitbucket/BitbucketImpl.kt index f37bdf58e3..dcf1e33126 100644 --- a/subprojects/gradle/bitbucket/src/main/kotlin/com/avito/bitbucket/BitbucketImpl.kt +++ b/subprojects/gradle/bitbucket/src/main/kotlin/com/avito/bitbucket/BitbucketImpl.kt @@ -67,7 +67,7 @@ class BitbucketImpl( link: HttpUrl, issues: List ): Try = - //todo extract + // todo extract newChangesDetector( rootDir = rootDir, targetCommit = targetCommitHash, @@ -98,7 +98,7 @@ class BitbucketImpl( insightKey = key, insightReportCreateRequest = InsightReportCreateRequest( title = title, - details = "", //todo lint version? + details = "", // todo lint version? data = emptyList(), link = link.toString() ) @@ -147,7 +147,7 @@ class BitbucketImpl( .handleError(link = link) } - //todo generic solution + // todo generic solution private fun retrofit2.Response.handleError(link: HttpUrl? = null, issueSize: Int = 0) { if (!isSuccessful) { diff --git a/subprojects/gradle/bitbucket/src/main/kotlin/com/avito/bitbucket/ProjectExtensions.kt b/subprojects/gradle/bitbucket/src/main/kotlin/com/avito/bitbucket/ProjectExtensions.kt index f5bb02f03a..b33e58e8ab 100644 --- a/subprojects/gradle/bitbucket/src/main/kotlin/com/avito/bitbucket/ProjectExtensions.kt +++ b/subprojects/gradle/bitbucket/src/main/kotlin/com/avito/bitbucket/ProjectExtensions.kt @@ -47,17 +47,14 @@ val Project.bitbucketConfig: Provider BitbucketConfig( baseUrl = "http://disable", projectKey = "disable", - credentials = AtlassianCredentials( - "disabled", "disabled" - ), + credentials = AtlassianCredentials("disabled", "disabled"), repositorySlug = "disabled" ) } } } - -//todo добавить префиксы avito. +// todo добавить префиксы avito. private fun atlassianCredentials(project: Project): AtlassianCredentials = AtlassianCredentials( project.getMandatoryStringProperty("atlassianUser"), project.getMandatoryStringProperty("atlassianPassword") diff --git a/subprojects/gradle/bitbucket/src/test/kotlin/com/avito/bitbucket/BitbucketImplTest.kt b/subprojects/gradle/bitbucket/src/test/kotlin/com/avito/bitbucket/BitbucketImplTest.kt index c642967ba7..29e434c1df 100644 --- a/subprojects/gradle/bitbucket/src/test/kotlin/com/avito/bitbucket/BitbucketImplTest.kt +++ b/subprojects/gradle/bitbucket/src/test/kotlin/com/avito/bitbucket/BitbucketImplTest.kt @@ -1,11 +1,11 @@ package com.avito.bitbucket -import com.avito.test.gradle.module.KotlinModule import com.avito.test.gradle.TestProjectGenerator import com.avito.test.gradle.commit import com.avito.test.gradle.file import com.avito.test.gradle.getCommitHash import com.avito.test.gradle.git +import com.avito.test.gradle.module.KotlinModule import com.avito.test.http.Mock import com.avito.test.http.MockDispatcher import com.avito.test.http.MockWebServerFactory diff --git a/subprojects/gradle/build-environment/src/main/kotlin/com/avito/utils/gradle/Environment.kt b/subprojects/gradle/build-environment/src/main/kotlin/com/avito/utils/gradle/BuildEnvironment.kt similarity index 100% rename from subprojects/gradle/build-environment/src/main/kotlin/com/avito/utils/gradle/Environment.kt rename to subprojects/gradle/build-environment/src/main/kotlin/com/avito/utils/gradle/BuildEnvironment.kt diff --git a/subprojects/gradle/build-environment/src/main/kotlin/com/avito/utils/gradle/EnvArgs.kt b/subprojects/gradle/build-environment/src/main/kotlin/com/avito/utils/gradle/EnvArgs.kt index aa1718150a..0b6031c3a1 100644 --- a/subprojects/gradle/build-environment/src/main/kotlin/com/avito/utils/gradle/EnvArgs.kt +++ b/subprojects/gradle/build-environment/src/main/kotlin/com/avito/utils/gradle/EnvArgs.kt @@ -4,7 +4,6 @@ package com.avito.utils.gradle import com.avito.kotlin.dsl.ProjectProperty import com.avito.kotlin.dsl.PropertyScope.ROOT_PROJECT -import com.avito.kotlin.dsl.getBooleanProperty import com.avito.kotlin.dsl.getMandatoryIntProperty import com.avito.kotlin.dsl.getMandatoryStringProperty import com.avito.kotlin.dsl.getOptionalStringProperty @@ -32,7 +31,7 @@ interface EnvArgs { override val id = id.id override val url = "No url. This is local build" override val number = "local" - override val type = "local-${userName}" + override val type = "local-$userName" internal enum class Id(val id: Int) { FOR_LOCAL_KUBERNETES_RUN(TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()).toInt()) @@ -49,7 +48,6 @@ interface EnvArgs { override val number: String, override val type: String ) : Build() - } val build: Build @@ -76,6 +74,5 @@ interface EnvArgs { else -> throw IllegalStateException("property avito.build must be 'teamcity' or 'local'") } } - } } diff --git a/subprojects/gradle/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/AggregatedMetricsConsumer.kt b/subprojects/gradle/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/AggregatedMetricsConsumer.kt index 68923c5d99..83c6fcbf9d 100644 --- a/subprojects/gradle/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/AggregatedMetricsConsumer.kt +++ b/subprojects/gradle/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/AggregatedMetricsConsumer.kt @@ -98,7 +98,7 @@ internal class AggregatedMetricsConsumer( .filterNot { defaultBuildTasks.contains(it) } .map { it.removePrefix(":") } - //todo тут правильно смотреть макс длину события, вместе с тегами сейчас 1000 + // todo тут правильно смотреть макс длину события, вместе с тегами сейчас 1000 val canBeTooLongForGraphite = tasks.size > 2 val tasksShorthand = if (canBeTooLongForGraphite) { "_" @@ -183,10 +183,10 @@ internal class AggregatedMetricsConsumer( "outcome:${state.outcome}" ) } - } private const val considerableTimeMs = 100 + /** * Добавляются неявно к каждой сборке, зашумляют метрики. */ diff --git a/subprojects/gradle/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/BuildMetricsPlugin.kt b/subprojects/gradle/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/BuildMetricsPlugin.kt index 83fbb4962b..939109f994 100644 --- a/subprojects/gradle/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/BuildMetricsPlugin.kt +++ b/subprojects/gradle/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/BuildMetricsPlugin.kt @@ -25,7 +25,8 @@ open class BuildMetricsPlugin : Plugin { return } GradleCollector.initialize( - project, listOf( + project, + listOf( aggregatedConsumer(project), SentryConsumer(project) ) @@ -39,5 +40,4 @@ open class BuildMetricsPlugin : Plugin { val graphiteClient = BuildMetricTracker(project.environmentInfo(), project.statsd) return AggregatedMetricsConsumer(project, graphiteClient) } - } diff --git a/subprojects/gradle/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/CollectTeamcityMetricsAction.kt b/subprojects/gradle/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/CollectTeamcityMetricsAction.kt index 5ca59f742f..9dd1a86bc3 100644 --- a/subprojects/gradle/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/CollectTeamcityMetricsAction.kt +++ b/subprojects/gradle/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/CollectTeamcityMetricsAction.kt @@ -28,11 +28,11 @@ class CollectTeamcityMetricsAction( // We use a redundant structure only for compatibility reasons val path = "ci.builds.teamcity.duration" + - ".build_type_id.${buildTypeId}" + - ".id.${buildId}" + + ".build_type_id.$buildTypeId" + + ".id.$buildId" + ".agent._" + ".state._" + - ".status.${buildStatus}" + + ".status.$buildStatus" + "._._._._" graphite.send(GraphiteMetric(path, duration.seconds.toString(), build.startDateTime!!.toEpochSecond())) } diff --git a/subprojects/gradle/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/SentryConsumer.kt b/subprojects/gradle/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/SentryConsumer.kt index 7593165534..dc1dfbaa96 100644 --- a/subprojects/gradle/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/SentryConsumer.kt +++ b/subprojects/gradle/build-metrics/src/main/kotlin/com/avito/android/plugin/build_metrics/SentryConsumer.kt @@ -12,7 +12,7 @@ import org.gradle.BuildResult import org.gradle.api.Project import org.gradle.api.logging.Logger -//todo вынести в фабрику знания про project +// todo вынести в фабрику знания про project internal class SentryConsumer( project: Project ) : AbstractMetricsConsumer() { @@ -64,7 +64,6 @@ internal class SentryConsumer( } sentry.get().sendException(error) } - } private class DefaultSendCallback( @@ -75,9 +74,9 @@ private class DefaultSendCallback( override fun onSuccess(event: Event) { val hash = event.id.toString().replace("-", "") if (sentryUrl.isNullOrBlank()) { - log.lifecycle("${logTag} Error sent") + log.lifecycle("$logTag Error sent") } else { - log.lifecycle("${logTag} Error sent: $sentryUrl?query=$hash") + log.lifecycle("$logTag Error sent: $sentryUrl?query=$hash") } } @@ -85,9 +84,8 @@ private class DefaultSendCallback( val cause = exception.javaClass.simpleName + " ← " + exception.cause?.javaClass?.name + ": " + exception.cause?.message - log.warn("${logTag} Can't send error: $cause. \nCheck your connection.") + log.warn("$logTag Can't send error: $cause. \nCheck your connection.") } - } private const val logTag = "[sentry]" diff --git a/subprojects/gradle/build-metrics/src/test/kotlin/com/avito/android/plugin/build_metrics/BuildMetricsPluginTest.kt b/subprojects/gradle/build-metrics/src/test/kotlin/com/avito/android/plugin/build_metrics/BuildMetricsPluginTest.kt index 436daebfa6..e8bc8f24a9 100644 --- a/subprojects/gradle/build-metrics/src/test/kotlin/com/avito/android/plugin/build_metrics/BuildMetricsPluginTest.kt +++ b/subprojects/gradle/build-metrics/src/test/kotlin/com/avito/android/plugin/build_metrics/BuildMetricsPluginTest.kt @@ -105,21 +105,25 @@ class BuildMetricsPluginTest { val metricName: String ) return listOf( - Case("build app", - arrayOf(":app:assemble"), - "build-tasks.app_assemble" + Case( + description = "build app", + tasks = arrayOf(":app:assemble"), + metricName = "build-tasks.app_assemble" ), - Case("run instrumentation tests", - arrayOf(":app:assembleDebug", ":app:assembleDebugAndroidTest"), - "build-tasks.app_assembleDebug_app_assembleDebugAndroidTest" + Case( + description = "run instrumentation tests", + tasks = arrayOf(":app:assembleDebug", ":app:assembleDebugAndroidTest"), + metricName = "build-tasks.app_assembleDebug_app_assembleDebugAndroidTest" ), - Case("stable tasks order", - arrayOf(":app:assembleDebugAndroidTest", ":app:assembleDebug"), - "build-tasks.app_assembleDebug_app_assembleDebugAndroidTest" + Case( + description = "stable tasks order", + tasks = arrayOf(":app:assembleDebugAndroidTest", ":app:assembleDebug"), + metricName = "build-tasks.app_assembleDebug_app_assembleDebugAndroidTest" ), - Case("up to three tasks", - arrayOf(":app:preBuild", ":app:assembleDebug", ":app:assembleDebugAndroidTest"), - "build-tasks._" + Case( + description = "up to three tasks", + tasks = arrayOf(":app:preBuild", ":app:assembleDebug", ":app:assembleDebugAndroidTest"), + metricName = "build-tasks._" ) ).map { dynamicTest("send build tasks - " + it.description) { @@ -153,7 +157,8 @@ class BuildMetricsPluginTest { } private fun build(vararg tasks: String, dryRun: Boolean = false): TestResult { - return gradlew(tempDir, *tasks, + return gradlew( + tempDir, *tasks, "-Pavito.build.metrics.enabled=true", "-Pavito.stats.enabled=false", "-Pavito.stats.host=http://stats", @@ -164,5 +169,4 @@ class BuildMetricsPluginTest { dryRun = dryRun ) } - } diff --git a/subprojects/gradle/build-metrics/src/test/kotlin/com/avito/android/plugin/build_metrics/CollectTeamcityMetricsActionTest.kt b/subprojects/gradle/build-metrics/src/test/kotlin/com/avito/android/plugin/build_metrics/CollectTeamcityMetricsActionTest.kt index 235c68c3a9..ad46ccdfde 100644 --- a/subprojects/gradle/build-metrics/src/test/kotlin/com/avito/android/plugin/build_metrics/CollectTeamcityMetricsActionTest.kt +++ b/subprojects/gradle/build-metrics/src/test/kotlin/com/avito/android/plugin/build_metrics/CollectTeamcityMetricsActionTest.kt @@ -55,5 +55,4 @@ class CollectTeamcityMetricsActionTest { } private val buildId = "BUILD_ID" - } diff --git a/subprojects/gradle/build-properties/src/main/kotlin/com/avito/android/info/BuildInfoExtension.kt b/subprojects/gradle/build-properties/src/main/kotlin/com/avito/android/info/BuildInfoExtension.kt index a42c2bce94..1b1bbcae4a 100644 --- a/subprojects/gradle/build-properties/src/main/kotlin/com/avito/android/info/BuildInfoExtension.kt +++ b/subprojects/gradle/build-properties/src/main/kotlin/com/avito/android/info/BuildInfoExtension.kt @@ -5,5 +5,4 @@ open class BuildInfoExtension { var gitCommit: String? = null var gitBranch: String? = null var buildNumber: String? = null - } diff --git a/subprojects/gradle/build-properties/src/main/kotlin/com/avito/android/info/BuildPropertiesExtension.kt b/subprojects/gradle/build-properties/src/main/kotlin/com/avito/android/info/BuildPropertiesExtension.kt index b8469b4e6e..7a4561f6f6 100644 --- a/subprojects/gradle/build-properties/src/main/kotlin/com/avito/android/info/BuildPropertiesExtension.kt +++ b/subprojects/gradle/build-properties/src/main/kotlin/com/avito/android/info/BuildPropertiesExtension.kt @@ -7,5 +7,4 @@ open class BuildPropertiesExtension { fun buildProperty(name: String, value: String) { properties[name] = value } - } diff --git a/subprojects/gradle/build-properties/src/main/kotlin/com/avito/android/info/BuildPropertiesPlugin.kt b/subprojects/gradle/build-properties/src/main/kotlin/com/avito/android/info/BuildPropertiesPlugin.kt index f6ef38fa3d..e996b01089 100644 --- a/subprojects/gradle/build-properties/src/main/kotlin/com/avito/android/info/BuildPropertiesPlugin.kt +++ b/subprojects/gradle/build-properties/src/main/kotlin/com/avito/android/info/BuildPropertiesPlugin.kt @@ -37,5 +37,4 @@ open class BuildPropertiesPlugin : Plugin { } project.addPreBuildTasks(task) } - } diff --git a/subprojects/gradle/build-trace/src/main/kotlin/com/avito/android/build_trace/BuildTraceConsumer.kt b/subprojects/gradle/build-trace/src/main/kotlin/com/avito/android/build_trace/BuildTraceConsumer.kt index 366c5ab54a..d2c9b74ecf 100644 --- a/subprojects/gradle/build-trace/src/main/kotlin/com/avito/android/build_trace/BuildTraceConsumer.kt +++ b/subprojects/gradle/build-trace/src/main/kotlin/com/avito/android/build_trace/BuildTraceConsumer.kt @@ -63,7 +63,6 @@ internal class BuildTraceConsumer( threadId = unknownThreadId, eventName = "execution end" ) - } internal const val unknownProcessId = "_" diff --git a/subprojects/gradle/build-trace/src/main/kotlin/com/avito/android/build_trace/BuildTracePlugin.kt b/subprojects/gradle/build-trace/src/main/kotlin/com/avito/android/build_trace/BuildTracePlugin.kt index cde75fd3c4..5e41eaf2da 100644 --- a/subprojects/gradle/build-trace/src/main/kotlin/com/avito/android/build_trace/BuildTracePlugin.kt +++ b/subprojects/gradle/build-trace/src/main/kotlin/com/avito/android/build_trace/BuildTracePlugin.kt @@ -18,11 +18,7 @@ open class BuildTracePlugin : Plugin { "Plugin must be applied to the root project but was applied to ${project.path}" } if (isBuildTraceEnabled(project)) { - GradleCollector.initialize( - project, listOf( - buildTraceConsumer(project) - ) - ) + GradleCollector.initialize(project, listOf(buildTraceConsumer(project))) } } @@ -39,5 +35,4 @@ open class BuildTracePlugin : Plugin { || (project.gradle.startParameter.isProfile) || (project.getBooleanProperty("android.enableProfileJson", default = false)) } - } diff --git a/subprojects/gradle/build-trace/src/main/kotlin/com/avito/android/build_trace/TaskEventProvider.kt b/subprojects/gradle/build-trace/src/main/kotlin/com/avito/android/build_trace/TaskEventProvider.kt index 38c9ff6f8c..9b24ba1bf8 100644 --- a/subprojects/gradle/build-trace/src/main/kotlin/com/avito/android/build_trace/TaskEventProvider.kt +++ b/subprojects/gradle/build-trace/src/main/kotlin/com/avito/android/build_trace/TaskEventProvider.kt @@ -83,7 +83,7 @@ private sealed class TaskResult { class FAILED(val error: Throwable?) : TaskResult() { override fun toString(): String { - return "${this.javaClass.simpleName} ${error.toString()}" // TODO: extract clean stacktrace + return "${this.javaClass.simpleName} $error" // TODO: extract clean stacktrace } } diff --git a/subprojects/gradle/build-verdict/src/main/kotlin/com/avito/android/build_verdict/TaskErrorOutputCaptureExecutionListener.kt b/subprojects/gradle/build-verdict/src/main/kotlin/com/avito/android/build_verdict/TaskErrorOutputCaptureExecutionListener.kt index 385b9a7267..e6d3c51ae2 100644 --- a/subprojects/gradle/build-verdict/src/main/kotlin/com/avito/android/build_verdict/TaskErrorOutputCaptureExecutionListener.kt +++ b/subprojects/gradle/build-verdict/src/main/kotlin/com/avito/android/build_verdict/TaskErrorOutputCaptureExecutionListener.kt @@ -19,14 +19,16 @@ internal class TaskErrorOutputCaptureExecutionListener( override fun beforeExecute(task: Task) { when (task) { is Test -> { - task.addTestListener(object : DefaultTestListener() { - override fun afterTest(testDescriptor: TestDescriptor, result: TestResult) { - if (result.resultType == TestResult.ResultType.FAILURE) { - logs.getOrPut(Path.path(task.path), { StringBuilder("FAILED tests:\n") }) - .appendln("\t${testDescriptor.className}.${testDescriptor.displayName}") + task.addTestListener( + object : DefaultTestListener() { + override fun afterTest(testDescriptor: TestDescriptor, result: TestResult) { + if (result.resultType == TestResult.ResultType.FAILURE) { + logs.getOrPut(Path.path(task.path), { StringBuilder("FAILED tests:\n") }) + .appendln("\t${testDescriptor.className}.${testDescriptor.displayName}") + } } } - }) + ) } else -> { task.logging.addStandardErrorListener { error -> diff --git a/subprojects/gradle/buildchecks/build.gradle.kts b/subprojects/gradle/buildchecks/build.gradle.kts index 8ee1ca9347..7264226be9 100644 --- a/subprojects/gradle/buildchecks/build.gradle.kts +++ b/subprojects/gradle/buildchecks/build.gradle.kts @@ -20,7 +20,7 @@ dependencies { implementation(Dependencies.funktionaleTry) implementation(Dependencies.Gradle.androidPlugin) - //for test + // for test implementation(project(":gradle:module-types")) implementation(project(":gradle:room-config")) diff --git a/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/BuildChecksExtension.kt b/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/BuildChecksExtension.kt index f20a595948..2e1910c0e0 100644 --- a/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/BuildChecksExtension.kt +++ b/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/BuildChecksExtension.kt @@ -4,11 +4,11 @@ import com.avito.android.plugin.build_param_check.BuildChecksExtension.Check.And import com.avito.android.plugin.build_param_check.BuildChecksExtension.Check.DynamicDependencies import com.avito.android.plugin.build_param_check.BuildChecksExtension.Check.GradleDaemon import com.avito.android.plugin.build_param_check.BuildChecksExtension.Check.GradleProperties +import com.avito.android.plugin.build_param_check.BuildChecksExtension.Check.IncrementalKapt import com.avito.android.plugin.build_param_check.BuildChecksExtension.Check.JavaVersion -import com.avito.android.plugin.build_param_check.BuildChecksExtension.Check.ModuleTypes import com.avito.android.plugin.build_param_check.BuildChecksExtension.Check.MacOSLocalhost +import com.avito.android.plugin.build_param_check.BuildChecksExtension.Check.ModuleTypes import com.avito.android.plugin.build_param_check.BuildChecksExtension.Check.UniqueRClasses -import com.avito.android.plugin.build_param_check.BuildChecksExtension.Check.IncrementalKapt import org.gradle.api.Action open class BuildChecksExtension { diff --git a/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/BuildParamCheckPlugin.kt b/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/BuildParamCheckPlugin.kt index 53ed5efd65..d55eedca61 100644 --- a/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/BuildParamCheckPlugin.kt +++ b/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/BuildParamCheckPlugin.kt @@ -223,7 +223,7 @@ open class BuildParamCheckPlugin : Plugin { "Actual: ${mismatch.actual}" ) val safeParamName = mismatch.name.replace(".", "-") - tracker.track(CountMetric("configuration.mismatch.${safeParamName}")) + tracker.track(CountMetric("configuration.mismatch.$safeParamName")) } } .onFailure { diff --git a/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/CheckGradleDaemonTask.kt b/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/CheckGradleDaemonTask.kt index 2197bc6717..57f7f19915 100644 --- a/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/CheckGradleDaemonTask.kt +++ b/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/CheckGradleDaemonTask.kt @@ -71,5 +71,4 @@ abstract class CheckGradleDaemonTask : DefaultTask() { load(input) } } - } diff --git a/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/CheckTaskWithMode.kt b/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/CheckTaskWithMode.kt index f940640a6e..1e87f8fb64 100644 --- a/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/CheckTaskWithMode.kt +++ b/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/CheckTaskWithMode.kt @@ -8,5 +8,4 @@ internal abstract class CheckTaskWithMode : DefaultTask() { @get:Input abstract val mode: Property - } diff --git a/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/DynamicDependenciesTask.kt b/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/DynamicDependenciesTask.kt index ee8d7ebde9..7e77891f2c 100644 --- a/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/DynamicDependenciesTask.kt +++ b/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/DynamicDependenciesTask.kt @@ -32,14 +32,13 @@ abstract class DynamicDependenciesTask : DefaultTask() { FailedCheckMessage( BuildChecksExtension::dynamicDependencies, """ - Module ${module.path} has dynamic dependency ${dependency.name}:${version}. + Module ${module.path} has dynamic dependency ${dependency.name}:$version. It leads to non-reproducible builds and slower configuration time. Please use exact version. """ ).toString() } } - } /** diff --git a/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/FailedCheckMessage.kt b/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/FailedCheckMessage.kt index dd1466ff34..92a2130150 100644 --- a/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/FailedCheckMessage.kt +++ b/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/FailedCheckMessage.kt @@ -9,7 +9,8 @@ internal class FailedCheckMessage( extensionMethodReference: KFunction, private val message: String ) { - override fun toString() = """ + override fun toString() = +""" ERROR: '$checkExtensionName' build check is failed. ${message.trimIndent()} This check can be disabled by extension: diff --git a/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/MacOSLocalhostResolvingTask.kt b/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/MacOSLocalhostResolvingTask.kt index 653091d422..965f65d29b 100644 --- a/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/MacOSLocalhostResolvingTask.kt +++ b/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/MacOSLocalhostResolvingTask.kt @@ -54,10 +54,11 @@ abstract class MacOSLocalhostResolvingTask @Inject constructor( if (resolveTimeMs > 100) { throw GradleException( FailedCheckMessage( - BuildChecksExtension::macOSLocalhost, """ + BuildChecksExtension::macOSLocalhost, + """ Localhost resolution took $resolveTimeMs ms. This is a bug in JVM on macOS. Please fix it: https://thoeni.io/post/macos-sierra-java/ - """ + """ ).toString() ) } else { @@ -76,7 +77,5 @@ abstract class MacOSLocalhostResolvingTask @Inject constructor( } private fun resolveLocalhost() = InetAddress.getLocalHost().hostName - } } - diff --git a/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/incremental_check/FakeProcessingEnvironment.kt b/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/incremental_check/FakeProcessingEnvironment.kt index 1f14294bbc..5df46d4c2c 100644 --- a/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/incremental_check/FakeProcessingEnvironment.kt +++ b/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/incremental_check/FakeProcessingEnvironment.kt @@ -28,4 +28,3 @@ internal class FakeProcessingEnvironment( private fun supposeNotUsed(): T? = null } - diff --git a/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/incremental_check/IncrementalKaptTask.kt b/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/incremental_check/IncrementalKaptTask.kt index 0da954435d..6be451c903 100644 --- a/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/incremental_check/IncrementalKaptTask.kt +++ b/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/incremental_check/IncrementalKaptTask.kt @@ -45,5 +45,4 @@ internal abstract class IncrementalKaptTask : CheckTaskWithMode() { get() = configurations.findByName("kapt")?.dependencies?.any { it.group == "androidx.room" && it.name == "room-compiler" } ?: false - } diff --git a/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/incremental_check/PrintStreamMessager.kt b/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/incremental_check/PrintStreamMessager.kt index fc2e6728cc..28ad35365a 100644 --- a/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/incremental_check/PrintStreamMessager.kt +++ b/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/incremental_check/PrintStreamMessager.kt @@ -34,6 +34,4 @@ internal class PrintStreamMessager( ) { printMessage(kind, msg) } - } - diff --git a/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/incremental_check/RoomIncrementalKaptChecker.kt b/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/incremental_check/RoomIncrementalKaptChecker.kt index d971b2b486..5018861155 100644 --- a/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/incremental_check/RoomIncrementalKaptChecker.kt +++ b/subprojects/gradle/buildchecks/src/main/kotlin/com/avito/android/plugin/build_param_check/incremental_check/RoomIncrementalKaptChecker.kt @@ -71,7 +71,6 @@ internal class RoomIncrementalKaptChecker( } return method.invoke(processor) as Boolean } - } private const val ISOLATING_ANNOTATION_PROCESSORS_INDICATOR = "org.gradle.annotation.processing.isolating" diff --git a/subprojects/gradle/buildchecks/src/test/kotlin/com/avito/android/plugin/build_param_check/BuildChecksTestProjectRunner.kt b/subprojects/gradle/buildchecks/src/test/kotlin/com/avito/android/plugin/build_param_check/BuildChecksTestProjectRunner.kt index f633c9dd9b..2ba26038f9 100644 --- a/subprojects/gradle/buildchecks/src/test/kotlin/com/avito/android/plugin/build_param_check/BuildChecksTestProjectRunner.kt +++ b/subprojects/gradle/buildchecks/src/test/kotlin/com/avito/android/plugin/build_param_check/BuildChecksTestProjectRunner.kt @@ -53,7 +53,7 @@ class BuildChecksTestProjectRunner( } val arguments = mutableListOf( "help", - //todo make params optional + // todo make params optional "-Pavito.stats.host=localhost", "-Pavito.stats.fallbackHost=localhost", "-Pavito.stats.port=80", diff --git a/subprojects/gradle/buildchecks/src/test/kotlin/com/avito/android/plugin/build_param_check/CheckAndroidSdkVersionTest.kt b/subprojects/gradle/buildchecks/src/test/kotlin/com/avito/android/plugin/build_param_check/CheckAndroidSdkVersionTest.kt index 3e71cebc59..963f57e2fb 100644 --- a/subprojects/gradle/buildchecks/src/test/kotlin/com/avito/android/plugin/build_param_check/CheckAndroidSdkVersionTest.kt +++ b/subprojects/gradle/buildchecks/src/test/kotlin/com/avito/android/plugin/build_param_check/CheckAndroidSdkVersionTest.kt @@ -138,7 +138,8 @@ class CheckAndroidSdkVersionTest { expectFailure: Boolean = false ): TestResult { return BuildChecksTestProjectRunner( - projectDir, androidHomeLocation, + projectDir = projectDir, + androidHome = androidHomeLocation, buildChecksExtension = """ enableByDefault = false androidSdk { @@ -153,10 +154,6 @@ class CheckAndroidSdkVersionTest { requireNotNull(androidHome) .dir("platforms") .dir("android-$version") - .file( - "source.properties", """ - Pkg.Revision=$revision - """.trimIndent() - ) + .file("source.properties", """Pkg.Revision=$revision""".trimIndent()) } } diff --git a/subprojects/gradle/buildchecks/src/test/kotlin/com/avito/android/plugin/build_param_check/ChecksFilterTest.kt b/subprojects/gradle/buildchecks/src/test/kotlin/com/avito/android/plugin/build_param_check/ChecksFilterTest.kt index a1360de0a8..9a56e27c0c 100644 --- a/subprojects/gradle/buildchecks/src/test/kotlin/com/avito/android/plugin/build_param_check/ChecksFilterTest.kt +++ b/subprojects/gradle/buildchecks/src/test/kotlin/com/avito/android/plugin/build_param_check/ChecksFilterTest.kt @@ -49,9 +49,7 @@ class ChecksFilterTest { @Test fun `disable single check`() { val extension = BuildChecksExtension().apply { - androidSdk(Action { - it.enabled = false - }) + androidSdk(Action { it.enabled = false }) } val checks = ChecksFilter(extension).enabledChecks() diff --git a/subprojects/gradle/buildchecks/src/test/kotlin/com/avito/android/plugin/build_param_check/UniqueRClassesTest.kt b/subprojects/gradle/buildchecks/src/test/kotlin/com/avito/android/plugin/build_param_check/UniqueRClassesTest.kt index fd3b2b3697..ca70d729dd 100644 --- a/subprojects/gradle/buildchecks/src/test/kotlin/com/avito/android/plugin/build_param_check/UniqueRClassesTest.kt +++ b/subprojects/gradle/buildchecks/src/test/kotlin/com/avito/android/plugin/build_param_check/UniqueRClassesTest.kt @@ -1,9 +1,9 @@ package com.avito.android.plugin.build_param_check -import com.avito.test.gradle.module.AndroidAppModule -import com.avito.test.gradle.module.AndroidLibModule import com.avito.test.gradle.TestProjectGenerator import com.avito.test.gradle.gradlew +import com.avito.test.gradle.module.AndroidAppModule +import com.avito.test.gradle.module.AndroidLibModule import org.junit.jupiter.api.Test import org.junit.jupiter.api.io.TempDir import java.io.File diff --git a/subprojects/gradle/cd/build.gradle.kts b/subprojects/gradle/cd/build.gradle.kts index 8c43e5136b..970ad86fc8 100644 --- a/subprojects/gradle/cd/build.gradle.kts +++ b/subprojects/gradle/cd/build.gradle.kts @@ -37,7 +37,7 @@ dependencies { configurations.all { resolutionStrategy { - //docker client тянет 4.x версию + // docker client тянет 4.x версию force(Dependencies.okhttp) } } @@ -45,7 +45,7 @@ configurations.all { gradlePlugin { plugins { create("cicd") { - id = "com.avito.android.cd" //todo rename to ci-steps + id = "com.avito.android.cd" // todo rename to ci-steps implementationClass = "com.avito.ci.CiStepsPlugin" displayName = "CI/CD" } diff --git a/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/BuildStepListExtension.kt b/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/BuildStepListExtension.kt index af3db5bf93..0dd9eb8ba9 100644 --- a/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/BuildStepListExtension.kt +++ b/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/BuildStepListExtension.kt @@ -78,7 +78,7 @@ open class BuildStepListExtension( } } - //todo property + // todo property var useImpactAnalysis: Boolean = true val taskDescription = objects.property() @@ -188,11 +188,13 @@ open class BuildStepListExtension( } fun artifacts(closure: Closure) { - artifacts(Action { - closure.delegate = artifactsConfig - closure.resolveStrategy = Closure.DELEGATE_FIRST - closure.call() - }) + artifacts( + Action { + closure.delegate = artifactsConfig + closure.resolveStrategy = Closure.DELEGATE_FIRST + closure.call() + } + ) } fun artifacts(action: Action) { @@ -205,11 +207,14 @@ open class BuildStepListExtension( name: String, configure: Closure ) { - configureAndAdd(name, Action { step -> - configure.delegate = step - configure.resolveStrategy = Closure.DELEGATE_FIRST - configure.call() - }) + configureAndAdd( + name, + Action { step -> + configure.delegate = step + configure.resolveStrategy = Closure.DELEGATE_FIRST + configure.call() + } + ) } private inline fun configureAndAdd( diff --git a/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/OutputsVerifier.kt b/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/OutputsVerifier.kt index f32d554c82..90f981a775 100644 --- a/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/OutputsVerifier.kt +++ b/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/OutputsVerifier.kt @@ -32,7 +32,7 @@ class OutputsVerifier( fun checkApkSignature(apkFile: ExistingFile, expectedSha1: String) { when (val result = signVerifier.verifyApk(apkFile, expectedSha1)) { is SignVerifier.Result.Ok -> { - //do nothing + // do nothing } is SignVerifier.Result.WrongSignature -> errors += "${apkFile.relativeToOutputsPath} signature doesn't match:\n" + @@ -45,7 +45,7 @@ class OutputsVerifier( fun checkBundleSignature(bundleFile: ExistingFile, expectedSha1: String) { when (val result = signVerifier.verifyBundle(bundleFile, expectedSha1)) { SignVerifier.Result.Ok -> { - //do nothing + // do nothing } is SignVerifier.Result.WrongSignature -> errors += "${bundleFile.relativeToOutputsPath} signature doesn't match:\n" + diff --git a/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/CopyArtifactsTask.kt b/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/CopyArtifactsTask.kt index c78d217de8..eff1edd497 100644 --- a/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/CopyArtifactsTask.kt +++ b/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/CopyArtifactsTask.kt @@ -29,7 +29,7 @@ abstract class CopyArtifactsTask : DefaultTask() { if (entry.exists()) { val relativeEntryPath = entry.relativeTo(sourceDir.get().asFile).path val destination = File(destinationDir.get().asFile, relativeEntryPath) - project.ciLogger.info("Copying ${entry.path} to ${destination}") + project.ciLogger.info("Copying ${entry.path} to $destination") entry.copyTo(destination, overwrite = true) // TODO: убрать перезапись после MBS-5491 } else { project.ciLogger.info("Can't copy ${entry.path} it does not exist") diff --git a/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/DeployStep.kt b/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/DeployStep.kt index 5a3b96de47..e7e038187a 100644 --- a/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/DeployStep.kt +++ b/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/DeployStep.kt @@ -105,9 +105,9 @@ class DeployStep( .filterIsInstance() .filter(predicate) - outputs.ifEmpty { throw IllegalStateException("Cant' find output ${O::class.java} in ${this}") } + outputs.ifEmpty { throw IllegalStateException("Cant' find output ${O::class.java} in $this") } return outputs.singleOrNull() - ?: throw IllegalStateException("Too many outputs: $outputs of type ${O::class.java} in ${this}") + ?: throw IllegalStateException("Too many outputs: $outputs of type ${O::class.java} in $this") } } diff --git a/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/FlakyAwareBuildStep.kt b/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/FlakyAwareBuildStep.kt index f3b823e80d..db1a1760e3 100644 --- a/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/FlakyAwareBuildStep.kt +++ b/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/FlakyAwareBuildStep.kt @@ -10,7 +10,5 @@ internal interface FlakyAwareBuildStep { class Impl : FlakyAwareBuildStep { override var suppressFlaky: Boolean = false - } - -} \ No newline at end of file +} diff --git a/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/ImpactAnalysisAwareBuildStep.kt b/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/ImpactAnalysisAwareBuildStep.kt index cfb4b06e41..91d46743a1 100644 --- a/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/ImpactAnalysisAwareBuildStep.kt +++ b/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/ImpactAnalysisAwareBuildStep.kt @@ -8,5 +8,4 @@ internal interface ImpactAnalysisAwareBuildStep { class Impl : ImpactAnalysisAwareBuildStep { override var useImpactAnalysis: Boolean = false } - } diff --git a/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/MarkReportAsSourceForTMSStep.kt b/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/MarkReportAsSourceForTMSStep.kt index e875c0206c..a38006a42f 100644 --- a/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/MarkReportAsSourceForTMSStep.kt +++ b/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/MarkReportAsSourceForTMSStep.kt @@ -33,11 +33,13 @@ class MarkReportAsSourceForTMSStep(context: String, name: String) : BuildStep(co it.dependsOn(instrumentationTask) @Suppress("UnstableApiUsage") - it.reportCoordinates.set(instrumentationTask.flatMap { task -> - task.instrumentationConfiguration.map { config -> - config.instrumentationParams.reportCoordinates() + it.reportCoordinates.set( + instrumentationTask.flatMap { task -> + task.instrumentationConfiguration.map { config -> + config.instrumentationParams.reportCoordinates() + } } - }) + ) } rootTask.dependsOn(markReportAsSourceTask) diff --git a/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/SuppressibleBuildStep.kt b/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/SuppressibleBuildStep.kt index eec6042538..ecdf9cb4c0 100644 --- a/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/SuppressibleBuildStep.kt +++ b/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/SuppressibleBuildStep.kt @@ -3,5 +3,4 @@ package com.avito.ci.steps abstract class SuppressibleBuildStep(context: String, name: String) : BuildStep(context, name) { var suppressFailures: Boolean = false - } diff --git a/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/UnitTestCheck.kt b/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/UnitTestCheck.kt index a02967c119..48d3bb5f2c 100644 --- a/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/UnitTestCheck.kt +++ b/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/UnitTestCheck.kt @@ -33,6 +33,4 @@ open class UnitTestCheck(context: String, name: String) : BuildStep(context, nam } rootTask.dependsOn(allTestTask) } - } - diff --git a/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/UploadToArtifactory.kt b/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/UploadToArtifactory.kt index b63a77589e..d389c7f42a 100644 --- a/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/UploadToArtifactory.kt +++ b/subprojects/gradle/cd/src/main/kotlin/com/avito/ci/steps/UploadToArtifactory.kt @@ -31,17 +31,21 @@ class UploadToArtifactory( val androidAppExtension = project.androidAppExtension val defaultConfig = androidAppExtension.defaultConfig val projectType = project.cdBuildConfig.orNull?.project?.id ?: "local" - project.appBackupExtension.backup(noOwnerClosureOf { - name = "${project.name}-android" - type = projectType - version = "${defaultConfig.versionName}-${defaultConfig.versionCode}-${project.envArgs.build.number}" - artifactsMap.forEach { key, output -> - artifact(noOwnerClosureOf { - id = key - path = output.path - }) + project.appBackupExtension.backup( + noOwnerClosureOf { + name = "${project.name}-android" + type = projectType + version = "${defaultConfig.versionName}-${defaultConfig.versionCode}-${project.envArgs.build.number}" + artifactsMap.forEach { key, output -> + artifact( + noOwnerClosureOf { + id = key + path = output.path + } + ) + } } - }) + ) val backupTask = project.tasks.artifactoryAppBackupTask() diff --git a/subprojects/gradle/cd/src/test/kotlin/com/avito/ci/CiStepsDynamicTest.kt b/subprojects/gradle/cd/src/test/kotlin/com/avito/ci/CiStepsDynamicTest.kt index 13bc595983..ec4af355e4 100644 --- a/subprojects/gradle/cd/src/test/kotlin/com/avito/ci/CiStepsDynamicTest.kt +++ b/subprojects/gradle/cd/src/test/kotlin/com/avito/ci/CiStepsDynamicTest.kt @@ -1,9 +1,9 @@ package com.avito.ci -import com.avito.test.gradle.module.KotlinModule import com.avito.test.gradle.TestProjectGenerator import com.avito.test.gradle.file import com.avito.test.gradle.gradlew +import com.avito.test.gradle.module.KotlinModule import org.junit.jupiter.api.Test import org.junit.jupiter.api.io.TempDir import java.io.File diff --git a/subprojects/gradle/cd/src/test/kotlin/com/avito/ci/CiStepsPluginTest.kt b/subprojects/gradle/cd/src/test/kotlin/com/avito/ci/CiStepsPluginTest.kt index 30a9950926..b5b291b4c3 100644 --- a/subprojects/gradle/cd/src/test/kotlin/com/avito/ci/CiStepsPluginTest.kt +++ b/subprojects/gradle/cd/src/test/kotlin/com/avito/ci/CiStepsPluginTest.kt @@ -5,10 +5,10 @@ import com.avito.android.plugin.artifactory.artifactoryPasswordParameterName import com.avito.android.plugin.artifactory.artifactoryUserParameterName import com.avito.cd.uploadCdBuildResultTaskName import com.avito.ci.steps.verifyTaskName -import com.avito.test.gradle.module.AndroidAppModule -import com.avito.test.gradle.module.AndroidLibModule import com.avito.test.gradle.TestProjectGenerator import com.avito.test.gradle.file +import com.avito.test.gradle.module.AndroidAppModule +import com.avito.test.gradle.module.AndroidLibModule import com.avito.upload_to_googleplay.deployTaskName import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.DynamicTest @@ -334,7 +334,6 @@ class CiStepsPluginTest { } } - @TestFactory fun `assembleDebug should not trigger CI tasks`(): List { val result = runTask(":appA:assembleDebug") diff --git a/subprojects/gradle/cd/src/test/kotlin/com/avito/ci/ProjectForImpactAnalysisGenerator.kt b/subprojects/gradle/cd/src/test/kotlin/com/avito/ci/ProjectForImpactAnalysisGenerator.kt index b6634c44d1..67a630bd67 100644 --- a/subprojects/gradle/cd/src/test/kotlin/com/avito/ci/ProjectForImpactAnalysisGenerator.kt +++ b/subprojects/gradle/cd/src/test/kotlin/com/avito/ci/ProjectForImpactAnalysisGenerator.kt @@ -1,8 +1,8 @@ package com.avito.ci +import com.avito.test.gradle.TestProjectGenerator import com.avito.test.gradle.module.AndroidAppModule import com.avito.test.gradle.module.AndroidLibModule -import com.avito.test.gradle.TestProjectGenerator import java.io.File internal fun generateProjectWithImpactAnalysis(rootDir: File) { diff --git a/subprojects/gradle/cd/src/test/kotlin/com/avito/ci/Utils.kt b/subprojects/gradle/cd/src/test/kotlin/com/avito/ci/Utils.kt index 4517d7a8f1..9c942c33c8 100644 --- a/subprojects/gradle/cd/src/test/kotlin/com/avito/ci/Utils.kt +++ b/subprojects/gradle/cd/src/test/kotlin/com/avito/ci/Utils.kt @@ -17,7 +17,6 @@ fun TestResult.assertAffectedModules(taskName: String, expectedModules: Set = mutableMapOf() @@ -18,12 +24,6 @@ internal object CILoggerRegistry { ) } -val Task.ciLogger: CILogger - get() = provideLogger(project, loggerName = getShortenedTaskPath(this)) - -val Project.ciLogger: CILogger - get() = provideLogger(project, loggerName = name) - private fun provideLogger(project: Project, loggerName: String): CILogger { return if (project.buildEnvironment is BuildEnvironment.CI && !project.buildEnvironment.inGradleTestKit) { CILoggerRegistry.loggersCache.getOrPut(loggerName) { diff --git a/subprojects/gradle/code-ownership/src/main/kotlin/com/avito/android/CodeOwnershipExtension.kt b/subprojects/gradle/code-ownership/src/main/kotlin/com/avito/android/CodeOwnershipExtension.kt index 404d4f7689..0a3e744771 100644 --- a/subprojects/gradle/code-ownership/src/main/kotlin/com/avito/android/CodeOwnershipExtension.kt +++ b/subprojects/gradle/code-ownership/src/main/kotlin/com/avito/android/CodeOwnershipExtension.kt @@ -1,7 +1,6 @@ package com.avito.android import Visibility -import org.gradle.api.Project import org.gradle.api.plugins.ExtensionContainer import org.gradle.kotlin.dsl.findByType diff --git a/subprojects/gradle/code-ownership/src/test/kotlin/com/avito/android/CodeOwnershipValidationTest.kt b/subprojects/gradle/code-ownership/src/test/kotlin/com/avito/android/CodeOwnershipValidationTest.kt index e57076bd6a..0232541b86 100644 --- a/subprojects/gradle/code-ownership/src/test/kotlin/com/avito/android/CodeOwnershipValidationTest.kt +++ b/subprojects/gradle/code-ownership/src/test/kotlin/com/avito/android/CodeOwnershipValidationTest.kt @@ -3,11 +3,11 @@ package com.avito.android import Visibility import com.avito.android.CodeOwnershipValidationTest.Case.NegativeCase import com.avito.android.CodeOwnershipValidationTest.Case.PositiveCase -import com.avito.test.gradle.module.AndroidAppModule -import com.avito.test.gradle.module.AndroidLibModule import com.avito.test.gradle.ManualTempFolder import com.avito.test.gradle.TestProjectGenerator import com.avito.test.gradle.gradlew +import com.avito.test.gradle.module.AndroidAppModule +import com.avito.test.gradle.module.AndroidLibModule import org.junit.jupiter.api.DynamicTest import org.junit.jupiter.api.DynamicTest.dynamicTest import org.junit.jupiter.api.TestFactory @@ -70,10 +70,18 @@ class CodeOwnershipValidationTest { ManualTempFolder.runIn { projectDir -> val featureAllowedDependencies = case.featureOwnership.allowedDependencies.joinToString( - separator = " ,", prefix = "[", postfix = "]", transform = { "'$it'" }) + separator = " ,", + prefix = "[", + postfix = "]", + transform = { "'$it'" } + ) val dependentAllowedDependencies = case.dependentOwnership.allowedDependencies.joinToString( - separator = " ,", prefix = "[", postfix = "]", transform = { "'$it'" }) + separator = " ,", + prefix = "[", + postfix = "]", + transform = { "'$it'" } + ) TestProjectGenerator( plugins = listOf( diff --git a/subprojects/gradle/code-ownership/src/test/kotlin/com/avito/android/PlatformDependencyTest.kt b/subprojects/gradle/code-ownership/src/test/kotlin/com/avito/android/PlatformDependencyTest.kt index fed910be66..f08c116270 100644 --- a/subprojects/gradle/code-ownership/src/test/kotlin/com/avito/android/PlatformDependencyTest.kt +++ b/subprojects/gradle/code-ownership/src/test/kotlin/com/avito/android/PlatformDependencyTest.kt @@ -1,9 +1,9 @@ package com.avito.android -import com.avito.test.gradle.module.KotlinModule -import com.avito.test.gradle.module.PlatformModule import com.avito.test.gradle.TestProjectGenerator import com.avito.test.gradle.gradlew +import com.avito.test.gradle.module.KotlinModule +import com.avito.test.gradle.module.PlatformModule import org.junit.jupiter.api.Test import org.junit.jupiter.api.io.TempDir import java.io.File diff --git a/subprojects/gradle/design-screenshots/src/main/kotlin/com/avito/plugin/DeviceProvider.kt b/subprojects/gradle/design-screenshots/src/main/kotlin/com/avito/plugin/DeviceProvider.kt index 585e4bf8bd..79c451916d 100644 --- a/subprojects/gradle/design-screenshots/src/main/kotlin/com/avito/plugin/DeviceProvider.kt +++ b/subprojects/gradle/design-screenshots/src/main/kotlin/com/avito/plugin/DeviceProvider.kt @@ -25,7 +25,7 @@ internal class DeviceProviderLocal( val serial: Serial.Local = when { adbDeviceParams.id is Serial.Local -> adbDeviceParams.id as Serial.Local - adbDeviceParams.id is Serial.Remote -> Serial.Local(adbDeviceParams.id.value) // TODO: support model of locally connected device + adbDeviceParams.id is Serial.Remote -> Serial.Local(adbDeviceParams.id.value) // TODO: support model of locally connected device else -> throw RuntimeException("Unsupported device id: " + adbDeviceParams.id) } @@ -47,4 +47,3 @@ internal class DeviceProviderLocal( } } } - diff --git a/subprojects/gradle/design-screenshots/src/main/kotlin/com/avito/plugin/PullScreenshotsTask.kt b/subprojects/gradle/design-screenshots/src/main/kotlin/com/avito/plugin/PullScreenshotsTask.kt index 227ceb6a22..7ddb87cf24 100644 --- a/subprojects/gradle/design-screenshots/src/main/kotlin/com/avito/plugin/PullScreenshotsTask.kt +++ b/subprojects/gradle/design-screenshots/src/main/kotlin/com/avito/plugin/PullScreenshotsTask.kt @@ -28,9 +28,8 @@ open class PullScreenshotsTask : DefaultTask() { val adb = Adb() val adbDevicesManager = AdbDevicesManager(StdOutLogger(), adb = adb) val currentDevice = DeviceProviderLocal(adb, adbDevicesManager, ciLogger).getDevice() - - val referencePath = - Paths.get("${project.projectDir.path}/src/androidTest/assets/screenshots/") + + val referencePath = Paths.get("${project.projectDir.path}/src/androidTest/assets/screenshots/") val remotePath = Paths.get("/sdcard/screenshots/$applicationId") currentDevice.list(remotePath.toString()).onSuccess { result -> if (result is ProcessNotification.Exit) { @@ -51,7 +50,6 @@ open class PullScreenshotsTask : DefaultTask() { }.onFailure { ciLogger.info("Cannot list screenshot directory") } - } private fun clearOutputFiles() { diff --git a/subprojects/gradle/feature-toggles/src/main/kotlin/com/avito/android/plugin/FeatureTogglesReportTask.kt b/subprojects/gradle/feature-toggles/src/main/kotlin/com/avito/android/plugin/FeatureTogglesReportTask.kt index a0fd380d28..8ad038975e 100644 --- a/subprojects/gradle/feature-toggles/src/main/kotlin/com/avito/android/plugin/FeatureTogglesReportTask.kt +++ b/subprojects/gradle/feature-toggles/src/main/kotlin/com/avito/android/plugin/FeatureTogglesReportTask.kt @@ -74,7 +74,6 @@ abstract class FeatureTogglesReportTask : DefaultTask() { } finally { connection.disconnect() } - } private fun buildReportText(sortedToggles: List): String { diff --git a/subprojects/gradle/feature-toggles/src/main/kotlin/com/avito/android/plugin/JsonToggle.kt b/subprojects/gradle/feature-toggles/src/main/kotlin/com/avito/android/plugin/JsonToggle.kt index b18646f744..773c94a6f6 100644 --- a/subprojects/gradle/feature-toggles/src/main/kotlin/com/avito/android/plugin/JsonToggle.kt +++ b/subprojects/gradle/feature-toggles/src/main/kotlin/com/avito/android/plugin/JsonToggle.kt @@ -3,4 +3,4 @@ package com.avito.android.plugin class JsonToggle( val key: String, val value: Any? -) \ No newline at end of file +) diff --git a/subprojects/gradle/feature-toggles/src/test/kotlin/com/avito/android/plugin/BlameParserTest.kt b/subprojects/gradle/feature-toggles/src/test/kotlin/com/avito/android/plugin/BlameParserTest.kt index 413a3b3756..1534bcfdc3 100644 --- a/subprojects/gradle/feature-toggles/src/test/kotlin/com/avito/android/plugin/BlameParserTest.kt +++ b/subprojects/gradle/feature-toggles/src/test/kotlin/com/avito/android/plugin/BlameParserTest.kt @@ -41,7 +41,6 @@ class BlameParserTest { } fun String.toLocalDate() = Instant.ofEpochSecond(this.toLong()).atZone(ZoneId.of("Europe/Moscow")).toLocalDate() - } val correctBlame = diff --git a/subprojects/gradle/feature-toggles/src/test/kotlin/com/avito/android/plugin/SuspiciousTogglesCollectorTest.kt b/subprojects/gradle/feature-toggles/src/test/kotlin/com/avito/android/plugin/SuspiciousTogglesCollectorTest.kt index a47717f7bf..d87b851194 100644 --- a/subprojects/gradle/feature-toggles/src/test/kotlin/com/avito/android/plugin/SuspiciousTogglesCollectorTest.kt +++ b/subprojects/gradle/feature-toggles/src/test/kotlin/com/avito/android/plugin/SuspiciousTogglesCollectorTest.kt @@ -59,8 +59,10 @@ class SuspiciousTogglesCollectorTest { ) val toggles = collector.collectSuspiciousToggles( - jsonTogglesList, blameCodeLinesList, - turnedOnDateAgo = monthAgo, turnedOffDateAgo = quarterAgo + jsonTogglesList = jsonTogglesList, + blameCodeLinesList = blameCodeLinesList, + turnedOnDateAgo = monthAgo, + turnedOffDateAgo = quarterAgo ) verifyNoMoreInteractions(logger) diff --git a/subprojects/gradle/files/src/main/kotlin/com/avito/utils/ExistingFile.kt b/subprojects/gradle/files/src/main/kotlin/com/avito/utils/ExistingFile.kt index 3dc9d59e3a..94ec6adbfe 100644 --- a/subprojects/gradle/files/src/main/kotlin/com/avito/utils/ExistingFile.kt +++ b/subprojects/gradle/files/src/main/kotlin/com/avito/utils/ExistingFile.kt @@ -25,7 +25,7 @@ interface ExistingFile { override fun toString(): String = file.toString() } - //todo move to test source + // todo move to test source object Stub : ExistingFile { override val file: File get() = TODO("not implemented") @@ -60,7 +60,7 @@ interface ExistingDirectory { override fun toString(): String = dir.toString() } - //todo move to test source + // todo move to test source object Stub : ExistingDirectory { override val dir: File get() = TODO("not implemented") diff --git a/subprojects/gradle/git/build.gradle.kts b/subprojects/gradle/git/build.gradle.kts index 9d198dae58..da614f529e 100644 --- a/subprojects/gradle/git/build.gradle.kts +++ b/subprojects/gradle/git/build.gradle.kts @@ -11,7 +11,6 @@ dependencies { implementation(Dependencies.funktionaleTry) api(project(":gradle:build-environment")) // project.buildEnvironment only - testImplementation(project(":gradle:test-project")) testImplementation(Dependencies.Test.mockitoJUnitJupiter) } diff --git a/subprojects/gradle/git/src/main/kotlin/com/avito/git/Branch.kt b/subprojects/gradle/git/src/main/kotlin/com/avito/git/Branch.kt index 5cef7d750a..889e55186b 100644 --- a/subprojects/gradle/git/src/main/kotlin/com/avito/git/Branch.kt +++ b/subprojects/gradle/git/src/main/kotlin/com/avito/git/Branch.kt @@ -22,6 +22,6 @@ internal fun String.asOriginBranch(): String { return if (startsWith("$defaultRemote/")) { this } else { - "${defaultRemote}/${this}" + "$defaultRemote/$this" } } diff --git a/subprojects/gradle/git/src/main/kotlin/com/avito/git/GitLocalState.kt b/subprojects/gradle/git/src/main/kotlin/com/avito/git/GitLocalState.kt index b3b9f05f3f..52cda64f17 100644 --- a/subprojects/gradle/git/src/main/kotlin/com/avito/git/GitLocalState.kt +++ b/subprojects/gradle/git/src/main/kotlin/com/avito/git/GitLocalState.kt @@ -4,7 +4,7 @@ import com.avito.kotlin.dsl.getOptionalStringProperty import org.gradle.api.Project import java.io.File -interface GitLocalState: GitState +interface GitLocalState : GitState class GitLocalStateImpl(repoDir: File, targetBranch: String?) : GitLocalState { @@ -54,6 +54,5 @@ class GitLocalStateImpl(repoDir: File, targetBranch: String?) : GitLocalState { val targetBranch: String? = project.getOptionalStringProperty("targetBranch") return GitLocalStateImpl(project.rootProject.rootDir, targetBranch) } - } } diff --git a/subprojects/gradle/git/src/main/kotlin/com/avito/git/ProjectExtensions.kt b/subprojects/gradle/git/src/main/kotlin/com/avito/git/ProjectExtensions.kt index 0a6205c77c..6603ad8e79 100644 --- a/subprojects/gradle/git/src/main/kotlin/com/avito/git/ProjectExtensions.kt +++ b/subprojects/gradle/git/src/main/kotlin/com/avito/git/ProjectExtensions.kt @@ -21,4 +21,4 @@ fun Project.gitState(logger: (String) -> Unit = {}): Provider = } ) } - } \ No newline at end of file + } diff --git a/subprojects/gradle/git/src/test/kotlin/com/avito/git/GitStateFromEnvironmentTest.kt b/subprojects/gradle/git/src/test/kotlin/com/avito/git/GitStateFromEnvironmentTest.kt index f2174e2edf..9cda688b13 100644 --- a/subprojects/gradle/git/src/test/kotlin/com/avito/git/GitStateFromEnvironmentTest.kt +++ b/subprojects/gradle/git/src/test/kotlin/com/avito/git/GitStateFromEnvironmentTest.kt @@ -119,6 +119,8 @@ class GitStateFromEnvironmentTest { repoDir = localRepo, gitBranch = gitBranch, targetBranch = targetBranch, - originalCommitHash = null, logger = {}) + originalCommitHash = null, + logger = {} + ) } } diff --git a/subprojects/gradle/gradle-profile/src/main/kotlin/com/avito/android/gradle/metric/MetricsConsumer.kt b/subprojects/gradle/gradle-profile/src/main/kotlin/com/avito/android/gradle/metric/MetricsConsumer.kt index 905727df88..92563995fb 100644 --- a/subprojects/gradle/gradle-profile/src/main/kotlin/com/avito/android/gradle/metric/MetricsConsumer.kt +++ b/subprojects/gradle/gradle-profile/src/main/kotlin/com/avito/android/gradle/metric/MetricsConsumer.kt @@ -10,7 +10,6 @@ interface MetricsConsumer : com.avito.android.gradle.profile.TaskExecutionListen fun onOutput(output: CharSequence) fun buildFinished(buildResult: BuildResult, profile: BuildProfile) - } abstract class AbstractMetricsConsumer : MetricsConsumer { diff --git a/subprojects/gradle/gradle-profile/src/main/kotlin/com/avito/android/gradle/profile/BuildProfile.kt b/subprojects/gradle/gradle-profile/src/main/kotlin/com/avito/android/gradle/profile/BuildProfile.kt index 8320b9f519..2c4a209b77 100644 --- a/subprojects/gradle/gradle-profile/src/main/kotlin/com/avito/android/gradle/profile/BuildProfile.kt +++ b/subprojects/gradle/gradle-profile/src/main/kotlin/com/avito/android/gradle/profile/BuildProfile.kt @@ -166,5 +166,4 @@ class BuildProfile { fun setBuildFinished(buildFinished: Long) { this.buildFinished = buildFinished } - } diff --git a/subprojects/gradle/gradle-profile/src/main/kotlin/com/avito/android/gradle/profile/ContinuousOperation.kt b/subprojects/gradle/gradle-profile/src/main/kotlin/com/avito/android/gradle/profile/ContinuousOperation.kt index 3bcf69e684..52c1275485 100644 --- a/subprojects/gradle/gradle-profile/src/main/kotlin/com/avito/android/gradle/profile/ContinuousOperation.kt +++ b/subprojects/gradle/gradle-profile/src/main/kotlin/com/avito/android/gradle/profile/ContinuousOperation.kt @@ -23,5 +23,4 @@ open class ContinuousOperation(override val description: String) : Operation() { this.finish = finish return this } - } diff --git a/subprojects/gradle/gradle-profile/src/main/kotlin/com/avito/android/gradle/profile/ProfileEventAdapter.kt b/subprojects/gradle/gradle-profile/src/main/kotlin/com/avito/android/gradle/profile/ProfileEventAdapter.kt index f955a25c23..7794d87674 100644 --- a/subprojects/gradle/gradle-profile/src/main/kotlin/com/avito/android/gradle/profile/ProfileEventAdapter.kt +++ b/subprojects/gradle/gradle-profile/src/main/kotlin/com/avito/android/gradle/profile/ProfileEventAdapter.kt @@ -108,5 +108,4 @@ class ProfileEventAdapter( listener.afterExecute(task, taskExecution) } - } diff --git a/subprojects/gradle/gradle-profile/src/main/kotlin/com/avito/android/gradle/profile/ProjectProfile.kt b/subprojects/gradle/gradle-profile/src/main/kotlin/com/avito/android/gradle/profile/ProjectProfile.kt index 7290eef93b..9c288b27b6 100644 --- a/subprojects/gradle/gradle-profile/src/main/kotlin/com/avito/android/gradle/profile/ProjectProfile.kt +++ b/subprojects/gradle/gradle-profile/src/main/kotlin/com/avito/android/gradle/profile/ProjectProfile.kt @@ -1,7 +1,6 @@ package com.avito.android.gradle.profile import org.gradle.util.CollectionUtils - import java.util.HashMap class ProjectProfile( @@ -9,6 +8,7 @@ class ProjectProfile( ) : Operation() { private val tasks = HashMap() + /** * Returns the configuration time of this project. */ @@ -43,5 +43,4 @@ class ProjectProfile( override val description: String get() = path - } diff --git a/subprojects/gradle/gradle-profile/src/main/kotlin/com/avito/android/gradle/profile/TaskExecution.kt b/subprojects/gradle/gradle-profile/src/main/kotlin/com/avito/android/gradle/profile/TaskExecution.kt index b6e3798e4d..e578d76584 100644 --- a/subprojects/gradle/gradle-profile/src/main/kotlin/com/avito/android/gradle/profile/TaskExecution.kt +++ b/subprojects/gradle/gradle-profile/src/main/kotlin/com/avito/android/gradle/profile/TaskExecution.kt @@ -14,5 +14,4 @@ class TaskExecution(val path: String) : ContinuousOperation(path) { this.state = state return this } - } diff --git a/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/changes/ChangeType.kt b/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/changes/ChangeType.kt index fd2dc85819..5aab81a549 100644 --- a/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/changes/ChangeType.kt +++ b/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/changes/ChangeType.kt @@ -21,5 +21,4 @@ enum class ChangeType(val code: Char) { ?: Try.Failure(IllegalArgumentException("Cannot parse diff type with code $code")) } } - } diff --git a/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/changes/ChangesDetector.kt b/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/changes/ChangesDetector.kt index e17ea56521..959eafa400 100644 --- a/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/changes/ChangesDetector.kt +++ b/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/changes/ChangesDetector.kt @@ -12,7 +12,6 @@ interface ChangesDetector { * @return list of changed files; could fail on git problems */ fun computeChanges(targetDirectory: File, excludedDirectories: Iterable = emptyList()): Try> - } class ChangesDetectorStub(private val reason: String) : ChangesDetector { diff --git a/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/changes/Git.kt b/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/changes/GitDiffLine.kt similarity index 100% rename from subprojects/gradle/impact-shared/src/main/java/com/avito/impact/changes/Git.kt rename to subprojects/gradle/impact-shared/src/main/java/com/avito/impact/changes/GitDiffLine.kt diff --git a/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/configuration/AndroidTestConfiguration.kt b/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/configuration/AndroidTestConfiguration.kt index 6fa6af931c..d701d43d0f 100644 --- a/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/configuration/AndroidTestConfiguration.kt +++ b/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/configuration/AndroidTestConfiguration.kt @@ -1,5 +1,5 @@ @file:Suppress("DEPRECATION") -//todo use new api? +// todo use new api? package com.avito.impact.configuration diff --git a/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/configuration/ImplementationConfiguration.kt b/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/configuration/ImplementationConfiguration.kt index 87b04a24b9..98faae7b75 100644 --- a/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/configuration/ImplementationConfiguration.kt +++ b/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/configuration/ImplementationConfiguration.kt @@ -1,5 +1,5 @@ @file:Suppress("DEPRECATION") -//todo use new api? +// todo use new api? package com.avito.impact.configuration @@ -72,5 +72,4 @@ class ImplementationConfiguration(module: InternalModule) : SimpleConfiguration( } override fun hashCode(): Int = project.hashCode() - } diff --git a/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/configuration/LintConfiguration.kt b/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/configuration/LintConfiguration.kt index beda337217..7be223cf66 100644 --- a/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/configuration/LintConfiguration.kt +++ b/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/configuration/LintConfiguration.kt @@ -1,5 +1,5 @@ @file:Suppress("DEPRECATION") -//todo use new api? +// todo use new api? package com.avito.impact.configuration diff --git a/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/configuration/SimpleConfiguration.kt b/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/configuration/SimpleConfiguration.kt index 964ce86f81..9595e190fc 100644 --- a/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/configuration/SimpleConfiguration.kt +++ b/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/configuration/SimpleConfiguration.kt @@ -1,5 +1,5 @@ @file:Suppress("DEPRECATION") -//todo use new api? +// todo use new api? package com.avito.impact.configuration diff --git a/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/configuration/TestConfiguration.kt b/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/configuration/TestConfiguration.kt index e02e071458..aca4469c9c 100644 --- a/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/configuration/TestConfiguration.kt +++ b/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/configuration/TestConfiguration.kt @@ -1,5 +1,5 @@ @file:Suppress("DEPRECATION") -//todo use new api? +// todo use new api? package com.avito.impact.configuration diff --git a/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/configuration/sets/AndroidSourceSets.kt b/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/configuration/sets/AndroidSourceSets.kt index b91b5e19a6..8f82f02c63 100644 --- a/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/configuration/sets/AndroidSourceSets.kt +++ b/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/configuration/sets/AndroidSourceSets.kt @@ -1,5 +1,5 @@ @file:Suppress("DEPRECATION") -//todo use new api? +// todo use new api? package com.avito.impact.configuration.sets diff --git a/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/fallback/IsAnalysisNeeded.kt b/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/fallback/IsAnalysisNeededResult.kt similarity index 97% rename from subprojects/gradle/impact-shared/src/main/java/com/avito/impact/fallback/IsAnalysisNeeded.kt rename to subprojects/gradle/impact-shared/src/main/java/com/avito/impact/fallback/IsAnalysisNeededResult.kt index 6a77001062..c61cc89533 100644 --- a/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/fallback/IsAnalysisNeeded.kt +++ b/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/fallback/IsAnalysisNeededResult.kt @@ -4,7 +4,6 @@ import com.avito.git.GitLocalState import com.avito.git.GitState import com.avito.impact.configuration.isBranchProtected import com.avito.impact.plugin.ImpactAnalysisExtension -import com.google.common.annotations.VisibleForTesting import org.gradle.api.provider.Provider sealed class IsAnalysisNeededResult { diff --git a/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/util/AndroidProject.kt b/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/util/AndroidProject.kt index 6b878956bc..2d38ae7f87 100644 --- a/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/util/AndroidProject.kt +++ b/subprojects/gradle/impact-shared/src/main/java/com/avito/impact/util/AndroidProject.kt @@ -31,7 +31,7 @@ class AndroidManifest( private val packageParser = AndroidManifestPackageParser fun getPackage(): String { - val manifest = File("${projectDir}/src/$sourceSet/AndroidManifest.xml") + val manifest = File("$projectDir/src/$sourceSet/AndroidManifest.xml") return packageParser.parse(manifest) ?: error("Project $projectDir doesn't have AndroidManifest or package in it") diff --git a/subprojects/gradle/impact/src/main/kotlin/com/avito/impact/plugin/GenerateModulesReport.kt b/subprojects/gradle/impact/src/main/kotlin/com/avito/impact/plugin/GenerateModulesReport.kt index 31f4226528..61673b78ac 100644 --- a/subprojects/gradle/impact/src/main/kotlin/com/avito/impact/plugin/GenerateModulesReport.kt +++ b/subprojects/gradle/impact/src/main/kotlin/com/avito/impact/plugin/GenerateModulesReport.kt @@ -1,7 +1,7 @@ package com.avito.impact.plugin -import com.avito.impact.ModifiedProjectsFinder import com.avito.impact.ConfigurationType +import com.avito.impact.ModifiedProjectsFinder import com.avito.utils.createOrClear import org.gradle.api.DefaultTask import org.gradle.api.Project @@ -34,9 +34,15 @@ abstract class GenerateModulesReport : DefaultTask() { fun printReport() { val modifiedProjectsFinder = ModifiedProjectsFinder.from(project) - printReport(implementationModulesReportFile, modifiedProjectsFinder.determineImpact(ConfigurationType.IMPLEMENTATION)) + printReport( + implementationModulesReportFile, + modifiedProjectsFinder.determineImpact(ConfigurationType.IMPLEMENTATION) + ) printReport(unitTestsModulesReportFile, modifiedProjectsFinder.determineImpact(ConfigurationType.UNIT_TESTS)) - printReport(androidTestsModulesReportFile, modifiedProjectsFinder.determineImpact(ConfigurationType.ANDROID_TESTS)) + printReport( + androidTestsModulesReportFile, + modifiedProjectsFinder.determineImpact(ConfigurationType.ANDROID_TESTS) + ) } private fun ModifiedProjectsFinder.determineImpact(configurationType: ConfigurationType): Set { diff --git a/subprojects/gradle/impact/src/test/kotlin/com/avito/impact/ImpactAnalysisTest.kt b/subprojects/gradle/impact/src/test/kotlin/com/avito/impact/ImpactAnalysisTest.kt index c172cd0fbd..8dd5644668 100644 --- a/subprojects/gradle/impact/src/test/kotlin/com/avito/impact/ImpactAnalysisTest.kt +++ b/subprojects/gradle/impact/src/test/kotlin/com/avito/impact/ImpactAnalysisTest.kt @@ -75,10 +75,11 @@ class ImpactAnalysisTest { with(projectDir) { checkoutSourceBranch() file( - ".tia_ignore", """ - .tia_ignore - *.md - ignored_directory/* + name = ".tia_ignore", + content = """ + .tia_ignore + *.md + ignored_directory/* """.trimIndent() ) file("README.md") @@ -176,7 +177,8 @@ class ImpactAnalysisTest { modules = listOf( AndroidAppModule("standalone_app"), AndroidAppModule( - "app", dependencies = """ + name = "app", + dependencies = """ implementation project(':feature_a') implementation project(':feature_b') """ @@ -206,18 +208,21 @@ class ImpactAnalysisTest { modules = listOf( AndroidAppModule("standalone_app"), AndroidAppModule( - "app", dependencies = """ + name = "app", + dependencies = """ implementation project(':feature_a') implementation project(':feature_b') """ ), AndroidLibModule( - "feature_a", dependencies = """ + name = "feature_a", + dependencies = """ implementation project(':core') """ ), AndroidLibModule( - "feature_b", dependencies = """ + name = "feature_b", + dependencies = """ implementation project(':core') """ ), @@ -245,13 +250,15 @@ class ImpactAnalysisTest { modules = listOf( AndroidAppModule("standalone_app"), AndroidAppModule( - "app", dependencies = """ + name = "app", + dependencies = """ implementation project(':feature') testImplementation project(':test_utils') """ ), AndroidLibModule( - "feature", dependencies = """ + name = "feature", + dependencies = """ testImplementation project(':test_utils') """ ), @@ -279,12 +286,14 @@ class ImpactAnalysisTest { modules = listOf( AndroidAppModule("standalone_app"), AndroidAppModule( - "app", dependencies = """ + name = "app", + dependencies = """ androidTestImplementation project(':android_test_utils') """ ), AndroidLibModule( - "android_test_utils", dependencies = """ + name = "android_test_utils", + dependencies = """ implementation project(':core_test_utils') """ ), @@ -315,18 +324,21 @@ class ImpactAnalysisTest { modules = listOf( AndroidAppModule("standalone_app"), AndroidAppModule( - "app", dependencies = """ + name = "app", + dependencies = """ implementation project(':feature') androidTestImplementation project(':android_test_feature') """ ), AndroidLibModule( - "feature", dependencies = """ + name = "feature", + dependencies = """ androidTestImplementation project(':android_test_feature') """ ), AndroidLibModule( - "android_test_feature", dependencies = """ + name = "android_test_feature", + dependencies = """ implementation project(':feature') """ ) @@ -353,13 +365,15 @@ class ImpactAnalysisTest { modules = listOf( AndroidAppModule("standalone_app"), AndroidAppModule( - "app", dependencies = """ + name = "app", + dependencies = """ api platform(project(':platform')) implementation project(':feature') """ ), AndroidLibModule( - "feature", dependencies = """ + name = "feature", + dependencies = """ api platform(project(':platform')) """ ), @@ -390,7 +404,8 @@ class ImpactAnalysisTest { modules = listOf( AndroidAppModule("standalone_app"), AndroidAppModule( - "app", dependencies = """ + name = "app", + dependencies = """ implementation project(':parent:feature1') implementation project(':parent:feature2') """ @@ -430,7 +445,8 @@ class ImpactAnalysisTest { modules = listOf( AndroidAppModule("standalone_app"), AndroidAppModule( - "app", dependencies = """ + name = "app", + dependencies = """ implementation project(':feature') """ ), @@ -461,7 +477,8 @@ class ImpactAnalysisTest { modules = listOf( AndroidAppModule("standalone_app"), AndroidAppModule( - "app", dependencies = """ + name = "app", + dependencies = """ androidTestImplementation platform(project(':platform')) """ ), diff --git a/subprojects/gradle/impact/src/test/kotlin/com/avito/impact/SourceSetsImpactTest.kt b/subprojects/gradle/impact/src/test/kotlin/com/avito/impact/SourceSetsImpactTest.kt index dfb97bf9f0..44d3ce8baf 100644 --- a/subprojects/gradle/impact/src/test/kotlin/com/avito/impact/SourceSetsImpactTest.kt +++ b/subprojects/gradle/impact/src/test/kotlin/com/avito/impact/SourceSetsImpactTest.kt @@ -43,7 +43,8 @@ class SourceSetsImpactTest { plugins = listOf("com.avito.android.impact"), modules = listOf( AndroidAppModule( - "app", dependencies = """ + name = "app", + dependencies = """ implementation(project(":feature")) """.trimIndent() ), diff --git a/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/AnalyzeTestImpactAction.kt b/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/AnalyzeTestImpactAction.kt index 55d0dbfda8..92d851646c 100644 --- a/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/AnalyzeTestImpactAction.kt +++ b/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/AnalyzeTestImpactAction.kt @@ -2,9 +2,9 @@ package com.avito.instrumentation.impact import com.avito.android.isAndroid import com.avito.bytecode.DIRTY_STUB +import com.avito.impact.ConfigurationType import com.avito.impact.ModifiedProject import com.avito.impact.ModifiedProjectsFinder -import com.avito.impact.ConfigurationType import com.avito.impact.configuration.internalModule import com.avito.impact.util.AndroidPackage import com.avito.impact.util.AndroidProject @@ -136,7 +136,7 @@ internal class AnalyzeTestImpactAction( .testsByScreen .flatMap { (screen, tests) -> when (screen) { - //We couldn't determine screen to test relation, so we will run all of these tests + // We couldn't determine screen to test relation, so we will run all of these tests DIRTY_STUB -> tests else -> { val screenToModuleMaps = screenToModulePaths diff --git a/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/InstrumentationTestImpactAnalysisPlugin.kt b/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/InstrumentationTestImpactAnalysisPlugin.kt index edf069cc6f..5aa23b57b2 100644 --- a/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/InstrumentationTestImpactAnalysisPlugin.kt +++ b/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/InstrumentationTestImpactAnalysisPlugin.kt @@ -59,7 +59,7 @@ class InstrumentationTestImpactAnalysisPlugin : Plugin { } private fun checkPreconditions(project: Project) { - //todo should work with library tests as well + // todo should work with library tests as well require(project.isAndroidApp()) { "$PLUGIN_NAME must be applied only in Android Application module type" } require(!project.isRoot()) { "$PLUGIN_NAME should be applied to the specific project, which produces test apk" } diff --git a/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/KotlinCompiler.kt b/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/KotlinCompiler.kt index 171a97041e..a23fa2ccba 100644 --- a/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/KotlinCompiler.kt +++ b/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/KotlinCompiler.kt @@ -27,8 +27,13 @@ internal class KotlinCompiler( } private fun createKtFile(content: String, path: Path) = psiFileFactory.createFileFromText( - path.fileName.toString(), KotlinLanguage.INSTANCE, StringUtilRt.convertLineSeparators(content), - true, true, false, LightVirtualFile(path.toString()) + path.fileName.toString(), + KotlinLanguage.INSTANCE, + StringUtilRt.convertLineSeparators(content), + true, + true, + false, + LightVirtualFile(path.toString()) ) as KtFile private fun String.determineLineSeparator(): String { diff --git a/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/metadata/MetadataParser.kt b/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/metadata/MetadataParser.kt index bdf020b9ca..b471236388 100644 --- a/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/metadata/MetadataParser.kt +++ b/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/metadata/MetadataParser.kt @@ -48,9 +48,9 @@ class MetadataParser( if (property.name == fieldName) { val expression = - property.getter?.bodyExpression ?: - property.children.filterIsInstance().firstOrNull() - ?: error("Can't parse $fieldName value, only direct value initialization or property getter supported") + property.getter?.bodyExpression + ?: property.children.filterIsInstance().firstOrNull() + ?: error("Can't parse $fieldName value, only direct value initialization or property getter supported") val importLines = ktFile.importDirectives.map { it.importedFqName.toString() } result[fullClassName] = getPackageName(expression.text, importLines)!! diff --git a/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/report/graph/ImpactAnalysisGraphVisualizeTask.kt b/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/report/graph/ImpactAnalysisGraphVisualizeTask.kt index 6de6190ced..b014caa141 100644 --- a/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/report/graph/ImpactAnalysisGraphVisualizeTask.kt +++ b/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/report/graph/ImpactAnalysisGraphVisualizeTask.kt @@ -1,9 +1,9 @@ package com.avito.instrumentation.impact.report.graph -import com.avito.instrumentation.impact.report.graph.html.cytoscapeGraphHtml import com.avito.instrumentation.impact.report.graph.html.CytoscapeEdgeData import com.avito.instrumentation.impact.report.graph.html.CytoscapeNode import com.avito.instrumentation.impact.report.graph.html.CytoscapeNodeData +import com.avito.instrumentation.impact.report.graph.html.cytoscapeGraphHtml import com.avito.instrumentation.impact.report.model.ModuleNode import com.avito.utils.createOrClear import com.google.gson.Gson diff --git a/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/report/graph/html/Markup.kt b/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/report/graph/html/Markup.kt index c9d3c260ce..1d11238e27 100644 --- a/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/report/graph/html/Markup.kt +++ b/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/report/graph/html/Markup.kt @@ -87,7 +87,7 @@ internal fun cytoscapeGraphHtml( #search::placeholder { color: #ddd; } - """.trimIndent() + """.trimIndent() ) } } diff --git a/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/report/model/ModuleConfiguration.kt b/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/report/model/ModuleConfiguration.kt index bb3ddc08bf..f16dcc06c3 100644 --- a/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/report/model/ModuleConfiguration.kt +++ b/subprojects/gradle/instrumentation-test-impact-analysis/src/main/kotlin/com/avito/instrumentation/impact/report/model/ModuleConfiguration.kt @@ -7,4 +7,3 @@ internal data class ModuleConfiguration( val isPrimaryModified: Boolean, val modifiedReason: String? ) - diff --git a/subprojects/gradle/instrumentation-test-impact-analysis/src/test/kotlin/com/avito/instrumentation/impact/InstrumentationAnalyzeImpactAnalysisIntegrationTest.kt b/subprojects/gradle/instrumentation-test-impact-analysis/src/test/kotlin/com/avito/instrumentation/impact/InstrumentationAnalyzeImpactAnalysisIntegrationTest.kt index 66c4254848..cbe3a0a019 100644 --- a/subprojects/gradle/instrumentation-test-impact-analysis/src/test/kotlin/com/avito/instrumentation/impact/InstrumentationAnalyzeImpactAnalysisIntegrationTest.kt +++ b/subprojects/gradle/instrumentation-test-impact-analysis/src/test/kotlin/com/avito/instrumentation/impact/InstrumentationAnalyzeImpactAnalysisIntegrationTest.kt @@ -48,7 +48,7 @@ class InstrumentationAnalyzeImpactAnalysisIntegrationTest { @Test fun newAddedTest() { } } - """.trimIndent() + """.trimIndent() } } diff --git a/subprojects/gradle/instrumentation-test-impact-analysis/src/test/kotlin/com/avito/instrumentation/impact/metadata/MetadataParserTest.kt b/subprojects/gradle/instrumentation-test-impact-analysis/src/test/kotlin/com/avito/instrumentation/impact/metadata/MetadataParserTest.kt index ce29f9b0c9..9d85b51040 100644 --- a/subprojects/gradle/instrumentation-test-impact-analysis/src/test/kotlin/com/avito/instrumentation/impact/metadata/MetadataParserTest.kt +++ b/subprojects/gradle/instrumentation-test-impact-analysis/src/test/kotlin/com/avito/instrumentation/impact/metadata/MetadataParserTest.kt @@ -19,7 +19,7 @@ internal class MetadataParserTest { val rootId: Int = R.id.something_root } - """.trimIndent() + """.trimIndent() ) } @@ -44,7 +44,7 @@ internal class MetadataParserTest { val rootId: Int get() = R.id.something_root } - """.trimIndent() + """.trimIndent() ) } diff --git a/subprojects/gradle/instrumentation-tests-test-fixtures/src/main/kotlin/com/avito/instrumentation/FakeInstrumentatioFilterData.kt b/subprojects/gradle/instrumentation-tests-test-fixtures/src/main/kotlin/com/avito/instrumentation/FakeInstrumentatioFilterData.kt index 649e3fbc0b..66dd62942a 100644 --- a/subprojects/gradle/instrumentation-tests-test-fixtures/src/main/kotlin/com/avito/instrumentation/FakeInstrumentatioFilterData.kt +++ b/subprojects/gradle/instrumentation-tests-test-fixtures/src/main/kotlin/com/avito/instrumentation/FakeInstrumentatioFilterData.kt @@ -29,4 +29,4 @@ fun InstrumentationFilter.Data.Companion.createStub( reportFilter = report ) ) -} \ No newline at end of file +} diff --git a/subprojects/gradle/instrumentation-tests-test-fixtures/src/main/kotlin/com/avito/instrumentation/FakeTestsFilterTest.kt b/subprojects/gradle/instrumentation-tests-test-fixtures/src/main/kotlin/com/avito/instrumentation/FakeTestsFilterTest.kt index a2f7365e23..853f97b1af 100644 --- a/subprojects/gradle/instrumentation-tests-test-fixtures/src/main/kotlin/com/avito/instrumentation/FakeTestsFilterTest.kt +++ b/subprojects/gradle/instrumentation-tests-test-fixtures/src/main/kotlin/com/avito/instrumentation/FakeTestsFilterTest.kt @@ -18,4 +18,4 @@ fun TestsFilter.Test.Companion.createStub( deviceName = deviceName, api = api, flakiness = flakiness - ) \ No newline at end of file + ) diff --git a/subprojects/gradle/instrumentation-tests-test-fixtures/src/main/kotlin/com/avito/instrumentation/minimalInstrumentationPluginConfiguration.kt b/subprojects/gradle/instrumentation-tests-test-fixtures/src/main/kotlin/com/avito/instrumentation/minimalInstrumentationPluginConfiguration.kt deleted file mode 100644 index afd9860a5e..0000000000 --- a/subprojects/gradle/instrumentation-tests-test-fixtures/src/main/kotlin/com/avito/instrumentation/minimalInstrumentationPluginConfiguration.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.avito.instrumentation - -import org.intellij.lang.annotations.Language - -@Language("Groovy") -val minimalInstrumentationPluginConfiguration = """// -android { - defaultConfig { - testInstrumentationRunner "runner" - } -} - -instrumentation { - output = project.file("outputs").path - reportApiUrl = "stub" - reportApiFallbackUrl = "stub" - reportViewerUrl = "stub" - sentryDsn = "stub" - slackToken = "stub" - fileStorageUrl = "stub" - registry = "stub" - - instrumentationParams = [ - "planSlug": "plan", - "jobSlug" : "job", - "runId" : "1234" - ] - - configurations { - functional { - } - } -} - """.trimIndent() diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/GetTestResultsAction.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/GetTestResultsAction.kt index 35077f6754..88e70a99a2 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/GetTestResultsAction.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/GetTestResultsAction.kt @@ -37,7 +37,7 @@ internal class GetTestResultsAction( private fun getReportId(): String? { report.tryCreate( - apiUrl = "", //todo + apiUrl = "", // todo gitBranch = gitBranch, gitCommit = gitCommit ) diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/InstrumentationTestsActionFactory.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/InstrumentationTestsActionFactory.kt index 9dd8620b6e..1584505af7 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/InstrumentationTestsActionFactory.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/InstrumentationTestsActionFactory.kt @@ -49,6 +49,5 @@ interface InstrumentationTestsActionFactory { override fun provideScheduler() = schedulerFactory.create() override fun provideFinalizer() = finalizerFactory.create() - } } diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/InstrumentationTestsPluginApi.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/InstrumentationTestsPluginApi.kt index 50273721dc..3fd34de3ad 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/InstrumentationTestsPluginApi.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/InstrumentationTestsPluginApi.kt @@ -19,7 +19,7 @@ internal fun preInstrumentationTaskName(configuration: String): String = internal const val preInstrumentationTaskName: String = "preInstrumentation" -//todo доступен только afterEvaluate и то ненадежно MBS-6926 +// todo доступен только afterEvaluate и то ненадежно MBS-6926 fun TaskContainer.instrumentationTask(configuration: String): TaskProvider = typedNamed(instrumentationTaskName(configuration)) diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/InstrumentationTestsTask.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/InstrumentationTestsTask.kt index 61a5030a93..e7f737ef34 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/InstrumentationTestsTask.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/InstrumentationTestsTask.kt @@ -131,8 +131,6 @@ abstract class InstrumentationTestsTask @Inject constructor( reportConfig ) - //todo новое api, когда выйдет в stable - // https://docs.gradle.org/5.6/userguide/custom_tasks.html#using-the-worker-api workerExecutor.inMemoryWork { InstrumentationTestsAction( InstrumentationTestsAction.Params( diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/TestRunResult.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/TestRunResult.kt index 8f49c35528..d5aee9a333 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/TestRunResult.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/TestRunResult.kt @@ -1,10 +1,10 @@ package com.avito.instrumentation +import com.avito.composite_exception.composeWith import com.avito.instrumentation.report.HasFailedTestDeterminer import com.avito.instrumentation.report.HasNotReportedTestsDeterminer import com.avito.report.model.SimpleRunTest import com.avito.report.model.Status -import com.avito.composite_exception.composeWith data class TestRunResult( val reportedTests: List, @@ -140,5 +140,4 @@ data class TestRunResult( fun failureCount(): Int = failed.count() fun notReportedCount(): Int = notReported.lostTests.size - } diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/configuration/GradleInstrumentationPluginConfiguration.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/configuration/InstrumentationPluginConfiguration.kt similarity index 99% rename from subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/configuration/GradleInstrumentationPluginConfiguration.kt rename to subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/configuration/InstrumentationPluginConfiguration.kt index 5559aea263..ffded7b689 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/configuration/GradleInstrumentationPluginConfiguration.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/configuration/InstrumentationPluginConfiguration.kt @@ -1,6 +1,5 @@ package com.avito.instrumentation.configuration -import com.avito.report.model.Team import com.google.common.annotations.VisibleForTesting import groovy.lang.Closure import org.gradle.api.Action diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/configuration/target/TargetConfiguration.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/configuration/target/TargetConfiguration.kt index ac3539b602..0402504c54 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/configuration/target/TargetConfiguration.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/configuration/target/TargetConfiguration.kt @@ -23,10 +23,12 @@ open class TargetConfiguration(val name: String) : Serializable { var instrumentationParams: Map = emptyMap() fun scheduling(closure: Closure) { - scheduling(Action { - closure.delegate = it - closure.call() - }) + scheduling( + Action { + closure.delegate = it + closure.call() + } + ) } fun scheduling(action: Action) { diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/configuration/target/scheduling/SchedulingConfiguration.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/configuration/target/scheduling/SchedulingConfiguration.kt index 0d0fbe63e0..76c890a641 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/configuration/target/scheduling/SchedulingConfiguration.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/configuration/target/scheduling/SchedulingConfiguration.kt @@ -15,17 +15,21 @@ open class SchedulingConfiguration { lateinit var quota: QuotaConfiguration fun staticDevicesReservation(closure: Closure) { - staticDevicesReservation(Action { - closure.delegate = it - closure.call() - }) + staticDevicesReservation( + Action { + closure.delegate = it + closure.call() + } + ) } fun testsCountBasedReservation(closure: Closure) { - testsCountBasedReservation(Action { - closure.delegate = it - closure.call() - }) + testsCountBasedReservation( + Action { + closure.delegate = it + closure.call() + } + ) } fun staticDevicesReservation(action: Action) { @@ -43,10 +47,12 @@ open class SchedulingConfiguration { } fun quota(closure: Closure) { - quota(Action { - closure.delegate = it - closure.call() - }) + quota( + Action { + closure.delegate = it + closure.call() + } + ) } fun quota(action: Action) { diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/executing/TestExecutor.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/executing/TestExecutor.kt index 92e9f2834f..ff6bd6ec6c 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/executing/TestExecutor.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/executing/TestExecutor.kt @@ -37,7 +37,7 @@ interface TestExecutor { private val runner = TestsRunnerClient() - //todo hi Juno! + // todo hi Juno! private val outputDirectoryName = "composer" override fun execute( diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/report/HasNotReportedTestsDeterminer.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/report/HasNotReportedTestsDeterminer.kt index dd3b7b2349..61b36489e5 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/report/HasNotReportedTestsDeterminer.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/report/HasNotReportedTestsDeterminer.kt @@ -41,7 +41,7 @@ interface HasNotReportedTestsDeterminer { .map { testMetadata -> AndroidTest.Lost.fromTestMetadata( testStaticData = testMetadata, - //todo это норм разве? + // todo это норм разве? startTime = 0, lastSignalTime = 0, stdout = "", diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/report/Report.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/report/Report.kt index c90f9db207..f3bc2dea9a 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/report/Report.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/report/Report.kt @@ -139,7 +139,6 @@ interface Report : ReadReport { ) } } - } } @@ -159,8 +158,8 @@ interface Report : ReadReport { fun getCrossDeviceTestData(): Try - //todo новый инстанс на каждый reportCoordinates, сейчас уже неверно шарится между rerun report и основным - //todo перенести логику с батчами в reportsApi + // todo новый инстанс на каждый reportCoordinates, сейчас уже неверно шарится между rerun report и основным + // todo перенести логику с батчами в reportsApi class Impl( private val reportsApi: ReportsApi, private val logger: CILogger, @@ -178,7 +177,7 @@ interface Report : ReadReport { } } - //todo закешировать после разделения инстансов + // todo закешировать после разделения инстансов override fun tryGetId(): String? { return when (val result = reportsApi.getReport(reportCoordinates)) { is GetReportResult.Found -> result.report.id diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/report/TestStatusFinalizer.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/report/TestStatusFinalizer.kt index bd4d004848..67f38661e3 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/report/TestStatusFinalizer.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/report/TestStatusFinalizer.kt @@ -114,4 +114,4 @@ internal interface TestStatusFinalizer { } } } -} \ No newline at end of file +} diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/report/listener/LogcatBuffer.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/report/listener/LogcatBuffer.kt index 1e347ef44f..a2686dd9f6 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/report/listener/LogcatBuffer.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/report/listener/LogcatBuffer.kt @@ -26,7 +26,7 @@ interface LogcatBuffer { private val tailerListener = object : TailerListenerAdapter() { override fun handle(line: String?) { if (line != null) { - //todo более надежное определение что есть ошибка + // todo более надежное определение что есть ошибка if (line.contains(" E ") || line.startsWith("E/")) { stderrBuffer.add(line) } else { diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/report/listener/ReportViewerTestReporter.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/report/listener/ReportViewerTestReporter.kt index 5d25678966..65082a3304 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/report/listener/ReportViewerTestReporter.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/report/listener/ReportViewerTestReporter.kt @@ -91,8 +91,7 @@ class ReportViewerTestReporter( executionNumber: Int ) { - val testFromSuite = requireNotNull(testSuite[test]) - { "Can't find test in suite: ${test.testName}" } + val testFromSuite = requireNotNull(testSuite[test]) { "Can't find test in suite: ${test.testName}" } val key = test to executionNumber artifacts.fold( @@ -102,7 +101,7 @@ class ReportViewerTestReporter( try { val testRuntimeData: TestRuntimeData = gson.fromJson(FileReader(reportJson)) - //отправляем только для упавших тестов + // отправляем только для упавших тестов val (stdout: String, stderr: String) = if (testRuntimeData.incident != null) { logcatBuffers.getLogcat(key) } else { @@ -129,8 +128,8 @@ class ReportViewerTestReporter( listOf( AndroidTest.Lost.fromTestMetadata( testFromSuite, - startTime = 0, //todo попробовать достать - lastSignalTime = 0, //todo попробовать достать + startTime = 0, // todo попробовать достать + lastSignalTime = 0, // todo попробовать достать stdout = stdout, stderr = stderr ) @@ -152,7 +151,7 @@ class ReportViewerTestReporter( } } - //todo coroutine + // todo coroutine private fun uploadLogcat(logcat: List): String { return if (logcat.isEmpty()) { logger.warn("Logcat is empty") diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/reservation/client/kubernetes/KubernetesReservationClient.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/reservation/client/kubernetes/KubernetesReservationClient.kt index 054b943e22..ba0e59e7c3 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/reservation/client/kubernetes/KubernetesReservationClient.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/reservation/client/kubernetes/KubernetesReservationClient.kt @@ -67,7 +67,7 @@ class KubernetesReservationClient( } launch { - //todo use Flow + // todo use Flow @Suppress("DEPRECATION") for (pod in podsChannel .filter { it.status.phase == POD_STATUS_RUNNING } @@ -101,7 +101,6 @@ class KubernetesReservationClient( } } } - } return ReservationClient.ClaimResult( deviceCoordinates = serialsChannel diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/reservation/client/kubernetes/ReservationDeploymentFactory.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/reservation/client/kubernetes/ReservationDeploymentFactory.kt index ecf28a5b21..375b2d963f 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/reservation/client/kubernetes/ReservationDeploymentFactory.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/reservation/client/kubernetes/ReservationDeploymentFactory.kt @@ -63,7 +63,7 @@ class ReservationDeploymentFactory( count: Int, phone: Device.Phone, deploymentName: String, - kubernetesNodeName: String = "avi-training06" //temporary node, remove later + kubernetesNodeName: String = "avi-training06" // temporary node, remove later ): Deployment { return deviceDeployment( deploymentMatchLabels = deviceMatchLabels(phone), @@ -222,9 +222,8 @@ class ReservationDeploymentFactory( ) } - private fun generateDeploymentName(namespace: String): String = - "${namespace}-${UUID.randomUUID()}" + "$namespace-${UUID.randomUUID()}" .kubernetesName() private fun String.kubernetesName(): String = replace("_", "-").toLowerCase() diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/reservation/devices/provider/DevicesProvider.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/reservation/devices/provider/DevicesProvider.kt index bbb8718cd0..14d0993db7 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/reservation/devices/provider/DevicesProvider.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/reservation/devices/provider/DevicesProvider.kt @@ -6,7 +6,7 @@ import com.avito.runner.service.worker.device.Device import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.ReceiveChannel -interface DevicesProvider: DeviceReservation { +interface DevicesProvider : DeviceReservation { fun provideFor(reservations: Collection, scope: CoroutineScope): ReceiveChannel suspend fun releaseDevices() } diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/reservation/devices/provider/KubernetesDevicesProvider.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/reservation/devices/provider/KubernetesDevicesProvider.kt index ffb0f992df..4f53ed9152 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/reservation/devices/provider/KubernetesDevicesProvider.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/reservation/devices/provider/KubernetesDevicesProvider.kt @@ -14,10 +14,10 @@ import kotlinx.coroutines.channels.ReceiveChannel import kotlinx.coroutines.channels.map class KubernetesDevicesProvider( - private val client: KubernetesReservationClient, - private val adbDevicesManager: AdbDevicesManager, - private val logger: CILogger, - private val adb: Adb + private val client: KubernetesReservationClient, + private val adbDevicesManager: AdbDevicesManager, + private val logger: CILogger, + private val adb: Adb ) : DevicesProvider { override fun provideFor(reservations: Collection, scope: CoroutineScope): ReceiveChannel { diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/reservation/devices/provider/LocalDevicesProvider.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/reservation/devices/provider/LocalDevicesProvider.kt index 6e97aa2d8a..fda1332df7 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/reservation/devices/provider/LocalDevicesProvider.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/reservation/devices/provider/LocalDevicesProvider.kt @@ -14,7 +14,6 @@ import com.avito.utils.logging.commonLogger import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.ObsoleteCoroutinesApi import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.channels.ReceiveChannel import kotlinx.coroutines.channels.distinctBy @@ -63,7 +62,7 @@ class LocalDevicesProvider( } } } - //todo use flow + // todo use flow @Suppress("DEPRECATION") return devices.distinctBy { it.coordinate }.take(devicesRequired) } diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/reservation/devices/provider/MockDevicesProvider.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/reservation/devices/provider/MockDevicesProvider.kt index 7949361c6e..39fb23b5ff 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/reservation/devices/provider/MockDevicesProvider.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/reservation/devices/provider/MockDevicesProvider.kt @@ -14,10 +14,8 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.channels.ReceiveChannel -import kotlinx.coroutines.delay import kotlinx.coroutines.launch import org.funktionale.tries.Try -import java.util.concurrent.TimeUnit class MockDevicesProvider(private val logger: CILogger) : DevicesProvider { diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/scheduling/TestsRunner.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/scheduling/TestsRunner.kt index 4ea58576f6..d802215193 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/scheduling/TestsRunner.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/scheduling/TestsRunner.kt @@ -100,7 +100,7 @@ class TestsRunnerImplementation( output = output ) - //todo через Report + // todo через Report val raw = report.getTests() log("test results: $raw") diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/scheduling/TestsSchedulerFactory.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/scheduling/TestsSchedulerFactory.kt index ea235c2a0f..b6de3bc22c 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/scheduling/TestsSchedulerFactory.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/scheduling/TestsSchedulerFactory.kt @@ -110,6 +110,5 @@ interface TestsSchedulerFactory { registry = params.registry ) } - } } diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/dex/AnnotationExtractor.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/dex/AnnotationExtractor.kt index 8acf40d064..42c7b2b3f6 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/dex/AnnotationExtractor.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/dex/AnnotationExtractor.kt @@ -29,7 +29,7 @@ data class AnnotationData( fun getIntArrayValue(key: String): List? = values[key] as? List @Suppress("UNCHECKED_CAST") - fun getEnumValue(key:String): String? = values[key] as? String + fun getEnumValue(key: String): String? = values[key] as? String } /** diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/dex/check/ExternalIdDuplicateCheck.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/dex/check/ExternalIdDuplicateCheck.kt index 15ab397edf..2b6bb3f196 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/dex/check/ExternalIdDuplicateCheck.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/dex/check/ExternalIdDuplicateCheck.kt @@ -46,6 +46,6 @@ class ExternalIdDuplicateCheck(override val onViolation: (String) -> Unit) : Tes } } -//visible in test +// visible in test internal const val EXTERNAL_ID_ANNOTATION_TYPE = "com.avito.android.test.annotations.ExternalId" internal const val DATA_SET_ANNOTATION_TYPE = "com.avito.android.test.annotations.DataSetNumber" diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/filter/CompositionFilter.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/filter/CompositionFilter.kt index dbe19f7f20..10981ffaa1 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/filter/CompositionFilter.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/filter/CompositionFilter.kt @@ -14,4 +14,4 @@ internal class CompositionFilter( .map { it.filter(test) } .firstOrNull { it is TestsFilter.Result.Excluded } ?: TestsFilter.Result.Included } -} \ No newline at end of file +} diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/filter/Filter.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/filter/Filter.kt index e77ab5e1e9..4cbb9eb2b5 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/filter/Filter.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/filter/Filter.kt @@ -27,4 +27,4 @@ class Filter { excluded = excluded.toSet() ) } -} \ No newline at end of file +} diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/filter/FilterFactory.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/filter/FilterFactory.kt index 99ef0bfdd1..b4a438a163 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/filter/FilterFactory.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/filter/FilterFactory.kt @@ -8,7 +8,7 @@ interface FilterFactory { fun createFilter(): TestsFilter companion object { - + internal const val JUNIT_IGNORE_ANNOTATION = "org.junit.Ignore" fun create( diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/filter/FilterInfoWriter.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/filter/FilterInfoWriter.kt index ce6be382ce..baf6057b37 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/filter/FilterInfoWriter.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/filter/FilterInfoWriter.kt @@ -41,9 +41,10 @@ interface FilterInfoWriter { "testName" to test.test.name.name, "device" to test.test.device.name ) - }) + } + ) ) ) } } -} \ No newline at end of file +} diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/filter/TestsFilter.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/filter/TestsFilter.kt index aa96173582..20796bbf22 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/filter/TestsFilter.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/filter/TestsFilter.kt @@ -19,32 +19,38 @@ interface TestsFilter { override fun toString(): String = "test has been excluded because: $reason" class HasSkipSdkAnnotation(name: String, sdk: Int) : Excluded( - name, "test has SkipSdk with value sdk=$sdk" + byFilter = name, + reason = "test has SkipSdk with value sdk=$sdk" ) class HasFlakyAnnotation(name: String, sdk: Int) : Excluded( - name, "test has Flaky with value sdk=$sdk" + byFilter = name, + reason = "test has Flaky with value sdk=$sdk" ) - class DoesNotHaveIncludeAnnotations(name: String, annotations: Set) : - Excluded(name, "test doesn't have any of annotations=$annotations") + class DoesNotHaveIncludeAnnotations(name: String, annotations: Set) : Excluded( + byFilter = name, + reason = "test doesn't have any of annotations=$annotations" + ) - class HasExcludeAnnotations(name: String, annotations: Set) : - Excluded(name, "test has any of excluded annotations=$annotations") + class HasExcludeAnnotations(name: String, annotations: Set) : Excluded( + byFilter = name, + reason = "test has any of excluded annotations=$annotations" + ) abstract class BySignatures(name: String, reason: String) : Excluded(name, reason) { abstract val source: Signatures.Source } - class DoesNotMatchIncludeSignature( - name: String, - override val source: Signatures.Source - ) : BySignatures(name, "test doesn't match any of signatures from source=$source") + class DoesNotMatchIncludeSignature(name: String, override val source: Signatures.Source) : BySignatures( + name = name, + reason = "test doesn't match any of signatures from source=$source" + ) - class MatchesExcludeSignature( - name: String, - override val source: Signatures.Source - ) : BySignatures(name, "test has matched one of signatures from source=$source") + class MatchesExcludeSignature(name: String, override val source: Signatures.Source) : BySignatures( + name = name, + reason = "test has matched one of signatures from source=$source" + ) } } diff --git a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/model/TestWithTarget.kt b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/model/TestWithTarget.kt index e4c2ded111..f28f3a4cbf 100644 --- a/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/model/TestWithTarget.kt +++ b/subprojects/gradle/instrumentation-tests/src/main/kotlin/com/avito/instrumentation/suite/model/TestWithTarget.kt @@ -8,7 +8,7 @@ data class TestWithTarget( val target: TargetConfiguration.Data ) -//todo чето как-то уродливо, кажется проблема в том что targetTestRun слишком много знает, и нужно стркутуру саму поменять +// todo чето как-то уродливо, кажется проблема в том что targetTestRun слишком много знает, и нужно стркутуру саму поменять fun List.transformTestsWithNewJobSlug(newJobSlug: String): List { return map { TestWithTarget( diff --git a/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/GetTestResultsActionTest.kt b/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/GetTestResultsActionTest.kt index f86b475c4c..579648cfa8 100644 --- a/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/GetTestResultsActionTest.kt +++ b/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/GetTestResultsActionTest.kt @@ -35,7 +35,6 @@ class GetTestResultsActionTest { ) ) ) - } private fun createGetTestResultsAction( diff --git a/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/InstrumentationParamsBuildingTest.kt b/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/InstrumentationParamsBuildingTest.kt index ef4cdb1f2c..446e1896ac 100644 --- a/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/InstrumentationParamsBuildingTest.kt +++ b/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/InstrumentationParamsBuildingTest.kt @@ -2,11 +2,11 @@ package com.avito.instrumentation import com.avito.instrumentation.configuration.InstrumentationPluginConfiguration.GradleInstrumentationPluginConfiguration.Data import com.avito.report.model.RunId -import com.avito.test.gradle.module.AndroidAppModule import com.avito.test.gradle.TestProjectGenerator import com.avito.test.gradle.ciRun import com.avito.test.gradle.file import com.avito.test.gradle.git +import com.avito.test.gradle.module.AndroidAppModule import com.google.common.truth.Truth.assertThat import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test @@ -184,7 +184,6 @@ class InstrumentationParamsBuildingTest { it.readObject() as Data } - val pluginConfigurationInstrumentationParameters = data.checkPluginLevelInstrumentationParameters() assertThat(pluginConfigurationInstrumentationParameters) diff --git a/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/InstrumentationTestActionFinalizerTest.kt b/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/InstrumentationTestActionFinalizerTest.kt index 0eb818c9c4..7c0013e22e 100644 --- a/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/InstrumentationTestActionFinalizerTest.kt +++ b/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/InstrumentationTestActionFinalizerTest.kt @@ -3,18 +3,15 @@ package com.avito.instrumentation import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test - class InstrumentationTestActionFinalizerTest { @Test @Disabled("TODO") fun `no fails when 0 tests run and there aren't previous reports`() { - } @Test @Disabled("TODO") fun `build fails when there are lost tests`() { - } } diff --git a/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/InstrumentationTestsPluginCIFalseTests.kt b/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/InstrumentationTestsPluginCIFalseTests.kt index 4e22c62a80..e09e383501 100644 --- a/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/InstrumentationTestsPluginCIFalseTests.kt +++ b/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/InstrumentationTestsPluginCIFalseTests.kt @@ -1,9 +1,9 @@ package com.avito.instrumentation -import com.avito.test.gradle.module.AndroidAppModule import com.avito.test.gradle.TestProjectGenerator import com.avito.test.gradle.TestResult import com.avito.test.gradle.gradlew +import com.avito.test.gradle.module.AndroidAppModule import org.junit.jupiter.api.Test import org.junit.jupiter.api.io.TempDir import java.io.File diff --git a/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/InstrumentationTestsPluginTest.kt b/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/InstrumentationTestsPluginTest.kt index 5215a025f5..8ef8ff1ce6 100644 --- a/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/InstrumentationTestsPluginTest.kt +++ b/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/InstrumentationTestsPluginTest.kt @@ -1,10 +1,10 @@ package com.avito.instrumentation +import com.avito.test.gradle.TestProjectGenerator +import com.avito.test.gradle.ciRun import com.avito.test.gradle.module.AndroidAppModule import com.avito.test.gradle.module.AndroidLibModule import com.avito.test.gradle.module.Module -import com.avito.test.gradle.TestProjectGenerator -import com.avito.test.gradle.ciRun import org.junit.jupiter.api.Test import org.junit.jupiter.api.io.TempDir import java.io.File diff --git a/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/TestRunResultTest.kt b/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/TestRunResultTest.kt index 5f913e653b..b086738324 100644 --- a/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/TestRunResultTest.kt +++ b/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/TestRunResultTest.kt @@ -32,7 +32,7 @@ internal class TestRunResultTest { Truth.assertThat(gson.toJson(verdict)) .isEqualTo( -""" + """ { "message": "Failed. There are 1 unsuppressed failed tests", "prettifiedDetails": { @@ -50,7 +50,6 @@ internal class TestRunResultTest { ) } - @Test fun `has 1 unsuppresed test with 2 apis`() { val verdict = TestRunResult( @@ -90,5 +89,4 @@ internal class TestRunResultTest { }""".trimIndent() ) } - } diff --git a/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/report/JUnitReportWriterTest.kt b/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/report/JUnitReportWriterTest.kt index b70cb839d5..6ef774ba0f 100644 --- a/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/report/JUnitReportWriterTest.kt +++ b/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/report/JUnitReportWriterTest.kt @@ -95,7 +95,9 @@ internal class JUnitReportWriterTest { runId = "49.0.275.32855" ) JUnitReportWriter(FakeReportViewer(reportViewerUrl)).write( - runIdentifier, testRunResult, file + reportCoordinates = runIdentifier, + testRunResult = testRunResult, + destination = file ) } } diff --git a/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/suite/dex/AnnotationExtractorTest.kt b/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/suite/dex/AnnotationExtractorTest.kt index 215aa58201..79b83502a3 100644 --- a/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/suite/dex/AnnotationExtractorTest.kt +++ b/subprojects/gradle/instrumentation-tests/src/test/kotlin/com/avito/instrumentation/suite/dex/AnnotationExtractorTest.kt @@ -19,9 +19,12 @@ internal class AnnotationExtractorTest { fun `extract array of strings`() { val key = "x" val annotation: Annotation = ImmutableAnnotation( - AnnotationVisibility.RUNTIME, "Lcom.avito.Whatever;", setOf( + AnnotationVisibility.RUNTIME, + "Lcom.avito.Whatever;", + setOf( ImmutableAnnotationElement( - key, ImmutableArrayEncodedValue( + key, + ImmutableArrayEncodedValue( ImmutableList.of( ImmutableStringEncodedValue("one"), ImmutableStringEncodedValue("two"), @@ -42,9 +45,12 @@ internal class AnnotationExtractorTest { fun `extract array of ints`() { val key = "x" val annotation: Annotation = ImmutableAnnotation( - AnnotationVisibility.RUNTIME, "Lcom.avito.Whatever;", setOf( + AnnotationVisibility.RUNTIME, + "Lcom.avito.Whatever;", + setOf( ImmutableAnnotationElement( - key, ImmutableArrayEncodedValue( + key, + ImmutableArrayEncodedValue( ImmutableList.of( ImmutableIntEncodedValue(1), ImmutableIntEncodedValue(2), @@ -65,9 +71,12 @@ internal class AnnotationExtractorTest { fun `extract enum`() { val key = "x" val annotation: Annotation = ImmutableAnnotation( - AnnotationVisibility.RUNTIME, "Lcom.avito.Whatever;", setOf( + AnnotationVisibility.RUNTIME, + "Lcom.avito.Whatever;", + setOf( ImmutableAnnotationElement( - key, ImmutableEnumEncodedValue( + key, + ImmutableEnumEncodedValue( ImmutableFieldReference("", "major", "") ) ) diff --git a/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/com/avito/kotlin/dsl/ProjectExtensions.kt b/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/com/avito/kotlin/dsl/ProjectExtensions.kt index 7bee7972c6..cee6140c63 100644 --- a/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/com/avito/kotlin/dsl/ProjectExtensions.kt +++ b/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/com/avito/kotlin/dsl/ProjectExtensions.kt @@ -5,7 +5,7 @@ import org.gradle.api.file.RegularFileProperty import java.io.File import kotlin.reflect.KProperty -//TODO these methods should return Property +// TODO these methods should return Property /** * @param nullIfBlank we accept cases when user passes empty string to override diff --git a/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/com/avito/kotlin/dsl/TaskExtensions.kt b/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/com/avito/kotlin/dsl/TaskExtensions.kt index f1eaa6b701..8be549470f 100644 --- a/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/com/avito/kotlin/dsl/TaskExtensions.kt +++ b/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/com/avito/kotlin/dsl/TaskExtensions.kt @@ -23,7 +23,6 @@ inline fun Task.dependencyOn(anotherTask: T, configuration: ( dependsOn(anotherTask) } - /** * Add Task dependencies based on a project plugins * @param project pairs of pluginId, task.name (ex: "com.android.application" to "testDebugUnitTest") @@ -61,4 +60,3 @@ inline fun NamedDomainObjectProvider.finalizeByProjectsTasks( } } } - diff --git a/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/ExtensionContainerExtensions.kt b/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/ExtensionContainerExtensions.kt index 5f3ced2369..305eadac4d 100644 --- a/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/ExtensionContainerExtensions.kt +++ b/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/ExtensionContainerExtensions.kt @@ -19,10 +19,8 @@ package org.gradle.kotlin.dsl import org.gradle.api.Incubating import org.gradle.api.UnknownDomainObjectException import org.gradle.api.plugins.ExtensionContainer - import kotlin.reflect.KProperty - /** * Looks for the extension of a given name. If none found it will throw an exception. * @@ -35,7 +33,6 @@ import kotlin.reflect.KProperty operator fun ExtensionContainer.get(name: String): Any = getByName(name) - /** * Looks for the extension of a given name and casts it to the expected type [T]. * @@ -52,17 +49,16 @@ inline fun ExtensionContainer.getByName(name: String) = getByName(name).let { it as? T ?: throw IllegalStateException( - "Element '$name' of type '${it::class.java.name}' from container '$this' cannot be cast to '${T::class.qualifiedName}'.") + "Element '$name' of type '${it::class.java.name}' from container '$this' cannot be cast to '${T::class.qualifiedName}'." + ) } - /** * Delegated property getter that locates extensions. */ inline operator fun ExtensionContainer.getValue(thisRef: Any?, property: KProperty<*>): T = getByName(property.name) - /** * Adds a new extension to this container. * @@ -80,7 +76,6 @@ inline fun ExtensionContainer.add(name: String, extension: T) add(typeOf(), name, extension) } - /** * Creates and adds a new extension to this container. * @@ -95,7 +90,6 @@ inline fun ExtensionContainer.add(name: String, extension: T) inline fun ExtensionContainer.create(name: String, vararg constructionArguments: Any): T = create(name, T::class.java, *constructionArguments) - /** * Looks for the extension of a given type. * @@ -109,7 +103,6 @@ inline fun ExtensionContainer.create(name: String, vararg cons inline fun ExtensionContainer.getByType(): T = getByType(typeOf()) - /** * Looks for the extension of a given type. * @@ -122,7 +115,6 @@ inline fun ExtensionContainer.getByType(): T = inline fun ExtensionContainer.findByType(): T? = findByType(typeOf()) - /** * Looks for the extension of the specified type and configures it with the supplied action. * diff --git a/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/GroovyInteropability.kt b/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/GroovyInteropability.kt index 9046923713..1fcdbfc531 100644 --- a/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/GroovyInteropability.kt +++ b/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/GroovyInteropability.kt @@ -3,27 +3,6 @@ package org.gradle.kotlin.dslx import groovy.lang.Closure import org.gradle.kotlin.dsl.support.uncheckedCast -/** - * Adapts an unary Kotlin function to an unary Groovy [Closure]. - * - * @param T the type of the single argument to the closure. - * @param V the return type. - * @param function the function to be adapted. - * @param owner optional owner of the Closure. - * @param thisObject optional _this Object_ of the Closure. - * - * @see [Closure] - */ -class KotlinClosure1( - val function: T.() -> V?, - owner: Any? = null, - thisObject: Any? = null -) : Closure(owner, thisObject) { - - @Suppress("unused") // to be called dynamically by Groovy - fun doCall(it: T): V? = it.function() -} - /** * Adapts a Kotlin function to a Groovy [Closure] that operates on the * configured Closure delegate. @@ -49,3 +28,24 @@ fun noOwnerClosureOf(action: T.() -> Unit) = */ fun Any.closureOf(action: T.() -> Unit): Closure = KotlinClosure1(action, this, this) + +/** + * Adapts an unary Kotlin function to an unary Groovy [Closure]. + * + * @param T the type of the single argument to the closure. + * @param V the return type. + * @param function the function to be adapted. + * @param owner optional owner of the Closure. + * @param thisObject optional _this Object_ of the Closure. + * + * @see [Closure] + */ +class KotlinClosure1( + val function: T.() -> V?, + owner: Any? = null, + thisObject: Any? = null +) : Closure(owner, thisObject) { + + @Suppress("unused") // to be called dynamically by Groovy + fun doCall(it: T): V? = it.function() +} diff --git a/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/PolymorphicDomainObjectContainerExtensions.kt b/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/PolymorphicDomainObjectContainerExtensions.kt index f0ff4a8408..462ec06b9f 100644 --- a/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/PolymorphicDomainObjectContainerExtensions.kt +++ b/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/PolymorphicDomainObjectContainerExtensions.kt @@ -12,7 +12,6 @@ import org.gradle.api.PolymorphicDomainObjectContainer inline fun PolymorphicDomainObjectContainer.register(name: String): NamedDomainObjectProvider = register(name, T::class.java) - /** * Defines and configure a new object, which will be created when it is required. * diff --git a/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/ProjectExtensions.kt b/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/ProjectExtensions.kt index b59d713678..2284534b5b 100644 --- a/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/ProjectExtensions.kt +++ b/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/ProjectExtensions.kt @@ -42,7 +42,6 @@ inline fun Project.the(): T = ?: convention.getByType(type) } - /** * Returns the plugin convention or extension of the specified type. */ @@ -62,14 +61,12 @@ fun Project.the(extensionType: KClass): T = fun Project.repositories(configuration: RepositoryHandler.() -> Unit) = repositories.configuration() - /** * Configures the repositories for the script dependencies. */ fun ScriptHandler.repositories(configuration: RepositoryHandler.() -> Unit) = repositories.configuration() - /** * Creates a container for managing named objects of the specified type. * @@ -86,7 +83,6 @@ fun ScriptHandler.repositories(configuration: RepositoryHandler.() -> Unit) = inline fun Project.container(): NamedDomainObjectContainer = container(T::class.java) - /** * Creates a container for managing named objects of the specified type. * diff --git a/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/TaskContainerExtensions.kt b/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/TaskContainerExtensions.kt index 993bddd3c8..f9f8048018 100644 --- a/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/TaskContainerExtensions.kt +++ b/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/TaskContainerExtensions.kt @@ -13,7 +13,6 @@ import org.gradle.api.tasks.TaskProvider inline fun TaskContainer.register(name: String): TaskProvider = register(name, T::class.java) - /** * Defines and configure a new object, which will be created when it is required. * diff --git a/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/TypeOfExtensions.kt b/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/TypeOfExtensions.kt index ef4bb741b7..13743c1343 100644 --- a/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/TypeOfExtensions.kt +++ b/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/TypeOfExtensions.kt @@ -17,7 +17,6 @@ package org.gradle.kotlin.dsl import org.gradle.api.reflect.TypeOf - /** * Creates an instance of [TypeOf] for the given parameterized type. * diff --git a/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/support/GradleExtensions.kt b/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/support/GradleExtensions.kt index 5cab653bf6..8c4f23af57 100644 --- a/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/support/GradleExtensions.kt +++ b/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/support/GradleExtensions.kt @@ -18,11 +18,9 @@ package org.gradle.kotlin.dsl.support import org.gradle.api.internal.GradleInternal import org.gradle.api.invocation.Gradle - inline fun Gradle.serviceOf(): T = (gradle as GradleInternal).services.get() - internal fun serviceRegistryOf(gradle: Gradle) = (gradle as GradleInternal).services diff --git a/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/support/ServiceRegistryExtensions.kt b/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/support/ServiceRegistryExtensions.kt index 16e40dad3f..d52de9ee06 100644 --- a/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/support/ServiceRegistryExtensions.kt +++ b/subprojects/gradle/kotlin-dsl-support/src/main/kotlin/org/gradle/kotlin/dsl/support/ServiceRegistryExtensions.kt @@ -17,6 +17,5 @@ package org.gradle.kotlin.dsl.support import org.gradle.internal.service.ServiceRegistry - inline fun ServiceRegistry.get(): T = this[T::class.java]!! diff --git a/subprojects/gradle/kotlin-dsl-support/src/test/kotlin/com/avito/kotlin/dsl/GetMandatoryStringPropertyTest.kt b/subprojects/gradle/kotlin-dsl-support/src/test/kotlin/com/avito/kotlin/dsl/GetMandatoryStringPropertyTest.kt index 602722957c..1e153829b7 100644 --- a/subprojects/gradle/kotlin-dsl-support/src/test/kotlin/com/avito/kotlin/dsl/GetMandatoryStringPropertyTest.kt +++ b/subprojects/gradle/kotlin-dsl-support/src/test/kotlin/com/avito/kotlin/dsl/GetMandatoryStringPropertyTest.kt @@ -17,7 +17,7 @@ internal class GetMandatoryStringPropertyTest { } } - //todo throw by default + // todo throw by default @Test fun `getMandatoryStringProperty - returns empty value - on empty string value by default`() { val project = ProjectBuilder.builder().build() diff --git a/subprojects/gradle/kotlin-dsl-support/src/test/kotlin/com/avito/kotlin/dsl/GetOptionalStringPropertyTest.kt b/subprojects/gradle/kotlin-dsl-support/src/test/kotlin/com/avito/kotlin/dsl/GetOptionalStringPropertyTest.kt index 51ee989521..634679855e 100644 --- a/subprojects/gradle/kotlin-dsl-support/src/test/kotlin/com/avito/kotlin/dsl/GetOptionalStringPropertyTest.kt +++ b/subprojects/gradle/kotlin-dsl-support/src/test/kotlin/com/avito/kotlin/dsl/GetOptionalStringPropertyTest.kt @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test internal class GetOptionalStringPropertyTest { - //todo null by default + // todo null by default @Test fun `getOptionalStringProperty - returns empty string - on empty string by default`() { val project = ProjectBuilder.builder().build() diff --git a/subprojects/gradle/kubernetes/src/main/kotlin/com/avito/utils/gradle/Kubernetes.kt b/subprojects/gradle/kubernetes/src/main/kotlin/com/avito/utils/gradle/Kubernetes.kt index 1aad005ff9..fd6fcae587 100644 --- a/subprojects/gradle/kubernetes/src/main/kotlin/com/avito/utils/gradle/Kubernetes.kt +++ b/subprojects/gradle/kubernetes/src/main/kotlin/com/avito/utils/gradle/Kubernetes.kt @@ -1,4 +1,5 @@ @file:JvmName("Kubernetes") + package com.avito.utils.gradle import com.avito.kotlin.dsl.getOptionalStringProperty @@ -33,7 +34,7 @@ fun createKubernetesClient( require(configFile.exists() && configFile.length() > 0) { "kubernetes.configFile:(${kubernetesCredentials.configFile}) is unavailable" } val configContents = configFile.readText() - + Config.fromKubeconfig(kubernetesCredentials.context, configContents, "").apply { if (!kubernetesCredentials.caCertFile.isNullOrBlank()) { caCertFile = kubernetesCredentials.caCertFile diff --git a/subprojects/gradle/kubernetes/src/main/kotlin/com/avito/utils/gradle/KubernetesCredentials.kt b/subprojects/gradle/kubernetes/src/main/kotlin/com/avito/utils/gradle/KubernetesCredentials.kt index 3c51dbe73a..714d91c615 100644 --- a/subprojects/gradle/kubernetes/src/main/kotlin/com/avito/utils/gradle/KubernetesCredentials.kt +++ b/subprojects/gradle/kubernetes/src/main/kotlin/com/avito/utils/gradle/KubernetesCredentials.kt @@ -22,12 +22,12 @@ sealed class KubernetesCredentials : Serializable { // TODO: get rid of this default. autoConfig is enabled by default private val kubeConfigDefaultPath: String by lazy { val userHome: String = requireUserHome() - "${userHome}/.kube/config" + "$userHome/.kube/config" } private val kubeDefaultCaCertFile: String by lazy { val userHome: String = requireUserHome() - "${userHome}/.kube/avito_ca.crt" + "$userHome/.kube/avito_ca.crt" } private fun requireUserHome(): String { @@ -35,4 +35,3 @@ private fun requireUserHome(): String { require(!userHome.isNullOrBlank()) { "system property 'user.home' is not set" } return userHome } - diff --git a/subprojects/gradle/lint-report/src/main/kotlin/com/avito/android/lint/LintReportExtension.kt b/subprojects/gradle/lint-report/src/main/kotlin/com/avito/android/lint/LintReportExtension.kt index 7354ab20e0..9c95160c17 100644 --- a/subprojects/gradle/lint-report/src/main/kotlin/com/avito/android/lint/LintReportExtension.kt +++ b/subprojects/gradle/lint-report/src/main/kotlin/com/avito/android/lint/LintReportExtension.kt @@ -6,7 +6,7 @@ import javax.inject.Inject open class LintReportExtension @Inject constructor(objects: ObjectFactory) { - //todo some global slack settings? + // todo some global slack settings? val slackToken = objects.property() val slackWorkspace = objects.property() val slackChannelToReportLintBugs = objects.property() diff --git a/subprojects/gradle/lint-report/src/main/kotlin/com/avito/android/lint/LintResultsParser.kt b/subprojects/gradle/lint-report/src/main/kotlin/com/avito/android/lint/LintResultsParser.kt index c53c023d2d..8cdbf5664c 100644 --- a/subprojects/gradle/lint-report/src/main/kotlin/com/avito/android/lint/LintResultsParser.kt +++ b/subprojects/gradle/lint-report/src/main/kotlin/com/avito/android/lint/LintResultsParser.kt @@ -97,7 +97,6 @@ class LintResultsParser(private val log: CILogger) { } return issues } - } internal class UnsupportedFormatVersion(message: String) : RuntimeException(message) diff --git a/subprojects/gradle/lint-report/src/main/kotlin/com/avito/android/lint/html/HtmlExtensions.kt b/subprojects/gradle/lint-report/src/main/kotlin/com/avito/android/lint/html/HtmlExtensions.kt index c69654eb21..d3925e1c11 100644 --- a/subprojects/gradle/lint-report/src/main/kotlin/com/avito/android/lint/html/HtmlExtensions.kt +++ b/subprojects/gradle/lint-report/src/main/kotlin/com/avito/android/lint/html/HtmlExtensions.kt @@ -7,11 +7,11 @@ import kotlinx.html.TagConsumer import kotlinx.html.attributesMapOf import kotlinx.html.visit -internal open class MAIN(initialAttributes: Map, override val consumer: TagConsumer<*>) : - HTMLTag("main", consumer, initialAttributes, null, false, false), - CommonAttributeGroupFacadeFlowSectioningContent - internal fun SectioningOrFlowContent.main(classes: String? = null, block: MAIN.() -> Unit = {}): Unit = MAIN( - attributesMapOf("class", classes), consumer + attributesMapOf("class", classes), + consumer ).visit(block) +internal open class MAIN(initialAttributes: Map, override val consumer: TagConsumer<*>) : + HTMLTag("main", consumer, initialAttributes, null, false, false), + CommonAttributeGroupFacadeFlowSectioningContent diff --git a/subprojects/gradle/lint-report/src/main/kotlin/com/avito/android/lint/html/LintReportMerger.kt b/subprojects/gradle/lint-report/src/main/kotlin/com/avito/android/lint/html/LintReportMerger.kt index 60b974cd22..0766d4324b 100644 --- a/subprojects/gradle/lint-report/src/main/kotlin/com/avito/android/lint/html/LintReportMerger.kt +++ b/subprojects/gradle/lint-report/src/main/kotlin/com/avito/android/lint/html/LintReportMerger.kt @@ -133,5 +133,4 @@ class LintReportMerger { } } } - } diff --git a/subprojects/gradle/lint-report/src/main/kotlin/com/avito/android/lint/slack/LintSlackReporter.kt b/subprojects/gradle/lint-report/src/main/kotlin/com/avito/android/lint/slack/LintSlackReporter.kt index 1af703eeda..9c51ff5f42 100644 --- a/subprojects/gradle/lint-report/src/main/kotlin/com/avito/android/lint/slack/LintSlackReporter.kt +++ b/subprojects/gradle/lint-report/src/main/kotlin/com/avito/android/lint/slack/LintSlackReporter.kt @@ -100,7 +100,7 @@ interface LintSlackReporter { buildUrl: HttpUrl ): String { return buildString { - appendln("*Critical lint problems detected for project ${projectPath}*") + appendln("*Critical lint problems detected for project $projectPath*") appendln("Build: <$buildUrl|link>") appendln() diff --git a/subprojects/gradle/module-types/src/main/kotlin/com/avito/android/ModuleTypeExtension.kt b/subprojects/gradle/module-types/src/main/kotlin/com/avito/android/ModuleTypeExtension.kt index e1d0ecb3af..ff506c6771 100644 --- a/subprojects/gradle/module-types/src/main/kotlin/com/avito/android/ModuleTypeExtension.kt +++ b/subprojects/gradle/module-types/src/main/kotlin/com/avito/android/ModuleTypeExtension.kt @@ -6,6 +6,6 @@ open class ModuleTypeExtension( var type: ModuleType = ModuleType.IMPLEMENTATION ) -//todo правда должен быть nullable? +// todo правда должен быть nullable? inline val ExtensionContainer.moduleType get() = findByType(ModuleTypeExtension::class.java) diff --git a/subprojects/gradle/module-types/src/main/kotlin/com/avito/android/ModuleTypePlugin.kt b/subprojects/gradle/module-types/src/main/kotlin/com/avito/android/ModuleTypesPlugin.kt similarity index 100% rename from subprojects/gradle/module-types/src/main/kotlin/com/avito/android/ModuleTypePlugin.kt rename to subprojects/gradle/module-types/src/main/kotlin/com/avito/android/ModuleTypesPlugin.kt diff --git a/subprojects/gradle/module-types/src/test/kotlin/com/avito/android/ModuleTypesPluginTest.kt b/subprojects/gradle/module-types/src/test/kotlin/com/avito/android/ModuleTypesPluginTest.kt index db0ba520f8..46c0b95ea9 100644 --- a/subprojects/gradle/module-types/src/test/kotlin/com/avito/android/ModuleTypesPluginTest.kt +++ b/subprojects/gradle/module-types/src/test/kotlin/com/avito/android/ModuleTypesPluginTest.kt @@ -1,10 +1,10 @@ package com.avito.android -import com.avito.test.gradle.module.AndroidAppModule -import com.avito.test.gradle.module.AndroidLibModule import com.avito.test.gradle.TestProjectGenerator import com.avito.test.gradle.git import com.avito.test.gradle.gradlew +import com.avito.test.gradle.module.AndroidAppModule +import com.avito.test.gradle.module.AndroidLibModule import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.junit.jupiter.api.io.TempDir @@ -46,7 +46,8 @@ class ModuleTypesPluginTest { } val result = gradlew( - projectDir, "assemble", + projectDir, + "assemble", "-Pavito.moduleTypeValidationEnabled=true", "-PgitBranch=xxx", // todo need for impact plugin dryRun = true diff --git a/subprojects/gradle/module-types/src/test/kotlin/com/avito/android/ModuleTypesRules.kt b/subprojects/gradle/module-types/src/test/kotlin/com/avito/android/ModuleTypesRules.kt index 5b86ad3c54..513fab515c 100644 --- a/subprojects/gradle/module-types/src/test/kotlin/com/avito/android/ModuleTypesRules.kt +++ b/subprojects/gradle/module-types/src/test/kotlin/com/avito/android/ModuleTypesRules.kt @@ -6,11 +6,11 @@ import com.avito.android.ModuleType.IMPLEMENTATION import com.avito.android.ModuleType.TEST_LIB import com.avito.android.ModuleTypesRules.Case.NegativeCase import com.avito.android.ModuleTypesRules.Case.PositiveCase -import com.avito.test.gradle.module.AndroidLibModule import com.avito.test.gradle.ManualTempFolder import com.avito.test.gradle.TestProjectGenerator import com.avito.test.gradle.git import com.avito.test.gradle.gradlew +import com.avito.test.gradle.module.AndroidLibModule import org.junit.jupiter.api.DynamicTest.dynamicTest import org.junit.jupiter.api.TestFactory @@ -116,9 +116,11 @@ class ModuleTypesRules { dependentModuleDependencyType: DependencyType, dependentModuleType: ModuleType ) : Case( - "${featureModuleType.name} ALLOWED to have " + + name = "${featureModuleType.name} ALLOWED to have " + "${dependentModuleDependencyType.name} dependency on ${dependentModuleType.name}", - featureModuleType, dependentModuleDependencyType, dependentModuleType + featureModuleType = featureModuleType, + dependentModuleDependencyType = dependentModuleDependencyType, + dependentModuleType = dependentModuleType ) class NegativeCase( @@ -126,9 +128,11 @@ class ModuleTypesRules { dependentModuleDependencyType: DependencyType, dependentModuleType: ModuleType ) : Case( - "${featureModuleType.name} RESTRICTED to have " + + name = "${featureModuleType.name} RESTRICTED to have " + "${dependentModuleDependencyType.name} dependency on ${dependentModuleType.name}", - featureModuleType, dependentModuleDependencyType, dependentModuleType + featureModuleType = featureModuleType, + dependentModuleDependencyType = dependentModuleDependencyType, + dependentModuleType = dependentModuleType ) } diff --git a/subprojects/gradle/namespaced-resources-fixer/src/main/kotlin/com/avito/android/plugin/FileResourcesFixer.kt b/subprojects/gradle/namespaced-resources-fixer/src/main/kotlin/com/avito/android/plugin/FileResourcesFixer.kt index 0085b0f362..8fc1e18f8f 100644 --- a/subprojects/gradle/namespaced-resources-fixer/src/main/kotlin/com/avito/android/plugin/FileResourcesFixer.kt +++ b/subprojects/gradle/namespaced-resources-fixer/src/main/kotlin/com/avito/android/plugin/FileResourcesFixer.kt @@ -102,9 +102,11 @@ internal class FileResourcesFixer { .unique() return uniqueIds.map { id -> - val module = requireNotNull(modules.find { module -> - module.ids.contains(id) - }) + val module = requireNotNull( + modules.find { module -> + module.ids.contains(id) + } + ) ResourceId(id, module) } } @@ -129,7 +131,10 @@ internal class FileResourcesFixer { val rClassName = resource.module.packageId + ".R" val oldImport = imports.findImport(rClassName) val import = oldImport - ?: elementsFactory.createImportDirective(rClassName, resource.module.packageId.substringAfterLast('.') + "_R") + ?: elementsFactory.createImportDirective( + rClassName, + resource.module.packageId.substringAfterLast('.') + "_R" + ) val element = elementsFactory.createExpression("${import.referencedClass}.id.${resource.id}") diff --git a/subprojects/gradle/namespaced-resources-fixer/src/main/kotlin/com/avito/android/plugin/FixNamespacedResourcesTask.kt b/subprojects/gradle/namespaced-resources-fixer/src/main/kotlin/com/avito/android/plugin/FixNamespacedResourcesTask.kt index 8e69a1c9a6..1966455ff5 100644 --- a/subprojects/gradle/namespaced-resources-fixer/src/main/kotlin/com/avito/android/plugin/FixNamespacedResourcesTask.kt +++ b/subprojects/gradle/namespaced-resources-fixer/src/main/kotlin/com/avito/android/plugin/FixNamespacedResourcesTask.kt @@ -96,8 +96,6 @@ abstract class FixNamespacedResourcesTask @Inject constructor( } } - internal data class AndroidModule(val packageId: String, val ids: List) internal data class ResourceId(val id: String, val module: AndroidModule) - diff --git a/subprojects/gradle/namespaced-resources-fixer/src/test/kotlin/com/avito/android/plugin/FileResourcesFixerTest.kt b/subprojects/gradle/namespaced-resources-fixer/src/test/kotlin/com/avito/android/plugin/FileResourcesFixerTest.kt index afa5f83d4d..04659a2453 100644 --- a/subprojects/gradle/namespaced-resources-fixer/src/test/kotlin/com/avito/android/plugin/FileResourcesFixerTest.kt +++ b/subprojects/gradle/namespaced-resources-fixer/src/test/kotlin/com/avito/android/plugin/FileResourcesFixerTest.kt @@ -26,7 +26,8 @@ class FileResourcesFixerTest { import com.library.R val id = R.id.container """.trimIndent(), - app, libraries + app, + libraries ) assertThat(result).isEqualTo( """ @@ -46,7 +47,8 @@ class FileResourcesFixerTest { import com.library.R val id = R.id.container """.trimIndent(), - app, libraries + app, + libraries ) assertThat(result).isEqualTo( """ @@ -70,7 +72,8 @@ class FileResourcesFixerTest { val id = R.id.container """.trimIndent(), - app, libraries + app, + libraries ) assertThat(result).isEqualTo( """ @@ -93,7 +96,8 @@ class FileResourcesFixerTest { val id = R.id.container """.trimIndent(), - app, libraries + app, + libraries ) assertThat(result).isEqualTo( """ @@ -119,7 +123,8 @@ class FileResourcesFixerTest { val icon = element(ViewMatchers.withId(R.id.icon)) """.trimIndent(), - app, libraries + app, + libraries ) assertThat(result).isEqualTo( """ @@ -145,7 +150,8 @@ class FileResourcesFixerTest { val id = custom_alias_R.id.container """.trimIndent(), - app, libraries + app, + libraries ) assertThat(result).isEqualTo( """ @@ -171,7 +177,8 @@ class FileResourcesFixerTest { val id1 = R.id.container val id2 = custom_alias_R.id.container """.trimIndent(), - app, libraries + app, + libraries ) assertThat(result).isEqualTo( """ @@ -198,7 +205,8 @@ class FileResourcesFixerTest { val id1 = app_R.id.container val id2 = library_R.id.container """.trimIndent(), - app, libraries + app, + libraries ) assertThat(result).isEqualTo( """ diff --git a/subprojects/gradle/namespaced-resources-fixer/src/test/kotlin/com/avito/android/plugin/NamespacedResourcesFixerPluginTest.kt b/subprojects/gradle/namespaced-resources-fixer/src/test/kotlin/com/avito/android/plugin/NamespacedResourcesFixerPluginTest.kt index 446e613c88..aeca818b09 100644 --- a/subprojects/gradle/namespaced-resources-fixer/src/test/kotlin/com/avito/android/plugin/NamespacedResourcesFixerPluginTest.kt +++ b/subprojects/gradle/namespaced-resources-fixer/src/test/kotlin/com/avito/android/plugin/NamespacedResourcesFixerPluginTest.kt @@ -1,10 +1,10 @@ package com.avito.android.plugin -import com.avito.test.gradle.module.AndroidAppModule -import com.avito.test.gradle.module.AndroidLibModule import com.avito.test.gradle.TestProjectGenerator import com.avito.test.gradle.file import com.avito.test.gradle.gradlew +import com.avito.test.gradle.module.AndroidAppModule +import com.avito.test.gradle.module.AndroidLibModule import com.google.common.truth.Truth.assertThat import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test @@ -29,43 +29,53 @@ class NamespacedResourcesFixerPluginTest { "com.avito.android.namespaced-resources-fixer" ), modules = listOf( - AndroidAppModule("app", - dependencies = """ + AndroidAppModule( + "app", + dependencies = """ implementation project(':feature') """.trimIndent() ) { - file("src/androidTest/java/Test.kt", """ - import com.app.R - val id = R.id.container - """.trimIndent()) + file( + name = "src/androidTest/java/Test.kt", + content = """ + import com.app.R + val id = R.id.container + """.trimIndent() + ) }, AndroidLibModule("feature") { - file("src/main/res/layout/container.xml", """ - - - - """.trimIndent()) + file( + name = "src/main/res/layout/container.xml", + content = """ + + + + """.trimIndent() + ) } ) ).generateIn(projectDir) val result = gradlew( - projectDir, "fixNamespacedResources", + projectDir, + "fixNamespacedResources", "-Pavito.fixNamespacedResources.filesPrefix=app/src/androidTest", "-PgitBranch=xxx" // todo needed for impact plugin ) result.assertThat().buildSuccessful() val newContent = File(projectDir, "app/src/androidTest/java/Test.kt").readText() - assertThat(newContent).isEqualTo(""" + assertThat(newContent).isEqualTo( + """ import com.app.R import com.feature.R as feature_R val id = feature_R.id.container - """.trimIndent()) + """.trimIndent() + ) } } diff --git a/subprojects/gradle/process/build.gradle.kts b/subprojects/gradle/process/build.gradle.kts index 0a755b5ce1..606ace7dce 100644 --- a/subprojects/gradle/process/build.gradle.kts +++ b/subprojects/gradle/process/build.gradle.kts @@ -7,6 +7,6 @@ plugins { dependencies { api(Dependencies.funktionaleTry) - //todo used only for Commandline.translateCommandline(source) + // todo used only for Commandline.translateCommandline(source) implementation(gradleApi()) } diff --git a/subprojects/gradle/process/src/main/kotlin/com/avito/utils/Process.kt b/subprojects/gradle/process/src/main/kotlin/com/avito/utils/ProcessRunner.kt similarity index 100% rename from subprojects/gradle/process/src/main/kotlin/com/avito/utils/Process.kt rename to subprojects/gradle/process/src/main/kotlin/com/avito/utils/ProcessRunner.kt diff --git a/subprojects/gradle/prosector/src/main/kotlin/BranchCompareMeta.kt b/subprojects/gradle/prosector/src/main/kotlin/BranchCompareMeta.kt index 8279c09db2..a54165f4c0 100644 --- a/subprojects/gradle/prosector/src/main/kotlin/BranchCompareMeta.kt +++ b/subprojects/gradle/prosector/src/main/kotlin/BranchCompareMeta.kt @@ -5,4 +5,4 @@ data class BranchCompareMeta( val beforeBuild: BuildInfo, val afterBuild: BuildInfo, val taskType: TaskType = TaskType.BRANCH_COMPARE -) \ No newline at end of file +) diff --git a/subprojects/gradle/prosector/src/main/kotlin/BuildInfo.kt b/subprojects/gradle/prosector/src/main/kotlin/BuildInfo.kt index 016e8f5132..fd9088362e 100644 --- a/subprojects/gradle/prosector/src/main/kotlin/BuildInfo.kt +++ b/subprojects/gradle/prosector/src/main/kotlin/BuildInfo.kt @@ -5,4 +5,4 @@ data class BuildInfo( val buildType: String, val branchName: String, val commit: String -) \ No newline at end of file +) diff --git a/subprojects/gradle/prosector/src/main/kotlin/ProsectorConfig.kt b/subprojects/gradle/prosector/src/main/kotlin/ProsectorConfig.kt index cd456f4afa..8b3af8f755 100644 --- a/subprojects/gradle/prosector/src/main/kotlin/ProsectorConfig.kt +++ b/subprojects/gradle/prosector/src/main/kotlin/ProsectorConfig.kt @@ -1,5 +1,5 @@ open class ProsectorConfig { - + lateinit var host: String var branchName = "" diff --git a/subprojects/gradle/prosector/src/main/kotlin/ProsectorReleaseAnalysisTask.kt b/subprojects/gradle/prosector/src/main/kotlin/ProsectorReleaseAnalysisTask.kt index cd69bfd378..459fa6fcff 100644 --- a/subprojects/gradle/prosector/src/main/kotlin/ProsectorReleaseAnalysisTask.kt +++ b/subprojects/gradle/prosector/src/main/kotlin/ProsectorReleaseAnalysisTask.kt @@ -5,7 +5,13 @@ import okhttp3.OkHttpClient import okhttp3.RequestBody.Companion.asRequestBody import okhttp3.logging.HttpLoggingInterceptor import org.gradle.api.DefaultTask -import org.gradle.api.tasks.* +import org.gradle.api.tasks.CacheableTask +import org.gradle.api.tasks.Input +import org.gradle.api.tasks.InputFile +import org.gradle.api.tasks.Internal +import org.gradle.api.tasks.PathSensitive +import org.gradle.api.tasks.PathSensitivity +import org.gradle.api.tasks.TaskAction import retrofit2.Retrofit import retrofit2.converter.gson.GsonConverterFactory import java.io.File @@ -33,13 +39,17 @@ abstract class ProsectorReleaseAnalysisTask : DefaultTask() { .client( OkHttpClient.Builder().apply { if (debug) { - addInterceptor(HttpLoggingInterceptor(object : HttpLoggingInterceptor.Logger { - override fun log(message: String) { - project.ciLogger.info(message) + addInterceptor( + HttpLoggingInterceptor( + object : HttpLoggingInterceptor.Logger { + override fun log(message: String) { + project.ciLogger.info(message) + } + } + ).apply { + level = HttpLoggingInterceptor.Level.BODY } - }).apply { - level = HttpLoggingInterceptor.Level.BODY - }) + ) } } .build() @@ -60,13 +70,15 @@ abstract class ProsectorReleaseAnalysisTask : DefaultTask() { ) ).execute() - //todo prosector service not so stable now, should not fail build - //require(result.isSuccessful) { "${result.message()} ${result.errorBody()?.string()}" } - //require(result.body()?.result == "ok") { "Service should return {result:ok} normally" } + // todo prosector service not so stable now, should not fail build + // require(result.isSuccessful) { "${result.message()} ${result.errorBody()?.string()}" } + // require(result.body()?.result == "ok") { "Service should return {result:ok} normally" } ciLogger.info( - "isSuccessful = ${result.isSuccessful}; body = ${result.body()?.result}; errorBody = ${result.errorBody() - ?.string()}" + "isSuccessful = ${result.isSuccessful}; body = ${result.body()?.result}; errorBody = ${ + result.errorBody() + ?.string() + }" ) } catch (e: Throwable) { ciLogger.critical("Prosector upload failed", e) diff --git a/subprojects/gradle/prosector/src/main/kotlin/ProsectorResponse.kt b/subprojects/gradle/prosector/src/main/kotlin/ProsectorResponse.kt index de1a5de65d..ad4c1c943e 100644 --- a/subprojects/gradle/prosector/src/main/kotlin/ProsectorResponse.kt +++ b/subprojects/gradle/prosector/src/main/kotlin/ProsectorResponse.kt @@ -1 +1 @@ -data class ProsectorResponse(val result: String) \ No newline at end of file +data class ProsectorResponse(val result: String) diff --git a/subprojects/gradle/prosector/src/main/kotlin/ReleaseAnalysisMeta.kt b/subprojects/gradle/prosector/src/main/kotlin/ReleaseAnalysisMeta.kt index 8a05c9a472..47d3c3cded 100644 --- a/subprojects/gradle/prosector/src/main/kotlin/ReleaseAnalysisMeta.kt +++ b/subprojects/gradle/prosector/src/main/kotlin/ReleaseAnalysisMeta.kt @@ -4,4 +4,4 @@ data class ReleaseAnalysisMeta( val appPackage: String, @SerializedName("afterBuild") val buildInfo: BuildInfo, val taskType: TaskType = TaskType.RELEASE_ANALYSIS -) \ No newline at end of file +) diff --git a/subprojects/gradle/prosector/src/main/kotlin/TaskType.kt b/subprojects/gradle/prosector/src/main/kotlin/TaskType.kt index ac6266b6f8..43620cb4c9 100644 --- a/subprojects/gradle/prosector/src/main/kotlin/TaskType.kt +++ b/subprojects/gradle/prosector/src/main/kotlin/TaskType.kt @@ -13,4 +13,4 @@ enum class TaskType { */ @SerializedName("release-analysis") RELEASE_ANALYSIS -} \ No newline at end of file +} diff --git a/subprojects/gradle/qapps/src/main/kotlin/com/avito/plugin/QAppsUploadAction.kt b/subprojects/gradle/qapps/src/main/kotlin/com/avito/plugin/QAppsUploadAction.kt index 5bbb5a4a0b..f0a6391c6b 100644 --- a/subprojects/gradle/qapps/src/main/kotlin/com/avito/plugin/QAppsUploadAction.kt +++ b/subprojects/gradle/qapps/src/main/kotlin/com/avito/plugin/QAppsUploadAction.kt @@ -82,12 +82,16 @@ internal class QAppsUploadAction( logger = commonLogger(logger) ) ) - .addInterceptor(HttpLoggingInterceptor(object : HttpLoggingInterceptor.Logger { - override fun log(message: String) { - logger.info(message) + .addInterceptor( + HttpLoggingInterceptor( + object : HttpLoggingInterceptor.Logger { + override fun log(message: String) { + logger.info(message) + } + } + ).apply { + level = HttpLoggingInterceptor.Level.BASIC } - }).apply { - level = HttpLoggingInterceptor.Level.BASIC - }) + ) .build() } diff --git a/subprojects/gradle/qapps/src/main/kotlin/com/avito/plugin/QAppsUploadApi.kt b/subprojects/gradle/qapps/src/main/kotlin/com/avito/plugin/QAppsUploadApi.kt index 428f862541..112ad8f3a4 100644 --- a/subprojects/gradle/qapps/src/main/kotlin/com/avito/plugin/QAppsUploadApi.kt +++ b/subprojects/gradle/qapps/src/main/kotlin/com/avito/plugin/QAppsUploadApi.kt @@ -22,5 +22,4 @@ interface QAppsUploadApi { @Part release_chain: MultipartBody.Part, @Part apk: MultipartBody.Part ): Call - } diff --git a/subprojects/gradle/robolectric/src/main/kotlin/com/avito/android/plugin/RobolectricPlugin.kt b/subprojects/gradle/robolectric/src/main/kotlin/com/avito/android/plugin/RobolectricPlugin.kt index 61697056bb..bbfe597d98 100644 --- a/subprojects/gradle/robolectric/src/main/kotlin/com/avito/android/plugin/RobolectricPlugin.kt +++ b/subprojects/gradle/robolectric/src/main/kotlin/com/avito/android/plugin/RobolectricPlugin.kt @@ -19,7 +19,7 @@ class RobolectricPlugin : Plugin { extension.testOptions.unitTests.isIncludeAndroidResources = true target.dependencies.add("testImplementation", "androidx.test:core:$androidXTestVersion") - target.dependencies.add("testImplementation", target.project(":test:utils:robolectric")) //todo open source + target.dependencies.add("testImplementation", target.project(":test:utils:robolectric")) // todo open source } } } diff --git a/subprojects/gradle/room-config/src/test/kotlin/com/avito/android/plugin/RoomConfigPluginTest.kt b/subprojects/gradle/room-config/src/test/kotlin/com/avito/android/plugin/RoomConfigPluginTest.kt index fae1f57c86..2e91db1bb4 100644 --- a/subprojects/gradle/room-config/src/test/kotlin/com/avito/android/plugin/RoomConfigPluginTest.kt +++ b/subprojects/gradle/room-config/src/test/kotlin/com/avito/android/plugin/RoomConfigPluginTest.kt @@ -1,8 +1,8 @@ package com.avito.android.plugin -import com.avito.test.gradle.module.AndroidLibModule import com.avito.test.gradle.TestProjectGenerator import com.avito.test.gradle.gradlew +import com.avito.test.gradle.module.AndroidLibModule import org.junit.jupiter.api.Test import org.junit.jupiter.api.io.TempDir import java.io.File diff --git a/subprojects/gradle/runner/client/src/test/kotlin/com/avito/runner/scheduler/runner/RunnerIntegrationTest.kt b/subprojects/gradle/runner/client/src/test/kotlin/com/avito/runner/scheduler/runner/RunnerIntegrationTest.kt index 040880a870..83eeade168 100644 --- a/subprojects/gradle/runner/client/src/test/kotlin/com/avito/runner/scheduler/runner/RunnerIntegrationTest.kt +++ b/subprojects/gradle/runner/client/src/test/kotlin/com/avito/runner/scheduler/runner/RunnerIntegrationTest.kt @@ -79,7 +79,7 @@ class RunnerIntegrationTest { coordinate = randomDeviceCoordinate(), installApplicationResults = mutableListOf( MockActionResult.Success(Any()), // Install application - MockActionResult.Success(Any()) // Install test application + MockActionResult.Success(Any()) // Install test application ), gettingDeviceStatusResults = listOf( deviceIsAlive(), // Device status for initializing @@ -98,7 +98,7 @@ class RunnerIntegrationTest { }, runTestsResults = listOf( testPassed(), // Test result for first test - testPassed() // Test result for second test + testPassed() // Test result for second test ) ) val secondDevice = MockDevice( @@ -106,7 +106,7 @@ class RunnerIntegrationTest { coordinate = randomDeviceCoordinate(), installApplicationResults = mutableListOf( MockActionResult.Success(Any()), // Install application - MockActionResult.Success(Any()) // Install test application + MockActionResult.Success(Any()) // Install test application ), clearPackageResults = listOf( succeedClearPackage(), @@ -267,7 +267,6 @@ class RunnerIntegrationTest { minimumFailedCount = 0 ) - val requests = listOf( testRunRequest(scheduling = scheduling), testRunRequest(scheduling = scheduling) @@ -310,7 +309,7 @@ class RunnerIntegrationTest { ).isEqualTo( mapOf( requests[0].let { request -> - request to listOf(request.toPassedRun(device)) // Passed by first try + request to listOf(request.toPassedRun(device)) // Passed by first try }, requests[1].let { request -> request to listOf(request.toFailedRun(device), request.toPassedRun(device)) @@ -353,7 +352,7 @@ class RunnerIntegrationTest { deviceIsAlive(), // Alive status for second try for second test deviceIsAlive(), // Alive status for third try for first test deviceIsAlive(), // Alive status for third try for second test - deviceIsAlive() // Alive status for fourth try for second test + deviceIsAlive() // Alive status for fourth try for second test ), clearPackageResults = listOf( succeedClearPackage(), // Clear test package for second try for first test @@ -382,7 +381,6 @@ class RunnerIntegrationTest { devices.send(device) - val actualResult = runner.runTests(requests, this) device.verify() @@ -460,7 +458,6 @@ class RunnerIntegrationTest { ) ) - devices.send(device) val result = runner.runTests(requests, this) @@ -475,7 +472,8 @@ class RunnerIntegrationTest { }, requests[1].let { request -> request to listOf(request.toPassedRun(device), request.toFailedRun(device)) - }) + } + ) ) } diff --git a/subprojects/gradle/runner/client/src/test/kotlin/com/avito/runner/scheduler/runner/scheduler/TestExecutionStateTest.kt b/subprojects/gradle/runner/client/src/test/kotlin/com/avito/runner/scheduler/runner/scheduler/TestExecutionStateTest.kt index 5b85084cea..a62facbf05 100644 --- a/subprojects/gradle/runner/client/src/test/kotlin/com/avito/runner/scheduler/runner/scheduler/TestExecutionStateTest.kt +++ b/subprojects/gradle/runner/client/src/test/kotlin/com/avito/runner/scheduler/runner/scheduler/TestExecutionStateTest.kt @@ -233,7 +233,6 @@ class TestExecutionStateTest { .that(verdict) .isInstanceOf(TestExecutionState.Verdict.SendResult::class.java) - val results = (verdict as TestExecutionState.Verdict.SendResult).results diff --git a/subprojects/gradle/runner/service/src/main/kotlin/com/avito/runner/service/model/intention/State.kt b/subprojects/gradle/runner/service/src/main/kotlin/com/avito/runner/service/model/intention/State.kt index 695d2047f4..88a713ae57 100644 --- a/subprojects/gradle/runner/service/src/main/kotlin/com/avito/runner/service/model/intention/State.kt +++ b/subprojects/gradle/runner/service/src/main/kotlin/com/avito/runner/service/model/intention/State.kt @@ -2,7 +2,7 @@ package com.avito.runner.service.model.intention data class State( val layers: List, - val digest: String = layers.hashCode().toString() //layers order matter + val digest: String = layers.hashCode().toString() // layers order matter ) { sealed class Layer { diff --git a/subprojects/gradle/runner/service/src/main/kotlin/com/avito/runner/service/worker/DeviceWorkerMessage.kt b/subprojects/gradle/runner/service/src/main/kotlin/com/avito/runner/service/worker/DeviceWorkerMessage.kt index 186d85db94..deeb7ac191 100644 --- a/subprojects/gradle/runner/service/src/main/kotlin/com/avito/runner/service/worker/DeviceWorkerMessage.kt +++ b/subprojects/gradle/runner/service/src/main/kotlin/com/avito/runner/service/worker/DeviceWorkerMessage.kt @@ -23,5 +23,5 @@ sealed class DeviceWorkerMessage { data class WorkerDied( val t: Throwable, val coordinate: DeviceCoordinate - ): DeviceWorkerMessage() + ) : DeviceWorkerMessage() } diff --git a/subprojects/gradle/runner/service/src/main/kotlin/com/avito/runner/service/worker/device/Device.kt b/subprojects/gradle/runner/service/src/main/kotlin/com/avito/runner/service/worker/device/Device.kt index 1adffc7280..7b4010d536 100644 --- a/subprojects/gradle/runner/service/src/main/kotlin/com/avito/runner/service/worker/device/Device.kt +++ b/subprojects/gradle/runner/service/src/main/kotlin/com/avito/runner/service/worker/device/Device.kt @@ -9,8 +9,9 @@ import java.nio.file.Path interface Device { sealed class Signal { - data class Died(val coordinate: DeviceCoordinate): Signal() + data class Died(val coordinate: DeviceCoordinate) : Signal() } + val coordinate: DeviceCoordinate val online: Boolean val model: String diff --git a/subprojects/gradle/runner/service/src/main/kotlin/com/avito/runner/service/worker/device/adb/AdbDevice.kt b/subprojects/gradle/runner/service/src/main/kotlin/com/avito/runner/service/worker/device/adb/AdbDevice.kt index 1f2464c87c..78d36d5790 100644 --- a/subprojects/gradle/runner/service/src/main/kotlin/com/avito/runner/service/worker/device/adb/AdbDevice.kt +++ b/subprojects/gradle/runner/service/src/main/kotlin/com/avito/runner/service/worker/device/adb/AdbDevice.kt @@ -195,9 +195,7 @@ data class AdbDevice( delaySeconds = 2, block = { attempt -> executeBlockingShellCommand( - command = listOf( - "pm", "clear", name - ) + command = listOf("pm", "clear", name) ) logger.debug("Attempt: $attempt: clear package $name completed") }, @@ -436,9 +434,8 @@ data class AdbDevice( output = redirectOutputTo ) - override fun debug(message: String) { - logger.debug("$TAG $message") + logger.debug("$tag $message") } override fun info(message: String) { @@ -446,15 +443,15 @@ data class AdbDevice( } override fun warn(message: String, error: Throwable?) { - logger.warn("$TAG $message", error) + logger.warn("$tag $message", error) } override fun toString(): String { - return "Device $TAG" + return "Device $tag" } // MBS-8531: don't use ADB here to avoid possible recursion - private val TAG: String = "[${coordinate.serial}]" + private val tag: String = "[${coordinate.serial}]" } private const val DEFAULT_COMMAND_TIMEOUT_SECONDS = 5L diff --git a/subprojects/gradle/runner/service/src/main/kotlin/com/avito/runner/service/worker/device/adb/instrumentation/InstrumentationTestEntry.kt b/subprojects/gradle/runner/service/src/main/kotlin/com/avito/runner/service/worker/device/adb/instrumentation/InstrumentationEntry.kt similarity index 100% rename from subprojects/gradle/runner/service/src/main/kotlin/com/avito/runner/service/worker/device/adb/instrumentation/InstrumentationTestEntry.kt rename to subprojects/gradle/runner/service/src/main/kotlin/com/avito/runner/service/worker/device/adb/instrumentation/InstrumentationEntry.kt diff --git a/subprojects/gradle/runner/service/src/main/kotlin/com/avito/runner/service/worker/device/adb/instrumentation/InstrumentationTestCaseRunParser.kt b/subprojects/gradle/runner/service/src/main/kotlin/com/avito/runner/service/worker/device/adb/instrumentation/InstrumentationTestCaseRunParser.kt index 41fd2a09e3..1499cd3650 100644 --- a/subprojects/gradle/runner/service/src/main/kotlin/com/avito/runner/service/worker/device/adb/instrumentation/InstrumentationTestCaseRunParser.kt +++ b/subprojects/gradle/runner/service/src/main/kotlin/com/avito/runner/service/worker/device/adb/instrumentation/InstrumentationTestCaseRunParser.kt @@ -149,12 +149,9 @@ interface InstrumentationTestCaseRunParser { .subList(index + 1, this.size) .firstOrNull { first.clazz == it.clazz - && - first.test == it.test - && - first.current == it.current - && - first.statusCode != it.statusCode + && first.test == it.test + && first.current == it.current + && first.statusCode != it.statusCode } if (second == null) null else first to second diff --git a/subprojects/gradle/runner/service/src/test/kotlin/com/avito/runner/service/worker/device/adb/AdbDeviceParserTest.kt b/subprojects/gradle/runner/service/src/test/kotlin/com/avito/runner/service/worker/device/adb/AdbDeviceParserTest.kt index f8c12ea988..0ac6357413 100644 --- a/subprojects/gradle/runner/service/src/test/kotlin/com/avito/runner/service/worker/device/adb/AdbDeviceParserTest.kt +++ b/subprojects/gradle/runner/service/src/test/kotlin/com/avito/runner/service/worker/device/adb/AdbDeviceParserTest.kt @@ -63,5 +63,4 @@ error: cannot connect to daemon""" } assertThat(error).hasMessageThat().contains("cannot connect to daemon") } - } diff --git a/subprojects/gradle/runner/shared-test/build.gradle.kts b/subprojects/gradle/runner/shared-test/build.gradle.kts index 847ee1a81a..f5d26f1ef8 100644 --- a/subprojects/gradle/runner/shared-test/build.gradle.kts +++ b/subprojects/gradle/runner/shared-test/build.gradle.kts @@ -8,7 +8,7 @@ extra["artifact-id"] = "runner-shared-test" dependencies { api(Dependencies.Test.coroutinesTest) - + compileOnly(gradleApi()) implementation(Dependencies.coroutinesCore) diff --git a/subprojects/gradle/runner/shared-test/src/main/kotlin/com/avito/runner/test/Generator.kt b/subprojects/gradle/runner/shared-test/src/main/kotlin/com/avito/runner/test/Generator.kt index 15abe41fb7..9d6178a7c9 100644 --- a/subprojects/gradle/runner/shared-test/src/main/kotlin/com/avito/runner/test/Generator.kt +++ b/subprojects/gradle/runner/shared-test/src/main/kotlin/com/avito/runner/test/Generator.kt @@ -50,7 +50,6 @@ fun generateInstrumentationTestAction( enableDeviceDebug = enableDeviceDebug ) - fun generateDeviceTestCaseRun( testCaseRun: TestCaseRun = generateTestCaseRun(), deviceData: DeviceData = generateDeviceData() diff --git a/subprojects/gradle/runner/shared-test/src/main/kotlin/com/avito/runner/test/NoOpListener.kt b/subprojects/gradle/runner/shared-test/src/main/kotlin/com/avito/runner/test/NoOpListener.kt index 9ed5bfe94c..9b221cb508 100644 --- a/subprojects/gradle/runner/shared-test/src/main/kotlin/com/avito/runner/test/NoOpListener.kt +++ b/subprojects/gradle/runner/shared-test/src/main/kotlin/com/avito/runner/test/NoOpListener.kt @@ -5,7 +5,7 @@ import com.avito.runner.service.model.TestCase import com.avito.runner.service.model.TestCaseRun import com.avito.runner.service.worker.device.Device -object NoOpListener: TestListener { +object NoOpListener : TestListener { override fun started(device: Device, targetPackage: String, test: TestCase, executionNumber: Int) { // empty } diff --git a/subprojects/gradle/runner/shared-test/src/main/kotlin/com/avito/runner/test/Random.kt b/subprojects/gradle/runner/shared-test/src/main/kotlin/com/avito/runner/test/Random.kt index 6e041a0231..a00375b3c7 100644 --- a/subprojects/gradle/runner/shared-test/src/main/kotlin/com/avito/runner/test/Random.kt +++ b/subprojects/gradle/runner/shared-test/src/main/kotlin/com/avito/runner/test/Random.kt @@ -18,4 +18,4 @@ fun randomString(): String { fun randomBoolean(): Boolean { return random.nextBoolean() -} \ No newline at end of file +} diff --git a/subprojects/gradle/runner/shared/src/main/kotlin/com/avito/runner/CommandLineExecutor.kt b/subprojects/gradle/runner/shared/src/main/kotlin/com/avito/runner/CommandLineExecutor.kt index 96f2b5fdde..d6785af38a 100644 --- a/subprojects/gradle/runner/shared/src/main/kotlin/com/avito/runner/CommandLineExecutor.kt +++ b/subprojects/gradle/runner/shared/src/main/kotlin/com/avito/runner/CommandLineExecutor.kt @@ -81,7 +81,8 @@ interface CommandLineExecutor { ) } } - }, Emitter.BackpressureMode.ERROR + }, + Emitter.BackpressureMode.ERROR ) private fun prepareOutputFile( diff --git a/subprojects/gradle/sentry-config/build.gradle.kts b/subprojects/gradle/sentry-config/build.gradle.kts index 85e996bbac..ad1f3de66f 100644 --- a/subprojects/gradle/sentry-config/build.gradle.kts +++ b/subprojects/gradle/sentry-config/build.gradle.kts @@ -13,4 +13,3 @@ dependencies { implementation(project(":gradle:kotlin-dsl-support")) implementation(Dependencies.funktionaleTry) } - diff --git a/subprojects/gradle/sentry-config/src/main/kotlin/com/avito/android/sentry/ProjectExtensions.kt b/subprojects/gradle/sentry-config/src/main/kotlin/com/avito/android/sentry/ProjectExtensions.kt index 7a80c12c6e..06e229c027 100644 --- a/subprojects/gradle/sentry-config/src/main/kotlin/com/avito/android/sentry/ProjectExtensions.kt +++ b/subprojects/gradle/sentry-config/src/main/kotlin/com/avito/android/sentry/ProjectExtensions.kt @@ -10,7 +10,6 @@ import com.avito.kotlin.dsl.getMandatoryStringProperty import com.avito.kotlin.dsl.getOptionalStringProperty import com.avito.kotlin.dsl.lazyProperty import io.sentry.SentryClient -import okhttp3.HttpUrl import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import org.gradle.api.Project import org.gradle.api.internal.provider.Providers diff --git a/subprojects/gradle/signer/src/main/kotlin/com/avito/plugin/SignArtifactTask.kt b/subprojects/gradle/signer/src/main/kotlin/com/avito/plugin/SignArtifactTask.kt index 5b5a966a6f..e799b77424 100644 --- a/subprojects/gradle/signer/src/main/kotlin/com/avito/plugin/SignArtifactTask.kt +++ b/subprojects/gradle/signer/src/main/kotlin/com/avito/plugin/SignArtifactTask.kt @@ -5,7 +5,6 @@ import com.avito.utils.logging.ciLogger import org.gradle.api.DefaultTask import org.gradle.api.model.ObjectFactory import org.gradle.api.tasks.Input -import org.gradle.api.tasks.Internal import org.gradle.api.tasks.TaskAction import org.gradle.kotlin.dsl.property import java.io.File diff --git a/subprojects/gradle/signer/src/main/kotlin/com/avito/plugin/SignExtension.kt b/subprojects/gradle/signer/src/main/kotlin/com/avito/plugin/SignExtension.kt index 9f7929c2d4..76fa4bce7b 100644 --- a/subprojects/gradle/signer/src/main/kotlin/com/avito/plugin/SignExtension.kt +++ b/subprojects/gradle/signer/src/main/kotlin/com/avito/plugin/SignExtension.kt @@ -8,7 +8,7 @@ open class SignExtension { internal val bundleSignTokens = mutableMapOf() - //todo rename to url + // todo rename to url var host: String? = null fun apk(variant: BuildType, token: String?) { diff --git a/subprojects/gradle/signer/src/main/kotlin/com/avito/plugin/SignServicePlugin.kt b/subprojects/gradle/signer/src/main/kotlin/com/avito/plugin/SignServicePlugin.kt index 4a18907a68..507593ab22 100644 --- a/subprojects/gradle/signer/src/main/kotlin/com/avito/plugin/SignServicePlugin.kt +++ b/subprojects/gradle/signer/src/main/kotlin/com/avito/plugin/SignServicePlugin.kt @@ -1,16 +1,16 @@ package com.avito.plugin +import com.android.build.api.artifact.ArtifactType +import com.android.build.api.variant.Variant import com.android.build.gradle.api.ApplicationVariant import com.avito.android.androidCommonExtension +import com.avito.android.bundleTaskProvider import com.avito.android.withAndroidApp import com.avito.kotlin.dsl.getBooleanProperty import com.avito.kotlin.dsl.hasTasks import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.execution.TaskExecutionGraph -import com.android.build.api.variant.Variant -import com.android.build.api.artifact.ArtifactType -import com.avito.android.bundleTaskProvider import org.gradle.api.tasks.TaskContainer import org.gradle.kotlin.dsl.create import org.gradle.kotlin.dslx.closureOf @@ -65,14 +65,14 @@ class SignServicePlugin : Plugin { override fun apply(target: Project) { val signExtension = target.extensions.create("signService") - //todo rename to `avito.signer.disable` + // todo rename to `avito.signer.disable` if (target.getBooleanProperty("disableSignService")) { return } - //todo explain why do we have multiple options to skip signing - // disableSignService (avito.signer.disable) + avito.signer.allowSkip - // Is it feasible to have only one? + // todo explain why do we have multiple options to skip signing + // disableSignService (avito.signer.disable) + avito.signer.allowSkip + // Is it feasible to have only one? val skipSigning: Boolean = target.getBooleanProperty("avito.signer.allowSkip") target.afterEvaluate { @@ -145,15 +145,17 @@ class SignServicePlugin : Plugin { } if (!skipSigning) { - target.gradle.taskGraph.whenReady(closureOf { - failOnMissingToken( - projectPath = target.path, - variantToBuildType = registeredBuildTypes, - taskExecutionGraph = this, - apkSignTokens = signExtension.apkSignTokens, - bundleSignTokens = signExtension.bundleSignTokens - ) - }) + target.gradle.taskGraph.whenReady( + closureOf { + failOnMissingToken( + projectPath = target.path, + variantToBuildType = registeredBuildTypes, + taskExecutionGraph = this, + apkSignTokens = signExtension.apkSignTokens, + bundleSignTokens = signExtension.bundleSignTokens + ) + } + ) } } diff --git a/subprojects/gradle/signer/src/main/kotlin/com/avito/plugin/SignVerifier.kt b/subprojects/gradle/signer/src/main/kotlin/com/avito/plugin/SignVerifier.kt index b755fa781f..7c892e11af 100644 --- a/subprojects/gradle/signer/src/main/kotlin/com/avito/plugin/SignVerifier.kt +++ b/subprojects/gradle/signer/src/main/kotlin/com/avito/plugin/SignVerifier.kt @@ -27,7 +27,8 @@ interface SignVerifier { Result.WrongSignature(expectedSha1, actualSha1) } }, - { error -> Result.VerificationError(error) }) + { error -> Result.VerificationError(error) } + ) } override fun verifyBundle(bundle: ExistingFile, expectedSha1: String): Result { diff --git a/subprojects/gradle/signer/src/main/kotlin/com/avito/plugin/SignViaServiceAction.kt b/subprojects/gradle/signer/src/main/kotlin/com/avito/plugin/SignViaServiceAction.kt index 2115bbae7f..886ad9b3b1 100644 --- a/subprojects/gradle/signer/src/main/kotlin/com/avito/plugin/SignViaServiceAction.kt +++ b/subprojects/gradle/signer/src/main/kotlin/com/avito/plugin/SignViaServiceAction.kt @@ -57,11 +57,13 @@ internal class SignViaServiceAction( .writeTimeout(1, TimeUnit.MINUTES) .readTimeout(1, TimeUnit.MINUTES) .addInterceptor( - HttpLoggingInterceptor(object : HttpLoggingInterceptor.Logger { - override fun log(message: String) { - ciLogger.info(message) + HttpLoggingInterceptor( + object : HttpLoggingInterceptor.Logger { + override fun log(message: String) { + ciLogger.info(message) + } } - }).setLevel(HttpLoggingInterceptor.Level.BASIC) + ).setLevel(HttpLoggingInterceptor.Level.BASIC) ) .build() diff --git a/subprojects/gradle/signer/src/test/kotlin/com/avito/plugin/SignViaServiceActionTest.kt b/subprojects/gradle/signer/src/test/kotlin/com/avito/plugin/SignViaServiceActionTest.kt index b69799968f..1eb53fbfc4 100644 --- a/subprojects/gradle/signer/src/test/kotlin/com/avito/plugin/SignViaServiceActionTest.kt +++ b/subprojects/gradle/signer/src/test/kotlin/com/avito/plugin/SignViaServiceActionTest.kt @@ -90,5 +90,4 @@ class SignViaServiceActionTest { assertThat(result).isInstanceOf(Try.Success::class.java) } - } diff --git a/subprojects/gradle/slack/src/integTest/kotlin/com/avito/slack/SlackConditionalSenderIntegrationTest.kt b/subprojects/gradle/slack/src/integTest/kotlin/com/avito/slack/SlackConditionalSenderIntegrationTest.kt index 824bbd9763..376f56e25d 100644 --- a/subprojects/gradle/slack/src/integTest/kotlin/com/avito/slack/SlackConditionalSenderIntegrationTest.kt +++ b/subprojects/gradle/slack/src/integTest/kotlin/com/avito/slack/SlackConditionalSenderIntegrationTest.kt @@ -11,7 +11,7 @@ import java.util.UUID internal class SlackConditionalSenderIntegrationTest { - //todo хреново что для локального запуска нужно здесь ENV задавать + // todo хреново что для локального запуска нужно здесь ENV задавать private val testChannel = SlackChannel(requireNotNull(System.getProperty("avito.slack.test.channel"))) private val testToken = requireNotNull(System.getProperty("avito.slack.test.token")) private val slackClient: SlackClient = @@ -43,7 +43,7 @@ internal class SlackConditionalSenderIntegrationTest { assertThat(message).isInstanceOf(Try.Success::class.java) assertThat(message.get().text).contains("second message") - //todo assert thread message + // todo assert thread message } @Test diff --git a/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackBulkSender.kt b/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackBulkSender.kt index 061529d7db..e079923866 100644 --- a/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackBulkSender.kt +++ b/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackBulkSender.kt @@ -18,7 +18,7 @@ interface SlackBulkSender { fun sendBulk(body: Bulk.() -> Unit) } -//todo use Flow API +// todo use Flow API @OptIn(ObsoleteCoroutinesApi::class) class CoroutinesSlackBulkSender( private val sender: SlackMessageSender, @@ -32,7 +32,7 @@ class CoroutinesSlackBulkSender( private val ticker = kotlinx.coroutines.channels.ticker(delayMillis = 1500L, initialDelayMillis = 0L) init { - //todo use Flow + // todo use Flow @Suppress("DEPRECATION") val tickedQueue = requestQueue.zip(ticker) { request, _ -> request } // TODO: Don't use global scope. Unconfined coroutines lead to leaks diff --git a/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackClient.kt b/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackClient.kt index 567af8c56d..df07b6685e 100644 --- a/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackClient.kt +++ b/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackClient.kt @@ -1,5 +1,5 @@ @file:Suppress("DEPRECATION") -//todo use new slack api +// todo use new slack api package com.avito.slack @@ -94,7 +94,6 @@ interface SlackClient : SlackMessageSender, SlackFileUploader { .build() methodsClient.chatUpdate(request).toTry() - }.map { SlackMessage( workspace = workspace, diff --git a/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackStringFormat.kt b/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackStringFormat.kt index 3533bdd834..c598a79c4a 100644 --- a/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackStringFormat.kt +++ b/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/SlackStringFormat.kt @@ -17,5 +17,4 @@ object SlackStringFormat { fun link(label: String, url: String): String = "<$url|$label>" fun link(label: String, url: HttpUrl): String = "<$url|$label>" - } diff --git a/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/model/SlackMessage.kt b/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/model/SlackMessage.kt index 5a2e9686ca..914654fe8a 100644 --- a/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/model/SlackMessage.kt +++ b/subprojects/gradle/slack/src/main/kotlin/com/avito/slack/model/SlackMessage.kt @@ -18,7 +18,7 @@ data class SlackMessage( ) { val link: HttpUrl get() { - val source = StringBuilder("https://${workspace}.slack.com/archives/$channelId/p$id") + val source = StringBuilder("https://$workspace.slack.com/archives/$channelId/p$id") if (threadId != null) { source.append("?thread_ts=$threadId&cid=$channelId") } diff --git a/subprojects/gradle/statsd-config/src/main/kotlin/com/avito/android/stats/ProjectExtensions.kt b/subprojects/gradle/statsd-config/src/main/kotlin/com/avito/android/stats/ProjectExtensions.kt index 5b7b7a9ee4..96d46f6f85 100644 --- a/subprojects/gradle/statsd-config/src/main/kotlin/com/avito/android/stats/ProjectExtensions.kt +++ b/subprojects/gradle/statsd-config/src/main/kotlin/com/avito/android/stats/ProjectExtensions.kt @@ -15,15 +15,17 @@ import org.gradle.api.provider.Provider val Project.statsd: Provider by ProjectProperty.lazy(scope = ROOT_PROJECT) { project -> val logger = project.ciLogger - Providers.of(StatsDSender.Impl( - config = config(project), - logger = { message, error -> - if (error != null) logger.info( - message, - error - ) else logger.debug(message) - } - )) + Providers.of( + StatsDSender.Impl( + config = config(project), + logger = { message, error -> + if (error != null) logger.info( + message, + error + ) else logger.debug(message) + } + ) + ) } val Project.statsdConfig: Provider by ProjectProperty.lazy(scope = ROOT_PROJECT) { project -> diff --git a/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/GradleTestKit.kt b/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/GradleTestKit.kt index 93e0b7a9a8..a3488c78d1 100644 --- a/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/GradleTestKit.kt +++ b/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/GradleTestKit.kt @@ -44,7 +44,7 @@ fun gradlew( .withProjectDir(projectDir) .withArguments(finalArgs) .withEnvironment(environment) - .apply { if(useModuleClasspath) withPluginClasspath() } + .apply { if (useModuleClasspath) withPluginClasspath() } /** * WARNING! it breaks classpath and causes failures in AGP's tasks * see. MBS-5462 diff --git a/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/ManualTempFolder.kt b/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/ManualTempFolder.kt index 3ca0334882..fd82b77dd7 100644 --- a/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/ManualTempFolder.kt +++ b/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/ManualTempFolder.kt @@ -45,26 +45,29 @@ object ManualTempFolder { private fun deleteAllFilesAndDirectories(): SortedMap { val failures = TreeMap() - Files.walkFileTree(dir, object : SimpleFileVisitor() { + Files.walkFileTree( + dir, + object : SimpleFileVisitor() { - override fun visitFile(file: Path, attributes: BasicFileAttributes): FileVisitResult { - return deleteAndContinue(file) - } - - override fun postVisitDirectory(dir: Path, exc: IOException?): FileVisitResult { - return deleteAndContinue(dir) - } + override fun visitFile(file: Path, attributes: BasicFileAttributes): FileVisitResult { + return deleteAndContinue(file) + } - private fun deleteAndContinue(path: Path): FileVisitResult { - try { - Files.delete(path) - } catch (ex: IOException) { - failures[path] = ex + override fun postVisitDirectory(dir: Path, exc: IOException?): FileVisitResult { + return deleteAndContinue(dir) } - return FileVisitResult.CONTINUE + private fun deleteAndContinue(path: Path): FileVisitResult { + try { + Files.delete(path) + } catch (ex: IOException) { + failures[path] = ex + } + + return FileVisitResult.CONTINUE + } } - }) + ) return failures } @@ -76,8 +79,8 @@ object ManualTempFolder { .collect(joining(", ")) val exception = IOException( "Failed to delete temp directory " + dir.toAbsolutePath() - + ". The following paths could not be deleted (see suppressed exceptions for details): " - + joinedPaths + + ". The following paths could not be deleted (see suppressed exceptions for details): " + + joinedPaths ) failures.values.forEach(Consumer { exception.addSuppressed(it) }) return exception @@ -99,4 +102,3 @@ object ManualTempFolder { } } } - diff --git a/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/TestProjectGenerator.kt b/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/TestProjectGenerator.kt index 9931865507..6c8c2fd420 100644 --- a/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/TestProjectGenerator.kt +++ b/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/TestProjectGenerator.kt @@ -34,7 +34,7 @@ class TestProjectGenerator( override val name: String = "test-project", override val plugins: List = emptyList(), override val buildGradleExtra: String = "", - //TODO: don't share complex default values in common test fixtures. Plugin must define them implicitly! + // TODO: don't share complex default values in common test fixtures. Plugin must define them implicitly! override val modules: List = listOf( AndroidAppModule(appA, dependencies = "implementation project(':$sharedModule')"), AndroidAppModule(appB, dependencies = "implementation project(':$sharedModule')"), @@ -140,4 +140,3 @@ private fun generateIncludes(modules: List, prefix: String): String = modules.joinToString(separator = "\n") { "include('$prefix:${it.name}')" + "\n" + generateIncludes(it.modules, "$prefix:${it.name}") } - diff --git a/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/files/AndroidManifest.kt b/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/files/AndroidManifest.kt index 4a45f64831..6258039c6f 100644 --- a/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/files/AndroidManifest.kt +++ b/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/files/AndroidManifest.kt @@ -4,9 +4,10 @@ import com.avito.test.gradle.file import java.io.File internal fun File.androidManifest(packageName: String) = file( - "AndroidManifest.xml", """ - - -""".trimIndent() + name = "AndroidManifest.xml", + content = """ + + + """.trimIndent() ) diff --git a/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/module/AndroidAppModule.kt b/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/module/AndroidAppModule.kt index 3261db676d..9d2fddc26e 100644 --- a/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/module/AndroidAppModule.kt +++ b/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/module/AndroidAppModule.kt @@ -34,7 +34,7 @@ class AndroidAppModule( dir("src") { dir("main") { androidManifest(packageName = packageName) - if(enableKotlinAndroidPlugin || enableKapt) { + if (enableKotlinAndroidPlugin || enableKapt) { dir("kotlin") { kotlinClass("SomeClass", packageName) } @@ -42,17 +42,18 @@ class AndroidAppModule( dir("res") { dir("values") { file( - "id.xml", content = """ - - - + name = "id.xml", + content = """ + + + """.trimIndent() ) } } } dir("androidTest") { - if(enableKotlinAndroidPlugin || enableKapt) { + if (enableKotlinAndroidPlugin || enableKapt) { dir("kotlin") { kotlinClass("SomeTestClass", packageName) instrumentationTests.forEach { it.generateIn(this) } @@ -62,12 +63,13 @@ class AndroidAppModule( } file( - "proguard.pro", """ --ignorewarnings --keep public class * { - public protected *; -} -""".trimIndent() + name = "proguard.pro", + content = """ + -ignorewarnings + -keep public class * { + public protected *; + } + """.trimIndent() ) build_gradle { @@ -77,8 +79,8 @@ class AndroidAppModule( plugins { id 'com.android.application' - ${if(enableKotlinAndroidPlugin || enableKapt) "id 'kotlin-android'" else ""} - ${if(enableKapt) "id 'kotlin-kapt'" else ""} + ${if (enableKotlinAndroidPlugin || enableKapt) "id 'kotlin-android'" else ""} + ${if (enableKapt) "id 'kotlin-kapt'" else ""} ${plugins.joinToString(separator = "\n") { " id '$it'" }} } @@ -100,7 +102,8 @@ android { matchingFallbacks = ["debug"] } } - ${if(enableKotlinAndroidPlugin || enableKapt) """ + ${ + if (enableKotlinAndroidPlugin || enableKapt) """ sourceSets { main { java.srcDir("src/main/kotlin") @@ -112,7 +115,8 @@ android { java.srcDir("src/androidTest/kotlin") } } - """.trimIndent() else ""} + """.trimIndent() else "" + } } afterEvaluate{ @@ -124,10 +128,12 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion") androidTestImplementation("junit:junit:4.13") testImplementation("junit:junit:4.13") - ${if(enableKapt) """ + ${ + if (enableKapt) """ implementation("com.google.dagger:dagger:2.29.1") kapt("com.google.dagger:dagger-compiler:2.29.1") - """.trimIndent() else ""} + """.trimIndent() else "" + } } $customScript diff --git a/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/module/AndroidLibModule.kt b/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/module/AndroidLibModule.kt index eebd1bd219..823064eef6 100644 --- a/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/module/AndroidLibModule.kt +++ b/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/module/AndroidLibModule.kt @@ -12,14 +12,14 @@ import com.avito.test.gradle.sdkVersion import java.io.File class AndroidLibModule( - override val name: String, - override val packageName: String = "com.$name", - override val plugins: List = emptyList(), - override val buildGradleExtra: String = "", - override val modules: List = emptyList(), - override val enableKotlinAndroidPlugin: Boolean = true, - private val dependencies: String = "", - private val mutator: File.() -> Unit = {} + override val name: String, + override val packageName: String = "com.$name", + override val plugins: List = emptyList(), + override val buildGradleExtra: String = "", + override val modules: List = emptyList(), + override val enableKotlinAndroidPlugin: Boolean = true, + private val dependencies: String = "", + private val mutator: File.() -> Unit = {} ) : AndroidModule { override fun generateIn(file: File) { @@ -30,7 +30,7 @@ class AndroidLibModule( """ plugins { id 'com.android.library' - ${if(enableKotlinAndroidPlugin) "id 'kotlin-android'" else ""} + ${if (enableKotlinAndroidPlugin) "id 'kotlin-android'" else ""} ${plugins.joinToString(separator = "\n") { "id '$it'" }} } @@ -39,13 +39,15 @@ $buildGradleExtra android { compileSdkVersion $sdkVersion buildToolsVersion "$buildToolsVersion" - ${if(enableKotlinAndroidPlugin) """ + ${ + if (enableKotlinAndroidPlugin) """ sourceSets { main { java.srcDir("src/main/kotlin") } } - """.trimIndent() else ""} + """.trimIndent() else "" + } } dependencies { @@ -57,7 +59,7 @@ dependencies { } dir("src/main") { androidManifest(packageName = packageName) - if(enableKotlinAndroidPlugin) { + if (enableKotlinAndroidPlugin) { dir("kotlin") { kotlinClass("SomeClass", packageName) } @@ -65,7 +67,8 @@ dependencies { dir("res") { dir("layout") { file( - "lib.xml", content = """ + name = "lib.xml", + content = """ = emptyList(), - override val buildGradleExtra: String = "", - override val modules: List = emptyList(), - private val dependencies: String = "", - private val mutator: File.() -> Unit = {} + override val name: String, + val packageName: String = "com.$name", + override val plugins: List = emptyList(), + override val buildGradleExtra: String = "", + override val modules: List = emptyList(), + private val dependencies: String = "", + private val mutator: File.() -> Unit = {} ) : Module { override fun generateIn(file: File) { @@ -34,7 +34,7 @@ dependencies { $dependencies implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion") } - """.trimIndent() +""".trimIndent() ) } dir("src/main") { diff --git a/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/module/ParentGradleModule.kt b/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/module/ParentGradleModule.kt index 6f889bf82a..ae4f5efba8 100644 --- a/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/module/ParentGradleModule.kt +++ b/subprojects/gradle/test-project/src/main/kotlin/com/avito/test/gradle/module/ParentGradleModule.kt @@ -8,10 +8,10 @@ import java.io.File * Empty module. It setups build.gradle for all child modules */ class ParentGradleModule( - override val name: String, - override val modules: List, - override val plugins: List = emptyList(), - override val buildGradleExtra: String = "" + override val name: String, + override val modules: List, + override val plugins: List = emptyList(), + override val buildGradleExtra: String = "" ) : Module { override fun generateIn(file: File) { diff --git a/subprojects/gradle/test-project/src/test/kotlin/com/avito/test/gradle/TestProjectGeneratorTest.kt b/subprojects/gradle/test-project/src/test/kotlin/com/avito/test/gradle/TestProjectGeneratorTest.kt index 0b54303ab9..b64ef45a9b 100644 --- a/subprojects/gradle/test-project/src/test/kotlin/com/avito/test/gradle/TestProjectGeneratorTest.kt +++ b/subprojects/gradle/test-project/src/test/kotlin/com/avito/test/gradle/TestProjectGeneratorTest.kt @@ -107,11 +107,14 @@ class TestProjectGeneratorTest { @Test fun `generating test project with all module types is successful`() { - val androidApp = AndroidAppModule("app", dependencies = """ + val androidApp = AndroidAppModule( + "app", + dependencies = """ implementation project(':parent:empty:library') implementation project(':parent:empty:kotlin') implementation project(':parent:empty:platform') - """.trimIndent()) + """.trimIndent() + ) val androidLibrary = AndroidLibModule("library") val platform = PlatformModule("platform") val kotlin = KotlinModule("kotlin") diff --git a/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/FlakyTestReporterImpl.kt b/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/FlakyTestReporterImpl.kt index ab1e9916d3..57cd26d52a 100644 --- a/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/FlakyTestReporterImpl.kt +++ b/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/FlakyTestReporterImpl.kt @@ -57,7 +57,8 @@ internal class FlakyTestReporterImpl( return slackClient.sendMessage( SlackSendMessageRequest( channel = channel, - text = """<$buildUrl|Билд на ветке $currentBranch> шел дольше чем нужно, и виноваты эти тесты: + text = +"""<$buildUrl|Билд на ветке $currentBranch> шел дольше чем нужно, и виноваты эти тесты: ``` ${badTests.stringify()} ``` @@ -74,7 +75,8 @@ ${badTests.stringify()} private fun List.stringify(): String = joinToString( separator = "\n", - transform = { "${it.testName} пришлось запустить ${it.attempts} раз; занял суммарно ${formatTime(it.wastedTimeEstimateInSec)}" }) + transform = { "${it.testName} пришлось запустить ${it.attempts} раз; занял суммарно ${formatTime(it.wastedTimeEstimateInSec)}" } + ) private fun determineBadTests(info: List): List { return info diff --git a/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/TestSummaryPlugin.kt b/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/TestSummaryPlugin.kt index 12c8864411..08d5792505 100644 --- a/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/TestSummaryPlugin.kt +++ b/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/TestSummaryPlugin.kt @@ -43,11 +43,12 @@ class TestSummaryPlugin : Plugin { buildUrl.set(extension.buildUrl) @Suppress("UnstableApiUsage") - unitToChannelMapping.set(extension.unitToChannelMapping - .map { map -> map.map { (key, value) -> Team(key) to SlackChannel(value) }.toMap() }) + unitToChannelMapping.set( + extension.unitToChannelMapping + .map { map -> map.map { (key, value) -> Team(key) to SlackChannel(value) }.toMap() } + ) - mentionOnFailures.set(extension.mentionOnFailures - .map { set -> set.map { Team(it) }.toSet() }) + mentionOnFailures.set(extension.mentionOnFailures.map { set -> set.map { Team(it) }.toSet() }) reserveSlackChannel.set(extension.reserveSlackChannel) slackUserName.set(extension.slackUserName) diff --git a/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/analysis/CrossDeviceSuteExtensions.kt b/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/analysis/CrossDeviceSuteExtensions.kt index ae68a74023..1b714e62a9 100644 --- a/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/analysis/CrossDeviceSuteExtensions.kt +++ b/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/analysis/CrossDeviceSuteExtensions.kt @@ -12,7 +12,7 @@ internal fun CrossDeviceSuite.analyzeFailures(): Map normalizer.normalize(message) }) diff --git a/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/compose/SlackSummaryComposerImpl.kt b/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/compose/SlackSummaryComposerImpl.kt index ebdfa26351..69fc2a25f1 100644 --- a/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/compose/SlackSummaryComposerImpl.kt +++ b/subprojects/gradle/test-summary/src/main/kotlin/com/avito/test/summary/compose/SlackSummaryComposerImpl.kt @@ -41,7 +41,7 @@ internal class SlackSummaryComposerImpl(private val reportViewer: ReportViewer) appendln("*Автотесты*: ${testData.automatedCount}") - //todo адекватная разбивка по flaky + // todo адекватная разбивка по flaky appendln(":green_heart: *Зеленые тесты*: ${testData.success} (${testData.percentSuccessOfAutomated}%)") appendln(":warning: *Тесты упали только на некоторых девайсах*: ${testData.failedOnSomeDevicesCount} (${testData.percentFailedOnSomeDevicesOfAutomated}%)") appendln(":red_circle: *Тесты упали на всех девайсах*: ${testData.failedOnAllDevicesCount} (${testData.percentFailedOnAllDevicesOfAutomated}%)") @@ -65,7 +65,6 @@ internal class SlackSummaryComposerImpl(private val reportViewer: ReportViewer) if (rareFailuresCount > 0) { appendln("И еще *$rareFailuresCount* более редких падений из-за различных причин.") } - }.toString() } } diff --git a/subprojects/gradle/test-summary/src/test/kotlin/com/avito/test/summary/analysis/FailureMessageNormalizerTest.kt b/subprojects/gradle/test-summary/src/test/kotlin/com/avito/test/summary/analysis/FailureMessageNormalizerTest.kt index 2986e853c3..36b1bf6f0d 100644 --- a/subprojects/gradle/test-summary/src/test/kotlin/com/avito/test/summary/analysis/FailureMessageNormalizerTest.kt +++ b/subprojects/gradle/test-summary/src/test/kotlin/com/avito/test/summary/analysis/FailureMessageNormalizerTest.kt @@ -21,7 +21,6 @@ class FailureMessageNormalizerTest { ) } - @Test fun regex_with_pattern_replacement() { val normalizer = RegexToPatternMessageNormalizer( diff --git a/subprojects/gradle/test-summary/src/test/kotlin/com/avito/test/summary/compose/SlackSummaryComposerTest.kt b/subprojects/gradle/test-summary/src/test/kotlin/com/avito/test/summary/compose/SlackSummaryComposerTest.kt index e0146feaa6..aed3147aae 100644 --- a/subprojects/gradle/test-summary/src/test/kotlin/com/avito/test/summary/compose/SlackSummaryComposerTest.kt +++ b/subprojects/gradle/test-summary/src/test/kotlin/com/avito/test/summary/compose/SlackSummaryComposerTest.kt @@ -70,7 +70,7 @@ internal class SlackSummaryComposerTest { val message = compose(crossDeviceSuite) assertThat(message).isInstanceOf(Try.Success::class.java) - assertThat(message.get()).contains(":green_heart: *Зеленые тесты*: 3 (60%)") //не 50% потому что manual не берется в расчет + assertThat(message.get()).contains(":green_heart: *Зеленые тесты*: 3 (60%)") // не 50% потому что manual не берется в расчет } @Test diff --git a/subprojects/gradle/tms/src/main/kotlin/com/avito/plugin/MarkReportAsSourceAction.kt b/subprojects/gradle/tms/src/main/kotlin/com/avito/plugin/MarkReportAsSourceAction.kt index a47e1aea1a..e2db6d9192 100644 --- a/subprojects/gradle/tms/src/main/kotlin/com/avito/plugin/MarkReportAsSourceAction.kt +++ b/subprojects/gradle/tms/src/main/kotlin/com/avito/plugin/MarkReportAsSourceAction.kt @@ -45,11 +45,13 @@ class MarkReportAsSourceAction( }, { error -> logger.critical("[$tag] Can't finish report for coordinates: $reportCoordinates", error) - }) + } + ) }, { error -> logger.critical("[$tag] Can't push prepared data: testSuite info", error) - }) + } + ) } GetReportResult.NotFound -> { logger.critical( diff --git a/subprojects/gradle/trace-event/src/main/kotlin/com/avito/android/trace/TraceEvent.kt b/subprojects/gradle/trace-event/src/main/kotlin/com/avito/android/trace/TraceEvent.kt index cf323cef57..73efe996e5 100644 --- a/subprojects/gradle/trace-event/src/main/kotlin/com/avito/android/trace/TraceEvent.kt +++ b/subprojects/gradle/trace-event/src/main/kotlin/com/avito/android/trace/TraceEvent.kt @@ -7,12 +7,14 @@ interface TraceEvent { * The name of the event, as displayed in Trace Viewer */ val eventName: String + /** * The event categories. * This is a comma separated list of categories for the event. * The categories can be used to hide events in the Trace Viewer UI. */ val categories: String? + /** * The event type. * This is a single character which changes depending on the type of event being output @@ -20,15 +22,18 @@ interface TraceEvent { val phase: Char val processId: String val threadId: String? + /** * The tracing clock timestamp of the event. * Somehow `displayTimeUnit` doesn't affect this time unit. */ val timestampMicroseconds: Long + /** * A fixed color name: https://github.com/catapult-project/catapult/blob/master/tracing/tracing/base/color_scheme.html */ val color: String? + /** * Any arguments provided for the event. * Some of the event types have required argument fields, otherwise, you can put any information you wish in here. @@ -59,7 +64,7 @@ data class DurationEvent( // If you provide args to both the Begin and End events then the arguments will be merged. // If there is a duplicate argument value provided the E event argument will be taken and the B event argument will be discarded. @SerializedName("args") override val args: Map? = null -): TraceEvent { +) : TraceEvent { companion object { const val PHASE_BEGIN = 'B' const val PHASE_END = 'E' @@ -88,7 +93,7 @@ data class CompleteEvent( // If you provide args to both the Begin and End events then the arguments will be merged. // If there is a duplicate argument value provided the E event argument will be taken and the B event argument will be discarded. @SerializedName("args") override val args: Map? = null -): TraceEvent { +) : TraceEvent { companion object { const val PHASE = 'X' } @@ -118,7 +123,7 @@ data class InstantEvent( // If you provide args to both the Begin and End events then the arguments will be merged. // If there is a duplicate argument value provided the E event argument will be taken and the B event argument will be discarded. @SerializedName("args") override val args: Map? = null -): TraceEvent { +) : TraceEvent { companion object { const val PHASE = 'i' const val SCOPE_THREAD = "t" diff --git a/subprojects/gradle/trace-event/src/main/kotlin/com/avito/android/trace/TraceReportClient.kt b/subprojects/gradle/trace-event/src/main/kotlin/com/avito/android/trace/TraceReportClient.kt index b75d8e59f6..1e7e2cd9be 100644 --- a/subprojects/gradle/trace-event/src/main/kotlin/com/avito/android/trace/TraceReportClient.kt +++ b/subprojects/gradle/trace-event/src/main/kotlin/com/avito/android/trace/TraceReportClient.kt @@ -57,5 +57,4 @@ class TraceReportClient { } } } - } diff --git a/subprojects/gradle/trace-event/src/test/kotlin/com/avito/android/trace/TraceReportTest.kt b/subprojects/gradle/trace-event/src/test/kotlin/com/avito/android/trace/TraceReportTest.kt index d0ca728389..889b6f7939 100644 --- a/subprojects/gradle/trace-event/src/test/kotlin/com/avito/android/trace/TraceReportTest.kt +++ b/subprojects/gradle/trace-event/src/test/kotlin/com/avito/android/trace/TraceReportTest.kt @@ -67,5 +67,4 @@ class TraceReportTest { assertThat(deserialized).isEqualTo(report) } - } diff --git a/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/Constant.kt b/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/Constant.kt index 2d0bed6d8e..253708a507 100644 --- a/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/Constant.kt +++ b/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/Constant.kt @@ -1,3 +1,3 @@ package com.avito.bytecode -const val DIRTY_STUB = "*" \ No newline at end of file +const val DIRTY_STUB = "*" diff --git a/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/InvocationGraphBuilder.kt b/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/InvocationGraphBuilder.kt index d1231abb65..126635348b 100644 --- a/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/InvocationGraphBuilder.kt +++ b/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/InvocationGraphBuilder.kt @@ -34,4 +34,4 @@ class InvocationGraphBuilder( return invocationGraph } -} \ No newline at end of file +} diff --git a/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/invokes/bytecode/Util.kt b/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/invokes/bytecode/Util.kt index 0b044102da..1ff6312a84 100644 --- a/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/invokes/bytecode/Util.kt +++ b/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/invokes/bytecode/Util.kt @@ -8,4 +8,4 @@ fun InvokeInstruction.getFullMethodName(pool: ConstantPoolGen) = "${getMethodName(pool)}(${getArgumentTypes(pool).joinToString(" ") { it.toString() }})" inline val Method.fullName: String - get() = "$name(${argumentTypes.joinToString(" ") { it.toString() }})" \ No newline at end of file + get() = "$name(${argumentTypes.joinToString(" ") { it.toString() }})" diff --git a/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/invokes/bytecode/tracer/InvokesTracer.kt b/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/invokes/bytecode/tracer/InvokesTracer.kt index b715991edb..7a1cf71dbe 100644 --- a/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/invokes/bytecode/tracer/InvokesTracer.kt +++ b/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/invokes/bytecode/tracer/InvokesTracer.kt @@ -11,7 +11,7 @@ interface InvokesTracer { fun trace(context: Context, listener: InvokesListener) } -class InvokesTracerImpl: InvokesTracer { +class InvokesTracerImpl : InvokesTracer { override fun trace(context: Context, listener: InvokesListener) { context.classes.values.parallelStream() diff --git a/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/invokes/model/InvocationTo.kt b/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/invokes/model/InvocationTo.kt index 1be78773bd..9865217265 100644 --- a/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/invokes/model/InvocationTo.kt +++ b/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/invokes/model/InvocationTo.kt @@ -8,4 +8,3 @@ data class InvocationTo( val fullName: String get() = "$className.$methodNameWithArguments" } - diff --git a/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/metadata/DuplicateIdChecker.kt b/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/metadata/DuplicateIdChecker.kt index d53c94f608..b2e91426c7 100644 --- a/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/metadata/DuplicateIdChecker.kt +++ b/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/metadata/DuplicateIdChecker.kt @@ -9,13 +9,15 @@ interface DuplicateIdChecker { class Impl(private val unknownId: Int) : DuplicateIdChecker { override fun check(screenToId: Set): Result = - Result(screenToId - .groupBy( - keySelector = { it.rootViewRId }, - valueTransform = { it.screenClass }) - .filter { it.key != unknownId.toString() && it.value.size > 1 } - .map { DuplicateId(it.key, it.value) } - .toSet() + Result( + screenToId + .groupBy( + keySelector = { it.rootViewRId }, + valueTransform = { it.screenClass } + ) + .filter { it.key != unknownId.toString() && it.value.size > 1 } + .map { DuplicateId(it.key, it.value) } + .toSet() ) } @@ -25,4 +27,4 @@ interface DuplicateIdChecker { val hasDuplicates: Boolean = ids.isNotEmpty() } -} \ No newline at end of file +} diff --git a/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/metadata/IdFieldExtractor.kt b/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/metadata/IdFieldExtractor.kt index 710755f381..fea6bdd35f 100644 --- a/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/metadata/IdFieldExtractor.kt +++ b/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/metadata/IdFieldExtractor.kt @@ -2,7 +2,6 @@ package com.avito.bytecode.metadata import com.avito.bytecode.invokes.bytecode.context.Context import org.apache.bcel.classfile.JavaClass -import java.lang.RuntimeException interface IdFieldExtractor { @@ -32,7 +31,8 @@ interface IdFieldExtractor { ) } catch (t: Throwable) { throw RuntimeException( - "Failed to get field value: $fieldName from class: ${clazz.className}", t + "Failed to get field value: $fieldName from class: ${clazz.className}", + t ) } } @@ -42,4 +42,5 @@ interface IdFieldExtractor { } } -fun Set.toMap(): Map = map { it.screenClass to it.rootViewRId.toInt() }.toMap() +fun Set.toMap(): Map = + map { it.screenClass to it.rootViewRId.toInt() }.toMap() diff --git a/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/report/CompositeReporter.kt b/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/report/CompositeReporter.kt index 9b8ada84ec..d63b93a8e8 100644 --- a/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/report/CompositeReporter.kt +++ b/subprojects/gradle/ui-test-bytecode-analyzer/src/main/kotlin/com/avito/bytecode/report/CompositeReporter.kt @@ -4,7 +4,6 @@ class CompositeReporter( private val reporters: List ) : DataReporter { - override fun report(data: T) { reporters.forEach { it.report(data) } } diff --git a/subprojects/gradle/upload-cd-build-result/src/main/kotlin/com/avito/cd/CdBuildConfig.kt b/subprojects/gradle/upload-cd-build-result/src/main/kotlin/com/avito/cd/CdBuildConfig.kt index f88fc21653..45670e3526 100644 --- a/subprojects/gradle/upload-cd-build-result/src/main/kotlin/com/avito/cd/CdBuildConfig.kt +++ b/subprojects/gradle/upload-cd-build-result/src/main/kotlin/com/avito/cd/CdBuildConfig.kt @@ -61,7 +61,7 @@ data class CdBuildConfig( val isRelease: Boolean ) : Deployment() - data class Unknown(val type: String): Deployment() + data class Unknown(val type: String) : Deployment() enum class Track { @SerializedName("alpha") @@ -78,9 +78,3 @@ data class CdBuildConfig( } } } - - - - - - diff --git a/subprojects/gradle/upload-cd-build-result/src/main/kotlin/com/avito/cd/CdBuildConfigValidator.kt b/subprojects/gradle/upload-cd-build-result/src/main/kotlin/com/avito/cd/CdBuildConfigValidator.kt index 6a22192e6a..a875d90be7 100644 --- a/subprojects/gradle/upload-cd-build-result/src/main/kotlin/com/avito/cd/CdBuildConfigValidator.kt +++ b/subprojects/gradle/upload-cd-build-result/src/main/kotlin/com/avito/cd/CdBuildConfigValidator.kt @@ -30,7 +30,7 @@ internal class CdBuildConfigValidator(private val config: CdBuildConfig) { require(deployments.size <= 1) { "Must be one Qapps deployment, but was: $deployments" } - if(deployments.isNotEmpty()){ + if (deployments.isNotEmpty()) { require(config.schemaVersion >= 2) { "Qapps deployments is supported only in the 2'nd version of contract" } diff --git a/subprojects/gradle/upload-cd-build-result/src/main/kotlin/com/avito/cd/ProjectExtentions.kt b/subprojects/gradle/upload-cd-build-result/src/main/kotlin/com/avito/cd/ProjectExtentions.kt index 51b4ac0eee..af0a44f608 100644 --- a/subprojects/gradle/upload-cd-build-result/src/main/kotlin/com/avito/cd/ProjectExtentions.kt +++ b/subprojects/gradle/upload-cd-build-result/src/main/kotlin/com/avito/cd/ProjectExtentions.kt @@ -41,7 +41,6 @@ private class CdBuildConfigFactory : (Project) -> Provider { } } - val Project.isCdBuildConfigPresent get() = cdBuildConfig.isPresent diff --git a/subprojects/gradle/upload-cd-build-result/src/main/kotlin/com/avito/cd/Providers.kt b/subprojects/gradle/upload-cd-build-result/src/main/kotlin/com/avito/cd/Providers.kt index 80afd34da3..e355327d0d 100644 --- a/subprojects/gradle/upload-cd-build-result/src/main/kotlin/com/avito/cd/Providers.kt +++ b/subprojects/gradle/upload-cd-build-result/src/main/kotlin/com/avito/cd/Providers.kt @@ -34,9 +34,11 @@ object Providers { .build() ) } - .addInterceptor(HttpLoggingInterceptor(logger).apply { - level = HttpLoggingInterceptor.Level.BODY - }) + .addInterceptor( + HttpLoggingInterceptor(logger).apply { + level = HttpLoggingInterceptor.Level.BODY + } + ) .build() } } diff --git a/subprojects/gradle/upload-cd-build-result/src/main/kotlin/com/avito/cd/UploadCdBuildResultTask.kt b/subprojects/gradle/upload-cd-build-result/src/main/kotlin/com/avito/cd/UploadCdBuildResultTask.kt index 5054101964..034d389a3e 100644 --- a/subprojects/gradle/upload-cd-build-result/src/main/kotlin/com/avito/cd/UploadCdBuildResultTask.kt +++ b/subprojects/gradle/upload-cd-build-result/src/main/kotlin/com/avito/cd/UploadCdBuildResultTask.kt @@ -15,12 +15,11 @@ import org.gradle.api.DefaultTask import org.gradle.api.tasks.TaskAction import javax.inject.Inject -//TODO internal? +// TODO internal? const val uploadCdBuildResultTaskName = "uploadCdBuildResult" -abstract class UploadCdBuildResultTask -@Inject constructor( +abstract class UploadCdBuildResultTask @Inject constructor( private val uiTestConfiguration: String, private val user: String, private val password: String, @@ -40,7 +39,7 @@ abstract class UploadCdBuildResultTask client = Providers.client( user = user, password = password, - logger = object: HttpLoggingInterceptor.Logger { + logger = object : HttpLoggingInterceptor.Logger { override fun log(message: String) { project.ciLogger.info(message) } @@ -101,7 +100,7 @@ internal class UploadCdBuildResultTaskAction( val response = client.newCall(request).execute() if (!suppressErrors && !response.isSuccessful) { - throw RuntimeException("Upload build result failed: ${response.code} ${response.body.toString()}") + throw RuntimeException("Upload build result failed: ${response.code} ${response.body}") } } } diff --git a/subprojects/gradle/upload-cd-build-result/src/test/kotlin/com/avito/cd/CdBuildConfigDeserializationTest.kt b/subprojects/gradle/upload-cd-build-result/src/test/kotlin/com/avito/cd/CdBuildConfigDeserializationTest.kt index 46a8b0d9da..33f913106c 100644 --- a/subprojects/gradle/upload-cd-build-result/src/test/kotlin/com/avito/cd/CdBuildConfigDeserializationTest.kt +++ b/subprojects/gradle/upload-cd-build-result/src/test/kotlin/com/avito/cd/CdBuildConfigDeserializationTest.kt @@ -83,4 +83,3 @@ class CdBuildConfigDeserializationTest { create() } } - diff --git a/subprojects/gradle/upload-to-googleplay/src/main/kotlin/com/avito/upload_to_googleplay/GooglePlayDeployer.kt b/subprojects/gradle/upload-to-googleplay/src/main/kotlin/com/avito/upload_to_googleplay/GooglePlayDeployer.kt index 317b4b96d2..e5e47da218 100644 --- a/subprojects/gradle/upload-to-googleplay/src/main/kotlin/com/avito/upload_to_googleplay/GooglePlayDeployer.kt +++ b/subprojects/gradle/upload-to-googleplay/src/main/kotlin/com/avito/upload_to_googleplay/GooglePlayDeployer.kt @@ -152,11 +152,13 @@ interface GooglePlayDeployer { deploy.track, Track().also { track -> track.track = deploy.track - track.releases = listOf(TrackRelease() - .also { release -> - release.versionCodes = listOf(versionCode.toLong()) - release.status = "completed" - }) + track.releases = listOf( + TrackRelease() + .also { release -> + release.versionCodes = listOf(versionCode.toLong()) + release.status = "completed" + } + ) } ).execute() logger.info("Updated track is $track") diff --git a/subprojects/gradle/worker/build.gradle.kts b/subprojects/gradle/worker/build.gradle.kts index d31ada97be..84dcae2ee7 100644 --- a/subprojects/gradle/worker/build.gradle.kts +++ b/subprojects/gradle/worker/build.gradle.kts @@ -6,4 +6,4 @@ plugins { dependencies { api(gradleApi()) -} \ No newline at end of file +}