mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-09-09 09:36:12 +00:00
Code Issues Releases Wiki Activity

Fix empty Domain nameserver loads (#769)

Browse Source 
* Fix empty Domain nameserver loads

Domains with no nameservers were being loaded from SQL as an empty set instead
of null as they should be.

Discovered this will trying to test updates, so added a test for updates in
the course of it.
This commit is contained in:
Michael Muller
2020-08-21 11:11:01 -04:00
committed by GitHub
parent 5c30ef7086
commit 15587f03d6
2 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/test/java/google/registry/model/domain/DomainBaseSqlTest.java
+33 -2
View File
@@ -144,11 +144,10 @@ public class DomainBaseSqlTest {
EntityManager em = jpaTm().getEntityManager();
DomainBase result = em.find(DomainBase.class, "4-COM");
// Fix grace period and DS data, since we can't persist them yet.
// Fix DS data, since we can't persist it yet.
result =
result
.asBuilder()
.setRegistrant(contactKey)
.setDsData(
ImmutableSet.of(
DelegationSignerData.create(1, 2, 3, new byte[] {0, 1, 2})))
@@ -193,6 +192,38 @@ public class DomainBaseSqlTest {
});
}
@Test
void testUpdates() {
jpaTm()
.transact(
() -> {
jpaTm().saveNew(contact);
jpaTm().saveNew(contact2);
jpaTm().saveNew(domain);
jpaTm().saveNew(host);
});
domain = domain.asBuilder().setNameservers(ImmutableSet.of()).build();
jpaTm().transact(() -> jpaTm().saveNewOrUpdate(domain));
jpaTm()
.transact(
() -> {
DomainBase result = jpaTm().load(domain.createVKey());
// Fix DS data, since we can't persist that yet.
result =
result
.asBuilder()
.setDsData(
ImmutableSet.of(
DelegationSignerData.create(1, 2, 3, new byte[] {0, 1, 2})))
.build();
assertAboutImmutableObjects()
.that(result)
.isEqualExceptFields(domain, "updateTimestamp", "creationTime");
});
}
static ContactResource makeContact(String repoId) {
return new ContactResource.Builder()
.setRepoId(repoId)