< prev index next >

bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotTests.java

Print this page
@@ -109,11 +109,12 @@
                                                   Set.of(),
                                                   listServer.getArchive(), listServer.getSMTP(),
                                                   archive, "webrev", Path.of("test"),
                                                   URIBuilder.base("http://www.test.test/").build(),
                                                   Set.of("rfr"), Map.of(ignored.host().getCurrentUserDetails().userName(),
-                                                                        Pattern.compile("ready")));
+                                                                        Pattern.compile("ready")),
+                                                  URIBuilder.base("http://issues.test/browse/").build());
  
              // Populate the projects repository
              var localRepo = CheckableRepository.init(tempFolder.path(), author.getRepositoryType());
              var masterHash = localRepo.resolve("master").orElseThrow();
              localRepo.push(masterHash, author.getUrl(), "master", true);

@@ -121,11 +122,11 @@
  
              // Make a change with a corresponding PR
              var editHash = CheckableRepository.appendAndCommit(localRepo, "A simple change",
                                                                 "Change msg\n\nWith several lines");
              localRepo.push(editHash, author.getUrl(), "edit", true);
-             var pr = credentials.createPullRequest(archive, "master", "edit", "This is a pull request");
+             var pr = credentials.createPullRequest(archive, "master", "edit", "1234: This is a pull request");
              pr.setBody("This should not be ready");
  
              // Run an archive pass
              TestBotRunner.runPeriodicItems(mlBot);
  

@@ -168,10 +169,12 @@
              assertTrue(archiveContains(archiveFolder.path(), "Patch:"));
              assertTrue(archiveContains(archiveFolder.path(), "Changes:"));
              assertTrue(archiveContains(archiveFolder.path(), "Webrev:"));
              assertTrue(archiveContains(archiveFolder.path(), "http://www.test.test/"));
              assertTrue(archiveContains(archiveFolder.path(), "webrev.00"));
+             assertTrue(archiveContains(archiveFolder.path(), "Issue:"));
+             assertTrue(archiveContains(archiveFolder.path(), "http://issues.test/browse/TSTPRJ-1234"));
              assertTrue(archiveContains(archiveFolder.path(), "Fetch:"));
              assertTrue(archiveContains(archiveFolder.path(), "^ - " + editHash.abbreviate() + ": Change msg"));
              assertFalse(archiveContains(archiveFolder.path(), "With several lines"));
  
              // The mailing list as well

@@ -179,11 +182,11 @@
              var mailmanServer = MailingListServerFactory.createMailmanServer(listServer.getArchive(), listServer.getSMTP());
              var mailmanList = mailmanServer.getList(listAddress.address());
              var conversations = mailmanList.conversations(Duration.ofDays(1));
              assertEquals(1, conversations.size());
              var mail = conversations.get(0).first();
-             assertEquals("RFR: This is a pull request", mail.subject());
+             assertEquals("RFR: 1234: This is a pull request", mail.subject());
              assertEquals(pr.getAuthor().fullName(), mail.author().fullName().orElseThrow());
              assertEquals(noreplyAddress(archive), mail.author().address());
              assertEquals(from, mail.sender());
  
              // And there should be a webrev

@@ -258,11 +261,12 @@
                                                   Set.of(ignored.host().getCurrentUserDetails().userName()),
                                                   Set.of(),
                                                   listServer.getArchive(), listServer.getSMTP(),
                                                   archive, "webrev", Path.of("test"),
                                                   URIBuilder.base("http://www.test.test/").build(),
-                                                  Set.of(), Map.of());
+                                                  Set.of(), Map.of(),
+                                                  URIBuilder.base("http://issues.test/browse/").build());
  
              // Populate the projects repository
              var reviewFile = Path.of("reviewfile.txt");
              var localRepo = CheckableRepository.init(tempFolder.path(), author.getRepositoryType(), reviewFile);
              var masterHash = localRepo.resolve("master").orElseThrow();

