forked from openjdk/skara
/
IssueNotifierTests.java
1209 lines (1007 loc) · 63.4 KB
/
IssueNotifierTests.java
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
/*
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package org.openjdk.skara.bots.notify.issue;
import org.junit.jupiter.api.*;
import org.openjdk.skara.bots.notify.CommitFormatters;
import org.openjdk.skara.bots.notify.NotifyBot;
import org.openjdk.skara.forge.HostedRepository;
import org.openjdk.skara.issuetracker.*;
import org.openjdk.skara.json.*;
import org.openjdk.skara.test.*;
import org.openjdk.skara.vcs.Branch;
import java.io.IOException;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.nio.file.*;
import java.util.*;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.openjdk.skara.bots.notify.TestUtils.*;
import static org.openjdk.skara.issuetracker.Issue.State.OPEN;
import static org.openjdk.skara.issuetracker.Issue.State.RESOLVED;
public class IssueNotifierTests {
private Set<String> fixVersions(Issue issue) {
if (!issue.properties().containsKey("fixVersions")) {
return Set.of();
}
return issue.properties().get("fixVersions").stream()
.map(JSONValue::asString)
.collect(Collectors.toSet());
}
private TestBotFactory.TestBotFactoryBuilder testBotBuilderFactory(HostedRepository hostedRepository, IssueProject issueProject, Path storagePath, JSONObject notifierConfig) throws IOException {
if (!notifierConfig.contains("project")) {
notifierConfig.put("project", "issueproject");
}
return TestBotFactory.newBuilder()
.addHostedRepository("hostedrepo", hostedRepository)
.addIssueProject("issueproject", issueProject)
.storagePath(storagePath)
.addConfiguration("database", JSON.object()
.put("repository", "hostedrepo:history")
.put("name", "duke")
.put("email", "duke@openjdk.org"))
.addConfiguration("ready", JSON.object()
.put("labels", JSON.array())
.put("comments", JSON.array()))
.addConfiguration("integrator", JSON.of(hostedRepository.forge().currentUser().id()))
.addConfiguration("repositories", JSON.object()
.put("hostedrepo", JSON.object()
.put("basename", "test")
.put("branches", "master|other")
.put("issue", notifierConfig)));
}
private TestBotFactory testBotBuilder(HostedRepository hostedRepository, IssueProject issueProject, Path storagePath, JSONObject notifierConfig) throws IOException {
return testBotBuilderFactory(hostedRepository, issueProject, storagePath, notifierConfig).build();
}
@Test
void testIssueLinkIdempotence(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo);
var tempFolder = new TemporaryDirectory()) {
var repo = credentials.getHostedRepository();
var repoFolder = tempFolder.path().resolve("repo");
var localRepo = CheckableRepository.init(repoFolder, repo.repositoryType());
credentials.commitLock(localRepo);
localRepo.pushAll(repo.url());
var tagStorage = createTagStorage(repo);
var branchStorage = createBranchStorage(repo);
var prStateStorage = createPullRequestStateStorage(repo);
var storageFolder = tempFolder.path().resolve("storage");
var issueProject = credentials.getIssueProject();
var commitIcon = URI.create("http://www.example.com/commit.png");
var notifyBot = NotifyBot.newBuilder()
.repository(repo)
.storagePath(storageFolder)
.branches(Pattern.compile("master"))
.tagStorageBuilder(tagStorage)
.branchStorageBuilder(branchStorage)
.prStateStorageBuilder(prStateStorage)
.integratorId(repo.forge().currentUser().id())
.build();
var updater = IssueNotifier.newBuilder()
.issueProject(issueProject)
.reviewLink(false)
.commitIcon(commitIcon)
.build();
updater.attachTo(notifyBot);
// Initialize history
TestBotRunner.runPeriodicItems(notifyBot);
// Save the state
var historyState = localRepo.fetch(repo.url(), "history");
// Create an issue and commit a fix
var issue = issueProject.createIssue("This is an issue", List.of("Indeed"), Map.of("issuetype", JSON.of("Enhancement")));
var editHash = CheckableRepository.appendAndCommit(localRepo, "Another line", issue.id() + ": Fix that issue");
localRepo.push(editHash, repo.url(), "master");
var pr = credentials.createPullRequest(repo, "master", "master", issue.id() + ": Fix that issue");
pr.setBody("\n\n### Issue\n * [" + issue.id() + "](http://www.test.test/): The issue");
pr.addLabel("integrated");
pr.addComment("Pushed as commit " + editHash.hex() + ".");
TestBotRunner.runPeriodicItems(notifyBot);
// The changeset should be reflected in a link
var links = issue.links();
assertEquals(1, links.size());
var link = links.get(0);
assertEquals(commitIcon, link.iconUrl().orElseThrow());
assertEquals("Commit", link.title().orElseThrow());
assertEquals(repo.webUrl(editHash), link.uri().orElseThrow());
// Wipe the history
localRepo.push(historyState, repo.url(), "history", true);
// Run it again
TestBotRunner.runPeriodicItems(notifyBot);
// There should be no new links
var updatedIssue = issueProject.issue(issue.id()).orElseThrow();
assertEquals(1, updatedIssue.links().size());
}
}
@Test
void testPullRequest(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo);
var tempFolder = new TemporaryDirectory()) {
var repo = credentials.getHostedRepository();
var reviewer = credentials.getHostedRepository();
var repoFolder = tempFolder.path().resolve("repo");
var localRepo = CheckableRepository.init(repoFolder, repo.repositoryType());
credentials.commitLock(localRepo);
localRepo.pushAll(repo.url());
var tagStorage = createTagStorage(repo);
var branchStorage = createBranchStorage(repo);
var prStateStorage = createPullRequestStateStorage(repo);
var storageFolder = tempFolder.path().resolve("storage");
var issueProject = credentials.getIssueProject();
var reviewIcon = URI.create("http://www.example.com/review.png");
var notifyBot = NotifyBot.newBuilder()
.repository(repo)
.storagePath(storageFolder)
.branches(Pattern.compile("master"))
.tagStorageBuilder(tagStorage)
.branchStorageBuilder(branchStorage)
.prStateStorageBuilder(prStateStorage)
.readyComments(Map.of(reviewer.forge().currentUser().username(), Pattern.compile("This is now ready")))
.build();
var updater = IssueNotifier.newBuilder()
.issueProject(issueProject)
.reviewIcon(reviewIcon)
.commitLink(false)
.build();
updater.attachTo(notifyBot);
// Initialize history
TestBotRunner.runPeriodicItems(notifyBot);
// Create an issue and a pull request to fix it
var issue = issueProject.createIssue("This is an issue", List.of("Indeed"), Map.of("issuetype", JSON.of("Enhancement")));
var editHash = CheckableRepository.appendAndCommit(localRepo, "Another line", "Fix that issue");
localRepo.push(editHash, repo.url(), "edit", true);
var pr = credentials.createPullRequest(repo, "edit", "master", issue.id() + ": Fix that issue");
pr.setBody("\n\n### Issue\n * [" + issue.id() + "](http://www.test.test/): The issue");
TestBotRunner.runPeriodicItems(notifyBot);
// The issue should not yet contain a link to the PR
var links = issue.links();
assertEquals(0, links.size());
// Just a label isn't enough
pr.addLabel("rfr");
TestBotRunner.runPeriodicItems(notifyBot);
links = issue.links();
assertEquals(0, links.size());
// Neither is just a comment
pr.removeLabel("rfr");
var reviewPr = reviewer.pullRequest(pr.id());
reviewPr.addComment("This is now ready");
TestBotRunner.runPeriodicItems(notifyBot);
links = issue.links();
assertEquals(0, links.size());
// Both are needed
pr.addLabel("rfr");
TestBotRunner.runPeriodicItems(notifyBot);
// The issue should now contain a link to the PR
links = issue.links();
assertEquals(1, links.size());
assertEquals(pr.webUrl(), links.get(0).uri().orElseThrow());
assertEquals(reviewIcon, links.get(0).iconUrl().orElseThrow());
// Add another issue
var issue2 = issueProject.createIssue("This is another issue", List.of("Yes indeed"), Map.of("issuetype", JSON.of("Enhancement")));
pr.setBody("\n\n### Issues\n * [" + issue.id() + "](http://www.test.test/): The issue\n * [" + issue2.id() +
"](http://www.test2.test/): The second issue");
TestBotRunner.runPeriodicItems(notifyBot);
// Both issues should contain a link to the PR
var links1 = issue.links();
assertEquals(1, links1.size());
assertEquals(pr.webUrl(), links1.get(0).uri().orElseThrow());
var links2 = issue2.links();
assertEquals(1, links2.size());
assertEquals(pr.webUrl(), links2.get(0).uri().orElseThrow());
// Drop the first one
pr.setBody("\n\n### Issues\n * [" + issue2.id() + "](http://www.test2.test/): That other issue");
TestBotRunner.runPeriodicItems(notifyBot);
// Only the second issue should now contain a link to the PR
links1 = issue.links();
assertEquals(0, links1.size());
links2 = issue2.links();
assertEquals(1, links2.size());
assertEquals(pr.webUrl(), links2.get(0).uri().orElseThrow());
}
}
@Test
void testPullRequestNoReview(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo);
var tempFolder = new TemporaryDirectory()) {
var repo = credentials.getHostedRepository();
var reviewer = credentials.getHostedRepository();
var repoFolder = tempFolder.path().resolve("repo");
var localRepo = CheckableRepository.init(repoFolder, repo.repositoryType());
credentials.commitLock(localRepo);
localRepo.pushAll(repo.url());
var tagStorage = createTagStorage(repo);
var branchStorage = createBranchStorage(repo);
var prStateStorage = createPullRequestStateStorage(repo);
var storageFolder = tempFolder.path().resolve("storage");
var issueProject = credentials.getIssueProject();
var reviewIcon = URI.create("http://www.example.com/review.png");
var notifyBot = NotifyBot.newBuilder()
.repository(repo)
.storagePath(storageFolder)
.branches(Pattern.compile("master"))
.tagStorageBuilder(tagStorage)
.branchStorageBuilder(branchStorage)
.prStateStorageBuilder(prStateStorage)
.readyComments(Map.of(reviewer.forge().currentUser().username(), Pattern.compile("This is now ready")))
.build();
var updater = IssueNotifier.newBuilder()
.issueProject(issueProject)
.reviewLink(false)
.reviewIcon(reviewIcon)
.commitLink(false)
.build();
updater.attachTo(notifyBot);
// Initialize history
TestBotRunner.runPeriodicItems(notifyBot);
// Create an issue and a pull request to fix it
var issue = issueProject.createIssue("This is an issue", List.of("Indeed"), Map.of("issuetype", JSON.of("Enhancement")));
var editHash = CheckableRepository.appendAndCommit(localRepo, "Another line", "Fix that issue");
localRepo.push(editHash, repo.url(), "edit", true);
var pr = credentials.createPullRequest(repo, "edit", "master", issue.id() + ": Fix that issue");
pr.setBody("\n\n### Issue\n * [" + issue.id() + "](http://www.test.test/): The issue");
TestBotRunner.runPeriodicItems(notifyBot);
// Add required label
pr.addLabel("rfr");
TestBotRunner.runPeriodicItems(notifyBot);
// And the required comment
var reviewPr = reviewer.pullRequest(pr.id());
reviewPr.addComment("This is now ready");
TestBotRunner.runPeriodicItems(notifyBot);
// The issue should still not contain a link to the PR
var links = issue.links();
assertEquals(0, links.size());
}
}
@Test
void testPullRequestPROnly(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo);
var tempFolder = new TemporaryDirectory()) {
var repo = credentials.getHostedRepository();
var repoFolder = tempFolder.path().resolve("repo");
var localRepo = CheckableRepository.init(repoFolder, repo.repositoryType());
credentials.commitLock(localRepo);
localRepo.pushAll(repo.url());
var issueProject = credentials.getIssueProject();
var storageFolder = tempFolder.path().resolve("storage");
var reviewIcon = URI.create("http://www.example.com/review.png");
var jbsNotifierConfig = JSON.object().put("reviews", JSON.object().put("icon", reviewIcon.toString()));
var notifyBot = testBotBuilder(repo, issueProject, storageFolder, jbsNotifierConfig).create("notify", JSON.object());
// Initialize history
localRepo.push(localRepo.resolve("master").orElseThrow(), repo.url(), "other");
TestBotRunner.runPeriodicItems(notifyBot);
// Create an issue and a pull request to fix it
var issue = issueProject.createIssue("This is an issue", List.of("Indeed"), Map.of("issuetype", JSON.of("Enhancement")));
var editHash = CheckableRepository.appendAndCommit(localRepo, "Another line", issue.id() + ": Fix that issue");
localRepo.push(editHash, repo.url(), "edit", true);
var pr = credentials.createPullRequest(repo, "other", "edit", issue.id() + ": Fix that issue");
pr.setBody("\n\n### Issue\n * [" + issue.id() + "](http://www.test.test/): The issue");
pr.addLabel("rfr");
TestBotRunner.runPeriodicItems(notifyBot);
// The issue should now contain a link to the PR
var links = issue.links();
assertEquals(1, links.size());
assertEquals(pr.webUrl(), links.get(0).uri().orElseThrow());
assertEquals(reviewIcon, links.get(0).iconUrl().orElseThrow());
// Simulate integration
pr.addComment("Pushed as commit " + editHash.hex() + ".");
pr.addLabel("integrated");
pr.setState(Issue.State.CLOSED);
localRepo.push(editHash, repo.url(), "other");
TestBotRunner.runPeriodicItems(notifyBot);
// The changeset should be reflected in another link
var updatedIssue = issueProject.issue(issue.id()).orElseThrow();
links = updatedIssue.links();
assertEquals(2, links.size());
// Now simulate a merge to another branch
localRepo.push(editHash, repo.url(), "master");
TestBotRunner.runPeriodicItems(notifyBot);
// No additional link should have been created
updatedIssue = issueProject.issue(issue.id()).orElseThrow();
links = updatedIssue.links();
assertEquals(2, links.size());
// And no comments should have been made
assertEquals(0, issue.comments().size());
}
}
@Test
void testMultipleIssues(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo);
var tempFolder = new TemporaryDirectory()) {
var repo = credentials.getHostedRepository();
var repoFolder = tempFolder.path().resolve("repo");
var localRepo = CheckableRepository.init(repoFolder, repo.repositoryType());
credentials.commitLock(localRepo);
localRepo.pushAll(repo.url());
var issueProject = credentials.getIssueProject();
var storageFolder = tempFolder.path().resolve("storage");
var jbsNotifierConfig = JSON.object().put("fixversions", JSON.object())
.put("buildname", "team");
var notifyBot = testBotBuilder(repo, issueProject, storageFolder, jbsNotifierConfig).create("notify", JSON.object());
// Initialize history
TestBotRunner.runPeriodicItems(notifyBot);
// Create an issue and commit a fix
var authorEmailAddress = issueProject.issueTracker().currentUser().username() + "@openjdk.org";
var issue1 = issueProject.createIssue("This is an issue", List.of("Indeed"), Map.of("issuetype", JSON.of("Enhancement")));
var issue2 = issueProject.createIssue("This is another issue", List.of("Indeed"), Map.of("issuetype", JSON.of("Enhancement")));
var issue3 = issueProject.createIssue("This is yet another issue", List.of("Indeed"), Map.of("issuetype", JSON.of("Enhancement")));
var editHash = CheckableRepository.appendAndCommit(localRepo, "Another line",
issue1.id() + ": Fix that issue\n" +
issue1.id() + ": Fix that issue\n" +
issue2.id() + ": And fix the other issue\n" +
issue3.id() + ": As well as this one\n",
"Duke", authorEmailAddress);
localRepo.push(editHash, repo.url(), "master");
TestBotRunner.runPeriodicItems(notifyBot);
TestBotRunner.runPeriodicItems(notifyBot);
// The changeset should be reflected in a comment
var updatedIssue1 = issueProject.issue(issue1.id()).orElseThrow();
var updatedIssue2 = issueProject.issue(issue2.id()).orElseThrow();
var updatedIssue3 = issueProject.issue(issue3.id()).orElseThrow();
var comments1 = updatedIssue1.comments();
assertEquals(1, comments1.size());
var comment1 = comments1.get(0);
assertTrue(comment1.body().contains(editHash.toString()));
var comments2 = updatedIssue2.comments();
assertEquals(1, comments2.size());
var comment2 = comments2.get(0);
assertTrue(comment2.body().contains(editHash.toString()));
var comments3 = updatedIssue3.comments();
assertEquals(1, comments3.size());
var comment3 = comments3.get(0);
assertTrue(comment3.body().contains(editHash.toString()));
// As well as a fixVersion and a resolved in build
assertEquals(Set.of("0.1"), fixVersions(updatedIssue1));
assertEquals("team", updatedIssue1.properties().get("customfield_10006").asString());
assertEquals(Set.of("0.1"), fixVersions(updatedIssue2));
assertEquals("team", updatedIssue2.properties().get("customfield_10006").asString());
// The issue should be assigned and resolved
assertEquals(RESOLVED, updatedIssue1.state());
assertEquals(List.of(issueProject.issueTracker().currentUser()), updatedIssue1.assignees());
assertEquals(RESOLVED, updatedIssue2.state());
assertEquals(List.of(issueProject.issueTracker().currentUser()), updatedIssue2.assignees());
}
}
@Test
void testIssue(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo);
var tempFolder = new TemporaryDirectory()) {
var repo = credentials.getHostedRepository();
var repoFolder = tempFolder.path().resolve("repo");
var localRepo = CheckableRepository.init(repoFolder, repo.repositoryType());
credentials.commitLock(localRepo);
localRepo.pushAll(repo.url());
var issueProject = credentials.getIssueProject();
var storageFolder = tempFolder.path().resolve("storage");
var jbsNotifierConfig = JSON.object().put("fixversions", JSON.object())
.put("buildname", "team");
var notifyBot = testBotBuilder(repo, issueProject, storageFolder, jbsNotifierConfig).create("notify", JSON.object());
// Initialize history
TestBotRunner.runPeriodicItems(notifyBot);
// Create an issue and commit a fix
var authorEmailAddress = issueProject.issueTracker().currentUser().username() + "@openjdk.org";
var issue = issueProject.createIssue("This is an issue", List.of("Indeed"), Map.of("issuetype", JSON.of("Enhancement")));
var editHash = CheckableRepository.appendAndCommit(localRepo, "Another line", issue.id() + ": Fix that issue", "Duke", authorEmailAddress);
localRepo.push(editHash, repo.url(), "master");
TestBotRunner.runPeriodicItems(notifyBot);
// The changeset should be reflected in a comment
var updatedIssue = issueProject.issue(issue.id()).orElseThrow();
var comments = updatedIssue.comments();
assertEquals(1, comments.size());
var comment = comments.get(0);
assertTrue(comment.body().contains(editHash.toString()));
// As well as a fixVersion and a resolved in build
assertEquals(Set.of("0.1"), fixVersions(updatedIssue));
assertEquals("team", updatedIssue.properties().get("customfield_10006").asString());
// The issue should be assigned and resolved
assertEquals(RESOLVED, updatedIssue.state());
assertEquals(List.of(issueProject.issueTracker().currentUser()), updatedIssue.assignees());
}
}
@Test
void testIssueBuildAfterMerge(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo);
var tempFolder = new TemporaryDirectory()) {
var repo = credentials.getHostedRepository();
var repoFolder = tempFolder.path().resolve("repo");
var localRepo = CheckableRepository.init(repoFolder, repo.repositoryType());
credentials.commitLock(localRepo);
localRepo.pushAll(repo.url());
var issueProject = credentials.getIssueProject();
var storageFolder = tempFolder.path().resolve("storage");
var jbsNotifierConfig = JSON.object().put("fixversions", JSON.object())
.put("buildname", "team");
var notifyBot = testBotBuilder(repo, issueProject, storageFolder, jbsNotifierConfig).create("notify", JSON.object());
var jbsNotifierConfig2 = JSON.object().put("fixversions", JSON.object())
.put("buildname", "master");
var notifyBot2 = testBotBuilder(repo, issueProject, storageFolder, jbsNotifierConfig2).create("notify", JSON.object());
var jbsNotifierConfig3 = JSON.object().put("fixversions", JSON.object())
.put("buildname", "b04");
var notifyBot3 = testBotBuilder(repo, issueProject, storageFolder, jbsNotifierConfig3).create("notify", JSON.object());
var jbsNotifierConfig4 = JSON.object().put("fixversions", JSON.object())
.put("buildname", "b02");
var notifyBot4 = testBotBuilder(repo, issueProject, storageFolder, jbsNotifierConfig4).create("notify", JSON.object());
var jbsNotifierConfig5 = JSON.object().put("fixversions", JSON.object())
.put("buildname", "b03");
var notifyBot5 = testBotBuilder(repo, issueProject, storageFolder, jbsNotifierConfig5).create("notify", JSON.object());
// Initialize history
TestBotRunner.runPeriodicItems(notifyBot);
var blankHistory = repo.branchHash("history");
// Create an issue and commit a fix
var authorEmailAddress = issueProject.issueTracker().currentUser().username() + "@openjdk.org";
var issue = issueProject.createIssue("This is an issue", List.of("Indeed"), Map.of("issuetype", JSON.of("Enhancement")));
var editHash = CheckableRepository.appendAndCommit(localRepo, "Another line", issue.id() + ": Fix that issue", "Duke", authorEmailAddress);
localRepo.push(editHash, repo.url(), "master");
TestBotRunner.runPeriodicItems(notifyBot);
// The changeset should be reflected in a comment
var updatedIssue = issueProject.issue(issue.id()).orElseThrow();
var comments = updatedIssue.comments();
assertEquals(1, comments.size());
var comment = comments.get(0);
assertTrue(comment.body().contains(editHash.toString()));
// As well as a fixVersion and a resolved in build
assertEquals(Set.of("0.1"), fixVersions(updatedIssue));
assertEquals("team", updatedIssue.properties().get("customfield_10006").asString());
// The issue should be assigned and resolved
assertEquals(RESOLVED, updatedIssue.state());
assertEquals(List.of(issueProject.issueTracker().currentUser()), updatedIssue.assignees());
// Restore the history to simulate looking at another repository
localRepo.fetch(repo.url(), "history");
localRepo.push(blankHistory, repo.url(), "history", true);
// When the second notifier sees it, it should upgrade the build name
TestBotRunner.runPeriodicItems(notifyBot2);
updatedIssue = issueProject.issue(issue.id()).orElseThrow();
assertEquals("master", updatedIssue.properties().get("customfield_10006").asString());
// Restore the history to simulate looking at another repository
localRepo.fetch(repo.url(), "history");
localRepo.push(blankHistory, repo.url(), "history", true);
// When the third notifier sees it, it should switch to a build number
TestBotRunner.runPeriodicItems(notifyBot3);
updatedIssue = issueProject.issue(issue.id()).orElseThrow();
assertEquals("b04", updatedIssue.properties().get("customfield_10006").asString());
// Restore the history to simulate looking at another repository
localRepo.fetch(repo.url(), "history");
localRepo.push(blankHistory, repo.url(), "history", true);
// When the fourth notifier sees it, it should switch to a lower build number
TestBotRunner.runPeriodicItems(notifyBot4);
updatedIssue = issueProject.issue(issue.id()).orElseThrow();
assertEquals("b02", updatedIssue.properties().get("customfield_10006").asString());
// Restore the history to simulate looking at another repository
localRepo.fetch(repo.url(), "history");
localRepo.push(blankHistory, repo.url(), "history", true);
// When the fifth notifier sees it, it should NOT switch to a higher build number
TestBotRunner.runPeriodicItems(notifyBot5);
updatedIssue = issueProject.issue(issue.id()).orElseThrow();
assertEquals("b02", updatedIssue.properties().get("customfield_10006").asString());
}
}
@Test
void testIssueBuildAfterTag(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo);
var tempFolder = new TemporaryDirectory()) {
var repo = credentials.getHostedRepository();
var repoFolder = tempFolder.path().resolve("repo");
var localRepo = CheckableRepository.init(repoFolder, repo.repositoryType());
credentials.commitLock(localRepo);
localRepo.pushAll(repo.url());
var issueProject = credentials.getIssueProject();
var storageFolder = tempFolder.path().resolve("storage");
var jbsNotifierConfig = JSON.object().put("fixversions", JSON.object())
.put("buildname", "team");
var notifyBot = testBotBuilder(repo, issueProject, storageFolder, jbsNotifierConfig).create("notify", JSON.object());
// Initialize history
var current = localRepo.resolve("master").orElseThrow();
localRepo.tag(current, "jdk-16+9", "First tag", "duke", "duke@openjdk.org");
localRepo.push(new Branch(repo.url().toString()), "--tags", false);
TestBotRunner.runPeriodicItems(notifyBot);
// Create an issue and commit a fix
var authorEmailAddress = issueProject.issueTracker().currentUser().username() + "@openjdk.org";
var issue = issueProject.createIssue("This is an issue", List.of("Indeed"), Map.of("issuetype", JSON.of("Enhancement")));
var editHash = CheckableRepository.appendAndCommit(localRepo, "Another line", issue.id() + ": Fix that issue", "Duke", authorEmailAddress);
localRepo.push(editHash, repo.url(), "master");
TestBotRunner.runPeriodicItems(notifyBot);
// The changeset should be reflected in a comment
var updatedIssue = issueProject.issue(issue.id()).orElseThrow();
var comments = updatedIssue.comments();
assertEquals(1, comments.size());
var comment = comments.get(0);
assertTrue(comment.body().contains(editHash.toString()));
// As well as a fixVersion and a resolved in build
assertEquals(Set.of("0.1"), fixVersions(updatedIssue));
assertEquals("team", updatedIssue.properties().get("customfield_10006").asString());
// The issue should be assigned and resolved
assertEquals(RESOLVED, updatedIssue.state());
assertEquals(List.of(issueProject.issueTracker().currentUser()), updatedIssue.assignees());
// Tag it
localRepo.tag(editHash, "jdk-16+110", "Second tag", "duke", "duke@openjdk.org");
localRepo.push(new Branch(repo.url().toString()), "--tags", false);
TestBotRunner.runPeriodicItems(notifyBot);
// The build should now be updated
updatedIssue = issueProject.issue(issue.id()).orElseThrow();
assertEquals("b110", updatedIssue.properties().get("customfield_10006").asString());
// Tag it again
localRepo.tag(editHash, "jdk-16+10", "Third tag", "duke", "duke@openjdk.org");
localRepo.push(new Branch(repo.url().toString()), "--tags", false);
TestBotRunner.runPeriodicItems(notifyBot);
// The build should now be updated
updatedIssue = issueProject.issue(issue.id()).orElseThrow();
assertEquals("b10", updatedIssue.properties().get("customfield_10006").asString());
// Tag it once again
localRepo.tag(editHash, "jdk-16+8", "Fourth tag", "duke", "duke@openjdk.org");
localRepo.push(new Branch(repo.url().toString()), "--tags", false);
TestBotRunner.runPeriodicItems(notifyBot);
// The build should now be updated
updatedIssue = issueProject.issue(issue.id()).orElseThrow();
assertEquals("b08", updatedIssue.properties().get("customfield_10006").asString());
}
}
@Test
void testIssueBuildAfterTagMultipleBranches(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo);
var tempFolder = new TemporaryDirectory()) {
var repo = credentials.getHostedRepository();
var repoFolder = tempFolder.path().resolve("repo");
var localRepo = CheckableRepository.init(repoFolder, repo.repositoryType());
credentials.commitLock(localRepo);
localRepo.pushAll(repo.url());
var issueProject = credentials.getIssueProject();
var storageFolder = tempFolder.path().resolve("storage");
var jbsNotifierConfig = JSON.object().put("fixversions", JSON.object()
.put("master", "16")
.put("other", "16.0.2"))
.put("buildname", "team");
var notifyBot = testBotBuilder(repo, issueProject, storageFolder, jbsNotifierConfig).create("notify", JSON.object());
// Initialize history
var current = localRepo.resolve("master").orElseThrow();
localRepo.push(current, repo.url(), "other");
localRepo.tag(current, "jdk-16+9", "First tag", "duke", "duke@openjdk.org");
localRepo.push(new Branch(repo.url().toString()), "--tags", false);
TestBotRunner.runPeriodicItems(notifyBot);
// Create an issue and commit a fix
var authorEmailAddress = issueProject.issueTracker().currentUser().username() + "@openjdk.org";
var issue = issueProject.createIssue("This is an issue", List.of("Indeed"), Map.of("issuetype", JSON.of("Enhancement")));
issue.setProperty("fixVersions", JSON.of("16.0.2"));
var editHash = CheckableRepository.appendAndCommit(localRepo, "Another line", issue.id() + ": Fix that issue", "Duke", authorEmailAddress);
localRepo.push(editHash, repo.url(), "master");
localRepo.push(editHash, repo.url(), "other");
TestBotRunner.runPeriodicItems(notifyBot);
// The changeset should be reflected in a comment in the issue and in a new backport
var updatedIssue = issueProject.issue(issue.id()).orElseThrow();
var backportIssue = updatedIssue.links().get(0).issue().orElseThrow();
var comments = updatedIssue.comments();
assertEquals(1, comments.size());
var comment = comments.get(0);
assertTrue(comment.body().contains(editHash.toString()));
var backportComments = backportIssue.comments();
assertEquals(1, backportComments.size());
var backportComment = backportComments.get(0);
assertTrue(backportComment.body().contains(editHash.toString()));
// As well as a fixVersion and a resolved in build
assertEquals(Set.of("16.0.2"), fixVersions(updatedIssue));
assertEquals("team", updatedIssue.properties().get("customfield_10006").asString());
assertEquals(Set.of("16"), fixVersions(backportIssue));
assertEquals("team", backportIssue.properties().get("customfield_10006").asString());
// The issue should be assigned and resolved
assertEquals(RESOLVED, updatedIssue.state());
assertEquals(List.of(issueProject.issueTracker().currentUser()), updatedIssue.assignees());
assertEquals(RESOLVED, backportIssue.state());
assertEquals(List.of(issueProject.issueTracker().currentUser()), backportIssue.assignees());
// Tag it
localRepo.tag(editHash, "jdk-16+110", "Second tag", "duke", "duke@openjdk.org");
localRepo.push(new Branch(repo.url().toString()), "--tags", false);
TestBotRunner.runPeriodicItems(notifyBot);
// The build should now be updated
updatedIssue = issueProject.issue(issue.id()).orElseThrow();
backportIssue = issueProject.issue(backportIssue.id()).orElseThrow();
assertEquals("b110", updatedIssue.properties().get("customfield_10006").asString());
assertEquals("b110", backportIssue.properties().get("customfield_10006").asString());
// Tag it again
localRepo.tag(editHash, "jdk-16+10", "Third tag", "duke", "duke@openjdk.org");
localRepo.push(new Branch(repo.url().toString()), "--tags", false);
TestBotRunner.runPeriodicItems(notifyBot);
// The build should now be updated
updatedIssue = issueProject.issue(issue.id()).orElseThrow();
backportIssue = issueProject.issue(backportIssue.id()).orElseThrow();
assertEquals("b10", updatedIssue.properties().get("customfield_10006").asString());
assertEquals("b10", backportIssue.properties().get("customfield_10006").asString());
// Tag it once again
localRepo.tag(editHash, "jdk-16+8", "Fourth tag", "duke", "duke@openjdk.org");
localRepo.push(new Branch(repo.url().toString()), "--tags", false);
TestBotRunner.runPeriodicItems(notifyBot);
// The build should now be updated
updatedIssue = issueProject.issue(issue.id()).orElseThrow();
backportIssue = issueProject.issue(backportIssue.id()).orElseThrow();
assertEquals("b08", updatedIssue.properties().get("customfield_10006").asString());
assertEquals("b08", backportIssue.properties().get("customfield_10006").asString());
}
}
@Test
void testIssueRetryTag(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo);
var tempFolder = new TemporaryDirectory()) {
var repo = credentials.getHostedRepository();
var repoFolder = tempFolder.path().resolve("repo");
var localRepo = CheckableRepository.init(repoFolder, repo.repositoryType());
credentials.commitLock(localRepo);
localRepo.pushAll(repo.url());
var issueProject = credentials.getIssueProject();
var storageFolder = tempFolder.path().resolve("storage");
var jbsNotifierConfig = JSON.object().put("fixversions", JSON.object())
.put("buildname", "team");
var notifyBot = testBotBuilder(repo, issueProject, storageFolder, jbsNotifierConfig).create("notify", JSON.object());
// Initialize history
var current = localRepo.resolve("master").orElseThrow();
localRepo.tag(current, "jdk-16+9", "First tag", "duke", "duke@openjdk.org");
localRepo.push(new Branch(repo.url().toString()), "--tags", false);
TestBotRunner.runPeriodicItems(notifyBot);
// Create an issue and commit a fix
var authorEmailAddress = issueProject.issueTracker().currentUser().username() + "@openjdk.org";
var issue = issueProject.createIssue("This is an issue", List.of("Indeed"), Map.of("issuetype", JSON.of("Enhancement")));
var editHash = CheckableRepository.appendAndCommit(localRepo, "Another line", issue.id() + ": Fix that issue", "Duke", authorEmailAddress);
localRepo.push(editHash, repo.url(), "master");
TestBotRunner.runPeriodicItems(notifyBot);
// The changeset should be reflected in a comment
var updatedIssue = issueProject.issue(issue.id()).orElseThrow();
var comments = updatedIssue.comments();
assertEquals(1, comments.size());
var comment = comments.get(0);
assertTrue(comment.body().contains(editHash.toString()));
// As well as a fixVersion and a resolved in build
assertEquals(Set.of("0.1"), fixVersions(updatedIssue));
assertEquals("team", updatedIssue.properties().get("customfield_10006").asString());
// The issue should be assigned and resolved
assertEquals(RESOLVED, updatedIssue.state());
assertEquals(List.of(issueProject.issueTracker().currentUser()), updatedIssue.assignees());
// Tag it
localRepo.tag(editHash, "jdk-16+110", "Second tag", "duke", "duke@openjdk.org");
localRepo.push(new Branch(repo.url().toString()), "--tags", false);
TestBotRunner.runPeriodicItems(notifyBot);
// The build should now be updated
updatedIssue = issueProject.issue(issue.id()).orElseThrow();
assertEquals("b110", updatedIssue.properties().get("customfield_10006").asString());
// Tag it again
localRepo.tag(editHash, "jdk-16+10", "Third tag", "duke", "duke@openjdk.org");
localRepo.push(new Branch(repo.url().toString()), "--tags", false);
// Claim that it is already processed
localRepo.fetch(repo.url(), "+history:history");
localRepo.checkout(new Branch("history"), true);
var historyFile = repoFolder.resolve("test.tags.txt");
var processed = new ArrayList<>(Files.readAllLines(historyFile, StandardCharsets.UTF_8));
processed.add("jdk-16+10 issue done");
Files.writeString(historyFile, String.join("\n", processed), StandardCharsets.UTF_8);
localRepo.add(historyFile);
var updatedHash = localRepo.commit("Marking jdk-16+10 as done", "duke", "duke@openjdk.org");
localRepo.push(updatedHash, repo.url(), "history");
// Now let the notifier see it
TestBotRunner.runPeriodicItems(notifyBot);
// The build should not have been updated
updatedIssue = issueProject.issue(issue.id()).orElseThrow();
assertEquals("b110", updatedIssue.properties().get("customfield_10006").asString());
// Flag it as in need of retry
processed.remove(processed.size() - 1);
processed.add("jdk-16+10 issue retry");
Files.writeString(repoFolder.resolve("test.tags.txt"), String.join("\n", processed), StandardCharsets.UTF_8);
localRepo.add(historyFile);
var retryHash = localRepo.commit("Marking jdk-16+10 as needing retry", "duke", "duke@openjdk.org");
localRepo.push(retryHash, repo.url(), "history");
// Now let the notifier see it
TestBotRunner.runPeriodicItems(notifyBot);
// The build should have been updated by the retry
updatedIssue = issueProject.issue(issue.id()).orElseThrow();
assertEquals("b10", updatedIssue.properties().get("customfield_10006").asString());
}
}
@Test
void testIssueOtherDomain(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo);
var tempFolder = new TemporaryDirectory()) {
var repo = credentials.getHostedRepository();
var repoFolder = tempFolder.path().resolve("repo");
var localRepo = CheckableRepository.init(repoFolder, repo.repositoryType());
credentials.commitLock(localRepo);
localRepo.pushAll(repo.url());
var issueProject = credentials.getIssueProject();
var censusBuilder = credentials.getCensusBuilder()
.addReviewer(issueProject.issueTracker().currentUser().username());
var storageFolder = tempFolder.path().resolve("storage");
var jbsNotifierConfig = JSON.object().put("fixversions", JSON.object())
.put("census", JSON.of("census:master"))
.put("namespace", "test");
var notifyBotFactory = testBotBuilderFactory(repo, issueProject, storageFolder, jbsNotifierConfig);
notifyBotFactory.addHostedRepository("census", censusBuilder.build());
var notifyBot = notifyBotFactory.build().create("notify", JSON.object());
// Initialize history
TestBotRunner.runPeriodicItems(notifyBot);
// Create an issue and commit a fix
var authorEmailAddress = "integrationreviewer1@otherjdk.org";
var issue = issueProject.createIssue("This is an issue", List.of("Indeed"), Map.of("issuetype", JSON.of("Enhancement")));
var editHash = CheckableRepository.appendAndCommit(localRepo, "Another line", issue.id() + ": Fix that issue", "Duke", authorEmailAddress);
localRepo.push(editHash, repo.url(), "master");
TestBotRunner.runPeriodicItems(notifyBot);
// The changeset should be reflected in a comment
var updatedIssue = issueProject.issue(issue.id()).orElseThrow();
var comments = updatedIssue.comments();
assertEquals(1, comments.size());
var comment = comments.get(0);
assertTrue(comment.body().contains(editHash.toString()));
// As well as a fixVersion
assertEquals(Set.of("0.1"), fixVersions(updatedIssue));
// The issue should be assigned and resolved
assertEquals(RESOLVED, updatedIssue.state());
assertEquals(List.of(issueProject.issueTracker().currentUser()), updatedIssue.assignees());
}
}
@Test
void testIssueNoVersion(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo);
var tempFolder = new TemporaryDirectory()) {
var repo = credentials.getHostedRepository();
var repoFolder = tempFolder.path().resolve("repo");
var localRepo = CheckableRepository.init(repoFolder, repo.repositoryType(), Path.of("appendable.txt"), Set.of(), null);
credentials.commitLock(localRepo);
localRepo.pushAll(repo.url());
var storageFolder = tempFolder.path().resolve("storage");
var issueProject = credentials.getIssueProject();
var jbsNotifierConfig = JSON.object().put("fixversions", JSON.object());
var notifyBot = testBotBuilder(repo, issueProject, storageFolder, jbsNotifierConfig).create("notify", JSON.object());
// Initialize history
TestBotRunner.runPeriodicItems(notifyBot);
// Create an issue and commit a fix
var issue = issueProject.createIssue("This is an issue", List.of("Indeed"), Map.of("issuetype", JSON.of("Enhancement")));
var editHash = CheckableRepository.appendAndCommit(localRepo, "Another line", issue.id() + ": Fix that issue");
localRepo.push(editHash, repo.url(), "master");
TestBotRunner.runPeriodicItems(notifyBot);
// The changeset should be reflected in a comment
var comments = issue.comments();
assertEquals(1, comments.size());
var comment = comments.get(0);
assertTrue(comment.body().contains(editHash.toString()));
// But not in the fixVersion
assertEquals(Set.of(), fixVersions(issue));
}
}
@Test
void testIssueConfiguredVersionNoCommit(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo);
var tempFolder = new TemporaryDirectory()) {
var repo = credentials.getHostedRepository();
var repoFolder = tempFolder.path().resolve("repo");
var localRepo = CheckableRepository.init(repoFolder, repo.repositoryType(), Path.of("appendable.txt"), Set.of(), null);
credentials.commitLock(localRepo);
localRepo.pushAll(repo.url());
var storageFolder = tempFolder.path().resolve("storage");
var issueProject = credentials.getIssueProject();
var jbsNotifierConfig = JSON.object().put("fixversions", JSON.object().put("master", "2.0"));
var notifyBot = testBotBuilder(repo, issueProject, storageFolder, jbsNotifierConfig).create("notify", JSON.object());
// Initialize history
TestBotRunner.runPeriodicItems(notifyBot);
// Create an issue and commit a fix
var issue = issueProject.createIssue("This is an issue", List.of("Indeed"), Map.of("issuetype", JSON.of("Enhancement")));
var editHash = CheckableRepository.appendAndCommit(localRepo, "Another line", issue.id() + ": Fix that issue");
localRepo.push(editHash, repo.url(), "master");
TestBotRunner.runPeriodicItems(notifyBot);
// The changeset should not reflected in a comment
var comments = issue.comments();
assertEquals(1, comments.size());
var comment = comments.get(0);
assertTrue(comment.body().contains(editHash.toString()));
// As well as a fixVersion - but not the one from the repo
assertEquals(Set.of("2.0"), fixVersions(issue));
// And no commit link
var links = issue.links();
assertEquals(0, links.size());
}
}
@Test
void testIssueIdempotence(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo);
var tempFolder = new TemporaryDirectory()) {
var repo = credentials.getHostedRepository();
var repoFolder = tempFolder.path().resolve("repo");
var localRepo = CheckableRepository.init(repoFolder, repo.repositoryType());
credentials.commitLock(localRepo);
localRepo.pushAll(repo.url());
var storageFolder = tempFolder.path().resolve("storage");
var issueProject = credentials.getIssueProject();
var jbsNotifierConfig = JSON.object().put("fixversions", JSON.object());
var notifyBot = testBotBuilder(repo, issueProject, storageFolder, jbsNotifierConfig).create("notify", JSON.object());
// Initialize history
TestBotRunner.runPeriodicItems(notifyBot);
// Save the state
var historyState = localRepo.fetch(repo.url(), "history");
// Create an issue and commit a fix
var issue = issueProject.createIssue("This is an issue", List.of("Indeed"), Map.of("issuetype", JSON.of("Enhancement")));
var editHash = CheckableRepository.appendAndCommit(localRepo, "Another line", issue.id() + ": Fix that issue");
localRepo.push(editHash, repo.url(), "master");
TestBotRunner.runPeriodicItems(notifyBot);