-
-
Notifications
You must be signed in to change notification settings - Fork 122
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Co-authored-by: Konstantin Aksenov <aksenov.kostya@gmail.com>
- Loading branch information
Showing
21 changed files
with
578 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
...ation/src/main/kotlin/com/malinskiy/marathon/config/vendor/ios/TestParserConfiguration.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| package com.malinskiy.marathon.config.vendor.ios | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonSubTypes | ||
| import com.fasterxml.jackson.annotation.JsonTypeInfo | ||
|
|
||
| @JsonTypeInfo( | ||
| use = JsonTypeInfo.Id.NAME, | ||
| include = JsonTypeInfo.As.PROPERTY, | ||
| property = "type" | ||
| ) | ||
| @JsonSubTypes( | ||
| JsonSubTypes.Type(value = TestParserConfiguration.NmTestParserConfiguration::class, name = "nm"), | ||
| JsonSubTypes.Type(value = TestParserConfiguration.XCTestParserConfiguration::class, name = "xctest"), | ||
| ) | ||
| sealed class TestParserConfiguration { | ||
| object NmTestParserConfiguration : TestParserConfiguration() | ||
| object XCTestParserConfiguration : TestParserConfiguration() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
114 changes: 114 additions & 0 deletions
114
vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/XCTestParser.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| package com.malinskiy.marathon.ios | ||
|
|
||
| import com.malinskiy.marathon.config.Configuration | ||
| import com.malinskiy.marathon.config.exceptions.ConfigurationException | ||
| import com.malinskiy.marathon.config.vendor.VendorConfiguration | ||
| import com.malinskiy.marathon.device.Device | ||
| import com.malinskiy.marathon.exceptions.TestParsingException | ||
| import com.malinskiy.marathon.execution.RemoteTestParser | ||
| import com.malinskiy.marathon.execution.withRetry | ||
| import com.malinskiy.marathon.ios.model.AppleTestBundle | ||
| import com.malinskiy.marathon.ios.test.TestEvent | ||
| import com.malinskiy.marathon.ios.test.TestRequest | ||
| import com.malinskiy.marathon.ios.test.TestStarted | ||
| import com.malinskiy.marathon.log.MarathonLogging | ||
| import com.malinskiy.marathon.test.Test | ||
| import kotlinx.coroutines.CancellationException | ||
| import kotlinx.coroutines.channels.ReceiveChannel | ||
| import kotlin.io.path.outputStream | ||
|
|
||
| class XCTestParser( | ||
| private val configuration: Configuration, | ||
| private val vendorConfiguration: VendorConfiguration.IOSConfiguration, | ||
| private val testBundleIdentifier: AppleTestBundleIdentifier | ||
| ) : RemoteTestParser<AppleDeviceProvider> { | ||
| private val logger = MarathonLogging.logger(XCTestParser::class.java.simpleName) | ||
|
|
||
| override suspend fun extract(device: Device): List<Test> { | ||
| return withRetry(3, 0) { | ||
| try { | ||
| val device = | ||
| device as? AppleSimulatorDevice ?: throw ConfigurationException("Unexpected device type for remote test parsing") | ||
| return@withRetry parseTests(device, configuration, vendorConfiguration) | ||
| } catch (e: CancellationException) { | ||
| throw e | ||
| } catch (e: Exception) { | ||
| logger.debug(e) { "Remote parsing failed. Retrying" } | ||
| throw e | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private suspend fun parseTests( | ||
| device: AppleSimulatorDevice, | ||
| configuration: Configuration, | ||
| vendorConfiguration: VendorConfiguration.IOSConfiguration | ||
| ): List<Test> { | ||
| val appleApplicationInstaller = AppleApplicationInstaller(configuration, vendorConfiguration, testBundleIdentifier) | ||
| appleApplicationInstaller.prepareInstallation(device, useXctestParser = true) | ||
|
|
||
| val dylib = javaClass.getResourceAsStream("/libxctest-parser.dylib") | ||
| val tempFile = kotlin.io.path.createTempFile().apply { | ||
| outputStream().use { | ||
| dylib.copyTo(it) | ||
| } | ||
| }.toFile() | ||
| val remoteLibParseTests = device.remoteFileManager.remoteXctestParserFile() | ||
| if (!device.pushFile(tempFile, remoteLibParseTests)) { | ||
| throw TestParsingException("failed to push libparse-tests.dylib for test parsing") | ||
| } | ||
|
|
||
| val remoteXctestrunFile = device.remoteFileManager.remoteXctestrunFile() | ||
| val remoteDir = device.remoteFileManager.parentOf(remoteXctestrunFile) | ||
|
|
||
| logger.debug("Remote xctestrun = $remoteXctestrunFile") | ||
|
|
||
| val runnerRequest = TestRequest( | ||
| workdir = remoteDir, | ||
| remoteXctestrun = remoteXctestrunFile, | ||
| coverage = false, | ||
| ) | ||
| var channel: ReceiveChannel<List<TestEvent>>? = null | ||
| var tests = mutableSetOf<Test>() | ||
| try { | ||
| val localChannel = device.executeTestRequest(runnerRequest) | ||
| channel = localChannel | ||
| for (events in localChannel) { | ||
| for (event in events) { | ||
| when (event) { | ||
| is TestStarted -> { | ||
| tests.add(event.id) | ||
| } | ||
| else -> Unit | ||
| } | ||
| } | ||
| } | ||
|
|
||
| logger.debug { "Execution finished" } | ||
| } catch (e: CancellationException) { | ||
| val errorMessage = "Test parsing got stuck. " + | ||
| "You can increase the timeout in settings if it's too strict" | ||
| logger.error(e) { errorMessage } | ||
| } finally { | ||
| channel?.cancel() | ||
| } | ||
|
|
||
| val xctest = vendorConfiguration.bundle?.xctest ?: throw IllegalArgumentException("No test bundle provided") | ||
| val possibleTestBinaries = xctest.listFiles()?.filter { it.isFile && it.extension == "" } | ||
| ?: throw ConfigurationException("missing test binaries in xctest folder at $xctest") | ||
| val testBinary = when (possibleTestBinaries.size) { | ||
| 0 -> throw ConfigurationException("missing test binaries in xctest folder at $xctest") | ||
| 1 -> possibleTestBinaries[0] | ||
| else -> { | ||
| logger.warn { "Multiple test binaries present in xctest folder" } | ||
| possibleTestBinaries.find { it.name == xctest.nameWithoutExtension } ?: possibleTestBinaries.first() | ||
| } | ||
| } | ||
|
|
||
| val testBundle = AppleTestBundle(vendorConfiguration.bundle?.application, xctest, testBinary) | ||
| val result = tests.toList() | ||
| result.forEach { testBundleIdentifier.put(it, testBundle) } | ||
|
|
||
| return result | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 4 additions & 3 deletions
7
vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/test/TestRequest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,17 @@ | ||
| package com.malinskiy.marathon.ios.test | ||
|
|
||
| import com.malinskiy.marathon.test.Test | ||
| import com.malinskiy.marathon.test.toTestName | ||
|
|
||
| data class TestRequest( | ||
| val workdir: String, | ||
| val remoteXctestrun: String, | ||
| val tests: List<Test>, | ||
| val xcresult: String, | ||
| val coverage: Boolean, | ||
| val tests: List<Test>? = null, | ||
| val xcresult: String? = null, | ||
| ) { | ||
| fun toXcodebuildTestFilter(): Array<String> { | ||
| return tests.map { "'-only-testing:${it.pkg}/${it.clazz}/${it.method}'" }.toTypedArray() | ||
| return tests?.map { "'-only-testing:${it.toTestName(packageSeparator = '/', methodSeparator = '/')}'" }?.toTypedArray() ?: emptyArray() | ||
| } | ||
| } | ||
|
|
Oops, something went wrong.