Refactor most of OT&E verification code to exist in utils class

This does not change existing functionality but will allow us to use this common code in the yet-to-be-created web console action as well. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=227159346
2025-08-04 00:42:12 +02:00 · 2018-12-28 12:28:58 -08:00 · 2018-12-28 12:28:58 -08:00 · 2e7d71b238
commit 2e7d71b238
parent 2777018d6a
22 changed files with 754 additions and 470 deletions
--- a/javatests/google/registry/tools/server/BUILD
+++ b/javatests/google/registry/tools/server/BUILD
@ -18,6 +18,7 @@ java_library(
        "//java/google/registry/request",
        "//java/google/registry/tools/server",
        "//java/google/registry/util",
+        "//javatests/google/registry/model",
        "//javatests/google/registry/testing",
        "//javatests/google/registry/testing/mapreduce",
        "//third_party/objectify:objectify-v4_1",
--- a/javatests/google/registry/tools/server/VerifyOteActionTest.java
+++ b/javatests/google/registry/tools/server/VerifyOteActionTest.java
@ -15,18 +15,12 @@
 package google.registry.tools.server;

 import static com.google.common.truth.Truth.assertThat;
-import static google.registry.testing.DatastoreHelper.deleteResource;
-import static google.registry.testing.DatastoreHelper.persistResource;
-import static google.registry.util.DateTimeUtils.END_OF_TIME;

 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import google.registry.model.eppcommon.Trid;
-import google.registry.model.reporting.HistoryEntry;
-import google.registry.model.reporting.HistoryEntry.Type;
+import google.registry.model.OteStatsTestHelper;
 import google.registry.testing.AppEngineRule;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.regex.Pattern;
 import org.junit.Before;
 import org.junit.Rule;
@ -42,214 +36,94 @@ public class VerifyOteActionTest {

  private final VerifyOteAction action = new VerifyOteAction();

-  private HistoryEntry hostDeleteHistoryEntry;
-  private HistoryEntry domainCreateHistoryEntry;
-  private HistoryEntry domainRestoreHistoryEntry;
-
  @Before
  public void init() throws Exception {
-    persistResource(
-        new HistoryEntry.Builder()
-            .setClientId("blobio-1")
-            .setType(Type.DOMAIN_CREATE)
-            .setXmlBytes(ToolsTestData.loadBytes("domain_create_sunrise.xml").read())
-            .build());
-    domainCreateHistoryEntry = persistResource(
-        new HistoryEntry.Builder()
-            .setClientId("blobio-1")
-            .setType(Type.DOMAIN_CREATE)
-            .setXmlBytes(ToolsTestData.loadBytes("domain_create_idn.xml").read())
-            .build());
-    persistResource(
-        new HistoryEntry.Builder()
-            .setClientId("blobio-1")
-            .setType(Type.DOMAIN_CREATE)
-            .setXmlBytes(ToolsTestData.loadBytes("domain_create_claim_notice.xml").read())
-            .build());
-    persistResource(
-        new HistoryEntry.Builder()
-            .setClientId("blobio-1")
-            .setType(Type.DOMAIN_CREATE)
-            .setXmlBytes(ToolsTestData.loadBytes("domain_create_anchor_tenant_fee_standard.xml").read())
-            .build());
-    persistResource(
-        new HistoryEntry.Builder()
-            .setClientId("blobio-1")
-            .setType(Type.DOMAIN_CREATE)
-            .setXmlBytes(ToolsTestData.loadBytes("domain_create_dsdata.xml").read())
-            .build());
-    persistResource(
-        new HistoryEntry.Builder()
-            .setClientId("blobio-1")
-            .setType(Type.DOMAIN_DELETE)
-            .setXmlBytes(ToolsTestData.loadBytes("domain_delete.xml").read())
-            .build());
-    persistResource(
-        new HistoryEntry.Builder()
-            .setClientId("blobio-2")
-            .setType(Type.DOMAIN_DELETE)
-            .setXmlBytes(ToolsTestData.loadBytes("domain_delete.xml").read())
-            .build());
-    domainRestoreHistoryEntry = persistResource(
-        new HistoryEntry.Builder()
-            .setClientId("blobio-1")
-            .setType(Type.DOMAIN_RESTORE)
-            .setXmlBytes(ToolsTestData.loadBytes("domain_restore.xml").read())
-            .build());
-    persistResource(
-        new HistoryEntry.Builder()
-            .setClientId("blobio-1")
-            .setType(Type.DOMAIN_TRANSFER_APPROVE)
-            .setXmlBytes(ToolsTestData.loadBytes("domain_transfer_approve.xml").read())
-            .build());
-    persistResource(
-        new HistoryEntry.Builder()
-            .setClientId("blobio-1")
-            .setType(Type.DOMAIN_TRANSFER_CANCEL)
-            .setXmlBytes(ToolsTestData.loadBytes("domain_transfer_cancel.xml").read())
-            .build());
-    persistResource(
-        new HistoryEntry.Builder()
-            .setClientId("blobio-1")
-            .setType(Type.DOMAIN_TRANSFER_REJECT)
-            .setXmlBytes(ToolsTestData.loadBytes("domain_transfer_reject.xml").read())
-            .build());
-    persistResource(
-        new HistoryEntry.Builder()
-            .setClientId("blobio-1")
-            .setType(Type.DOMAIN_TRANSFER_REQUEST)
-            .setXmlBytes(ToolsTestData.loadBytes("domain_transfer_request.xml").read())
-            .build());
-    persistResource(
-        new HistoryEntry.Builder()
-            .setClientId("blobio-1")
-            .setType(Type.DOMAIN_UPDATE)
-            .setXmlBytes(ToolsTestData.loadBytes("domain_update_with_secdns.xml").read())
-            .build());
-    persistResource(
-        new HistoryEntry.Builder()
-            .setClientId("blobio-1")
-            .setType(Type.HOST_CREATE)
-            .setXmlBytes(ToolsTestData.loadBytes("host_create_complete.xml").read())
-            .build());
-    hostDeleteHistoryEntry =
-        persistResource(
-            new HistoryEntry.Builder()
-                .setClientId("blobio-1")
-                .setType(Type.HOST_DELETE)
-                .setXmlBytes(ToolsTestData.loadBytes("host_delete.xml").read())
-                .build());
-    // Persist 10 host updates for a total of 25 history entries. Since these also sort last by
-    // modification time, when these cause all tests to pass, only the first will be recorded and
-    // the rest will be skipped.
-    for (int i = 0; i < 10; i++) {
-      persistResource(
-          new HistoryEntry.Builder()
-              .setClientId("blobio-1")
-              .setType(Type.HOST_UPDATE)
-              .setXmlBytes(ToolsTestData.loadBytes("host_update.xml").read())
-              .setTrid(Trid.create(null, String.format("blahtrid-%d", i)))
-              .setModificationTime(END_OF_TIME)
-              .build());
-    }
+    OteStatsTestHelper.setupHistoryEntries();
  }

  @Test
  public void testSuccess_summarize_allPass() {
-    Map<String, Object> response =
-        action.handleJsonRequest(
-            ImmutableMap.of("summarize", "true", "registrars", ImmutableList.of("blobio")));
-    assertThat(response)
-        .containsExactly(
-            "blobio", "# actions:   31 - Reqs: [----------------] 16/16 - Overall: PASS");
+    assertThat(getResponse(true))
+        .isEqualTo("# actions:   31 - Reqs: [----------------] 16/16 - Overall: PASS");
  }

  @Test
-  public void testSuccess_summarize_someFailures() {
-    deleteResource(hostDeleteHistoryEntry);
-    deleteResource(domainCreateHistoryEntry);
-    deleteResource(domainRestoreHistoryEntry);
-    Map<String, Object> response =
-        action.handleJsonRequest(
-            ImmutableMap.of("summarize", "true", "registrars", ImmutableList.of("blobio")));
-    assertThat(response)
-        .containsExactly(
-            "blobio", "# actions:   35 - Reqs: [-.-----.------.-] 13/16 - Overall: FAIL");
+  public void testFailure_summarize_someFailures() {
+    OteStatsTestHelper.deleteDomainCreateHistoryEntry();
+    OteStatsTestHelper.deleteDomainRestoreHistoryEntry();
+    OteStatsTestHelper.deleteHostDeleteHistoryEntry();
+    assertThat(getResponse(true))
+        .isEqualTo("# actions:   35 - Reqs: [-.-----.------.-] 13/16 - Overall: FAIL");
  }

  @Test
  public void testSuccess_passNotSummarized() {
-    Map<String, Object> response =
-        action.handleJsonRequest(
-            ImmutableMap.of("summarize", "false", "registrars", ImmutableList.of("blobio")));
-
-    for (Entry<String, Object> registrar : response.entrySet()) {
-      assertThat(registrar.getKey()).matches("blobio");
-      String expectedOteStatus =
-          "domain creates idn: 1\n"
-              + "domain creates start date sunrise: 1\n"
-              + "domain creates with claims notice: 1\n"
-              + "domain creates with fee: 1\n"
-              + "domain creates with sec dns: 1\n"
-              + ".*"
-              + "domain deletes: 2\n"
-              + ".*"
-              + "domain restores: 1\n"
-              + "domain transfer approves: 1\n"
-              + "domain transfer cancels: 1\n"
-              + "domain transfer rejects: 1\n"
-              + "domain transfer requests: 1\n"
-              + ".*"
-              + "domain updates with sec dns: 1\n"
-              + ".*"
-              + "host creates subordinate: 1\n"
-              + "host deletes: 1\n"
-              + "host updates: 1\n"
-              + ".*"
-              + "Requirements passed: 16/16\n"
-              + "Overall OT&E status: PASS\n";
-      Pattern expectedOteStatusPattern = Pattern.compile(expectedOteStatus, Pattern.DOTALL);
-      assertThat(registrar.getValue().toString()).containsMatch(expectedOteStatusPattern);
-    }
+    String expectedOteStatus =
+        "domain creates idn: 1\n"
+            + "domain creates start date sunrise: 1\n"
+            + "domain creates with claims notice: 1\n"
+            + "domain creates with fee: 1\n"
+            + "domain creates with sec dns: 1\n"
+            + ".*"
+            + "domain deletes: 2\n"
+            + ".*"
+            + "domain restores: 1\n"
+            + "domain transfer approves: 1\n"
+            + "domain transfer cancels: 1\n"
+            + "domain transfer rejects: 1\n"
+            + "domain transfer requests: 1\n"
+            + ".*"
+            + "domain updates with sec dns: 1\n"
+            + ".*"
+            + "host creates subordinate: 1\n"
+            + "host deletes: 1\n"
+            + "host updates: 1\n"
+            + ".*"
+            + "Requirements passed: 16/16\n"
+            + "Overall OT&E status: PASS\n";
+    Pattern expectedOteStatusPattern = Pattern.compile(expectedOteStatus, Pattern.DOTALL);
+    assertThat(getResponse(false)).containsMatch(expectedOteStatusPattern);
  }

  @Test
  public void testFailure_missingHostDelete() {
-    deleteResource(hostDeleteHistoryEntry);
+    OteStatsTestHelper.deleteHostDeleteHistoryEntry();
+    String expectedOteStatus =
+        "domain creates idn: 1\n"
+            + "domain creates start date sunrise: 1\n"
+            + "domain creates with claims notice: 1\n"
+            + "domain creates with fee: 1\n"
+            + "domain creates with sec dns: 1\n"
+            + ".*"
+            + "domain deletes: 2\n"
+            + ".*"
+            + "domain restores: 1\n"
+            + "domain transfer approves: 1\n"
+            + "domain transfer cancels: 1\n"
+            + "domain transfer rejects: 1\n"
+            + "domain transfer requests: 1\n"
+            + ".*"
+            + "domain updates with sec dns: 1\n"
+            + ".*"
+            + "host creates subordinate: 1\n"
+            + "host deletes: 0\n"
+            + "host updates: 10\n"
+            + ".*"
+            + "Requirements passed: 15/16\n"
+            + "Overall OT&E status: FAIL\n";
+    Pattern expectedOteStatusPattern = Pattern.compile(expectedOteStatus, Pattern.DOTALL);
+    assertThat(getResponse(false)).containsMatch(expectedOteStatusPattern);
+  }

+  private String getResponse(boolean summarize) {
    Map<String, Object> response =
        action.handleJsonRequest(
-            ImmutableMap.of("summarize", "false", "registrars", ImmutableList.of("blobio")));
-
-    for (Entry<String, Object> registrar : response.entrySet()) {
-      assertThat(registrar.getKey()).matches("blobio");
-      String oteStatus = registrar.getValue().toString();
-
-      String expectedOteStatus =
-          "domain creates idn: 1\n"
-              + "domain creates start date sunrise: 1\n"
-              + "domain creates with claims notice: 1\n"
-              + "domain creates with fee: 1\n"
-              + "domain creates with sec dns: 1\n"
-              + ".*"
-              + "domain deletes: 2\n"
-              + ".*"
-              + "domain restores: 1\n"
-              + "domain transfer approves: 1\n"
-              + "domain transfer cancels: 1\n"
-              + "domain transfer rejects: 1\n"
-              + "domain transfer requests: 1\n"
-              + ".*"
-              + "domain updates with sec dns: 1\n"
-              + ".*"
-              + "host creates subordinate: 1\n"
-              + "host deletes: 0\n"
-              + "host updates: 10\n"
-              + ".*"
-              + "Requirements passed: 15/16\n"
-              + "Overall OT&E status: FAIL\n";
-      Pattern expectedOteStatusPattern = Pattern.compile(expectedOteStatus, Pattern.DOTALL);
-      assertThat(oteStatus).containsMatch(expectedOteStatusPattern);
-    }
+            ImmutableMap.of(
+                "summarize",
+                Boolean.toString(summarize),
+                "registrars",
+                ImmutableList.of("blobio")));
+    assertThat(response).containsKey("blobio");
+    return response.get("blobio").toString();
  }
 }
--- a/javatests/google/registry/tools/server/testdata/domain_create_claim_notice.xml
+++ b/javatests/google/registry/tools/server/testdata/domain_create_claim_notice.xml
@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <create>
-      <domain:create
-          xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>example-one.tld</domain:name>
-        <domain:period unit="y">2</domain:period>
-        <domain:ns>
-          <domain:hostObj>ns1.example.net</domain:hostObj>
-          <domain:hostObj>ns2.example.net</domain:hostObj>
-        </domain:ns>
-        <domain:registrant>jd1234</domain:registrant>
-        <domain:contact type="admin">sh8013</domain:contact>
-        <domain:contact type="tech">sh8013</domain:contact>
-        <domain:authInfo>
-          <domain:pw>2fooBAR</domain:pw>
-        </domain:authInfo>
-      </domain:create>
-    </create>
-    <extension>
-      <launch:create xmlns:launch="urn:ietf:params:xml:ns:launch-1.0" type="registration">
-        <launch:phase>claims</launch:phase>
-        <launch:notice>
-          <launch:noticeID>370d0b7c9223372036854775807</launch:noticeID>
-          <launch:notAfter>2010-08-16T09:00:00.0Z</launch:notAfter>
-          <launch:acceptedDate>2009-08-16T09:00:00.0Z</launch:acceptedDate>
-        </launch:notice>
-      </launch:create>
-    </extension>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
--- a/javatests/google/registry/tools/server/testdata/domain_create_dsdata.xml
+++ b/javatests/google/registry/tools/server/testdata/domain_create_dsdata.xml
@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <command>
-    <create>
-      <domain:create
-       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>example.tld</domain:name>
-        <domain:period unit="y">2</domain:period>
-        <domain:ns>
-          <domain:hostObj>ns1.example.net</domain:hostObj>
-          <domain:hostObj>ns2.example.net</domain:hostObj>
-        </domain:ns>
-        <domain:registrant>jd1234</domain:registrant>
-        <domain:contact type="admin">sh8013</domain:contact>
-        <domain:contact type="tech">sh8013</domain:contact>
-        <domain:authInfo>
-          <domain:pw>2fooBAR</domain:pw>
-        </domain:authInfo>
-      </domain:create>
-    </create>
-    <extension>
-      <secDNS:create
-       xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1">
-        <secDNS:maxSigLife>604800</secDNS:maxSigLife>
-        <secDNS:dsData>
-          <secDNS:keyTag>12345</secDNS:keyTag>
-          <secDNS:alg>3</secDNS:alg>
-          <secDNS:digestType>1</secDNS:digestType>
-          <secDNS:digest>49FD46E6C4B45C55D4AC</secDNS:digest>
-        </secDNS:dsData>
-      </secDNS:create>
-    </extension>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
--- a/javatests/google/registry/tools/server/testdata/domain_create_idn.xml
+++ b/javatests/google/registry/tools/server/testdata/domain_create_idn.xml
@ -1,22 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <create>
-      <domain:create
-          xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>xn--abc-873b2e7eb1k8a4lpjvv.tld</domain:name>
-        <domain:period unit="y">2</domain:period>
-        <domain:ns>
-          <domain:hostObj>ns1.example.net</domain:hostObj>
-          <domain:hostObj>ns2.example.net</domain:hostObj>
-        </domain:ns>
-        <domain:registrant>jd1234</domain:registrant>
-        <domain:contact type="admin">sh8013</domain:contact>
-        <domain:contact type="tech">sh8013</domain:contact>
-        <domain:authInfo>
-          <domain:pw>2fooBAR</domain:pw>
-        </domain:authInfo>
-      </domain:create>
-    </create>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
--- a/javatests/google/registry/tools/server/testdata/domain_create_sunrise.xml
+++ b/javatests/google/registry/tools/server/testdata/domain_create_sunrise.xml
@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <create>
-      <domain:create
-          xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>exampleone.tld</domain:name>
-        <domain:ns>
-          <domain:hostObj>ns1.example.net</domain:hostObj>
-          <domain:hostObj>ns2.example.net</domain:hostObj>
-        </domain:ns>
-        <domain:registrant>jd1234</domain:registrant>
-        <domain:contact type="admin">sh8013</domain:contact>
-        <domain:contact type="tech">sh8013</domain:contact>
-        <domain:authInfo>
-          <domain:pw>2fooBAR</domain:pw>
-        </domain:authInfo>
-      </domain:create>
-    </create>
-    <extension>
-      <launch:create
-          xmlns:launch="urn:ietf:params:xml:ns:launch-1.0">
-        <launch:phase>sunrise</launch:phase>
-        <smd:signedMark xmlns:smd="urn:ietf:params:xml:ns:signedMark-1.0" id="signedMark">
-          <smd:id>1-2</smd:id>
-          <smd:issuerInfo issuerID="2">
-            <smd:org>Example Inc.</smd:org>
-            <smd:email>support@example.tld</smd:email>
-            <smd:url>http://www.example.tld</smd:url>
-            <smd:voice x="1234">+1.7035555555</smd:voice>
-          </smd:issuerInfo>
-          <smd:notBefore>2009-08-16T09:00:00.0Z</smd:notBefore>
-          <smd:notAfter>2010-08-16T09:00:00.0Z</smd:notAfter>
-          <mark:mark xmlns:mark="urn:ietf:params:xml:ns:mark-1.0">
-            <mark:trademark>
-              <mark:id>1234-2</mark:id>
-              <mark:markName>Example One</mark:markName>
-              <mark:holder entitlement="owner">
-                <mark:org>Example Inc.</mark:org>
-                <mark:addr>
-                  <mark:street>123 Example Dr.</mark:street>
-                  <mark:street>Suite 100</mark:street>
-                  <mark:city>Reston</mark:city>
-                  <mark:sp>VA</mark:sp>
-                  <mark:pc>20190</mark:pc>
-                  <mark:cc>US</mark:cc>
-                </mark:addr>
-              </mark:holder>
-              <mark:jurisdiction>US</mark:jurisdiction>
-              <mark:class>35</mark:class>
-              <mark:class>36</mark:class>
-              <mark:label>example-one</mark:label>
-              <mark:label>exampleone</mark:label>
-              <mark:goodsAndServices>Dirigendas et eiusmodi featuring infringo in airfare et cartam servicia.</mark:goodsAndServices>
-              <mark:regNum>234235</mark:regNum>
-              <mark:regDate>2009-08-16T09:00:00.0Z</mark:regDate>
-              <mark:exDate>2015-08-16T09:00:00.0Z</mark:exDate>
-            </mark:trademark>
-          </mark:mark>
-          <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
-            <SignedInfo>
-              <CanonicalizationMethod
-                  Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
-              <SignatureMethod
-                  Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-              <Reference URI="#signedMark">
-                <Transforms>
-                  <Transform
-                      Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
-                </Transforms>
-                <DigestMethod
-                    Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-                <DigestValue>
-                  miF4M2aTd1Y3tKOzJtiyl2VpzAnVPnV1Hq7Zax+yzrA=
-                </DigestValue>
-              </Reference>
-            </SignedInfo>
-            <SignatureValue>
-              MELpHTWEVfG1JcsG1/a//o54OnlJ5A864+X5JwfqgGBBeZSzGHNzwzTKFzIyyyfn
-              lGxVwNMoBV5aSvkF7oEKMNVzfcl/P0czNQZ/LJ83p3Ol27/iUNsqgCaGf9Zupw+M
-              XT4Q2lOrIw+qSx5g7q9T83siMLvkD5uEYlU5dPqgsObLTW8/doTQrA14RcxgY4kG
-              a4+t5B1cT+5VaghTOPb8uUSEDKjnOsGdy8p24wgyK9n8h0CTSS2ZQ6Zq/RmQeT7D
-              sbceUHheQ+mkQWIljpMQqsiBjw5XXh4jkEgfAzrb6gkYEF+X8ReuPZuOYC4QjIET
-              yx8ifN4KE3GIbMXeF4LDsA==
-            </SignatureValue>
-            <KeyInfo>
-              <KeyValue>
-                <RSAKeyValue>
-                  <Modulus>
-                    o/cwvXhbVYl0RDWWvoyeZpETVZVVcMCovUVNg/swWinuMgEWgVQFrz0xA04pEhXC
-                    FVv4evbUpekJ5buqU1gmQyOsCKQlhOHTdPjvkC5upDqa51Flk0TMaMkIQjs7aUKC
-                    mA4RG4tTTGK/EjR1ix8/D0gHYVRldy1YPrMP+ou75bOVnIos+HifrAtrIv4qEqwL
-                    L4FTZAUpaCa2BmgXfy2CSRQbxD5Or1gcSa3vurh5sPMCNxqaXmIXmQipS+DuEBqM
-                    M8tldaN7RYojUEKrGVsNk5i9y2/7sjn1zyyUPf7vL4GgDYqhJYWV61DnXgx/Jd6C
-                    WxvsnDF6scscQzUTEl+hyw==
-                  </Modulus>
-                  <Exponent>
-                    AQAB
-                  </Exponent>
-                </RSAKeyValue>
-              </KeyValue>
-              <X509Data>
-                <X509Certificate>
-                  MIIESTCCAzGgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBiMQswCQYDVQQGEwJVUzEL
-                  MAkGA1UECBMCQ0ExFDASBgNVBAcTC0xvcyBBbmdlbGVzMRMwEQYDVQQKEwpJQ0FO
-                  TiBUTUNIMRswGQYDVQQDExJJQ0FOTiBUTUNIIFRFU1QgQ0EwHhcNMTMwMjA4MDAw
-                  MDAwWhcNMTgwMjA3MjM1OTU5WjBsMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0Ex
-                  FDASBgNVBAcTC0xvcyBBbmdlbGVzMRcwFQYDVQQKEw5WYWxpZGF0b3IgVE1DSDEh
-                  MB8GA1UEAxMYVmFsaWRhdG9yIFRNQ0ggVEVTVCBDRVJUMIIBIjANBgkqhkiG9w0B
-                  AQEFAAOCAQ8AMIIBCgKCAQEAo/cwvXhbVYl0RDWWvoyeZpETVZVVcMCovUVNg/sw
-                  WinuMgEWgVQFrz0xA04pEhXCFVv4evbUpekJ5buqU1gmQyOsCKQlhOHTdPjvkC5u
-                  pDqa51Flk0TMaMkIQjs7aUKCmA4RG4tTTGK/EjR1ix8/D0gHYVRldy1YPrMP+ou7
-                  5bOVnIos+HifrAtrIv4qEqwLL4FTZAUpaCa2BmgXfy2CSRQbxD5Or1gcSa3vurh5
-                  sPMCNxqaXmIXmQipS+DuEBqMM8tldaN7RYojUEKrGVsNk5i9y2/7sjn1zyyUPf7v
-                  L4GgDYqhJYWV61DnXgx/Jd6CWxvsnDF6scscQzUTEl+hywIDAQABo4H/MIH8MAwG
-                  A1UdEwEB/wQCMAAwHQYDVR0OBBYEFPZEcIQcD/Bj2IFz/LERuo2ADJviMIGMBgNV
-                  HSMEgYQwgYGAFO0/7kEh3FuEKS+Q/kYHaD/W6wihoWakZDBiMQswCQYDVQQGEwJV
-                  UzELMAkGA1UECBMCQ0ExFDASBgNVBAcTC0xvcyBBbmdlbGVzMRMwEQYDVQQKEwpJ
-                  Q0FOTiBUTUNIMRswGQYDVQQDExJJQ0FOTiBUTUNIIFRFU1QgQ0GCAQEwDgYDVR0P
-                  AQH/BAQDAgeAMC4GA1UdHwQnMCUwI6AhoB+GHWh0dHA6Ly9jcmwuaWNhbm4ub3Jn
-                  L3RtY2guY3JsMA0GCSqGSIb3DQEBCwUAA4IBAQB2qSy7ui+43cebKUKwWPrzz9y/
-                  IkrMeJGKjo40n+9uekaw3DJ5EqiOf/qZ4pjBD++oR6BJCb6NQuQKwnoAz5lE4Ssu
-                  y5+i93oT3HfyVc4gNMIoHm1PS19l7DBKrbwbzAea/0jKWVzrvmV7TBfjxD3AQo1R
-                  bU5dBr6IjbdLFlnO5x0G0mrG7x5OUPuurihyiURpFDpwH8KAH1wMcCpXGXFRtGKk
-                  wydgyVYAty7otkl/z3bZkCVT34gPvF70sR6+QxUy8u0LzF5A/beYaZpxSYG31amL
-                  AdXitTWFipaIGea9lEGFM0L9+Bg7XzNn4nVLXokyEB3bgS4scG6QznX23FGk
-                </X509Certificate>
-              </X509Data>
-            </KeyInfo>
-          </Signature>
-        </smd:signedMark>
-      </launch:create>
-    </extension>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
--- a/javatests/google/registry/tools/server/testdata/domain_restore.xml
+++ b/javatests/google/registry/tools/server/testdata/domain_restore.xml
@ -1,17 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <update>
-      <domain:update
-          xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>example.tld</domain:name>
-        <domain:chg/>
-      </domain:update>
-    </update>
-    <extension>
-      <rgp:update xmlns:rgp="urn:ietf:params:xml:ns:rgp-1.0">
-        <rgp:restore op="request"/>
-      </rgp:update>
-    </extension>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
--- a/javatests/google/registry/tools/server/testdata/domain_transfer_approve.xml
+++ b/javatests/google/registry/tools/server/testdata/domain_transfer_approve.xml
@ -1,11 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <transfer op="approve">
-      <domain:transfer
-          xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>example.tld</domain:name>
-      </domain:transfer>
-    </transfer>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
--- a/javatests/google/registry/tools/server/testdata/domain_transfer_cancel.xml
+++ b/javatests/google/registry/tools/server/testdata/domain_transfer_cancel.xml
@ -1,11 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <transfer op="cancel">
-      <domain:transfer
-          xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>example.tld</domain:name>
-      </domain:transfer>
-    </transfer>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
--- a/javatests/google/registry/tools/server/testdata/domain_transfer_reject.xml
+++ b/javatests/google/registry/tools/server/testdata/domain_transfer_reject.xml
@ -1,11 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <transfer op="reject">
-      <domain:transfer
-          xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>example.tld</domain:name>
-      </domain:transfer>
-    </transfer>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
--- a/javatests/google/registry/tools/server/testdata/domain_transfer_request.xml
+++ b/javatests/google/registry/tools/server/testdata/domain_transfer_request.xml
@ -1,15 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <transfer op="request">
-      <domain:transfer
-          xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>example.tld</domain:name>
-        <domain:period unit="y">1</domain:period>
-        <domain:authInfo>
-          <domain:pw roid="JD1234-REP">2fooBAR</domain:pw>
-        </domain:authInfo>
-      </domain:transfer>
-    </transfer>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
--- a/javatests/google/registry/tools/server/testdata/domain_update_with_secdns.xml
+++ b/javatests/google/registry/tools/server/testdata/domain_update_with_secdns.xml
@ -1,28 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <update>
-      <domain:update
-          xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>example.tld</domain:name>
-        <domain:chg/>
-      </domain:update>
-    </update>
-    <extension>
-      <rgp:update xmlns:rgp="urn:ietf:params:xml:ns:rgp-1.0">
-        <rgp:restore op="request"/>
-      </rgp:update>
-      <secDNS:update
-          xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1">
-        <secDNS:add>
-          <secDNS:dsData>
-            <secDNS:keyTag>12346</secDNS:keyTag>
-            <secDNS:alg>3</secDNS:alg>
-            <secDNS:digestType>1</secDNS:digestType>
-            <secDNS:digest>38EC35D5B3A34B44C39B</secDNS:digest>
-          </secDNS:dsData>
-        </secDNS:add>
-      </secDNS:update>
-    </extension>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
--- a/javatests/google/registry/tools/server/testdata/host_update.xml
+++ b/javatests/google/registry/tools/server/testdata/host_update.xml
@ -1,14 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <update>
-      <host:update
-          xmlns:host="urn:ietf:params:xml:ns:host-1.0">
-        <host:name>example.tld</host:name>
-        <host:chg>
-          <host:name>example2.tld</host:name>
-        </host:chg>
-      </host:update>
-    </update>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>