Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1108: Fix label updater for gitlab #1196

Closed
wants to merge 2 commits into from
Closed

1108: Fix label updater for gitlab #1196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce5cc67
SKARA-1108
erikj79 Jul 13, 2021
fb7c65b
Update test
erikj79 Jul 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/LabelsUpdaterWorkItem.java
View file
Open in desktop
Expand Up @@ -46,7 +46,7 @@ public Collection<WorkItem> run(Path scratchPath) {

var configuredLabels = bot.lists().stream()
.flatMap(configuration -> configuration.labels().stream()
.map(labelName -> new Label(labelName, configuration.list().toString())))
.map(labelName -> new Label(labelName, configuration.list().address())))
.toList();

for (Label configuredLabel : configuredLabels) {
Expand All @@ -61,7 +61,7 @@ public Collection<WorkItem> run(Path scratchPath) {
}
}

log.fine("Done updating labels for: " + bot.codeRepo());
log.fine("Done updating labels for: " + bot.codeRepo().name());
bot.setLabelsUpdated(true);
return List.of();
}
Expand Down
8 changes: 4 additions & 4 deletions bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/LabelsUpdaterTests.java
View file
Open in desktop
Expand Up @@ -32,10 +32,10 @@ void simple(TestInfo testInfo) throws IOException {

assertEquals(2, targetRepo.labels().size(), "Wrong number of labels");
assertTrue(targetRepo.labels().stream()
.anyMatch(l -> l.name().equals("foo") && l.description().orElseThrow().equals(listAddress.toString())),
.anyMatch(l -> l.name().equals("foo") && l.description().orElseThrow().equals(listAddress.address())),
"No label 'foo' found");
assertTrue(targetRepo.labels().stream()
.anyMatch(l -> l.name().equals("bar") && l.description().orElseThrow().equals(listAddress.toString())),
.anyMatch(l -> l.name().equals("bar") && l.description().orElseThrow().equals(listAddress.address())),
"No label 'bar' found");

// Run again and expect no change
Expand Down Expand Up @@ -65,7 +65,7 @@ void update(TestInfo testInfo) throws IOException {

assertEquals(1, targetRepo.labels().size(), "Wrong number of labels");
assertTrue(targetRepo.labels().stream()
.anyMatch(l -> l.name().equals("foo") && l.description().orElseThrow().equals(listAddress.toString())),
.anyMatch(l -> l.name().equals("foo") && l.description().orElseThrow().equals(listAddress.address())),
"No label 'foo' found");

var mlBot2 = MailingListBridgeBot.newBuilder()
Expand All @@ -78,7 +78,7 @@ void update(TestInfo testInfo) throws IOException {

assertEquals(1, targetRepo.labels().size(), "Wrong number of labels");
assertTrue(targetRepo.labels().stream()
.anyMatch(l -> l.name().equals("foo") && l.description().orElseThrow().equals(listAddress2.toString())),
.anyMatch(l -> l.name().equals("foo") && l.description().orElseThrow().equals(listAddress2.address())),
"No label 'foo' found");
}
}
Expand Down