mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-02-09 14:30:33 +00:00
Code Issues Releases Wiki Activity

Use CloudTasksUtils to enqueue in GenerateEscrowDepositCommand (#1465)

Browse Source 
* Use CloudTasksUtils to enqueue in GenerateEscrowDepositCommand

* Add CloudTasksUtil to RegistryToolComponent

* Remove header param
This commit is contained in:
Rachel Guan
2022-01-06 15:36:22 -05:00
committed by GitHub
parent f87e7eb6e6
commit 1fcf63facd
4 changed files with 34 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/src/test/java/google/registry/tools/GenerateEscrowDepositCommandTest.java
View File

@@ -14,18 +14,16 @@
package google.registry.tools;
import static com.google.appengine.api.taskqueue.QueueFactory.getQueue;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.DatabaseHelper.createTld;
import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.when;
import com.beust.jcommander.ParameterException;
import google.registry.testing.CloudTasksHelper;
import google.registry.testing.CloudTasksHelper.TaskMatcher;
import google.registry.testing.InjectExtension;
import google.registry.testing.TaskQueueHelper.TaskMatcher;
import google.registry.util.AppEngineServiceUtils;
import java.util.Optional;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -42,14 +40,15 @@ public class GenerateEscrowDepositCommandTest
@Mock AppEngineServiceUtils appEngineServiceUtils;
CloudTasksHelper cloudTasksHelper = new CloudTasksHelper();
@BeforeEach
void beforeEach() {
createTld("tld");
createTld("anothertld");
command = new GenerateEscrowDepositCommand();
command.appEngineServiceUtils = appEngineServiceUtils;
command.queue = getQueue("rde-report");
command.maybeEtaMillis = Optional.of(fakeClock.nowUtc().getMillis());
command.cloudTasksUtils = cloudTasksHelper.getTestCloudTasksUtils();
when(appEngineServiceUtils.getCurrentVersionHostname("backend"))
.thenReturn("backend.test.localhost");
}
@@ -197,11 +196,10 @@ public class GenerateEscrowDepositCommandTest
"-r 42",
"-o test");
assertTasksEnqueued(
cloudTasksHelper.assertTasksEnqueued(
"rde-report",
new TaskMatcher()
.url("/_dr/task/rdeStaging")
.header("Host", "backend.test.localhost")
.param("mode", "THIN")
.param("lenient", "true")
.param("watermarks", "2017-01-01T00:00:00.000Z")
@@ -221,11 +219,10 @@ public class GenerateEscrowDepositCommandTest
"-r 42",
"-o test");
assertTasksEnqueued(
cloudTasksHelper.assertTasksEnqueued(
"rde-report",
new TaskMatcher()
.url("/_dr/task/rdeStaging")
.header("Host", "backend.test.localhost")
.param("mode", "THIN")
.param("beam", "true")
.param("watermarks", "2017-01-01T00:00:00.000Z")
@@ -239,11 +236,10 @@ public class GenerateEscrowDepositCommandTest
void testCommand_successWithDefaultValidationMode() throws Exception {
runCommand("--tld=tld", "--watermark=2017-01-01T00:00:00Z", "--mode=thin", "-r 42", "-o test");
assertTasksEnqueued(
cloudTasksHelper.assertTasksEnqueued(
"rde-report",
new TaskMatcher()
.url("/_dr/task/rdeStaging")
.header("Host", "backend.test.localhost")
.param("mode", "THIN")
.param("lenient", "false")
.param("watermarks", "2017-01-01T00:00:00.000Z")
@@ -257,11 +253,10 @@ public class GenerateEscrowDepositCommandTest
void testCommand_successWithDefaultRevision() throws Exception {
runCommand("--tld=tld", "--watermark=2017-01-01T00:00:00Z", "--mode=thin", "-o test");
assertTasksEnqueued(
cloudTasksHelper.assertTasksEnqueued(
"rde-report",
new TaskMatcher()
.url("/_dr/task/rdeStaging")
.header("Host", "backend.test.localhost")
.param("lenient", "false")
.param("beam", "false")
.param("mode", "THIN")
@@ -275,11 +270,10 @@ public class GenerateEscrowDepositCommandTest
void testCommand_successWithDefaultMode() throws Exception {
runCommand("--tld=tld", "--watermark=2017-01-01T00:00:00Z", "-r=42", "-o test");
assertTasksEnqueued(
cloudTasksHelper.assertTasksEnqueued(
"rde-report",
new TaskMatcher()
.url("/_dr/task/rdeStaging")
.header("Host", "backend.test.localhost")
.param("mode", "FULL")
.param("lenient", "false")
.param("beam", "false")
@@ -299,11 +293,10 @@ public class GenerateEscrowDepositCommandTest
"-r 42",
"-o test");
assertTasksEnqueued(
cloudTasksHelper.assertTasksEnqueued(
"rde-report",
new TaskMatcher()
.url("/_dr/task/rdeStaging")
.header("Host", "backend.test.localhost")
.param("mode", "THIN")
.param("lenient", "false")
.param("beam", "false")