Add OT&E verification that a domain was successfully created in sunrise

We already have verifications that a domain application was created in sunrise
- which checks for end-date sunrise. Start-date sunrise has checks that a
domain (not application) was created. There's no need to specifically check for
a signed mark, since a successful domain create during sunrise must have a
signed mark in it.

Also removed the requirement for end-date sunrise / landrush testing.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=190551080
This commit is contained in:
guyben 2018-03-26 17:18:11 -07:00 committed by jianglai
parent fea495e319
commit c1ca88ac9e
3 changed files with 14 additions and 52 deletions

View file

@ -146,14 +146,15 @@ public class VerifyOteAction implements Runnable, JsonAction {
CONTACT_UPDATES(0, equalTo(Type.CONTACT_UPDATE)), CONTACT_UPDATES(0, equalTo(Type.CONTACT_UPDATE)),
DOMAIN_APPLICATION_CREATES(0, equalTo(Type.DOMAIN_APPLICATION_CREATE)), DOMAIN_APPLICATION_CREATES(0, equalTo(Type.DOMAIN_APPLICATION_CREATE)),
DOMAIN_APPLICATION_CREATES_LANDRUSH( DOMAIN_APPLICATION_CREATES_LANDRUSH(
1, equalTo(Type.DOMAIN_APPLICATION_CREATE), IS_SUNRISE.negate()), 0, equalTo(Type.DOMAIN_APPLICATION_CREATE), IS_SUNRISE.negate()),
DOMAIN_APPLICATION_CREATES_SUNRISE(1, equalTo(Type.DOMAIN_APPLICATION_CREATE), IS_SUNRISE), DOMAIN_APPLICATION_CREATES_SUNRISE(0, equalTo(Type.DOMAIN_APPLICATION_CREATE), IS_SUNRISE),
DOMAIN_APPLICATION_DELETES(2, equalTo(Type.DOMAIN_APPLICATION_DELETE)), DOMAIN_APPLICATION_DELETES(0, equalTo(Type.DOMAIN_APPLICATION_DELETE)),
DOMAIN_APPLICATION_UPDATES(2, equalTo(Type.DOMAIN_APPLICATION_UPDATE)), DOMAIN_APPLICATION_UPDATES(0, equalTo(Type.DOMAIN_APPLICATION_UPDATE)),
DOMAIN_AUTORENEWS(0, equalTo(Type.DOMAIN_AUTORENEW)), DOMAIN_AUTORENEWS(0, equalTo(Type.DOMAIN_AUTORENEW)),
DOMAIN_CREATES(0, equalTo(Type.DOMAIN_CREATE)), DOMAIN_CREATES(0, equalTo(Type.DOMAIN_CREATE)),
DOMAIN_CREATES_ASCII(1, equalTo(Type.DOMAIN_CREATE), IS_IDN.negate()), DOMAIN_CREATES_ASCII(1, equalTo(Type.DOMAIN_CREATE), IS_IDN.negate()),
DOMAIN_CREATES_IDN(1, equalTo(Type.DOMAIN_CREATE), IS_IDN), DOMAIN_CREATES_IDN(1, equalTo(Type.DOMAIN_CREATE), IS_IDN),
DOMAIN_CREATES_START_DATE_SUNRISE(1, equalTo(Type.DOMAIN_CREATE), IS_SUNRISE),
DOMAIN_CREATES_WITH_CLAIMS_NOTICE(1, equalTo(Type.DOMAIN_CREATE), HAS_CLAIMS_NOTICE), DOMAIN_CREATES_WITH_CLAIMS_NOTICE(1, equalTo(Type.DOMAIN_CREATE), HAS_CLAIMS_NOTICE),
DOMAIN_CREATES_WITH_FEE( DOMAIN_CREATES_WITH_FEE(
1, 1,

View file

@ -47,39 +47,9 @@ public class VerifyOteActionTest {
persistResource( persistResource(
new HistoryEntry.Builder() new HistoryEntry.Builder()
.setClientId("blobio-1") .setClientId("blobio-1")
.setType(Type.DOMAIN_APPLICATION_CREATE) .setType(Type.DOMAIN_CREATE)
.setXmlBytes(ToolsTestData.loadBytes("domain_create_complete.xml").read())
.build());
persistResource(
new HistoryEntry.Builder()
.setClientId("blobio-1")
.setType(Type.DOMAIN_APPLICATION_CREATE)
.setXmlBytes(ToolsTestData.loadBytes("domain_create_sunrise.xml").read()) .setXmlBytes(ToolsTestData.loadBytes("domain_create_sunrise.xml").read())
.build()); .build());
persistResource(
new HistoryEntry.Builder()
.setClientId("blobio-1")
.setType(Type.DOMAIN_APPLICATION_DELETE)
.setXmlBytes(ToolsTestData.loadBytes("domain_delete.xml").read())
.build());
persistResource(
new HistoryEntry.Builder()
.setClientId("blobio-2")
.setType(Type.DOMAIN_APPLICATION_DELETE)
.setXmlBytes(ToolsTestData.loadBytes("domain_delete.xml").read())
.build());
persistResource(
new HistoryEntry.Builder()
.setClientId("blobio-1")
.setType(Type.DOMAIN_APPLICATION_UPDATE)
.setXmlBytes(ToolsTestData.loadBytes("domain_update_complete.xml").read())
.build());
persistResource(
new HistoryEntry.Builder()
.setClientId("blobio-2")
.setType(Type.DOMAIN_APPLICATION_UPDATE)
.setXmlBytes(ToolsTestData.loadBytes("domain_update_complete.xml").read())
.build());
persistResource( persistResource(
new HistoryEntry.Builder() new HistoryEntry.Builder()
.setClientId("blobio-1") .setClientId("blobio-1")
@ -181,7 +151,7 @@ public class VerifyOteActionTest {
for (Entry<String, Object> registrar : response.entrySet()) { for (Entry<String, Object> registrar : response.entrySet()) {
assertThat(registrar.getKey()).matches("blobio"); assertThat(registrar.getKey()).matches("blobio");
assertThat(registrar.getValue().toString()).containsMatch("Reqs passed: 19/19"); assertThat(registrar.getValue().toString()).containsMatch("Reqs passed: 16/16");
assertThat(registrar.getValue().toString()).containsMatch("Overall: PASS"); assertThat(registrar.getValue().toString()).containsMatch("Overall: PASS");
} }
} }
@ -195,12 +165,8 @@ public class VerifyOteActionTest {
for (Entry<String, Object> registrar : response.entrySet()) { for (Entry<String, Object> registrar : response.entrySet()) {
assertThat(registrar.getKey()).matches("blobio"); assertThat(registrar.getKey()).matches("blobio");
String expectedOteStatus = String expectedOteStatus =
"domain application creates landrush: 1\n" "domain creates idn: 1\n"
+ "domain application creates sunrise: 1\n" + "domain creates start date sunrise: 1\n"
+ "domain application deletes: 2\n"
+ "domain application updates: 2\n"
+ ".*"
+ "domain creates idn: 1\n"
+ "domain creates with claims notice: 1\n" + "domain creates with claims notice: 1\n"
+ "domain creates with fee: 1\n" + "domain creates with fee: 1\n"
+ "domain creates with sec dns: 1\n" + "domain creates with sec dns: 1\n"
@ -219,7 +185,7 @@ public class VerifyOteActionTest {
+ "host deletes: 1\n" + "host deletes: 1\n"
+ "host updates: 1\n" + "host updates: 1\n"
+ ".*" + ".*"
+ "Requirements passed: 19/19\n" + "Requirements passed: 16/16\n"
+ "Overall OT&E status: PASS\n"; + "Overall OT&E status: PASS\n";
Pattern expectedOteStatusPattern = Pattern.compile(expectedOteStatus, Pattern.DOTALL); Pattern expectedOteStatusPattern = Pattern.compile(expectedOteStatus, Pattern.DOTALL);
assertThat(registrar.getValue().toString()).containsMatch(expectedOteStatusPattern); assertThat(registrar.getValue().toString()).containsMatch(expectedOteStatusPattern);
@ -239,12 +205,8 @@ public class VerifyOteActionTest {
String oteStatus = registrar.getValue().toString(); String oteStatus = registrar.getValue().toString();
String expectedOteStatus = String expectedOteStatus =
"domain application creates landrush: 1\n" "domain creates idn: 1\n"
+ "domain application creates sunrise: 1\n" + "domain creates start date sunrise: 1\n"
+ "domain application deletes: 2\n"
+ "domain application updates: 2\n"
+ ".*"
+ "domain creates idn: 1\n"
+ "domain creates with claims notice: 1\n" + "domain creates with claims notice: 1\n"
+ "domain creates with fee: 1\n" + "domain creates with fee: 1\n"
+ "domain creates with sec dns: 1\n" + "domain creates with sec dns: 1\n"
@ -263,7 +225,7 @@ public class VerifyOteActionTest {
+ "host deletes: 0\n" + "host deletes: 0\n"
+ "host updates: 1\n" + "host updates: 1\n"
+ ".*" + ".*"
+ "Requirements passed: 18/19\n" + "Requirements passed: 15/16\n"
+ "Overall OT&E status: FAIL\n"; + "Overall OT&E status: FAIL\n";
Pattern expectedOteStatusPattern = Pattern.compile(expectedOteStatus, Pattern.DOTALL); Pattern expectedOteStatusPattern = Pattern.compile(expectedOteStatus, Pattern.DOTALL);
assertThat(oteStatus).containsMatch(expectedOteStatusPattern); assertThat(oteStatus).containsMatch(expectedOteStatusPattern);

View file

@ -19,8 +19,7 @@
</create> </create>
<extension> <extension>
<launch:create <launch:create
xmlns:launch="urn:ietf:params:xml:ns:launch-1.0" xmlns:launch="urn:ietf:params:xml:ns:launch-1.0">
type="application">
<launch:phase>sunrise</launch:phase> <launch:phase>sunrise</launch:phase>
<smd:signedMark xmlns:smd="urn:ietf:params:xml:ns:signedMark-1.0" id="signedMark"> <smd:signedMark xmlns:smd="urn:ietf:params:xml:ns:signedMark-1.0" id="signedMark">
<smd:id>1-2</smd:id> <smd:id>1-2</smd:id>