@@ -344,11 +348,12 @@
                                                   listAddress, Set.of(), Set.of(),
                                                   listServer.getArchive(),
                                                   listServer.getSMTP(),
                                                   archive, "webrev", Path.of("test"),
                                                   URIBuilder.base("http://www.test.test/").build(),
-                                                  Set.of(), Map.of());
+                                                  Set.of(), Map.of(),
+                                                  URIBuilder.base("http://issues.test/browse/").build());
  
              // Populate the projects repository
              var reviewFile = Path.of("reviewfile.txt");
              var localRepo = CheckableRepository.init(tempFolder.path(), author.getRepositoryType(), reviewFile);
              var masterHash = localRepo.resolve("master").orElseThrow();

@@ -416,11 +421,12 @@
                                                   listAddress, Set.of(), Set.of(),
                                                   listServer.getArchive(),
                                                   listServer.getSMTP(),
                                                   archive, "webrev", Path.of("test"),
                                                   URIBuilder.base("http://www.test.test/").build(),
-                                                  Set.of(), Map.of());
+                                                  Set.of(), Map.of(),
+                                                  URIBuilder.base("http://issues.test/browse/").build());
  
              // Populate the projects repository
              var reviewFile = Path.of("reviewfile.txt");
              var localRepo = CheckableRepository.init(tempFolder.path(), author.getRepositoryType(), reviewFile);
              var masterHash = localRepo.resolve("master").orElseThrow();

@@ -524,11 +530,12 @@
                                                   listAddress, Set.of(), Set.of(),
                                                   listServer.getArchive(),
                                                   listServer.getSMTP(),
                                                   archive, "webrev", Path.of("test"),
                                                   URIBuilder.base("http://www.test.test/").build(),
-                                                  Set.of(), Map.of());
+                                                  Set.of(), Map.of(),
+                                                  URIBuilder.base("http://issues.test/browse/").build());
  
              // Populate the projects repository
              var reviewFile = Path.of("reviewfile.txt");
              var localRepo = CheckableRepository.init(tempFolder.path(), author.getRepositoryType(), reviewFile);
              var masterHash = localRepo.resolve("master").orElseThrow();

@@ -573,11 +580,12 @@
                                                   listAddress, Set.of(), Set.of(),
                                                   listServer.getArchive(),
                                                   listServer.getSMTP(),
                                                   archive, "webrev", Path.of("test"),
                                                   URIBuilder.base("http://www.test.test/").build(),
-                                                  Set.of(), Map.of());
+                                                  Set.of(), Map.of(),
+                                                  URIBuilder.base("http://issues.test/browse/").build());
  
              // Populate the projects repository
              var reviewFile = Path.of("reviewfile.txt");
              var localRepo = CheckableRepository.init(tempFolder.path(), author.getRepositoryType(), reviewFile);
              var masterHash = localRepo.resolve("master").orElseThrow();

@@ -640,11 +648,12 @@
              var mlBot = new MailingListBridgeBot(from, author, archive, censusBuilder.build(), "master",
                                                   listAddress, Set.of(), Set.of(),
                                                   listServer.getArchive(), listServer.getSMTP(),
                                                   archive, "webrev", Path.of("test"),
                                                   URIBuilder.base("http://www.test.test/").build(),
-                                                  Set.of(), Map.of());
+                                                  Set.of(), Map.of(),
+                                                  URIBuilder.base("http://issues.test/browse/").build());
  
              // Populate the projects repository
              var reviewFile = Path.of("reviewfile.txt");
              var localRepo = CheckableRepository.init(tempFolder.path(), author.getRepositoryType(), reviewFile);
              var masterHash = localRepo.resolve("master").orElseThrow();

