Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dex and gradle #538

Merged
merged 1 commit into from
Apr 5, 2019
+17 −15
Merged

Update dex and gradle #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions release_notes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## next (unreleased)

- [#538](https://github.com/TestArmada/flank/pull/538) Update `dextestparser`. Fixes APK parsing crash. ([bootstraponline](https://github.com/bootstraponline))
- [#536](https://github.com/TestArmada/flank/pull/536) Always calculate exit code from matrix status instead of JUnit XML. ([bootstraponline](https://github.com/bootstraponline))
-

## v5.0.1
Expand Down
2 changes: 1 addition & 1 deletion test_runner/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ dependencies {
implementation("com.google.apis:google-api-services-toolresults:v1beta3-rev20190207-1.28.0")

// https://github.com/linkedin/dex-test-parser/releases
implementation("com.linkedin.dextestparser:parser:2.0.1")
implementation("com.linkedin.dextestparser:parser:2.1.0")

// NOTE: iOS support isn't in the public artifact. Use testing jar generated from the private gcloud CLI json
// https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.google.apis%22%20AND%20a%3A%22google-api-services-testing%22
Expand Down
2 changes: 1 addition & 1 deletion test_runner/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
26 changes: 13 additions & 13 deletions test_runner/src/test/kotlin/ftl/filter/TestFiltersTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ val BAR_PACKAGE = TestMethod("bar.ClassName#testName", emptyList())
val FOO_CLASSNAME = TestMethod("whatever.Foo#testName", emptyList())
val BAR_CLASSNAME = TestMethod("whatever.Bar#testName", emptyList())
val WITHOUT_IGNORE_ANNOTATION = TestMethod("whatever.Foo#testName", emptyList())
val WITH_IGNORE_ANNOTATION = TestMethod("whatever.Foo#testName", listOf(TestAnnotation("org.junit.Ignore", emptyMap())))
val WITH_FOO_ANNOTATION = TestMethod("whatever.Foo#testName", listOf(TestAnnotation("Foo", emptyMap())))
val WITH_BAR_ANNOTATION = TestMethod("whatever.Foo#testName", listOf(TestAnnotation("Bar", emptyMap())))
val WITH_IGNORE_ANNOTATION = TestMethod("whatever.Foo#testName", listOf(TestAnnotation("org.junit.Ignore", emptyMap(), false)))
val WITH_FOO_ANNOTATION = TestMethod("whatever.Foo#testName", listOf(TestAnnotation("Foo", emptyMap(), false)))
val WITH_BAR_ANNOTATION = TestMethod("whatever.Foo#testName", listOf(TestAnnotation("Bar", emptyMap(), false)))
val WITHOUT_FOO_ANNOTATION = TestMethod("whatever.Foo#testName", emptyList())
val WITH_FOO_ANNOTATION_AND_PACKAGE = TestMethod("foo.Bar#testName", listOf(TestAnnotation("Foo", emptyMap())))
val WITH_LARGE_ANNOTATION = TestMethod("whatever.Foo#testName", listOf(TestAnnotation("LargeTest", emptyMap())))
val WITH_MEDIUM_ANNOTATION = TestMethod("whatever.Foo#testName", listOf(TestAnnotation("MediumTest", emptyMap())))
val WITH_SMALL_ANNOTATION = TestMethod("whatever.Foo#testName", listOf(TestAnnotation("SmallTest", emptyMap())))
val WITH_FOO_ANNOTATION_AND_PACKAGE = TestMethod("foo.Bar#testName", listOf(TestAnnotation("Foo", emptyMap(), false)))
val WITH_LARGE_ANNOTATION = TestMethod("whatever.Foo#testName", listOf(TestAnnotation("LargeTest", emptyMap(), false)))
val WITH_MEDIUM_ANNOTATION = TestMethod("whatever.Foo#testName", listOf(TestAnnotation("MediumTest", emptyMap(), false)))
val WITH_SMALL_ANNOTATION = TestMethod("whatever.Foo#testName", listOf(TestAnnotation("SmallTest", emptyMap(), false)))
val WITHOUT_LARGE_ANNOTATION = TestMethod("whatever.Foo#testName", emptyList())
val WITHOUT_MEDIUM_ANNOTATION = TestMethod("whatever.Foo#testName", emptyList())
val WITHOUT_SMALL_ANNOTATION = TestMethod("whatever.Foo#testName", emptyList())
Expand All @@ -33,9 +33,9 @@ class TestFiltersTest {
@Test
fun testIgnoreMultipleAnnotations() {
val m1 = TestMethod("com.example.app.ExampleUiTest#testFails", listOf(
TestAnnotation("org.junit.runner.RunWith", emptyMap()),
TestAnnotation("org.junit.Ignore", emptyMap()),
TestAnnotation("org.junit.Test", emptyMap())
TestAnnotation("org.junit.runner.RunWith", emptyMap(), false),
TestAnnotation("org.junit.Ignore", emptyMap(), false),
TestAnnotation("org.junit.Test", emptyMap(), false)
))

val filter = fromTestTargets(listOf("class com.example.app.ExampleUiTest#testFails"))
Expand Down Expand Up @@ -206,9 +206,9 @@ class TestFiltersTest {
}

private fun getTestMethodSet(): List<TestMethod> {
val m1 = TestMethod("a.b#c", listOf(TestAnnotation("org.junit.Ignore", emptyMap())))
val m2 = TestMethod("d.e#f", listOf(TestAnnotation("Foo", emptyMap())))
val m3 = TestMethod("h.i#j", listOf(TestAnnotation("Bar", emptyMap())))
val m1 = TestMethod("a.b#c", listOf(TestAnnotation("org.junit.Ignore", emptyMap(), false)))
val m2 = TestMethod("d.e#f", listOf(TestAnnotation("Foo", emptyMap(), false)))
val m3 = TestMethod("h.i#j", listOf(TestAnnotation("Bar", emptyMap(), false)))
return listOf(m1, m2, m3)
}

Expand Down