Use try-with-resources pattern in RdeParserTest

This fixes a whole mess of Eclipse warnings about a Closeable not calling
close().

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=135407085

javatests/google/registry/rde/RdeParserTest.java

@@ -44,8 +44,7 @@ public class RdeParserTest {
 
   private InputStream xml;
 
-  @Rule
+  @Rule public final ExceptionRule thrown = new ExceptionRule();
-  public final ExceptionRule thrown = new ExceptionRule();
 
   private void checkHeader(RdeHeader header) {
     assertThat(header.getTld()).isEqualTo("test");
@@ -70,30 +69,34 @@ public class RdeParserTest {
 
   @Test
   public void testGetHeader_returnsHeader() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       checkHeader(parser.getHeader());
     }
+  }
 
   @Test
   public void testGetContactNotAtElement_throwsIllegalStateException() throws Exception {
-    thrown.expect(IllegalStateException.class,
+    try (RdeParser parser = new RdeParser(xml)) {
+      thrown.expect(
+          IllegalStateException.class,
           "Not at element urn:ietf:params:xml:ns:rdeContact-1.0:contact");
-    RdeParser parser = new RdeParser(xml);
       parser.getContact();
     }
+  }
 
   @Test
   public void testGetContactAtElement_returnsContact() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       parser.nextContact();
       XjcRdeContact contact = parser.getContact();
       assertThat(contact.getId()).isEqualTo("sh8013");
       assertThat(contact.getClID()).isEqualTo("RegistrarX");
     }
+  }
 
   @Test
   public void testNextContact_advancesParser() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       assertThat(parser.isAtContact()).isFalse();
       // there is only one contact in the escrow file
       assertThat(parser.nextContact()).isTrue();
@@ -101,72 +104,82 @@ public class RdeParserTest {
       assertThat(parser.nextContact()).isFalse();
       assertThat(parser.isAtContact()).isFalse();
     }
+  }
 
   @Test
   public void testSkipZeroContacts_skipsZero() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       assertThat(parser.skipContacts(0)).isEqualTo(0);
       assertThat(parser.nextContact()).isTrue();
     }
+  }
 
   @Test
   public void testSkipOneContactFromBeginning_skipsOne() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       assertThat(parser.skipContacts(1)).isEqualTo(1);
       assertThat(parser.isAtContact()).isFalse();
     }
+  }
 
   @Test
   public void testSkipOneContactFromFirstContact_skipsOne() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       parser.nextContact();
       assertThat(parser.skipContacts(1)).isEqualTo(1);
       assertThat(parser.isAtContact()).isFalse();
     }
+  }
 
   @Test
   public void testSkip9999Contacts_skipsOne() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       assertThat(parser.skipContacts(9999)).isEqualTo(1);
       assertThat(parser.isAtContact()).isFalse();
     }
+  }
 
   @Test
   public void testSkipContactsFromEnd_skipsZero() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       parser.nextContact();
       parser.nextContact();
       assertThat(parser.skipContacts(1)).isEqualTo(0);
       assertThat(parser.isAtContact()).isFalse();
     }
+  }
 
   @Test
   public void testGetHeaderAfterNextContact_returnsHeader() throws Exception {
     // verify that the header is still available after advancing to next contact
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       parser.nextContact();
       checkHeader(parser.getHeader());
     }
+  }
 
   @Test
   public void testGetDomainNotAtElement_throwsIllegalStateException() throws Exception {
-    thrown.expect(IllegalStateException.class,
+    try (RdeParser parser = new RdeParser(xml)) {
+      thrown.expect(
+          IllegalStateException.class,
           "Not at element urn:ietf:params:xml:ns:rdeDomain-1.0:domain");
-    RdeParser parser = new RdeParser(xml);
       parser.getDomain();
     }
+  }
 
   @Test
   public void testGetDomainAtElement_returnsDomain() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       parser.nextDomain();
       XjcRdeDomain domain = parser.getDomain();
       assertThat(domain.getName()).isEqualTo("example1.test");
     }
