Tidy up RefreshDnsAction

This reworks the logic in RefreshDnsAction by factoring out a few
helper methods so the core logic is simpler and more straightforward.

Also added a couple tests to DnsInjectionTest that seemed worth having
for symmetry.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=134110706
This commit is contained in:
nickfelt 2016-09-23 13:28:25 -07:00 committed by Ben McIlwain
parent 1b4e73a50f
commit 0bc6e7b728
2 changed files with 39 additions and 23 deletions

View file

@ -85,7 +85,7 @@ public final class DnsInjectionTest {
}
@Test
public void testWhoisHttpServer_injectsAndWorks() throws Exception {
public void testRefreshDns_domain_injectsAndWorks() throws Exception {
persistActiveDomain("example.lol");
when(req.getParameter("type")).thenReturn("domain");
when(req.getParameter("name")).thenReturn("example.lol");
@ -94,10 +94,27 @@ public final class DnsInjectionTest {
}
@Test
public void testWhoisHttpServer_missingDomain_throwsNotFound() throws Exception {
public void testRefreshDns_missingDomain_throwsNotFound() throws Exception {
when(req.getParameter("type")).thenReturn("domain");
when(req.getParameter("name")).thenReturn("example.lol");
thrown.expect(NotFoundException.class, "DOMAIN example.lol not found");
thrown.expect(NotFoundException.class, "domain example.lol not found");
component.refreshDns().run();
}
@Test
public void testRefreshDns_host_injectsAndWorks() throws Exception {
persistActiveSubordinateHost("ns1.example.lol", persistActiveDomain("example.lol"));
when(req.getParameter("type")).thenReturn("host");
when(req.getParameter("name")).thenReturn("ns1.example.lol");
component.refreshDns().run();
assertDnsTasksEnqueued("ns1.example.lol");
}
@Test
public void testRefreshDns_missingHost_throwsNotFound() throws Exception {
when(req.getParameter("type")).thenReturn("host");
when(req.getParameter("name")).thenReturn("ns1.example.lol");
thrown.expect(NotFoundException.class, "host ns1.example.lol not found");
component.refreshDns().run();
}
}