From 3fffd5ffe31e5926dad992449b365dcce7beb810 Mon Sep 17 00:00:00 2001 From: Honnix Date: Fri, 11 Oct 2024 05:02:52 +0200 Subject: [PATCH] chore: Reenable cquery e2e tests (#245) --- .../test/kotlin/com/bazel_diff/e2e/E2ETest.kt | 5 ----- ...d-code-change-android-impacted-targets.txt | 5 +++-- .../cquery-test-android-code-change.zip | Bin 8307 -> 9276 bytes .../resources/fixture/cquery-test-base.zip | Bin 8295 -> 9264 bytes ...guava-upgrade-android-impacted-targets.txt | 13 +++++++------ .../fixture/cquery-test-guava-upgrade.zip | Bin 8299 -> 9268 bytes 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/cli/src/test/kotlin/com/bazel_diff/e2e/E2ETest.kt b/cli/src/test/kotlin/com/bazel_diff/e2e/E2ETest.kt index 042940e..79835af 100644 --- a/cli/src/test/kotlin/com/bazel_diff/e2e/E2ETest.kt +++ b/cli/src/test/kotlin/com/bazel_diff/e2e/E2ETest.kt @@ -3,7 +3,6 @@ package com.bazel_diff.e2e import assertk.assertThat import assertk.assertions.isEqualTo import com.bazel_diff.cli.BazelDiff -import org.junit.Ignore import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder @@ -188,8 +187,6 @@ class E2ETest { testFineGrainedHashBzlMod(listOf("--useCquery"), "@rules_jvm_external~~maven~maven", "/fixture/fine-grained-hash-bzlmod-cquery-test-impacted-targets.txt") } - // TODO: re-enable the test after https://github.com/bazelbuild/bazel/issues/21010 is fixed - @Ignore("cquery mode is broken with Bazel 7 because --transition=lite is crashes due to https://github.com/bazelbuild/bazel/issues/21010") @Test fun testUseCqueryWithExternalDependencyChange() { // The difference between these two snapshots is simply upgrading the Guava version for Android platform. @@ -292,8 +289,6 @@ class E2ETest { assertThat(actual).isEqualTo(expected) } - // TODO: re-enable the test after https://github.com/bazelbuild/bazel/issues/21010 is fixed - @Ignore("cquery mode is broken with Bazel 7 because --transition=lite is crashes due to https://github.com/bazelbuild/bazel/issues/21010") @Test fun testUseCqueryWithAndroidCodeChange() { // The difference between these two snapshots is simply making a code change to Android-only source code. diff --git a/cli/src/test/resources/fixture/cquery-test-android-code-change-android-impacted-targets.txt b/cli/src/test/resources/fixture/cquery-test-android-code-change-android-impacted-targets.txt index a65892a..a4a1295 100644 --- a/cli/src/test/resources/fixture/cquery-test-android-code-change-android-impacted-targets.txt +++ b/cli/src/test/resources/fixture/cquery-test-android-code-change-android-impacted-targets.txt @@ -1,2 +1,3 @@ -//src/main/java/com/integration:android -//src/main/java/com/integration:guava-user \ No newline at end of file +@@//src/main/java/com/integration:android +@@//src/main/java/com/integration:android_deployjars_internal_rule +@@//src/main/java/com/integration:guava-user diff --git a/cli/src/test/resources/fixture/cquery-test-android-code-change.zip b/cli/src/test/resources/fixture/cquery-test-android-code-change.zip index 4d142d73ef3a98a776a77235640bc5950a07e1c3..2aee27827bcaa9aff1ca9eaa075f1f5237be89e0 100644 GIT binary patch delta 3458 zcmbW4ZEQi_4#Ee-aq^W79v$ob1B7{UDhzN^_i1;A!oO5q`&uQ=4Zd*>$efa;*^LqZ>uiCrI zmp0bx4Fv!&8gBL7U-vz*rQL&nRpBv#2<2_TSgnC})9_~IWz=8K127_EadTb6(xm+3m;AO=`N69TRr#ayD{db^a-SYRKzYlm zrusFFi@$L}|e3bSd$FN)Mp_j{ckwC;4O8$sYq= z-W6@FNZzZFIjNqBDpJ)XbfOOVgW;SI8-aEpc|CqGvy68C4u4LdbdD7(a6+_Ik1P{6 zRTpMetJPoE`>k&uwy?NcuppNNZVd={aJy?NTlqgBQvB`qB#+T7NB*)AqMci)8&ex_za#33aCtoHHJv4v34`! zv958eccJhao=T+#gI0ScfXTMsmO4frMLJ*`JAdc}|j>*H=2kVvDD?VdH&v7RTWi`7GT9dfP{*~#(;S1x1X9(y=02!vej;c%@ zxa)WkPrOU7`s>#J^F8P&K{+|2v6SVT{JR4k(N?-lKk+^Mll~@ReL|6NQCS%&xi7js z91Dg5z8!&RS1=N;i3UQESfG9LR-e~vYOL4gx%KM$6BCK6E;0#k1;EJR;y&_;^%SG* zDJh1K3gjJy<#ixW8EYQZg7;BxN@el(!m^rC!k7)uOW>qs&RKb)Ug~sCo5AMH8xD)T zCEasQiBs#;OjFxF3?MTAEHJp}%s5c2NINPyNo|rqNO4klih8Y}6ki%X&&);UGRu)s zoU)x7%nH0cQ;=2;y2&i{hz0naL4%Y9x7a4;k0&5pTA_C6PO2c@ zzF5#F3xZ}!-zN(Ta{=)l#)95T$HiIbXO^4-;;oG3Jhfs#RXIU;OJgCuHd>xR>!b`> zX^*FeYuGWV*j=(DbK})A^G3%8^n-BfG+&0qCZ|3OyxXy`4-;v212z*{pLN))Y~(WR zwL`)QhdkpOB_mUlqWl6T997mS=DZ-i%Yo6A+0Vf%4xuO zpJZF`m_Wpw_mB5W7G!i%&{>C=wU6n}$%1NJ=wwMB#VQdWO?%*t`Pcw(;xGRD1ea0c Q0e{up>gw5*Qd3d!f0onhC;$Ke delta 2498 zcma)8T}YEr7(R1b>l-@vquZR?zBVd7 zcLBgpa}Y8Ep`r6sOQVWid>m4-Z|0g_j2jSIG9o~7sQYwB^O?4z$Brxb)O|xRr$}Yg zSKkiJa0vbFM97UeY%3`?3r(afrdcjYI)>WHV*=5U;b>UVlQ)Ni%_%teKhsfAQD z|E7T&oIkXFVG6eS8dgYvhh->ka@?hm_vYVobB}l;@y?jXOkfK z7S;h3jyHHt67DLzLp3qEIs3UAutTs8D|nyMa=SaCF%ofdA~ur9#u?4RDFo%g1H`P!Uk2Cqpu{HKz-(*+7`0z&ZGoo)m=JKv!qO zLM4YmLmM4Lz+=R`(U&Vjx8}a(;FaR?J+v+pDFiDubq(j1lqRM5$~(~>1PK}OvBO(y z9%3U$pGrbUrH)F}vgi=N?!&7i;{8M z@G8$|VrI-Qfhl_7yuc)3R;yecxvI!z!i?fp*hy8)JM4N~Cf+D6=a9G@$vZth6L=K= zhsuWp)Z;S|Nb#4QLVd`?>TNv-u_!PRBAy#_0dt@JteJ$QYOWJzZ52~boHCP>6l)o; z@cZ$_-OlYV2MJE`A&tfgktRmvqt%+51gXlMmbsL%lkoQ=`|I&4O@ZWWR=$RyrP|n} zMestPkUgx75iAIZ_CDgqTY>VLj3Z|fnPNpfNX}=EL^baqzkA`eWI<@ci|u8h{~D$8 AVE_OC diff --git a/cli/src/test/resources/fixture/cquery-test-base.zip b/cli/src/test/resources/fixture/cquery-test-base.zip index 9f1a8f9df4833427d3f3d2e4e02dbdb9f3a0c2b3..6a611d7ef1a1b979249b3ba10ad8cfd65c2830df 100644 GIT binary patch delta 3443 zcmbW4ZD>uuUJH!rtEkZN0NCf1iB)>VhvPU}ls2G!7{*DhU?Xqvh@ zbfKUhHb1Dnevwr{R45y|Y6S&9_=PO801<3fMbyM^DjQp23h27cmBbU}{^805u zUq6iGiyVLzXnu$er2#afLlW8im4kobsj#{?ski-rmKQh`nHkx7YDI_+bsYK6!pS%>2-QPcENtcL^V#V z`MKjb7U3?Qn$+F$xVzYZARj0`Ndf+T_05(66raYkOa-j=IE?_I`3EV$%YA~7K=CO& zbt=Hgm!ttY<0Jd|0SYijn7i!&ihsiMkqWSR%Zvd3@`w4X0jf$V8~gf$kyuxMuQYA* zwH7@5>a(jy@%9IJYEztQjl=GvUOs~37?sb_zlLA5BWWL=dNrSVpJ0@axipx)PUIy> zNPUTE)6m~1@)#-deD`2CMw`8qWT7-jC>Hsj!3bD|NzpxnrQm;Dy7>)8^cWXIOsVBV z?pa1PjF-Kmn(*zpdDce=7()OVs!4IVk$BYkB$z11iurwFUCB-r`2 z)Ef^eYyCUEh=1h1iddgWELu@pOG+My_eT@qh!of_#rwjs=$g0`i6x|-t}g?AzpbUo zWcG2|01_KXYCckqw*p|~aDI?{qFtpRl)z z(dd(`gp?%3S5V_BO0}n%^XyDyf;|SqChgpZW8wJTT(4bwuDU`3BY0Z2Lvz8ibZ8T_DzU-}(ZQgQ&fb=J`is{#&g9NlibE|w?$9f(e+G_?(`SA<lZJK_O|33%~LIB{+kcD(I>YNh|jRUDJXMOC;2^cfj9!aC@(Tk z7X@`8AxL5gMsyp2K~xuA1yUpt5sF<#5Y%(tuXA?ZEq%vf@8JJ?&U4QBpZ}Imf3GTQ ztkddD2%%K8b@^r6W~jH%3%@F0n2-^b^n@efo`J!UP-}}GX@)kV!8*Kp zW{n8_ZbirjME_tg+#L=DFLj5nhK4#Ly`v?OXoTVh-9uvxmH`bZj}ExekuJZYl2?p` z6)QS;Ax#l!e`k1LC;D_&-`9DqlRzGEo089BK}M`GTMKs3kW-Ml)Kc-Z+7>pJZoq~% z>k#sYQk>y2>VB^YW0tWTgSB>04#POCs7-i}EmI+C zZC7|R5sODcqmiAsgWMlMD?4L5V-P!0plh(--&!Q!y5x3pNEB{z+lrM9m-V7iEQ_Uq zZ?MvLU=|mnr*6Sn_8(4amYa_i6yn1Jcm%xk zB#4s6y7&Tom=IDd&;f7p(L&g2c6L5pDC~zC>Z~CJaUW5R`_j5=9J2#HT7d^Ny~TqMaGp+-q4Q8X%{aS;^@{%>w#D_UTIExaEP&9@-h%;Oc@)V%imwhZC=7?6ClwF7XaEzj9ZovHgnCQld^K#k8;70t#c{FjeTm&-E8bC$IRdLAA%H<(bVBP{vyD@|#zg)FbAS4A6 zA!4#It3X0xRwOtYakX4#GV`v=w7FdRli+*i5|m-*v*ejcoW@kVx^oh%;zK&`$VRG= zO>QX?vy`2ZS;gAhU(Wao@;t7Bkis;Clea-)n6|M&i{KWw^;psq;FFn@5Pj~miMt@g lF4+A@Lc8-pP5Jg5hKJbBk$C+sqOrqg$$-$f9qab_{sGE94!{5a diff --git a/cli/src/test/resources/fixture/cquery-test-guava-upgrade-android-impacted-targets.txt b/cli/src/test/resources/fixture/cquery-test-guava-upgrade-android-impacted-targets.txt index 905b125..68d328f 100644 --- a/cli/src/test/resources/fixture/cquery-test-guava-upgrade-android-impacted-targets.txt +++ b/cli/src/test/resources/fixture/cquery-test-guava-upgrade-android-impacted-targets.txt @@ -1,7 +1,8 @@ //external:bazel_diff_maven_android -//src/main/java/com/integration:android -//src/main/java/com/integration:guava-user -@bazel_diff_maven_android//:com_google_errorprone_error_prone_annotations -@bazel_diff_maven_android//:com_google_guava_guava -@bazel_diff_maven_android//:com_google_j2objc_j2objc_annotations -@bazel_diff_maven_android//:org_checkerframework_checker_qual \ No newline at end of file +@@//src/main/java/com/integration:android +@@//src/main/java/com/integration:android_deployjars_internal_rule +@@//src/main/java/com/integration:guava-user +@@bazel_diff_maven_android//:com_google_errorprone_error_prone_annotations +@@bazel_diff_maven_android//:com_google_guava_guava +@@bazel_diff_maven_android//:com_google_j2objc_j2objc_annotations +@@bazel_diff_maven_android//:org_checkerframework_checker_qual diff --git a/cli/src/test/resources/fixture/cquery-test-guava-upgrade.zip b/cli/src/test/resources/fixture/cquery-test-guava-upgrade.zip index 4fee280a9e4615b1025ee44f39ee4c46f5f8d25f..5dbe436b50a72907f9b8e99413e58a83e867cb80 100644 GIT binary patch delta 3489 zcmb7{U1(Eh7{{M{v@=m-Ow-z=F{h=9sY`1+sZ>R+U!ZN(>WoDgWU-!hsZD}utX0$? zQqXxZw3^5kB&9et6NXz%ppIiX{#sI1yB%OBzf~tOwfU$dy zv#vb3Kg!lVPE08f0 zbY#UQ(iE)_bBae>YW0m!m}$Z3oA)8&7M`yV^D)$Fromouq{28?5jndcEeX3P(Sk>N zH;f<0q`%;4)CrQ;Z(6~y{|8F_@qf-f??J$BJc~3)uy6z3^~)<0MSDfwgq%2(GY+7| z`6JJg9By$T;;5FpSvrKX4Hm@&u?(Mtnn`rRcfGme4J!H#7eY{?4a>l*<8aj zhBq2Zl**)Q8yiX0IvqA-5688Vt=FM4tMxu&5r)CtH<~#kvj6ieU)lJuI()la>YM z+iM+CGBCG+zH>X{KQ#8P1JI3X^0Jq5FUt25CnyvEFZ{Xk+;mXAiLXn!CZFUYBy=16 z5Y%%Or5e@bc^*bt*rO?CLoZawP|xgY6LtJ)jW7)y^~)eMKg(TYt&djqR)e7rT5AAnfi&z{rK&76 z>D4Y{u6Use3ifDLc7CuAil9lX;457Kv=89$LQ2Aamhe z(nn!-iRIS!iS&+q)s?|#phEgWB| zE^qW}b?FG9G-M6DX#_tw)+ytI_UzH6AwwCh9)# zdIsW`DG2ESIMPyES3|WkFFaIRJ@a7smIk3YEdr$hwKX*RPc|d_2>oqA$Oc6JV0XAD9PIAw37-p|4@7!LN+Zz-#W(Aw3^9BT=tzEa0FDfId1YDr z$Vfc0tb-4@D=h5~gayxW`tWidp;V?E`0@WNWAL&~7YPHGg zjO-g${sp=vUEQ{HwP7q?Jh?CqCEvj+p>m-lhdEx(U8a%oKT}`YKs^MjQYH$d=RsZ$VL z4COE(9AuSAj-52hM3gw8lb}^fH?U^lf{o#ev+&kp%FoIa1+jHKg5#7txb==4qzKpedr}@7$17#W;w)q97<^M%>t-h2j@JnlaQY_k zs