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

Fix passing of null to some parameters expecting Optional

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=200465575
This commit is contained in:
mcilwain 2018-06-13 15:35:38 -07:00 • committed by Ben McIlwain
parent 9097a32cc8
commit 4098487b80
6 changed files with 98 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

77
javatests/google/registry/tools/server/ListDomainsActionTest.java
View file

@ -44,13 +44,23 @@ public class ListDomainsActionTest extends ListActionTestCase {
@Test @Test
public void testRun_invalidRequest_missingTlds() { public void testRun_invalidRequest_missingTlds() {
action.tlds = ImmutableSet.of(); 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 @Test
public void testRun_invalidRequest_invalidTld() { public void testRun_invalidRequest_invalidTld() {
action.tlds = ImmutableSet.of("%%%badtld%%%"); 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 @Test
@ -68,7 +78,13 @@ public class ListDomainsActionTest extends ListActionTestCase {
persistActiveDomain("example2.foo", DateTime.parse("2015-02-16T15:15:15Z")); persistActiveDomain("example2.foo", DateTime.parse("2015-02-16T15:15:15Z"));
persistActiveDomain("notlistedaswell.sim", DateTime.parse("2015-02-17T15: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. // 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 @Test
@ -79,7 +95,14 @@ public class ListDomainsActionTest extends ListActionTestCase {
persistActiveDomain("example1.foo", DateTime.parse("2015-02-15T15:15:15Z")); persistActiveDomain("example1.foo", DateTime.parse("2015-02-15T15:15:15Z"));
persistActiveDomain("example2.foo", DateTime.parse("2015-03-15T15:15:15Z")); persistActiveDomain("example2.foo", DateTime.parse("2015-03-15T15:15:15Z"));
persistActiveDomain("notlistedaswell.sim", DateTime.parse("2015-04-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 @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. // Since the limit is 4, expect all but domain5.baa (the oldest), sorted by creationTime asc.
testRunSuccess( testRunSuccess(
action, action,
null, Optional.empty(),
null, Optional.empty(),
null, Optional.empty(),
"^domain2.bab$", "^domain2.bab$",
"^domain1.baa$", "^domain1.baa$",
"^domain4.bad$", "^domain4.bad$",
@ -110,7 +133,13 @@ public class ListDomainsActionTest extends ListActionTestCase {
action.tlds = ImmutableSet.of("foo"); action.tlds = ImmutableSet.of("foo");
persistActiveDomain("example1.foo", DateTime.parse("2010-03-04T16:00:00Z")); persistActiveDomain("example1.foo", DateTime.parse("2010-03-04T16:00:00Z"));
persistActiveDomain("example2.foo", DateTime.parse("2011-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 @Test
@ -120,9 +149,9 @@ public class ListDomainsActionTest extends ListActionTestCase {
persistActiveDomain("example2.foo", DateTime.parse("2011-03-04T16:00:00Z")); persistActiveDomain("example2.foo", DateTime.parse("2011-03-04T16:00:00Z"));
testRunSuccess( testRunSuccess(
action, action,
null, Optional.empty(),
Optional.of(true), Optional.of(true),
null, Optional.empty(),
"^fullyQualifiedDomainName$", "^fullyQualifiedDomainName$",
"^-+\\s*$", "^-+\\s*$",
"^example1.foo\\s*$", "^example1.foo\\s*$",
@ -137,8 +166,8 @@ public class ListDomainsActionTest extends ListActionTestCase {
testRunSuccess( testRunSuccess(
action, action,
Optional.of("repoId"), Optional.of("repoId"),
null, Optional.empty(),
null, Optional.empty(),
"^fullyQualifiedDomainName\\s+repoId\\s*$", "^fullyQualifiedDomainName\\s+repoId\\s*$",
"^-+\\s+-+\\s*$", "^-+\\s+-+\\s*$",
"^example1.foo\\s+2-FOO\\s*$", "^example1.foo\\s+2-FOO\\s*$",
@ -154,7 +183,7 @@ public class ListDomainsActionTest extends ListActionTestCase {
action, action,
Optional.of("repoId"), Optional.of("repoId"),
Optional.of(false), Optional.of(false),
null, Optional.empty(),
"^example1.foo 2-FOO$", "^example1.foo 2-FOO$",
"^example3.foo 4-FOO$"); "^example3.foo 4-FOO$");
} }
@ -168,7 +197,7 @@ public class ListDomainsActionTest extends ListActionTestCase {
action, action,
Optional.of("repoId"), Optional.of("repoId"),
Optional.of(true), Optional.of(true),
null, Optional.empty(),
"^fullyQualifiedDomainName\\s+repoId\\s*$", "^fullyQualifiedDomainName\\s+repoId\\s*$",
"^-+\\s+-+\\s*$", "^-+\\s+-+\\s*$",
"^example1.foo\\s+2-FOO\\s*$", "^example1.foo\\s+2-FOO\\s*$",
@ -183,8 +212,8 @@ public class ListDomainsActionTest extends ListActionTestCase {
testRunSuccess( testRunSuccess(
action, action,
Optional.of("*"), Optional.of("*"),
null, Optional.empty(),
null, Optional.empty(),
"^fullyQualifiedDomainName\\s+.*repoId", "^fullyQualifiedDomainName\\s+.*repoId",
"^-+\\s+-+", "^-+\\s+-+",
"^example1.foo\\s+.*2-FOO", "^example1.foo\\s+.*2-FOO",
@ -199,8 +228,8 @@ public class ListDomainsActionTest extends ListActionTestCase {
testRunSuccess( testRunSuccess(
action, action,
Optional.of("*,repoId"), Optional.of("*,repoId"),
null, Optional.empty(),
null, Optional.empty(),
"^fullyQualifiedDomainName\\s+.*repoId", "^fullyQualifiedDomainName\\s+.*repoId",
"^-+\\s+-+", "^-+\\s+-+",
"^example1.foo\\s+.*2-FOO", "^example1.foo\\s+.*2-FOO",
@ -215,8 +244,8 @@ public class ListDomainsActionTest extends ListActionTestCase {
testRunError( testRunError(
action, action,
Optional.of("badfield"), Optional.of("badfield"),
null, Optional.empty(),
null, Optional.empty(),
"^Field 'badfield' not found - recognized fields are:"); "^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("example2.bar", DateTime.parse("2017-02-01TZ"));
persistActiveDomain("example3.bar", DateTime.parse("2017-03-01TZ")); persistActiveDomain("example3.bar", DateTime.parse("2017-03-01TZ"));
persistActiveDomain("example5.baz", DateTime.parse("2018-01-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$");
} }
} }

16
javatests/google/registry/tools/server/ListHostsActionTest.java
View file

@ -56,8 +56,8 @@ public class ListHostsActionTest extends ListActionTestCase {
testRunSuccess( testRunSuccess(
action, action,
Optional.of("repoId"), Optional.of("repoId"),
null, Optional.empty(),
null, Optional.empty(),
"^fullyQualifiedHostName\\s+repoId\\s*$", "^fullyQualifiedHostName\\s+repoId\\s*$",
"^-+\\s+-+\\s*$", "^-+\\s+-+\\s*$",
"^example1.foo\\s+3-ROID\\s*$", "^example1.foo\\s+3-ROID\\s*$",
@ -71,8 +71,8 @@ public class ListHostsActionTest extends ListActionTestCase {
testRunSuccess( testRunSuccess(
action, action,
Optional.of("*"), Optional.of("*"),
null, Optional.empty(),
null, Optional.empty(),
"^fullyQualifiedHostName\\s+.*repoId", "^fullyQualifiedHostName\\s+.*repoId",
"^-+\\s+-+", "^-+\\s+-+",
"^example1.foo\\s+.*2", "^example1.foo\\s+.*2",
@ -86,8 +86,8 @@ public class ListHostsActionTest extends ListActionTestCase {
testRunSuccess( testRunSuccess(
action, action,
Optional.of("*,repoId"), Optional.of("*,repoId"),
null, Optional.empty(),
null, Optional.empty(),
"^fullyQualifiedHostName\\s+.*repoId", "^fullyQualifiedHostName\\s+.*repoId",
"^-+\\s+-+", "^-+\\s+-+",
"^example1.foo\\s+.*2", "^example1.foo\\s+.*2",
@ -101,8 +101,8 @@ public class ListHostsActionTest extends ListActionTestCase {
testRunError( testRunError(
action, action,
Optional.of("badfield"), Optional.of("badfield"),
null, Optional.empty(),
null, Optional.empty(),
"^Field 'badfield' not found - recognized fields are:"); "^Field 'badfield' not found - recognized fields are:");
} }
} }

18
javatests/google/registry/tools/server/ListPremiumListsActionTest.java
View file

@ -41,9 +41,9 @@ public class ListPremiumListsActionTest extends ListActionTestCase {
public void testRun_noParameters() throws Exception { public void testRun_noParameters() throws Exception {
testRunSuccess( testRunSuccess(
action, action,
null, Optional.empty(),
null, Optional.empty(),
null, Optional.empty(),
"^how $", "^how $",
"^xn--q9jyb4c$"); "^xn--q9jyb4c$");
} }
@ -53,8 +53,8 @@ public class ListPremiumListsActionTest extends ListActionTestCase {
testRunSuccess( testRunSuccess(
action, action,
Optional.of("revisionKey,description"), Optional.of("revisionKey,description"),
null, Optional.empty(),
null, Optional.empty(),
"^name\\s+revisionKey\\s+description\\s*$", "^name\\s+revisionKey\\s+description\\s*$",
"^-+\\s+-+\\s+-+\\s*$", "^-+\\s+-+\\s+-+\\s*$",
"^how\\s+.*PremiumList.*$", "^how\\s+.*PremiumList.*$",
@ -66,8 +66,8 @@ public class ListPremiumListsActionTest extends ListActionTestCase {
testRunSuccess( testRunSuccess(
action, action,
Optional.of("*"), Optional.of("*"),
null, Optional.empty(),
null, Optional.empty(),
"^name\\s+.*revisionKey", "^name\\s+.*revisionKey",
"^-+\\s+-+.*", "^-+\\s+-+.*",
"^how\\s+.*PremiumList", "^how\\s+.*PremiumList",
@ -79,8 +79,8 @@ public class ListPremiumListsActionTest extends ListActionTestCase {
testRunError( testRunError(
action, action,
Optional.of("badfield"), Optional.of("badfield"),
null, Optional.empty(),
null, Optional.empty(),
"^Field 'badfield' not found - recognized fields are:"); "^Field 'badfield' not found - recognized fields are:");
} }
} }

18
javatests/google/registry/tools/server/ListRegistrarsActionTest.java
View file

@ -55,9 +55,9 @@ public class ListRegistrarsActionTest extends ListActionTestCase {
public void testRun_noParameters() throws Exception { public void testRun_noParameters() throws Exception {
testRunSuccess( testRunSuccess(
action, action,
null, Optional.empty(),
null, Optional.empty(),
null, Optional.empty(),
"^NewRegistrar$", "^NewRegistrar$",
"^TheRegistrar$"); "^TheRegistrar$");
} }
@ -67,8 +67,8 @@ public class ListRegistrarsActionTest extends ListActionTestCase {
testRunSuccess( testRunSuccess(
action, action,
Optional.of("allowedTlds"), Optional.of("allowedTlds"),
null, Optional.empty(),
null, Optional.empty(),
"^clientId\\s+allowedTlds\\s*$", "^clientId\\s+allowedTlds\\s*$",
"-+\\s+-+\\s*$", "-+\\s+-+\\s*$",
"^NewRegistrar\\s+\\[xn--q9jyb4c\\]\\s*$", "^NewRegistrar\\s+\\[xn--q9jyb4c\\]\\s*$",
@ -80,8 +80,8 @@ public class ListRegistrarsActionTest extends ListActionTestCase {
testRunSuccess( testRunSuccess(
action, action,
Optional.of("*"), Optional.of("*"),
null, Optional.empty(),
null, Optional.empty(),
"^clientId\\s+.*allowedTlds", "^clientId\\s+.*allowedTlds",
"^-+\\s+-+", "^-+\\s+-+",
"^NewRegistrar\\s+.*\\[xn--q9jyb4c\\]", "^NewRegistrar\\s+.*\\[xn--q9jyb4c\\]",
@ -93,8 +93,8 @@ public class ListRegistrarsActionTest extends ListActionTestCase {
testRunError( testRunError(
action, action,
Optional.of("badfield"), Optional.of("badfield"),
null, Optional.empty(),
null, Optional.empty(),
"^Field 'badfield' not found - recognized fields are:"); "^Field 'badfield' not found - recognized fields are:");
} }
} }

18
javatests/google/registry/tools/server/ListReservedListsActionTest.java
View file

@ -47,9 +47,9 @@ public class ListReservedListsActionTest extends ListActionTestCase {
public void testRun_noParameters() throws Exception { public void testRun_noParameters() throws Exception {
testRunSuccess( testRunSuccess(
action, action,
null, Optional.empty(),
null, Optional.empty(),
null, Optional.empty(),
"^xn--q9jyb4c-private\\s*$", "^xn--q9jyb4c-private\\s*$",
"^xn--q9jyb4c-published\\s*$"); "^xn--q9jyb4c-published\\s*$");
} }
@ -59,8 +59,8 @@ public class ListReservedListsActionTest extends ListActionTestCase {
testRunSuccess( testRunSuccess(
action, action,
Optional.of("shouldPublish"), Optional.of("shouldPublish"),
null, Optional.empty(),
null, Optional.empty(),
"^name\\s+shouldPublish\\s*$", "^name\\s+shouldPublish\\s*$",
"^-+\\s+-+\\s*$", "^-+\\s+-+\\s*$",
"^xn--q9jyb4c-private\\s+false\\s*$", "^xn--q9jyb4c-private\\s+false\\s*$",
@ -72,8 +72,8 @@ public class ListReservedListsActionTest extends ListActionTestCase {
testRunSuccess( testRunSuccess(
action, action,
Optional.of("*"), Optional.of("*"),
null, Optional.empty(),
null, Optional.empty(),
"^name\\s+.*shouldPublish.*", "^name\\s+.*shouldPublish.*",
"^-+\\s+-+", "^-+\\s+-+",
"^xn--q9jyb4c-private\\s+.*false", "^xn--q9jyb4c-private\\s+.*false",
@ -85,8 +85,8 @@ public class ListReservedListsActionTest extends ListActionTestCase {
testRunError( testRunError(
action, action,
Optional.of("badfield"), Optional.of("badfield"),
null, Optional.empty(),
null, Optional.empty(),
"^Field 'badfield' not found - recognized fields are:"); "^Field 'badfield' not found - recognized fields are:");
} }
} }

14
javatests/google/registry/tools/server/ListTldsActionTest.java
View file

@ -41,7 +41,7 @@ public class ListTldsActionTest extends ListActionTestCase {
@Test @Test
public void testRun_noParameters() throws Exception { public void testRun_noParameters() throws Exception {
testRunSuccess(action, null, null, null, "xn--q9jyb4c"); testRunSuccess(action, Optional.empty(), Optional.empty(), Optional.empty(), "xn--q9jyb4c");
} }
@Test @Test
@ -49,8 +49,8 @@ public class ListTldsActionTest extends ListActionTestCase {
testRunSuccess( testRunSuccess(
action, action,
Optional.of("tldType"), Optional.of("tldType"),
null, Optional.empty(),
null, Optional.empty(),
"TLD tldType", "TLD tldType",
"----------- -------", "----------- -------",
"xn--q9jyb4c REAL "); "xn--q9jyb4c REAL ");
@ -61,8 +61,8 @@ public class ListTldsActionTest extends ListActionTestCase {
testRunSuccess( testRunSuccess(
action, action,
Optional.of("*"), Optional.of("*"),
null, Optional.empty(),
null, Optional.empty(),
"^TLD .*tldType", "^TLD .*tldType",
"^----------- .*-------", "^----------- .*-------",
"^xn--q9jyb4c .*REAL "); "^xn--q9jyb4c .*REAL ");
@ -73,8 +73,8 @@ public class ListTldsActionTest extends ListActionTestCase {
testRunError( testRunError(
action, action,
Optional.of("badfield"), Optional.of("badfield"),
null, Optional.empty(),
null, Optional.empty(),
"^Field 'badfield' not found - recognized fields are:"); "^Field 'badfield' not found - recognized fields are:");
} }
} }