Skip to content

Commit 012f6b5

Browse files
committed
feat(apple): fix tests and add apple macos vendor
1 parent 07e0b3f commit 012f6b5

File tree

11 files changed

+47
-2
lines changed

11 files changed

+47
-2
lines changed

settings.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ include("core")
1818
include("configuration")
1919
include("vendor:vendor-android")
2020
include("vendor:vendor-apple:ios")
21+
include("vendor:vendor-apple:macos")
2122
include("vendor:vendor-apple:base")
2223
include("vendor:vendor-test")
2324
include("marathon-gradle-plugin")

vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/BaseCommandExecutorTest.kt

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
package com.malinskiy.marathon.ios.cmd
44

5+
import com.malinskiy.marathon.apple.ios.cmd.CommandExecutor
56
import kotlinx.coroutines.Dispatchers
67
import kotlinx.coroutines.async
78
import kotlinx.coroutines.delay

vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/local/KotlinProcessCommandExecutorTest.kt

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.malinskiy.marathon.ios.cmd.local
22

3-
import com.malinskiy.marathon.apple.ios.cmd.BaseCommandExecutorTest
3+
import com.malinskiy.marathon.apple.ios.cmd.local.KotlinProcessCommandExecutor
4+
import com.malinskiy.marathon.ios.cmd.BaseCommandExecutorTest
5+
46

57
class KotlinProcessCommandExecutorTest : BaseCommandExecutorTest() {
68
override fun createExecutor() = KotlinProcessCommandExecutor()

vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/cmd/remote/ssh/sshj/SshjCommandExecutorTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.malinskiy.marathon.ios.cmd.remote.ssh.sshj
22

3-
import com.malinskiy.marathon.apple.ios.cmd.BaseCommandExecutorTest
43
import com.malinskiy.marathon.apple.ios.cmd.remote.ssh.sshj.auth.SshAuthentication
4+
import com.malinskiy.marathon.ios.cmd.BaseCommandExecutorTest
55
import org.testcontainers.junit.jupiter.Container
66
import org.testcontainers.junit.jupiter.Testcontainers
77

vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/configuration/AppleTargetTest.kt

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.malinskiy.marathon.ios.configuration
22

3+
import com.malinskiy.marathon.apple.ios.configuration.AppleTarget
34
import org.amshove.kluent.shouldBeEqualTo
45
import org.junit.jupiter.params.ParameterizedTest
56
import org.junit.jupiter.params.provider.CsvSource

vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/configuration/MarathondevicesTest.kt

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator
66
import com.fasterxml.jackson.module.kotlin.KotlinFeature
77
import com.fasterxml.jackson.module.kotlin.KotlinModule
88
import com.fasterxml.jackson.module.kotlin.readValue
9+
import com.malinskiy.marathon.apple.ios.configuration.AppleTarget
10+
import com.malinskiy.marathon.apple.ios.configuration.Marathondevices
11+
import com.malinskiy.marathon.apple.ios.configuration.Transport
12+
import com.malinskiy.marathon.apple.ios.configuration.Worker
913
import com.malinskiy.marathon.config.vendor.ios.SshAuthentication
1014
import org.amshove.kluent.shouldBeEqualTo
1115
import org.junit.jupiter.api.BeforeEach

vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/logparser/parser/TestRunProgressParserTest.kt

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.malinskiy.marathon.ios.logparser.parser
22

33
import assertk.assertThat
44
import assertk.assertions.isEqualTo
5+
import com.malinskiy.marathon.apple.ios.logparser.parser.TestRunProgressParser
56
import com.malinskiy.marathon.apple.ios.test.TestEvent
67
import com.malinskiy.marathon.time.Timer
78
import org.junit.jupiter.api.BeforeEach

vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/v0/XctestrunTest.kt

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.malinskiy.marathon.ios.xctestrun.v0
22

33
import com.malinskiy.marathon.apple.ios.plist.PropertyList
4+
import com.malinskiy.marathon.apple.ios.xctestrun.v0.TestTarget
5+
import com.malinskiy.marathon.apple.ios.xctestrun.v0.Xctestrun
46
import org.amshove.kluent.shouldBeEqualTo
57
import org.junit.jupiter.api.Test
68
import java.io.ByteArrayOutputStream

vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/v1/XctestrunTest.kt

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.malinskiy.marathon.ios.xctestrun.v1
22

33
import com.malinskiy.marathon.apple.ios.plist.PropertyList
4+
import com.malinskiy.marathon.apple.ios.xctestrun.v1.Xctestrun
45
import org.amshove.kluent.shouldBeEqualTo
56
import org.amshove.kluent.shouldContainSame
67
import org.junit.jupiter.api.Test

vendor/vendor-apple/ios/src/test/kotlin/com/malinskiy/marathon/ios/xctestrun/v2/XctestrunTest.kt

+6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
package com.malinskiy.marathon.ios.xctestrun.v2
22

33
import com.malinskiy.marathon.apple.ios.plist.PropertyList
4+
import com.malinskiy.marathon.apple.ios.xctestrun.v2.CodeCoverageBuildableInfo
5+
import com.malinskiy.marathon.apple.ios.xctestrun.v2.TestConfiguration
6+
import com.malinskiy.marathon.apple.ios.xctestrun.v2.TestPlan
7+
import com.malinskiy.marathon.apple.ios.xctestrun.v2.TestTarget
8+
import com.malinskiy.marathon.apple.ios.xctestrun.v2.Xctestrun
49
import org.amshove.kluent.shouldBeEqualTo
510
import org.junit.jupiter.api.Test
611
import java.io.ByteArrayOutputStream
712
import java.io.File
13+
import com.malinskiy.marathon.apple.ios.xctestrun.v2.Metadata as Metadata
814

915
class XctestrunTest {
1016
@Test
+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
plugins {
2+
`java-library`
3+
jacoco
4+
id("org.jetbrains.kotlin.jvm")
5+
id("org.jetbrains.dokka")
6+
}
7+
8+
dependencies {
9+
implementation(project(":vendor:vendor-apple:base"))
10+
testImplementation(TestLibraries.kluent)
11+
testImplementation(TestLibraries.assertk)
12+
testImplementation(TestLibraries.mockitoKotlin)
13+
testImplementation(TestLibraries.testContainers)
14+
testImplementation(TestLibraries.testContainersJupiter)
15+
testImplementation(TestLibraries.junit5)
16+
testImplementation(TestLibraries.coroutinesTest)
17+
testRuntimeOnly(TestLibraries.jupiterEngine)
18+
}
19+
20+
setupDeployment()
21+
setupKotlinCompiler()
22+
setupTestTask()
23+
24+
tasks.jar.configure {
25+
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
26+
}

0 commit comments

Comments
 (0)