@@ -697,11 +706,12 @@
              var mlBot = new MailingListBridgeBot(from, author, archive, censusBuilder.build(), "master",
                                                   listAddress, Set.of(), Set.of(),
                                                   listServer.getArchive(), listServer.getSMTP(),
                                                   archive, "webrev", Path.of("test"),
                                                   URIBuilder.base("http://www.test.test/").build(),
-                                                  Set.of(), Map.of());
+                                                  Set.of(), Map.of(),
+                                                  URIBuilder.base("http://issues.test/browse/").build());
  
              // Populate the projects repository
              var reviewFile = Path.of("reviewfile.txt");
              var localRepo = CheckableRepository.init(tempFolder.path(), author.getRepositoryType(), reviewFile);
              var masterHash = localRepo.resolve("master").orElseThrow();

@@ -816,11 +826,12 @@
              var mlBot = new MailingListBridgeBot(sender, author, archive, censusBuilder.build(), "master",
                                                   listAddress, Set.of(), Set.of(),
                                                   listServer.getArchive(), listServer.getSMTP(),
                                                   archive, "webrev", Path.of("test"),
                                                   URIBuilder.base("http://www.test.test/").build(),
-                                                  Set.of(), Map.of());
+                                                  Set.of(), Map.of(),
+                                                  URIBuilder.base("http://issues.test/browse/").build());
  
              // Populate the projects repository
              var reviewFile = Path.of("reviewfile.txt");
              var localRepo = CheckableRepository.init(tempFolder.path().resolve("first"), author.getRepositoryType(), reviewFile);
              var masterHash = localRepo.resolve("master").orElseThrow();

@@ -907,11 +918,12 @@
                                                   Set.of(ignored.host().getCurrentUserDetails().userName()),
                                                   Set.of(),
                                                   listServer.getArchive(), listServer.getSMTP(),
                                                   archive, "webrev", Path.of("test"),
                                                   URIBuilder.base("http://www.test.test/").build(),
-                                                  Set.of(), Map.of());
+                                                  Set.of(), Map.of(),
+                                                  URIBuilder.base("http://issues.test/browse/").build());
  
              // Populate the projects repository
              var localRepo = CheckableRepository.init(tempFolder.path(), author.getRepositoryType());
              var masterHash = localRepo.resolve("master").orElseThrow();
              localRepo.push(masterHash, author.getUrl(), "master", true);

@@ -978,11 +990,12 @@
              var mlBot = new MailingListBridgeBot(from, author, archive, censusBuilder.build(), "master",
                                                   listAddress, Set.of(), Set.of(),
                                                   listServer.getArchive(), listServer.getSMTP(),
                                                   archive, "webrev", Path.of("test"),
                                                   URIBuilder.base("http://www.test.test/").build(),
-                                                  Set.of(), Map.of());
+                                                  Set.of(), Map.of(),
+                                                  URIBuilder.base("http://issues.test/browse/").build());
  
              // Populate the projects repository
              var reviewFile = Path.of("reviewfile.txt");
              var localRepo = CheckableRepository.init(tempFolder.path(), author.getRepositoryType(), reviewFile);
              var masterHash = localRepo.resolve("master").orElseThrow();

@@ -1060,11 +1073,12 @@
                                                   Set.of(ignored.host().getCurrentUserDetails().userName()),
                                                   Set.of(Pattern.compile("ignore this comment", Pattern.MULTILINE | Pattern.DOTALL)),
                                                   listServer.getArchive(), listServer.getSMTP(),
                                                   archive, "webrev", Path.of("test"),
                                                   URIBuilder.base("http://www.test.test/").build(),
-                                                  Set.of(), Map.of());
+                                                  Set.of(), Map.of(),
+                                                  URIBuilder.base("http://issues.test/browse/").build());
  
              // Populate the projects repository
              var reviewFile = Path.of("reviewfile.txt");
              var localRepo = CheckableRepository.init(tempFolder.path(), author.getRepositoryType(), reviewFile);
              var masterHash = localRepo.resolve("master").orElseThrow();
< prev index next >