+  }
 
   @Test
   public void testNextDomain_advancesParser() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       // there are 2 domains in the escrow file
       assertThat(parser.isAtDomain()).isFalse();
       assertThat(parser.nextDomain()).isTrue();
@@ -176,17 +189,19 @@ public class RdeParserTest {
       assertThat(parser.nextDomain()).isFalse();
       assertThat(parser.isAtDomain()).isFalse();
     }
+  }
 
   @Test
   public void testSkipZeroDomains_skipsZero() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       assertThat(parser.skipDomains(0)).isEqualTo(0);
       assertThat(parser.nextDomain()).isTrue();
     }
+  }
 
   @Test
   public void testSkipOneDomainFromBeginning_skipsOne() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       assertThat(parser.skipDomains(1)).isEqualTo(1);
       // there are two domains
       assertThat(parser.isAtDomain()).isTrue();
@@ -194,18 +209,20 @@ public class RdeParserTest {
       assertThat(parser.nextDomain()).isFalse();
       assertThat(parser.isAtDomain()).isFalse();
     }
+  }
 
   @Test
   public void testSkipTwoDomainsFromBeginning_skipsTwo() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       assertThat(parser.skipDomains(2)).isEqualTo(2);
       // there are two domains
       assertThat(parser.isAtDomain()).isFalse();
     }
+  }
 
   @Test
   public void testSkipOneDomainFromFirstDomain_skipsOne() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       parser.nextDomain();
       assertThat(parser.skipDomains(1)).isEqualTo(1);
       // there are two domains
@@ -214,60 +231,67 @@ public class RdeParserTest {
       assertThat(parser.nextDomain()).isFalse();
       assertThat(parser.isAtDomain()).isFalse();
     }
+  }
 
   @Test
   public void testSkipTwoDomainsFromFirstDomain_skipsTwo() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       parser.nextDomain();
       assertThat(parser.skipDomains(2)).isEqualTo(2);
       // there are two domains
       assertThat(parser.isAtDomain()).isFalse();
     }
+  }
 
   @Test
   public void testSkip9999Domains_skipsTwo() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       assertThat(parser.skipDomains(9999)).isEqualTo(2);
       assertThat(parser.isAtDomain()).isFalse();
     }
+  }
 
   @Test
   public void testSkipDomainsFromEnd_skipsZero() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       parser.nextDomain();
       parser.nextDomain();
       parser.nextDomain();
       assertThat(parser.skipDomains(1)).isEqualTo(0);
     }
+  }
 
   @Test
   public void testGetHeaderAfterNextDomain_returnsHeader() throws Exception {
     // verify that the header is still available after advancing to next domain
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       parser.nextDomain();
       checkHeader(parser.getHeader());
     }
+  }
 
   @Test
   public void testGetHostNotAtElement_throwsIllegalStateException() throws Exception {
-    thrown.expect(IllegalStateException.class,
+    try (RdeParser parser = new RdeParser(xml)) {
-        "Not at element urn:ietf:params:xml:ns:rdeHost-1.0:host");
+      thrown.expect(
-    RdeParser parser = new RdeParser(xml);
+          IllegalStateException.class, "Not at element urn:ietf:params:xml:ns:rdeHost-1.0:host");
       parser.getHost();
     }
+  }
 
   @Test
   public void testGetHostAtElement_returnsHost() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       parser.nextHost();
       XjcRdeHost host = parser.getHost();
       assertThat(host.getName()).isEqualTo("ns1.example.com");
     }
+  }
 
   @Test
   public void testNextHost_advancesParser() throws Exception {
     // the header lies, there are 2 hosts in the file
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       assertThat(parser.isAtHost()).isFalse();
       assertThat(parser.nextHost()).isTrue();
       assertThat(parser.isAtHost()).isTrue();
@@ -276,17 +300,19 @@ public class RdeParserTest {
       assertThat(parser.nextHost()).isFalse();
       assertThat(parser.isAtHost()).isFalse();
     }
+  }
 
   @Test
   public void testSkipZeroHosts_skipsZero() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       assertThat(parser.skipHosts(0)).isEqualTo(0);
       assertThat(parser.nextHost()).isTrue();
     }
+  }
 
   @Test
   public void testSkipOneHostFromBeginning_skipsOne() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       assertThat(parser.skipHosts(1)).isEqualTo(1);
       // there are two hosts
       assertThat(parser.isAtHost()).isTrue();
@@ -294,18 +320,20 @@ public class RdeParserTest {
       assertThat(parser.nextHost()).isFalse();
       assertThat(parser.isAtHost()).isFalse();
     }
+  }
 
   @Test
   public void testSkipTwoHostsFromBeginning_skipsTwo() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       assertThat(parser.skipHosts(2)).isEqualTo(2);
       // there are two hosts
       assertThat(parser.isAtHost()).isFalse();
     }
+  }
 
   @Test
   public void testSkipOneHostFromFirstHost_skipsOne() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       parser.nextHost();
       assertThat(parser.skipHosts(1)).isEqualTo(1);
       // there are two hosts
@@ -314,166 +342,189 @@ public class RdeParserTest {
       assertThat(parser.nextHost()).isFalse();
       assertThat(parser.isAtHost()).isFalse();
     }
+  }
 
   @Test
   public void testSkipTwoHostsFromFirstHost_skipsTwo() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       parser.nextHost();
       assertThat(parser.skipHosts(2)).isEqualTo(2);
       // there are two hosts
       assertThat(parser.isAtHost()).isFalse();
     }
+  }
 
   @Test
   public void testSkip9999Hosts_skipsTwo() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       assertThat(parser.skipHosts(9999)).isEqualTo(2);
       // there are two hosts
       assertThat(parser.isAtHost()).isFalse();
     }
+  }
 
   @Test
   public void testSkipHostFromEnd_skipsZero() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       parser.nextHost();
       parser.nextHost();
       parser.nextHost();
       assertThat(parser.skipHosts(1)).isEqualTo(0);
     }
+  }
 
   @Test
   public void testGetHeaderAfterNextHost_returnsHeader() throws Exception {
     // verify that the header is still available after advancing to next host
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       parser.nextHost();
       checkHeader(parser.getHeader());
     }
+  }
 
   @Test
   public void testGetRegistrarNotAtElement_throwsIllegalStateException() throws Exception {
-    thrown.expect(IllegalStateException.class,
+    try (RdeParser parser = new RdeParser(xml)) {
+      thrown.expect(
+          IllegalStateException.class,
           "Not at element urn:ietf:params:xml:ns:rdeRegistrar-1.0:registrar");
-    RdeParser parser = new RdeParser(xml);
       parser.getRegistrar();
     }
+  }
 
   @Test
   public void testGetRegistrarAtElement_returnsRegistrar() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       parser.nextRegistrar();
       XjcRdeRegistrar registrar = parser.getRegistrar();
       assertThat(registrar.getId()).isEqualTo("RegistrarX");
       assertThat(registrar.getName()).isEqualTo("Registrar X");
     }
+  }
 
   @Test
   public void testNextRegistrar_advancesParser() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       assertThat(parser.isAtRegistrar()).isFalse();
       assertThat(parser.nextRegistrar()).isTrue();
       assertThat(parser.isAtRegistrar()).isTrue();
       assertThat(parser.nextRegistrar()).isFalse();
       assertThat(parser.isAtRegistrar()).isFalse();
     }
+  }
 
   @Test
   public void testGetHeaderAfterNextRegistrar_returnsHeader() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       parser.nextRegistrar();
       checkHeader(parser.getHeader());
     }
