mirror of
https://github.com/google/nomulus.git
synced 2025-05-14 00:17:20 +02:00
Fix passing of null to some parameters expecting Optional
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=200465575
This commit is contained in:
mcilwain
Ben McIlwain
parent
9097a32cc8
commit
4098487b80
6 changed files with 98 additions and 63 deletions
|
|
@ -44,13 +44,23 @@ public class ListDomainsActionTest extends ListActionTestCase {
|
|||
@Test
|
||||
public void testRun_invalidRequest_missingTlds() {
|
||||
action.tlds = ImmutableSet.of();
|
||||
testRunError(action, null, null, null, "^Must specify TLDs to query$");
|
||||
testRunError(
|
||||
action,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^Must specify TLDs to query$");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRun_invalidRequest_invalidTld() {
|
||||
action.tlds = ImmutableSet.of("%%%badtld%%%");
|
||||
testRunError(action, null, null, null, "^TLDs do not exist: %%%badtld%%%$");
|
||||
testRunError(
|
||||
action,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^TLDs do not exist: %%%badtld%%%$");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -68,7 +78,13 @@ public class ListDomainsActionTest extends ListActionTestCase {
|
|||
persistActiveDomain("example2.foo", DateTime.parse("2015-02-16T15:15:15Z"));
|
||||
persistActiveDomain("notlistedaswell.sim", DateTime.parse("2015-02-17T15:15:15Z"));
|
||||
// Only list the two domains in .foo, not the .bar or .sim ones.
|
||||
testRunSuccess(action, null, null, null, "^example1.foo$", "^example2.foo$");
|
||||
testRunSuccess(
|
||||
action,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^example1.foo$",
|
||||
"^example2.foo$");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -79,7 +95,14 @@ public class ListDomainsActionTest extends ListActionTestCase {
|
|||
persistActiveDomain("example1.foo", DateTime.parse("2015-02-15T15:15:15Z"));
|
||||
persistActiveDomain("example2.foo", DateTime.parse("2015-03-15T15:15:15Z"));
|
||||
persistActiveDomain("notlistedaswell.sim", DateTime.parse("2015-04-15T15:15:15Z"));
|
||||
testRunSuccess(action, null, null, null, "^dolist.bar", "^example1.foo$", "^example2.foo$");
|
||||
testRunSuccess(
|
||||
action,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^dolist.bar",
|
||||
"^example1.foo$",
|
||||
"^example2.foo$");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -96,9 +119,9 @@ public class ListDomainsActionTest extends ListActionTestCase {
|
|||
// Since the limit is 4, expect all but domain5.baa (the oldest), sorted by creationTime asc.
|
||||
testRunSuccess(
|
||||
action,
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^domain2.bab$",
|
||||
"^domain1.baa$",
|
||||
"^domain4.bad$",
|
||||
|
|
@ -110,7 +133,13 @@ public class ListDomainsActionTest extends ListActionTestCase {
|
|||
action.tlds = ImmutableSet.of("foo");
|
||||
persistActiveDomain("example1.foo", DateTime.parse("2010-03-04T16:00:00Z"));
|
||||
persistActiveDomain("example2.foo", DateTime.parse("2011-03-04T16:00:00Z"));
|
||||
testRunSuccess(action, null, Optional.of(false), null, "^example1.foo$", "^example2.foo$");
|
||||
testRunSuccess(
|
||||
action,
|
||||
Optional.empty(),
|
||||
Optional.of(false),
|
||||
Optional.empty(),
|
||||
"^example1.foo$",
|
||||
"^example2.foo$");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -120,9 +149,9 @@ public class ListDomainsActionTest extends ListActionTestCase {
|
|||
persistActiveDomain("example2.foo", DateTime.parse("2011-03-04T16:00:00Z"));
|
||||
testRunSuccess(
|
||||
action,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.of(true),
|
||||
null,
|
||||
Optional.empty(),
|
||||
"^fullyQualifiedDomainName$",
|
||||
"^-+\\s*$",
|
||||
"^example1.foo\\s*$",
|
||||
|
|
@ -137,8 +166,8 @@ public class ListDomainsActionTest extends ListActionTestCase {
|
|||
testRunSuccess(
|
||||
action,
|
||||
Optional.of("repoId"),
|
||||
null,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^fullyQualifiedDomainName\\s+repoId\\s*$",
|
||||
"^-+\\s+-+\\s*$",
|
||||
"^example1.foo\\s+2-FOO\\s*$",
|
||||
|
|
@ -154,7 +183,7 @@ public class ListDomainsActionTest extends ListActionTestCase {
|
|||
action,
|
||||
Optional.of("repoId"),
|
||||
Optional.of(false),
|
||||
null,
|
||||
Optional.empty(),
|
||||
"^example1.foo 2-FOO$",
|
||||
"^example3.foo 4-FOO$");
|
||||
}
|
||||
|
|
@ -168,7 +197,7 @@ public class ListDomainsActionTest extends ListActionTestCase {
|
|||
action,
|
||||
Optional.of("repoId"),
|
||||
Optional.of(true),
|
||||
null,
|
||||
Optional.empty(),
|
||||
"^fullyQualifiedDomainName\\s+repoId\\s*$",
|
||||
"^-+\\s+-+\\s*$",
|
||||
"^example1.foo\\s+2-FOO\\s*$",
|
||||
|
|
@ -183,8 +212,8 @@ public class ListDomainsActionTest extends ListActionTestCase {
|
|||
testRunSuccess(
|
||||
action,
|
||||
Optional.of("*"),
|
||||
null,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^fullyQualifiedDomainName\\s+.*repoId",
|
||||
"^-+\\s+-+",
|
||||
"^example1.foo\\s+.*2-FOO",
|
||||
|
|
@ -199,8 +228,8 @@ public class ListDomainsActionTest extends ListActionTestCase {
|
|||
testRunSuccess(
|
||||
action,
|
||||
Optional.of("*,repoId"),
|
||||
null,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^fullyQualifiedDomainName\\s+.*repoId",
|
||||
"^-+\\s+-+",
|
||||
"^example1.foo\\s+.*2-FOO",
|
||||
|
|
@ -215,8 +244,8 @@ public class ListDomainsActionTest extends ListActionTestCase {
|
|||
testRunError(
|
||||
action,
|
||||
Optional.of("badfield"),
|
||||
null,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^Field 'badfield' not found - recognized fields are:");
|
||||
}
|
||||
|
||||
|
|
@ -230,6 +259,12 @@ public class ListDomainsActionTest extends ListActionTestCase {
|
|||
persistActiveDomain("example2.bar", DateTime.parse("2017-02-01TZ"));
|
||||
persistActiveDomain("example3.bar", DateTime.parse("2017-03-01TZ"));
|
||||
persistActiveDomain("example5.baz", DateTime.parse("2018-01-01TZ"));
|
||||
testRunSuccess(action, null, null, null, "^example3.bar$", "^example4.foo$");
|
||||
testRunSuccess(
|
||||
action,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^example3.bar$",
|
||||
"^example4.foo$");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,8 +56,8 @@ public class ListHostsActionTest extends ListActionTestCase {
|
|||
testRunSuccess(
|
||||
action,
|
||||
Optional.of("repoId"),
|
||||
null,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^fullyQualifiedHostName\\s+repoId\\s*$",
|
||||
"^-+\\s+-+\\s*$",
|
||||
"^example1.foo\\s+3-ROID\\s*$",
|
||||
|
|
@ -71,8 +71,8 @@ public class ListHostsActionTest extends ListActionTestCase {
|
|||
testRunSuccess(
|
||||
action,
|
||||
Optional.of("*"),
|
||||
null,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^fullyQualifiedHostName\\s+.*repoId",
|
||||
"^-+\\s+-+",
|
||||
"^example1.foo\\s+.*2",
|
||||
|
|
@ -86,8 +86,8 @@ public class ListHostsActionTest extends ListActionTestCase {
|
|||
testRunSuccess(
|
||||
action,
|
||||
Optional.of("*,repoId"),
|
||||
null,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^fullyQualifiedHostName\\s+.*repoId",
|
||||
"^-+\\s+-+",
|
||||
"^example1.foo\\s+.*2",
|
||||
|
|
@ -101,8 +101,8 @@ public class ListHostsActionTest extends ListActionTestCase {
|
|||
testRunError(
|
||||
action,
|
||||
Optional.of("badfield"),
|
||||
null,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^Field 'badfield' not found - recognized fields are:");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,9 +41,9 @@ public class ListPremiumListsActionTest extends ListActionTestCase {
|
|||
public void testRun_noParameters() throws Exception {
|
||||
testRunSuccess(
|
||||
action,
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^how $",
|
||||
"^xn--q9jyb4c$");
|
||||
}
|
||||
|
|
@ -53,8 +53,8 @@ public class ListPremiumListsActionTest extends ListActionTestCase {
|
|||
testRunSuccess(
|
||||
action,
|
||||
Optional.of("revisionKey,description"),
|
||||
null,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^name\\s+revisionKey\\s+description\\s*$",
|
||||
"^-+\\s+-+\\s+-+\\s*$",
|
||||
"^how\\s+.*PremiumList.*$",
|
||||
|
|
@ -66,8 +66,8 @@ public class ListPremiumListsActionTest extends ListActionTestCase {
|
|||
testRunSuccess(
|
||||
action,
|
||||
Optional.of("*"),
|
||||
null,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^name\\s+.*revisionKey",
|
||||
"^-+\\s+-+.*",
|
||||
"^how\\s+.*PremiumList",
|
||||
|
|
@ -79,8 +79,8 @@ public class ListPremiumListsActionTest extends ListActionTestCase {
|
|||
testRunError(
|
||||
action,
|
||||
Optional.of("badfield"),
|
||||
null,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^Field 'badfield' not found - recognized fields are:");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,9 +55,9 @@ public class ListRegistrarsActionTest extends ListActionTestCase {
|
|||
public void testRun_noParameters() throws Exception {
|
||||
testRunSuccess(
|
||||
action,
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^NewRegistrar$",
|
||||
"^TheRegistrar$");
|
||||
}
|
||||
|
|
@ -67,8 +67,8 @@ public class ListRegistrarsActionTest extends ListActionTestCase {
|
|||
testRunSuccess(
|
||||
action,
|
||||
Optional.of("allowedTlds"),
|
||||
null,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^clientId\\s+allowedTlds\\s*$",
|
||||
"-+\\s+-+\\s*$",
|
||||
"^NewRegistrar\\s+\\[xn--q9jyb4c\\]\\s*$",
|
||||
|
|
@ -80,8 +80,8 @@ public class ListRegistrarsActionTest extends ListActionTestCase {
|
|||
testRunSuccess(
|
||||
action,
|
||||
Optional.of("*"),
|
||||
null,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^clientId\\s+.*allowedTlds",
|
||||
"^-+\\s+-+",
|
||||
"^NewRegistrar\\s+.*\\[xn--q9jyb4c\\]",
|
||||
|
|
@ -93,8 +93,8 @@ public class ListRegistrarsActionTest extends ListActionTestCase {
|
|||
testRunError(
|
||||
action,
|
||||
Optional.of("badfield"),
|
||||
null,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^Field 'badfield' not found - recognized fields are:");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,9 +47,9 @@ public class ListReservedListsActionTest extends ListActionTestCase {
|
|||
public void testRun_noParameters() throws Exception {
|
||||
testRunSuccess(
|
||||
action,
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^xn--q9jyb4c-private\\s*$",
|
||||
"^xn--q9jyb4c-published\\s*$");
|
||||
}
|
||||
|
|
@ -59,8 +59,8 @@ public class ListReservedListsActionTest extends ListActionTestCase {
|
|||
testRunSuccess(
|
||||
action,
|
||||
Optional.of("shouldPublish"),
|
||||
null,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^name\\s+shouldPublish\\s*$",
|
||||
"^-+\\s+-+\\s*$",
|
||||
"^xn--q9jyb4c-private\\s+false\\s*$",
|
||||
|
|
@ -72,8 +72,8 @@ public class ListReservedListsActionTest extends ListActionTestCase {
|
|||
testRunSuccess(
|
||||
action,
|
||||
Optional.of("*"),
|
||||
null,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^name\\s+.*shouldPublish.*",
|
||||
"^-+\\s+-+",
|
||||
"^xn--q9jyb4c-private\\s+.*false",
|
||||
|
|
@ -85,8 +85,8 @@ public class ListReservedListsActionTest extends ListActionTestCase {
|
|||
testRunError(
|
||||
action,
|
||||
Optional.of("badfield"),
|
||||
null,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^Field 'badfield' not found - recognized fields are:");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ public class ListTldsActionTest extends ListActionTestCase {
|
|||
|
||||
@Test
|
||||
public void testRun_noParameters() throws Exception {
|
||||
testRunSuccess(action, null, null, null, "xn--q9jyb4c");
|
||||
testRunSuccess(action, Optional.empty(), Optional.empty(), Optional.empty(), "xn--q9jyb4c");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -49,8 +49,8 @@ public class ListTldsActionTest extends ListActionTestCase {
|
|||
testRunSuccess(
|
||||
action,
|
||||
Optional.of("tldType"),
|
||||
null,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"TLD tldType",
|
||||
"----------- -------",
|
||||
"xn--q9jyb4c REAL ");
|
||||
|
|
@ -61,8 +61,8 @@ public class ListTldsActionTest extends ListActionTestCase {
|
|||
testRunSuccess(
|
||||
action,
|
||||
Optional.of("*"),
|
||||
null,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^TLD .*tldType",
|
||||
"^----------- .*-------",
|
||||
"^xn--q9jyb4c .*REAL ");
|
||||
|
|
@ -73,8 +73,8 @@ public class ListTldsActionTest extends ListActionTestCase {
|
|||
testRunError(
|
||||
action,
|
||||
Optional.of("badfield"),
|
||||
null,
|
||||
null,
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
"^Field 'badfield' not found - recognized fields are:");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue