Skip to content

Commit 3fffd5f

Browse files
authored
chore: Reenable cquery e2e tests (#245)
1 parent 482214d commit 3fffd5f

File tree

6 files changed

+10
-13
lines changed

6 files changed

+10
-13
lines changed

cli/src/test/kotlin/com/bazel_diff/e2e/E2ETest.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.bazel_diff.e2e
33
import assertk.assertThat
44
import assertk.assertions.isEqualTo
55
import com.bazel_diff.cli.BazelDiff
6-
import org.junit.Ignore
76
import org.junit.Rule
87
import org.junit.Test
98
import org.junit.rules.TemporaryFolder
@@ -188,8 +187,6 @@ class E2ETest {
188187
testFineGrainedHashBzlMod(listOf("--useCquery"), "@rules_jvm_external~~maven~maven", "/fixture/fine-grained-hash-bzlmod-cquery-test-impacted-targets.txt")
189188
}
190189

191-
// TODO: re-enable the test after https://github.com/bazelbuild/bazel/issues/21010 is fixed
192-
@Ignore("cquery mode is broken with Bazel 7 because --transition=lite is crashes due to https://github.com/bazelbuild/bazel/issues/21010")
193190
@Test
194191
fun testUseCqueryWithExternalDependencyChange() {
195192
// The difference between these two snapshots is simply upgrading the Guava version for Android platform.
@@ -292,8 +289,6 @@ class E2ETest {
292289
assertThat(actual).isEqualTo(expected)
293290
}
294291

295-
// TODO: re-enable the test after https://github.com/bazelbuild/bazel/issues/21010 is fixed
296-
@Ignore("cquery mode is broken with Bazel 7 because --transition=lite is crashes due to https://github.com/bazelbuild/bazel/issues/21010")
297292
@Test
298293
fun testUseCqueryWithAndroidCodeChange() {
299294
// The difference between these two snapshots is simply making a code change to Android-only source code.
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
//src/main/java/com/integration:android
2-
//src/main/java/com/integration:guava-user
1+
@@//src/main/java/com/integration:android
2+
@@//src/main/java/com/integration:android_deployjars_internal_rule
3+
@@//src/main/java/com/integration:guava-user
969 Bytes
Binary file not shown.
969 Bytes
Binary file not shown.
Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
//external:bazel_diff_maven_android
2-
//src/main/java/com/integration:android
3-
//src/main/java/com/integration:guava-user
4-
@bazel_diff_maven_android//:com_google_errorprone_error_prone_annotations
5-
@bazel_diff_maven_android//:com_google_guava_guava
6-
@bazel_diff_maven_android//:com_google_j2objc_j2objc_annotations
7-
@bazel_diff_maven_android//:org_checkerframework_checker_qual
2+
@@//src/main/java/com/integration:android
3+
@@//src/main/java/com/integration:android_deployjars_internal_rule
4+
@@//src/main/java/com/integration:guava-user
5+
@@bazel_diff_maven_android//:com_google_errorprone_error_prone_annotations
6+
@@bazel_diff_maven_android//:com_google_guava_guava
7+
@@bazel_diff_maven_android//:com_google_j2objc_j2objc_annotations
8+
@@bazel_diff_maven_android//:org_checkerframework_checker_qual
969 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)