zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-13 16:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix stdout of DeleteAllocationTokensCommand

Browse source 
It was saying it was deleting tokens it wasn't, because it was outputting the
raw input list of tokens rather than the list that filtered out redeemed or
domain-specific tokens.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=227769266
This commit is contained in:
mcilwain 2019-01-03 16:21:39 -08:00 • committed by Ben McIlwain
parent 577c6f6bc9
commit a81d45fe5d
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
java/google/registry/tools/DeleteAllocationTokensCommand.java
View file

@ -101,7 +101,11 @@ final class DeleteAllocationTokensCommand extends ConfirmingCommand
System.out.printf( System.out.printf(
"%s tokens: %s\n", "%s tokens: %s\n",
dryRun ? "Would delete" : "Deleted", dryRun ? "Would delete" : "Deleted",
JOINER.join(batch.stream().map(Key::getName).collect(toImmutableSet()))); JOINER.join(
tokensToDelete.stream()
.map(AllocationToken::getToken)
.sorted()
.collect(toImmutableSet())));
return tokensToDelete.size(); return tokensToDelete.size();
} }
} }

2
javatests/google/registry/tools/DeleteAllocationTokensCommandTest.java
View file

@ -54,6 +54,7 @@ public class DeleteAllocationTokensCommandTest
runCommandForced("--prefix", ""); runCommandForced("--prefix", "");
assertThat(reloadTokens(preNot1, preNot2, othrNot)).isEmpty(); assertThat(reloadTokens(preNot1, preNot2, othrNot)).isEmpty();
assertThat(reloadTokens(preRed1, preRed2, othrRed)).containsExactly(preRed1, preRed2, othrRed); assertThat(reloadTokens(preRed1, preRed2, othrRed)).containsExactly(preRed1, preRed2, othrRed);
assertInStdout("Deleted tokens: asdgfho7HASDS, prefix2978204, prefix8ZZZhs8");
} }
@Test @Test
@ -84,6 +85,7 @@ public class DeleteAllocationTokensCommandTest
runCommandForced("--prefix", "", "--dry_run"); runCommandForced("--prefix", "", "--dry_run");
assertThat(reloadTokens(preRed1, preRed2, preNot1, preNot2, othrRed, othrNot)) assertThat(reloadTokens(preRed1, preRed2, preNot1, preNot2, othrRed, othrNot))
.containsExactly(preRed1, preRed2, preNot1, preNot2, othrRed, othrNot); .containsExactly(preRed1, preRed2, preNot1, preNot2, othrRed, othrNot);
assertInStdout("Would delete tokens: asdgfho7HASDS, prefix2978204, prefix8ZZZhs8");
} }
@Test @Test