+  }
 
   @Test
   public void testGetNndnNotAtElement_throwsIllegalStateException() throws Exception {
-    thrown.expect(IllegalStateException.class,
+    try (RdeParser parser = new RdeParser(xml)) {
-        "Not at element urn:ietf:params:xml:ns:rdeNNDN-1.0:NNDN");
+      thrown.expect(
-    RdeParser parser = new RdeParser(xml);
+          IllegalStateException.class, "Not at element urn:ietf:params:xml:ns:rdeNNDN-1.0:NNDN");
       parser.getNndn();
     }
+  }
 
   @Test
   public void testGetNndnAtElement_returnsNndn() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       parser.nextNndn();
       XjcRdeNndn nndn = parser.getNndn();
       assertThat(nndn.getAName()).isEqualTo("xn--exampl-gva.test");
     }
+  }
 
   @Test
   public void testNextNndn_advancesParser() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       assertThat(parser.isAtNndn()).isFalse();
       assertThat(parser.nextNndn()).isTrue();
       assertThat(parser.isAtNndn()).isTrue();
       assertThat(parser.nextNndn()).isFalse();
       assertThat(parser.isAtNndn()).isFalse();
     }
+  }
 
   @Test
   public void testGetHeaderAfterNextNndn_returnsHeader() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       parser.nextNndn();
       checkHeader(parser.getHeader());
     }
+  }
 
   @Test
   public void testGetIdnNotAtElement_throwsIllegalStateException() throws Exception {
-    thrown.expect(IllegalStateException.class,
+    try (RdeParser parser = new RdeParser(xml)) {
+      thrown.expect(
+          IllegalStateException.class,
           "Not at element urn:ietf:params:xml:ns:rdeIDN-1.0:idnTableRef");
-    RdeParser parser = new RdeParser(xml);
       parser.getIdn();
     }
+  }
 
   @Test
   public void testGetIdnAtElement_returnsIdn() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       parser.nextIdn();
       XjcRdeIdn idn = parser.getIdn();
       // url contains whitespace
       assertThat(idn.getUrl().trim())
           .isEqualTo("http://www.iana.org/domains/idn-tables/tables/br_pt-br_1.0.html");
     }
+  }
 
   @Test
   public void testNextIdn_advancesParser() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       assertThat(parser.isAtIdn()).isFalse();
       assertThat(parser.nextIdn()).isTrue();
       assertThat(parser.isAtIdn()).isTrue();
       assertThat(parser.nextIdn()).isFalse();
       assertThat(parser.isAtIdn()).isFalse();
     }
+  }
 
   @Test
   public void testGetHeaderAfterNextIdn_returnsHeader() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       parser.nextIdn();
       checkHeader(parser.getHeader());
     }
+  }
 
   @Test
   public void testGetEppParamsNotAtElement_throwsIllegalStateException() throws Exception {
-    thrown.expect(IllegalStateException.class,
+    try (RdeParser parser = new RdeParser(xml)) {
+      thrown.expect(
+          IllegalStateException.class,
           "Not at element urn:ietf:params:xml:ns:rdeEppParams-1.0:eppParams");
-    RdeParser parser = new RdeParser(xml);
       parser.getEppParams();
     }
+  }
 
   @Test
   public void testGetEppParamsAtElement_returnsEppParams() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       parser.nextEppParams();
       XjcRdeEppParams eppParams = parser.getEppParams();
       assertThat(eppParams.getVersions()).containsExactly("1.0");
     }
+  }
 
   @Test
   public void testNextEppParamsAdvancesParser() throws Exception {
-    RdeParser parser = new RdeParser(xml);
+    try (RdeParser parser = new RdeParser(xml)) {
       assertThat(parser.isAtEppParams()).isFalse();
       assertThat(parser.nextEppParams()).isTrue();
       assertThat(parser.isAtEppParams()).isTrue();
       assertThat(parser.nextEppParams()).isFalse();
       assertThat(parser.isAtEppParams()).isFalse();
     }
+  }
 }