-
Notifications
You must be signed in to change notification settings - Fork 81
Expand file tree
/
Copy pathE2ETest.kt
More file actions
1256 lines (1140 loc) · 44.1 KB
/
E2ETest.kt
File metadata and controls
1256 lines (1140 loc) · 44.1 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
package com.bazel_diff.e2e
import assertk.assertThat
import assertk.assertions.isEqualTo
import com.bazel_diff.cli.BazelDiff
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import java.io.File
import java.nio.file.Paths
import java.util.zip.ZipFile
import org.junit.Rule
import org.junit.Test
import org.junit.rules.TemporaryFolder
import picocli.CommandLine
class E2ETest {
@get:Rule val temp: TemporaryFolder = TemporaryFolder()
private fun CommandLine.execute(args: List<String>) = execute(*args.toTypedArray())
private fun filterBazelDiffInternalTargets(targets: Set<String>): Set<String> {
return targets.filter { target ->
// Filter out bazel-diff's own internal test targets
!target.contains("bazel-diff-integration-test") &&
!target.contains("@@//:BUILD") &&
!target.contains("bazel_diff_maven") && // Filter out bazel-diff's maven dependencies
// Filter out platform-specific Maven alias targets that may or may not appear in cquery
// results depending on Bazel version and platform (macOS vs Linux)
!target.matches(Regex(".*rules_jvm_external\\+\\+maven\\+maven//:com_google_code_findbugs_jsr305$")) &&
!target.matches(Regex(".*rules_jvm_external\\+\\+maven\\+maven//:com_google_guava_failureaccess$")) &&
!target.matches(Regex(".*rules_jvm_external\\+\\+maven\\+maven//:com_google_guava_listenablefuture$")) &&
!target.matches(Regex(".*rules_jvm_external\\+//private/tools/java/com/github/bazelbuild/rules_jvm_external/jar:AddJarManifestEntry$")) &&
// Filter out junit and hamcrest which may appear on some platforms
!target.matches(Regex(".*rules_jvm_external\\+\\+maven\\+maven//:junit_junit$")) &&
!target.matches(Regex(".*rules_jvm_external\\+\\+maven\\+maven//:org_hamcrest_hamcrest_core$"))
}.toSet()
}
private fun assertTargetsMatch(actual: Set<String>, expected: Set<String>, testContext: String = "") {
if (actual != expected) {
val missingTargets = expected - actual
val unexpectedTargets = actual - expected
val debugMessage = buildString {
appendLine("\n========================================")
appendLine("Target list mismatch${if (testContext.isNotEmpty()) " in $testContext" else ""}")
appendLine("========================================")
if (missingTargets.isNotEmpty()) {
appendLine("\nMISSING TARGETS (expected but not found):")
missingTargets.sorted().forEach { appendLine(" - $it") }
}
if (unexpectedTargets.isNotEmpty()) {
appendLine("\nUNEXPECTED TARGETS (found but not expected):")
unexpectedTargets.sorted().forEach { appendLine(" + $it") }
}
appendLine("\nEXPECTED (${expected.size} targets):")
expected.sorted().forEach { appendLine(" $it") }
appendLine("\nACTUAL (${actual.size} targets):")
actual.sorted().forEach { appendLine(" $it") }
appendLine("========================================")
}
println(debugMessage)
}
assertThat(actual).isEqualTo(expected)
}
private fun testE2E(
extraGenerateHashesArgs: List<String>,
extraGetImpactedTargetsArgs: List<String>,
expectedResultFile: String
) {
val projectA = extractFixtureProject("/fixture/integration-test-1.zip")
val projectB = extractFixtureProject("/fixture/integration-test-2.zip")
val workingDirectoryA = File(projectA, "integration")
val workingDirectoryB = File(projectB, "integration")
val bazelPath = "bazel"
val outputDir = temp.newFolder()
val from = File(outputDir, "starting_hashes.json")
val to = File(outputDir, "final_hashes.json")
val impactedTargetsOutput = File(outputDir, "impacted_targets.txt")
val cli = CommandLine(BazelDiff())
// From
cli.execute(
listOf(
"generate-hashes",
"-w",
workingDirectoryA.absolutePath,
"-b",
bazelPath,
from.absolutePath) + extraGenerateHashesArgs)
// To
cli.execute(
listOf(
"generate-hashes",
"-w",
workingDirectoryB.absolutePath,
"-b",
bazelPath,
to.absolutePath) + extraGenerateHashesArgs)
// Impacted targets
cli.execute(
listOf(
"get-impacted-targets",
"-w",
workingDirectoryB.absolutePath,
"-b",
bazelPath,
"-sh",
from.absolutePath,
"-fh",
to.absolutePath,
"-o",
impactedTargetsOutput.absolutePath) + extraGetImpactedTargetsArgs)
val actual: Set<String> = filterBazelDiffInternalTargets(
impactedTargetsOutput.readLines().filter { it.isNotBlank() }.toSet())
val expected: Set<String> =
javaClass.getResourceAsStream(expectedResultFile).use {
filterBazelDiffInternalTargets(
it.bufferedReader().readLines().filter { it.isNotBlank() }.toSet())
}
assertTargetsMatch(actual, expected, "testE2E")
}
@Test
fun testE2E() {
testE2E(emptyList(), emptyList(), "/fixture/impacted_targets-1-2.txt")
}
@Test
fun testDetermineBazelVersion() {
// E2E coverage for BazelQueryService.determineBazelVersion(): version is resolved lazily
// when the first query runs. Running generate-hashes to completion validates that
// "bazel version" is executed and parsed successfully (e.g. "Build label: X.Y.Z").
val projectA = extractFixtureProject("/fixture/integration-test-1.zip")
val workingDirectory = File(projectA, "integration")
val outputDir = temp.newFolder()
val outputPath = File(outputDir, "hashes.json")
val cli = CommandLine(BazelDiff())
val exitCode = cli.execute(
"generate-hashes",
"-w",
workingDirectory.absolutePath,
"-b",
"bazel",
outputPath.absolutePath)
assertThat(exitCode).isEqualTo(0)
assertThat(outputPath.readText().isNotEmpty()).isEqualTo(true)
}
@Test
fun testE2EWithNoKeepGoing() {
testE2E(
listOf("--no-keep_going"),
emptyList(),
"/fixture/impacted_targets-1-2.txt")
}
@Test
fun testE2EIncludingTargetType() {
testE2E(
listOf("-tt", "Rule,SourceFile"),
emptyList(),
"/fixture/impacted_targets-1-2-rule-sourcefile.txt")
}
@Test
fun testE2EWithTargetType() {
testE2E(
listOf("--includeTargetType"),
listOf("-tt", "Rule,SourceFile"),
"/fixture/impacted_targets-1-2-rule-sourcefile.txt")
}
@Test
fun testGenerateHashesWithCqueryStreamedProto() {
// Validates the --useCquery code path that consumes Bazel's `--output=streamed_proto`
// cquery output (https://github.com/Tinder/bazel-diff/issues/219). On Bazel 7.0.0+ this
// exercises the AnalysisProtosV2.CqueryResult.parseDelimitedFrom loop in
// BazelQueryService.query(); on older Bazel it falls back to single-message proto parsing.
// Uses the `distance_metrics` shell-only workspace so cquery analysis works without a
// sandboxed JDK / coursier fetch.
val workspace = copyTestWorkspace("distance_metrics")
val outputDir = temp.newFolder()
val output = File(outputDir, "hashes.json")
val cli = CommandLine(BazelDiff())
val exitCode = cli.execute(
"generate-hashes",
"-w", workspace.absolutePath,
"-b", "bazel",
"--useCquery",
output.absolutePath)
assertThat(exitCode).isEqualTo(0)
val hashes: Map<String, Any> =
Gson().fromJson(output.readText(), object : TypeToken<Map<String, Any>>() {}.type)
assertThat(hashes.isNotEmpty()).isEqualTo(true)
}
@Test
fun testFineGrainedHashExternalRepo() {
// The difference between these two snapshots is simply upgrading the Guava version.
// Following is the diff.
//
// diff --git a/integration/WORKSPACE b/integration/WORKSPACE
// index 617a8d6..2cb3c7d 100644
// --- a/integration/WORKSPACE
// +++ b/integration/WORKSPACE
// @@ -15,7 +15,7 @@ maven_install(
// name = "bazel_diff_maven",
// artifacts = [
// "junit:junit:4.12",
// - "com.google.guava:guava:31.0-jre",
// + "com.google.guava:guava:31.1-jre",
// ],
// repositories = [
// "http://uk.maven.org/maven2",
//
// The project contains a single target that depends on Guava:
// //src/main/java/com/integration:guava-user
//
// So this target, its derived targets, and all other changed external targets should be
// the only impacted targets.
val projectA = extractFixtureProject("/fixture/fine-grained-hash-external-repo-test-1.zip")
val projectB = extractFixtureProject("/fixture/fine-grained-hash-external-repo-test-2.zip")
val workingDirectoryA = projectA
val workingDirectoryB = projectB
val bazelPath = "bazel"
val outputDir = temp.newFolder()
val from = File(outputDir, "starting_hashes.json")
val to = File(outputDir, "final_hashes.json")
val impactedTargetsOutput = File(outputDir, "impacted_targets.txt")
val cli = CommandLine(BazelDiff())
// From
cli.execute(
"generate-hashes",
"-w",
workingDirectoryA.absolutePath,
"-b",
bazelPath,
"--fineGrainedHashExternalRepos",
"@bazel_diff_maven",
from.absolutePath)
// To
cli.execute(
"generate-hashes",
"-w",
workingDirectoryB.absolutePath,
"-b",
bazelPath,
"--fineGrainedHashExternalRepos",
"@bazel_diff_maven",
to.absolutePath)
// Impacted targets
cli.execute(
"get-impacted-targets",
"-w",
workingDirectoryB.absolutePath,
"-b",
bazelPath,
"-sh",
from.absolutePath,
"-fh",
to.absolutePath,
"-o",
impactedTargetsOutput.absolutePath)
val actual: Set<String> = filterBazelDiffInternalTargets(
impactedTargetsOutput.readLines().filter { it.isNotBlank() }.toSet())
val expected: Set<String> =
javaClass
.getResourceAsStream(
"/fixture/fine-grained-hash-external-repo-test-impacted-targets.txt")
.use { filterBazelDiffInternalTargets(
it.bufferedReader().readLines().filter { it.isNotBlank() }.toSet()) }
assertTargetsMatch(actual, expected, "testFineGrainedHashExternalRepo")
}
private fun testFineGrainedHashBzlMod(
extraGenerateHashesArgs: List<String>,
fineGrainedHashExternalRepo: String,
expectedResultFile: String
) {
// The difference between these two snapshots is simply upgrading the Guava version.
// Following is the diff. (The diff on maven_install.json is omitted)
//
// diff --git a/MODULE.bazel b/MODULE.bazel
// index 9a58823..3ffded3 100644
// --- a/MODULE.bazel
// +++ b/MODULE.bazel
// @@ -4,7 +4,7 @@ maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
// maven.install(
// artifacts = [
// "junit:junit:4.12",
// - "com.google.guava:guava:31.1-jre",
// + "com.google.guava:guava:32.0.0-jre",
// ],
// lock_file = "//:maven_install.json",
// repositories = [
//
// The project contains a single target that depends on Guava:
// //src/main/java/com/integration:guava-user
//
// So this target, its derived targets, and all other changed external targets should be
// the only impacted targets.
val projectA = extractFixtureProject("/fixture/fine-grained-hash-bzlmod-test-1.zip")
val projectB = extractFixtureProject("/fixture/fine-grained-hash-bzlmod-test-2.zip")
val workingDirectoryA = projectA
val workingDirectoryB = projectB
val bazelPath = "bazel"
val outputDir = temp.newFolder()
val from = File(outputDir, "starting_hashes.json")
val to = File(outputDir, "final_hashes.json")
val impactedTargetsOutput = File(outputDir, "impacted_targets.txt")
val cli = CommandLine(BazelDiff())
// From
cli.execute(
listOf(
"generate-hashes",
"-w",
workingDirectoryA.absolutePath,
"-b",
bazelPath,
"--fineGrainedHashExternalRepos",
fineGrainedHashExternalRepo,
from.absolutePath) + extraGenerateHashesArgs)
// To
cli.execute(
listOf(
"generate-hashes",
"-w",
workingDirectoryB.absolutePath,
"-b",
bazelPath,
"--fineGrainedHashExternalRepos",
fineGrainedHashExternalRepo,
to.absolutePath) + extraGenerateHashesArgs)
// Impacted targets
cli.execute(
"get-impacted-targets",
"-w",
workingDirectoryB.absolutePath,
"-b",
bazelPath,
"-sh",
from.absolutePath,
"-fh",
to.absolutePath,
"-o",
impactedTargetsOutput.absolutePath)
val actual: Set<String> = filterBazelDiffInternalTargets(
impactedTargetsOutput.readLines().filter { it.isNotBlank() }.toSet())
val expected: Set<String> =
javaClass.getResourceAsStream(expectedResultFile).use {
filterBazelDiffInternalTargets(
it.bufferedReader().readLines().filter { it.isNotBlank() }.toSet())
}
assertTargetsMatch(actual, expected, "testFineGrainedHashBzlMod")
}
@Test
fun testFineGrainedHashBzlMod() {
testFineGrainedHashBzlMod(
emptyList(),
"@bazel_diff_maven",
"/fixture/fine-grained-hash-bzlmod-test-impacted-targets.txt")
}
@Test
fun testFineGrainedHashBzlModCquery() {
testFineGrainedHashBzlMod(
listOf("--useCquery"),
"@@rules_jvm_external~~maven~maven",
"/fixture/fine-grained-hash-bzlmod-cquery-test-impacted-targets.txt")
}
private fun testBzlmodTransitiveDeps(
extraGenerateHashesArgs: List<String>,
fineGrainedHashExternalRepo: String,
expectedResultFile: String
) {
// This test validates that transitive dependencies are properly tracked when bzlmod external
// dependencies change.
//
// The fixtures contain:
// - target-a: depends on target-b (transitive dependency on Guava)
// - target-b: directly depends on Guava external library
//
// When Guava version changes (31.1-jre -> 32.0.0-jre), BOTH targets should be impacted:
// - target-b is directly impacted (it uses Guava)
// - target-a is transitively impacted (it depends on target-b which depends on Guava)
//
// This test reproduces the issue reported in https://github.com/Tinder/bazel-diff/issues/293
// where transitive dependencies may not be properly detected with bzlmod.
val projectA = extractFixtureProject("/fixture/bzlmod-transitive-test-1.zip")
val projectB = extractFixtureProject("/fixture/bzlmod-transitive-test-2.zip")
val workingDirectoryA = projectA
val workingDirectoryB = projectB
val bazelPath = "bazel"
val outputDir = temp.newFolder()
val from = File(outputDir, "starting_hashes.json")
val to = File(outputDir, "final_hashes.json")
val impactedTargetsOutput = File(outputDir, "impacted_targets.txt")
val cli = CommandLine(BazelDiff())
// From
cli.execute(
listOf(
"generate-hashes",
"-w",
workingDirectoryA.absolutePath,
"-b",
bazelPath,
"--fineGrainedHashExternalRepos",
fineGrainedHashExternalRepo,
from.absolutePath) + extraGenerateHashesArgs)
// To
cli.execute(
listOf(
"generate-hashes",
"-w",
workingDirectoryB.absolutePath,
"-b",
bazelPath,
"--fineGrainedHashExternalRepos",
fineGrainedHashExternalRepo,
to.absolutePath) + extraGenerateHashesArgs)
// Impacted targets
cli.execute(
"get-impacted-targets",
"-w",
workingDirectoryB.absolutePath,
"-b",
bazelPath,
"-sh",
from.absolutePath,
"-fh",
to.absolutePath,
"-o",
impactedTargetsOutput.absolutePath)
val actual: Set<String> = filterBazelDiffInternalTargets(
impactedTargetsOutput.readLines().filter { it.isNotBlank() }.toSet())
val expected: Set<String> =
javaClass.getResourceAsStream(expectedResultFile).use {
filterBazelDiffInternalTargets(
it.bufferedReader().readLines().filter { it.isNotBlank() }.toSet())
}
assertTargetsMatch(actual, expected, "testBzlmodTransitiveDeps")
}
@Test
fun testBzlmodTransitiveDepsQuery() {
testBzlmodTransitiveDeps(
emptyList(),
"@bazel_diff_maven",
"/fixture/bzlmod-transitive-test-impacted-targets.txt")
}
@Test
fun testBzlmodTransitiveDepsCquery() {
testBzlmodTransitiveDeps(
listOf("--useCquery"),
"@@rules_jvm_external~~maven~maven",
"/fixture/bzlmod-transitive-test-cquery-impacted-targets.txt")
}
private fun testBzlmodCCTransitiveDeps(
extraGenerateHashesArgs: List<String>,
expectedResultFile: String
) {
// This test validates transitive dependency tracking for native C++ libraries when
// Bazel module versions change in MODULE.bazel.
//
// The fixtures contain:
// - target-a (cc_library): depends on target-b
// - target-b (cc_library): directly depends on abseil-cpp external module
//
// When abseil-cpp version changes (20240116.2 -> 20240722.0), bazel-diff now detects
// these changes via module graph hashing (implemented in BazelModService.getModuleGraph()).
//
// Expected behavior:
// - target-b is impacted (uses abseil directly)
// - target-a is transitively impacted (depends on target-b)
// - All targets are invalidated because the module graph is included in the seed hash
//
// This validates the fix for:
// https://github.com/Tinder/bazel-diff/issues/293
val projectA = extractFixtureProject("/fixture/bzlmod-cc-transitive-test-1.zip")
val projectB = extractFixtureProject("/fixture/bzlmod-cc-transitive-test-2.zip")
val workingDirectoryA = projectA
val workingDirectoryB = projectB
val bazelPath = "bazel"
val outputDir = temp.newFolder()
val from = File(outputDir, "starting_hashes.json")
val to = File(outputDir, "final_hashes.json")
val impactedTargetsOutput = File(outputDir, "impacted_targets.txt")
val cli = CommandLine(BazelDiff())
// From
cli.execute(
listOf(
"generate-hashes",
"-w",
workingDirectoryA.absolutePath,
"-b",
bazelPath,
from.absolutePath) + extraGenerateHashesArgs)
// To
cli.execute(
listOf(
"generate-hashes",
"-w",
workingDirectoryB.absolutePath,
"-b",
bazelPath,
to.absolutePath) + extraGenerateHashesArgs)
// Impacted targets
cli.execute(
"get-impacted-targets",
"-w",
workingDirectoryB.absolutePath,
"-b",
bazelPath,
"-sh",
from.absolutePath,
"-fh",
to.absolutePath,
"-o",
impactedTargetsOutput.absolutePath)
val actual: Set<String> = filterBazelDiffInternalTargets(
impactedTargetsOutput.readLines().filter { it.isNotBlank() && !it.startsWith("#") }.toSet())
val expected: Set<String> =
javaClass.getResourceAsStream(expectedResultFile).use {
filterBazelDiffInternalTargets(
it.bufferedReader().readLines().filter { it.isNotBlank() && !it.startsWith("#") }.toSet())
}
assertTargetsMatch(actual, expected, "testBzlmodCCTransitiveDeps")
}
@Test
@org.junit.Ignore("Skipped due to Bazel version compatibility issues in test environment. " +
"The fixtures use Bazel 7.0.0 but test environment uses Bazel 8+, causing bzlmod/abseil-cpp " +
"package loading errors. This test is ready to run when Bazel version handling is resolved. " +
"Module graph hashing has been implemented and should detect transitive dependency changes.")
fun testBzlmodCCTransitiveDepsQuery() {
// This test validates that MODULE.bazel changes are now detected via module graph hashing.
// Both target-a and target-b should be impacted when abseil-cpp version changes.
testBzlmodCCTransitiveDeps(
emptyList(),
"/fixture/bzlmod-cc-transitive-test-impacted-targets.txt")
}
@Test
fun testUseCqueryWithExternalDependencyChange() {
// The difference between these two snapshots is simply upgrading the Guava version for Android
// platform.
// Following is the diff.
//
// diff --git a/WORKSPACE b/WORKSPACE
// index 0fa6bdc..378ba11 100644
// --- a/WORKSPACE
// +++ b/WORKSPACE
// @@ -27,7 +27,7 @@ maven_install(
// name = "bazel_diff_maven_android",
// artifacts = [
// "junit:junit:4.12",
// - "com.google.guava:guava:31.0-android",
// + "com.google.guava:guava:32.0.0-android",
// ],
// repositories = [
// "http://uk.maven.org/maven2",
//
// The project contains the following targets related to the test
//
// java_library(
// name = "guava-user",
// srcs = ["GuavaUser.java"] + select({
// "//:android_system": ["GuavaUserAndroid.java"],
// "//:jre_system": ["GuavaUserJre.java"],
// }),
// visibility = ["//visibility:public"],
// deps = select({
// "//:android_system": ["@bazel_diff_maven_android//:com_google_guava_guava"],
// "//:jre_system": ["@bazel_diff_maven//:com_google_guava_guava"],
// }),
// )
// java_binary(
// name = "android",
// main_class =
// "cli.src.test.resources.integration.src.main.java.com.integration.GuavaUser",
// runtime_deps = ["guava-user"],
// target_compatible_with = ["//:android_system"]
// )
// java_binary(
// name = "jre",
// main_class =
// "cli.src.test.resources.integration.src.main.java.com.integration.GuavaUser",
// runtime_deps = ["guava-user"],
// target_compatible_with = ["//:jre_system"]
// )
//
// So with the above android upgrade, querying changed targets for the `jre` platform should not
// return anything
// in the user repo changed. Querying changed targets for the `android` platform should only
// return `guava-user`
// and `android` targets above because `jre` target above is not compatible with the `android`
// platform.
val workingDirectoryA = extractFixtureProject("/fixture/cquery-test-base.zip")
val workingDirectoryB = extractFixtureProject("/fixture/cquery-test-guava-upgrade.zip")
val bazelPath = "bazel"
val outputDir = temp.newFolder()
val from = File(outputDir, "starting_hashes.json")
val to = File(outputDir, "final_hashes.json")
val impactedTargetsOutput = File(outputDir, "impacted_targets.txt")
val cli = CommandLine(BazelDiff())
// Query Android platform
// From
cli.execute(
"generate-hashes",
"-w",
workingDirectoryA.absolutePath,
"-b",
"bazel",
"--useCquery",
"--cqueryCommandOptions",
"--platforms=//:android",
"--fineGrainedHashExternalRepos",
"@@bazel_diff_maven,@@bazel_diff_maven_android",
from.absolutePath)
// To
cli.execute(
"generate-hashes",
"-w",
workingDirectoryB.absolutePath,
"-b",
"bazel",
"--useCquery",
"--cqueryCommandOptions",
"--platforms=//:android",
"--fineGrainedHashExternalRepos",
"@@bazel_diff_maven,@@bazel_diff_maven_android",
to.absolutePath)
// Impacted targets
cli.execute(
"get-impacted-targets",
"-w",
workingDirectoryB.absolutePath,
"-b",
bazelPath,
"-sh",
from.absolutePath,
"-fh",
to.absolutePath,
"-o",
impactedTargetsOutput.absolutePath)
var actual: Set<String> = filterBazelDiffInternalTargets(
impactedTargetsOutput.readLines().filter { it.isNotBlank() }.toSet())
var expected: Set<String> =
javaClass
.getResourceAsStream("/fixture/cquery-test-guava-upgrade-android-impacted-targets.txt")
.use { filterBazelDiffInternalTargets(
it.bufferedReader().readLines().filter { it.isNotBlank() }.toSet()) }
assertTargetsMatch(actual, expected, "testUseCqueryWithExternalDependencyChange - Android platform")
// Query JRE platform
// From
cli.execute(
"generate-hashes",
"-w",
workingDirectoryA.absolutePath,
"-b",
"bazel",
"--useCquery",
"--cqueryCommandOptions",
"--platforms=//:jre",
"--fineGrainedHashExternalRepos",
"@@bazel_diff_maven,@@bazel_diff_maven_android",
from.absolutePath)
// To
cli.execute(
"generate-hashes",
"-w",
workingDirectoryB.absolutePath,
"-b",
"bazel",
"--useCquery",
"--cqueryCommandOptions",
"--platforms=//:jre",
"--fineGrainedHashExternalRepos",
"@@bazel_diff_maven,@@bazel_diff_maven_android",
to.absolutePath)
// Impacted targets
cli.execute(
"get-impacted-targets",
"-w",
workingDirectoryB.absolutePath,
"-b",
bazelPath,
"-sh",
from.absolutePath,
"-fh",
to.absolutePath,
"-o",
impactedTargetsOutput.absolutePath)
actual = filterBazelDiffInternalTargets(
impactedTargetsOutput.readLines().filter { it.isNotBlank() }.toSet())
expected =
javaClass
.getResourceAsStream("/fixture/cquery-test-guava-upgrade-jre-impacted-targets.txt")
.use { filterBazelDiffInternalTargets(
it.bufferedReader().readLines().filter { it.isNotBlank() }.toSet()) }
assertTargetsMatch(actual, expected, "testUseCqueryWithExternalDependencyChange - JRE platform")
}
@Test
fun testUseCqueryWithAndroidCodeChange() {
// The difference between these two snapshots is simply making a code change to Android-only
// source code.
// Following is the diff.
//
// diff --git a/src/main/java/com/integration/GuavaUserAndroid.java
// b/src/main/java/com/integration/GuavaUserAndroid.java
// index 8a9289e..cb645dc 100644
// --- a/src/main/java/com/integration/GuavaUserAndroid.java
// +++ b/src/main/java/com/integration/GuavaUserAndroid.java
// @@ -2,4 +2,6 @@ package cli.src.test.resources.integration.src.main.java.com.integration;
//
// import com.google.common.collect.ImmutableList;
//
// -public class GuavaUserAndroid {}
// +public class GuavaUserAndroid {
// + // add a comment
// +}
//
// The project contains the following targets related to the test
//
// java_library(
// name = "guava-user",
// srcs = ["GuavaUser.java"] + select({
// "//:android_system": ["GuavaUserAndroid.java"],
// "//:jre_system": ["GuavaUserJre.java"],
// }),
// visibility = ["//visibility:public"],
// deps = select({
// "//:android_system": ["@bazel_diff_maven_android//:com_google_guava_guava"],
// "//:jre_system": ["@bazel_diff_maven//:com_google_guava_guava"],
// }),
// )
// java_binary(
// name = "android",
// main_class =
// "cli.src.test.resources.integration.src.main.java.com.integration.GuavaUser",
// runtime_deps = ["guava-user"],
// target_compatible_with = ["//:android_system"]
// )
// java_binary(
// name = "jre",
// main_class =
// "cli.src.test.resources.integration.src.main.java.com.integration.GuavaUser",
// runtime_deps = ["guava-user"],
// target_compatible_with = ["//:jre_system"]
// )
//
// So with the above android code change, querying changed targets for the `jre` platform should
// not return
// anything in the user repo changed. Querying changed targets for the `android` platform should
// only return
// `guava-user` and `android` targets above because `jre` target above is not compatible with
// the `android`
// platform.
val workingDirectoryA = extractFixtureProject("/fixture/cquery-test-base.zip")
val workingDirectoryB = extractFixtureProject("/fixture/cquery-test-android-code-change.zip")
val bazelPath = "bazel"
val outputDir = temp.newFolder()
val from = File(outputDir, "starting_hashes.json")
val to = File(outputDir, "final_hashes.json")
val impactedTargetsOutput = File(outputDir, "impacted_targets.txt")
val cli = CommandLine(BazelDiff())
// Query Android platform
// From
cli.execute(
"generate-hashes",
"-w",
workingDirectoryA.absolutePath,
"-b",
"bazel",
"--useCquery",
"--cqueryCommandOptions",
"--platforms=//:android",
"--fineGrainedHashExternalRepos",
"@@bazel_diff_maven,@@bazel_diff_maven_android",
from.absolutePath)
// To
cli.execute(
"generate-hashes",
"-w",
workingDirectoryB.absolutePath,
"-b",
"bazel",
"--useCquery",
"--cqueryCommandOptions",
"--platforms=//:android",
"--fineGrainedHashExternalRepos",
"@@bazel_diff_maven,@@bazel_diff_maven_android",
to.absolutePath)
// Impacted targets
cli.execute(
"get-impacted-targets",
"-w",
workingDirectoryB.absolutePath,
"-b",
bazelPath,
"-sh",
from.absolutePath,
"-fh",
to.absolutePath,
"-o",
impactedTargetsOutput.absolutePath)
var actual: Set<String> = filterBazelDiffInternalTargets(
impactedTargetsOutput.readLines().filter { it.isNotBlank() }.toSet())
var expected: Set<String> =
javaClass
.getResourceAsStream(
"/fixture/cquery-test-android-code-change-android-impacted-targets.txt")
.use { filterBazelDiffInternalTargets(
it.bufferedReader().readLines().filter { it.isNotBlank() }.toSet()) }
assertTargetsMatch(actual, expected, "testUseCqueryWithAndroidCodeChange - Android platform")
// Query JRE platform
// From
cli.execute(
"generate-hashes",
"-w",
workingDirectoryA.absolutePath,
"-b",
"bazel",
"--useCquery",
"--cqueryCommandOptions",
"--platforms=//:jre",
"--fineGrainedHashExternalRepos",
"@@bazel_diff_maven,@@bazel_diff_maven_android",
from.absolutePath)
// To
cli.execute(
"generate-hashes",
"-w",
workingDirectoryB.absolutePath,
"-b",
"bazel",
"--useCquery",
"--cqueryCommandOptions",
"--platforms=//:jre",
"--fineGrainedHashExternalRepos",
"@@bazel_diff_maven,@@bazel_diff_maven_android",
to.absolutePath)
// Impacted targets
cli.execute(
"get-impacted-targets",
"-w",
workingDirectoryB.absolutePath,
"-b",
bazelPath,
"-sh",
from.absolutePath,
"-fh",
to.absolutePath,
"-o",
impactedTargetsOutput.absolutePath)
actual = filterBazelDiffInternalTargets(
impactedTargetsOutput.readLines().filter { it.isNotBlank() }.toSet())
expected =
javaClass
.getResourceAsStream(
"/fixture/cquery-test-android-code-change-jre-impacted-targets.txt")
.use { filterBazelDiffInternalTargets(
it.bufferedReader().readLines().filter { it.isNotBlank() }.toSet()) }
assertTargetsMatch(actual, expected, "testUseCqueryWithAndroidCodeChange - JRE platform")
}
@Test
fun testTargetDistanceMetrics() {
val workspace = copyTestWorkspace("distance_metrics")
val outputDir = temp.newFolder()
val from = File(outputDir, "starting_hashes.json")
val to = File(outputDir, "final_hashes.json")
val depsFile = File(outputDir, "depEdges.json")
val impactedTargetsOutput = File(outputDir, "impacted_targets.txt")
val cli = CommandLine(BazelDiff())
cli.execute(
"generate-hashes",
"--includeTargetType",
"-w",
workspace.absolutePath,
"-b",
"bazel",
from.absolutePath)
// Modify the workspace
File(workspace, "A/one.sh").appendText("foo")
cli.execute(
"generate-hashes",
"--includeTargetType",
"-w",
workspace.absolutePath,
"-d",
depsFile.absolutePath,
"-b",
"bazel",
to.absolutePath)
// Impacted targets
cli.execute(
"get-impacted-targets",
"-w",
workspace.absolutePath,
"-b",
"bazel",
"-sh",
from.absolutePath,
"-fh",
to.absolutePath,
"-d",
depsFile.absolutePath,
"-tt",
"Rule,GeneratedFile",
"-o",
impactedTargetsOutput.absolutePath,
)
val gson = Gson()
val shape = object : TypeToken<List<Map<String, Any>>>() {}.type
val actual =
gson.fromJson<List<Map<String, Any>>>(impactedTargetsOutput.readText(), shape)
.filter { target ->
// Filter out Bazel convenience symlink targets (bazel-*) as they're not reliably
// present across all environments
!(target["label"] as String).contains("//bazel-")
}
.sortedBy { it["label"] as String }
val expected: List<Map<String, Any>> =
listOf(
mapOf("label" to "//A:one", "targetDistance" to 0.0, "packageDistance" to 0.0),
mapOf("label" to "//A:gen_two", "targetDistance" to 1.0, "packageDistance" to 0.0),
mapOf("label" to "//A:two.sh", "targetDistance" to 2.0, "packageDistance" to 0.0),
mapOf("label" to "//A:two", "targetDistance" to 3.0, "packageDistance" to 0.0),
mapOf("label" to "//A:three", "targetDistance" to 4.0, "packageDistance" to 0.0),
mapOf("label" to "//:lib", "targetDistance" to 5.0, "packageDistance" to 1.0))
assertThat(actual.size).isEqualTo(expected.size)
expected.forEach { expectedMap ->