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

Improve RegistryToolEnvironment setup behavior

Browse source 
Here's an alternate approach that I think simplifies the existing
code quite a bit.  Now instead of doing:

  RegistryToolEnvironment.loadFromArgs(args);
  RegistryToolEnvironment.get().setup();

You just do one chained call:

  RegistryToolEnvironment.parseFromArgs(args).setup();

or call setup() on a known environment constant:

  RegistryToolEnvironment.ALPHA.setup();

This avoids having loadFromArgs() implicitly set the active env
(but *not* do setup) and then having setup() *not* set the active
env, both of which were confusing.  Now parseFromArgs() is only
responsible for parsing from args, and setup() both sets the env
as the active one and does the environment variable setup (which
also ensures that the RegistryToolEnvironment.instance field
doesn't get out of sync with the RegistryEnvironment value).

In addition, this CL adds a runCommandInEnvironment() method to
CommandTestCase and ensures that the UNITTEST environment is always
set before constructing the default command instance.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=117492978
This commit is contained in:
nickfelt 2016-03-17 15:37:58 -07:00 • committed by Justine Tunney
parent 14c794aa45
commit 5174c1c63f
7 changed files with 60 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

55
javatests/com/google/domain/registry/tools/RegistryToolEnvironmentTest.java
View file

@ -30,35 +30,50 @@ public class RegistryToolEnvironmentTest {
public final ExpectedException thrown = ExpectedException.none();
@Test
public void testFromArgs_shortNotation_works() throws Exception {
RegistryToolEnvironment.loadFromArgs(new String[] { "-e", "alpha" });
public void testGet_withoutSetup_throws() throws Exception {
thrown.expect(IllegalStateException.class);
RegistryToolEnvironment.get();
}
@Test
public void testSetup_changesEnvironmentReturnedByGet() throws Exception {
RegistryToolEnvironment.UNITTEST.setup();
assertThat(RegistryToolEnvironment.get()).isEqualTo(RegistryToolEnvironment.UNITTEST);
RegistryToolEnvironment.ALPHA.setup();
assertThat(RegistryToolEnvironment.get()).isEqualTo(RegistryToolEnvironment.ALPHA);
}
@Test
public void testFromArgs_shortNotation_works() throws Exception {
assertThat(RegistryToolEnvironment.parseFromArgs(new String[] { "-e", "alpha" }))
.isEqualTo(RegistryToolEnvironment.ALPHA);
}
@Test
public void testFromArgs_longNotation_works() throws Exception {
RegistryToolEnvironment.loadFromArgs(new String[] { "--environment", "alpha" });
assertThat(RegistryToolEnvironment.get()).isEqualTo(RegistryToolEnvironment.ALPHA);
assertThat(RegistryToolEnvironment.parseFromArgs(new String[] { "--environment", "alpha" }))
.isEqualTo(RegistryToolEnvironment.ALPHA);
}
@Test
public void testFromArgs_uppercase_works() throws Exception {
RegistryToolEnvironment.loadFromArgs(new String[] { "-e", "QA" });
assertThat(RegistryToolEnvironment.get()).isEqualTo(RegistryToolEnvironment.QA);
assertThat(RegistryToolEnvironment.parseFromArgs(new String[] { "-e", "QA" }))
.isEqualTo(RegistryToolEnvironment.QA);
}
@Test
public void testFromArgs_equalsNotation_works() throws Exception {
RegistryToolEnvironment.loadFromArgs(new String[] { "-e=sandbox" });
assertThat(RegistryToolEnvironment.get()).isEqualTo(RegistryToolEnvironment.SANDBOX);
RegistryToolEnvironment.loadFromArgs(new String[] { "--environment=sandbox" });
assertThat(RegistryToolEnvironment.get()).isEqualTo(RegistryToolEnvironment.SANDBOX);
assertThat(RegistryToolEnvironment.parseFromArgs(new String[] { "-e=sandbox" }))
.isEqualTo(RegistryToolEnvironment.SANDBOX);
assertThat(RegistryToolEnvironment.parseFromArgs(new String[] { "--environment=sandbox" }))
.isEqualTo(RegistryToolEnvironment.SANDBOX);
}
@Test
public void testFromArgs_envFlagAfterCommandName_getsIgnored() throws Exception {
thrown.expect(IllegalArgumentException.class);
RegistryToolEnvironment.loadFromArgs(new String[] {
RegistryToolEnvironment.parseFromArgs(new String[] {
"registrar_activity_report",
"-e", "1406851199"});
}
@ -66,30 +81,32 @@ public class RegistryToolEnvironmentTest {
@Test
public void testFromArgs_missingEnvironmentFlag_throwsIae() throws Exception {
thrown.expect(IllegalArgumentException.class);
RegistryToolEnvironment.loadFromArgs(new String[] {});
RegistryToolEnvironment.parseFromArgs(new String[] {});
}
@Test
public void testFromArgs_extraEnvFlagAfterCommandName_getsIgnored() throws Exception {
RegistryToolEnvironment.loadFromArgs(new String[] {
String[] args = new String[] {
"-e", "alpha",
"registrar_activity_report",
"-e", "1406851199"});
assertThat(RegistryToolEnvironment.get()).isEqualTo(RegistryToolEnvironment.ALPHA);
"-e", "1406851199"};
assertThat(RegistryToolEnvironment.parseFromArgs(args))
.isEqualTo(RegistryToolEnvironment.ALPHA);
}
@Test
public void testFromArgs_loggingFlagWithUnderscores_isntConsideredCommand() throws Exception {
RegistryToolEnvironment.loadFromArgs(new String[] {
String[] args = new String[] {
"--logging_properties_file", "my_file.properties",
"-e", "alpha",
"list_tlds"});
assertThat(RegistryToolEnvironment.get()).isEqualTo(RegistryToolEnvironment.ALPHA);
"list_tlds"};
assertThat(RegistryToolEnvironment.parseFromArgs(args))
.isEqualTo(RegistryToolEnvironment.ALPHA);
}
@Test
public void testFromArgs_badName_throwsIae() throws Exception {
thrown.expect(IllegalArgumentException.class);
RegistryToolEnvironment.loadFromArgs(new String[] { "-e", "alphaville" });
RegistryToolEnvironment.parseFromArgs(new String[] { "-e", "alphaville" });
}
}