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

Update signed marks files and add an expiration test

Browse source 
We'll continue to use injected clocks for the rest of our tests that use signed marks files, so that they don't all fail after the current validity period. The new test TmchTestDataExpirationTest will let us know when the files are expired, so we can update them.

All updated test data files come from https://newgtlds.icann.org/en/about/trademark-clearinghouse/registries-registrars

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=202208196
This commit is contained in:
mcilwain 2018-06-26 15:42:25 -07:00 • committed by Ben McIlwain
parent 11c5d11a29
commit 892c1fc707
95 changed files with 6574 additions and 6461 deletions
Download patch file Download diff file Expand all files Collapse all files

36
javatests/google/registry/tmch/TmchXmlSignatureTest.java
View file

@ -69,7 +69,7 @@ public class TmchXmlSignatureTest {
//
// When updating this date, also update the dates below, which test to make sure that dates before
// and after the validity window result in rejection.
private final FakeClock clock = new FakeClock(DateTime.parse("2017-11-24T23:15:37.4Z"));
private final FakeClock clock = new FakeClock(DateTime.parse("2018-05-15T23:15:37.4Z"));
private byte[] smdData;
private TmchXmlSignature tmchXmlSignature;
@ -83,7 +83,7 @@ public class TmchXmlSignatureTest {
@Test
public void testWrongCertificateAuthority() {
tmchXmlSignature = new TmchXmlSignature(new TmchCertificateAuthority(TmchCaMode.PRODUCTION));
smdData = loadSmd("active/Court-Agent-Arabic-Active.smd");
smdData = loadSmd("active/Court-Agent-Arab-Active.smd");
CertificateSignatureException e =
assertThrows(CertificateSignatureException.class, () -> tmchXmlSignature.verify(smdData));
assertThat(e).hasMessageThat().contains("Signature does not match");
@ -91,21 +91,21 @@ public class TmchXmlSignatureTest {
@Test
public void testTimeTravelBeforeCertificateWasCreated() {
smdData = loadSmd("active/Court-Agent-Arabic-Active.smd");
smdData = loadSmd("active/Court-Agent-Arab-Active.smd");
clock.setTo(DateTime.parse("2013-05-01T00:00:00Z"));
assertThrows(CertificateNotYetValidException.class, () -> tmchXmlSignature.verify(smdData));
}
@Test
public void testTimeTravelAfterCertificateHasExpired() {
smdData = loadSmd("active/Court-Agent-Arabic-Active.smd");
smdData = loadSmd("active/Court-Agent-Arab-Active.smd");
clock.setTo(DateTime.parse("2023-06-01T00:00:00Z"));
assertThrows(CertificateExpiredException.class, () -> tmchXmlSignature.verify(smdData));
}
@Test
public void testActiveCourtAgentArabicActive() throws Exception {
smdData = loadSmd("active/Court-Agent-Arabic-Active.smd");
public void testActiveCourtAgentArabActive() throws Exception {
smdData = loadSmd("active/Court-Agent-Arab-Active.smd");
tmchXmlSignature.verify(smdData);
}
@ -134,8 +134,8 @@ public class TmchXmlSignatureTest {
}
@Test
public void testActiveCourtHolderArabicActive() throws Exception {
smdData = loadSmd("active/Court-Holder-Arabic-Active.smd");
public void testActiveCourtHolderArabActive() throws Exception {
smdData = loadSmd("active/Court-Holder-Arab-Active.smd");
tmchXmlSignature.verify(smdData);
}
@ -164,8 +164,8 @@ public class TmchXmlSignatureTest {
}
@Test
public void testActiveTrademarkAgentArabicActive() throws Exception {
smdData = loadSmd("active/Trademark-Agent-Arabic-Active.smd");
public void testActiveTrademarkAgentArabActive() throws Exception {
smdData = loadSmd("active/Trademark-Agent-Arab-Active.smd");
tmchXmlSignature.verify(smdData);
}
@ -194,8 +194,8 @@ public class TmchXmlSignatureTest {
}
@Test
public void testActiveTrademarkHolderArabicActive() throws Exception {
smdData = loadSmd("active/Trademark-Holder-Arabic-Active.smd");
public void testActiveTrademarkHolderArabActive() throws Exception {
smdData = loadSmd("active/Trademark-Holder-Arab-Active.smd");
tmchXmlSignature.verify(smdData);
}
@ -224,8 +224,8 @@ public class TmchXmlSignatureTest {
}
@Test
public void testActiveTreatystatuteAgentArabicActive() throws Exception {
smdData = loadSmd("active/TreatyStatute-Agent-Arabic-Active.smd");
public void testActiveTreatystatuteAgentArabActive() throws Exception {
smdData = loadSmd("active/TreatyStatute-Agent-Arab-Active.smd");
tmchXmlSignature.verify(smdData);
}
@ -254,8 +254,8 @@ public class TmchXmlSignatureTest {
}
@Test
public void testActiveTreatystatuteHolderArabicActive() throws Exception {
smdData = loadSmd("active/TreatyStatute-Holder-Arabic-Active.smd");
public void testActiveTreatystatuteHolderArabActive() throws Exception {
smdData = loadSmd("active/TreatyStatute-Holder-Arab-Active.smd");
tmchXmlSignature.verify(smdData);
}
@ -326,7 +326,7 @@ public class TmchXmlSignatureTest {
smdData = loadSmd("revoked/tmv/TMVRevoked-Trademark-Agent-English-Active.smd");
CertificateRevokedException e =
assertThrows(CertificateRevokedException.class, () -> tmchXmlSignature.verify(smdData));
assertThat(e).hasMessageThat().contains("KEY_COMPROMISE");
assertThat(e).hasMessageThat().contains("Certificate has been revoked");
}
@Test
@ -334,7 +334,7 @@ public class TmchXmlSignatureTest {
smdData = loadSmd("revoked/tmv/TMVRevoked-Trademark-Agent-Russian-Active.smd");
CertificateRevokedException e =
assertThrows(CertificateRevokedException.class, () -> tmchXmlSignature.verify(smdData));
assertThat(e).hasMessageThat().contains("KEY_COMPROMISE");
assertThat(e).hasMessageThat().contains("Certificate has been revoked");
}
@Test