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

Remove SMDRL completely from Datastore (#1104)

Browse source 
* Remove SMDRL completely from Datastore

* Remove some unnecessary stuff

* Change row count to 10000

* Remove implement EntityTestCase
This commit is contained in:
sarahcaseybot 2021-04-26 17:15:50 -04:00 • committed by GitHub
parent 367a38c5b0
commit 2528ee05dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 25 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

14
core/src/test/java/google/registry/model/smd/SignedMarkRevocationListTest.java
View file

@ -15,7 +15,6 @@
package google.registry.model.smd;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.model.smd.SignedMarkRevocationList.SHARD_SIZE;
import static google.registry.util.DateTimeUtils.START_OF_TIME;
import static org.joda.time.Duration.standardDays;
import static org.junit.jupiter.api.Assertions.assertThrows;
@ -31,14 +30,13 @@ import org.junit.jupiter.api.extension.RegisterExtension;
public class SignedMarkRevocationListTest {
@RegisterExtension
public final AppEngineExtension appEngine =
AppEngineExtension.builder().withDatastoreAndCloudSql().build();
public final AppEngineExtension appEngine = AppEngineExtension.builder().withCloudSql().build();
private final FakeClock clock = new FakeClock(DateTime.parse("2013-01-01T00:00:00Z"));
@Test
void testEmpty() {
// When Datastore is empty, it should give us an empty thing.
// When Cloud SQL is empty, it should give us an empty thing.
assertThat(SignedMarkRevocationList.get())
.isEqualTo(SignedMarkRevocationList.create(START_OF_TIME, ImmutableMap.of()));
}
@ -65,7 +63,7 @@ public class SignedMarkRevocationListTest {
@Test
void test_isSmdRevoked_garbage() {
SignedMarkRevocationList smdrl = createSaveGetHelper(SHARD_SIZE + 1);
SignedMarkRevocationList smdrl = createSaveGetHelper(100);
assertThat(smdrl.getCreationTime()).isEqualTo(clock.nowUtc());
assertThat(smdrl.isSmdRevoked("rofl", clock.nowUtc())).isFalse();
assertThat(smdrl.isSmdRevoked("31337", clock.nowUtc())).isFalse();
@ -84,7 +82,7 @@ public class SignedMarkRevocationListTest {
@Test
void test_isSmdRevoked_present() {
final int rows = SHARD_SIZE + 1;
final int rows = 100;
SignedMarkRevocationList smdrl = createSaveGetHelper(rows);
assertThat(smdrl.isSmdRevoked("0", clock.nowUtc())).isTrue();
assertThat(smdrl.isSmdRevoked(Integer.toString(rows - 1), clock.nowUtc())).isTrue();
@ -93,7 +91,7 @@ public class SignedMarkRevocationListTest {
@Test
void test_isSmdRevoked_future() {
final int rows = SHARD_SIZE;
final int rows = 100;
SignedMarkRevocationList smdrl = createSaveGetHelper(rows);
clock.advanceOneMilli();
assertThat(smdrl.isSmdRevoked("0", clock.nowUtc())).isTrue();
@ -103,7 +101,7 @@ public class SignedMarkRevocationListTest {
@Test
void test_isSmdRevoked_past() {
final int rows = SHARD_SIZE;
final int rows = 100;
SignedMarkRevocationList smdrl = createSaveGetHelper(rows);
clock.setTo(clock.nowUtc().minusMillis(1));
assertThat(smdrl.isSmdRevoked("0", clock.nowUtc())).isFalse();

7
core/src/test/java/google/registry/testing/AppEngineExtension.java
View file

@ -172,6 +172,13 @@ public final class AppEngineExtension implements BeforeEachCallback, AfterEachCa
return this;
}
/** Turns on Cloud SQL only, for use by test data generators. */
public Builder withCloudSql() {
rule.withCloudSql = true;
rule.withDatastore = false;
return this;
}
/** Disables insertion of canned data. */
public Builder withoutCannedData() {
rule.withoutCannedData = true;

1
core/src/test/resources/google/registry/export/crosstld_kinds.txt
View file

@ -12,5 +12,4 @@ RegistrarContact
Registry
ReservedList
ServerSecret
SignedMarkRevocationList
TmchCrl

6
core/src/test/resources/google/registry/model/schema.txt
View file

@ -826,12 +826,6 @@ class google.registry.model.server.ServerSecret {
long leastSignificant;
long mostSignificant;
}
class google.registry.model.smd.SignedMarkRevocationList {
@Id long id;
@Parent com.googlecode.objectify.Key<google.registry.model.common.EntityGroupRoot> parent;
java.util.Map<java.lang.String, org.joda.time.DateTime> revokes;
org.joda.time.DateTime creationTime;
}
class google.registry.model.tmch.ClaimsListShard {
@Id long id;
@Parent com.googlecode.objectify.Key<google.registry.model.tmch.ClaimsListShard$ClaimsListRevision> parent;