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

Avoid unnecessary tm() calls without ofy init in Spec11PipelineTest (#1250)

Browse source 
* Avoid unnecessary tm() calls without ofy init in Spec11PipelineTest
This commit is contained in:
gbrodman 2021-07-20 15:10:50 -04:00 • committed by GitHub
parent 48b856645a
commit 65e3a74944
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/src/test/java/google/registry/beam/spec11/Spec11PipelineTest.java
View file

@ -18,8 +18,8 @@ import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static google.registry.model.ImmutableObjectSubject.immutableObjectCorrespondence; import static google.registry.model.ImmutableObjectSubject.immutableObjectCorrespondence;
import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
import static google.registry.persistence.transaction.TransactionManagerFactory.removeTmOverrideForTest;
import static google.registry.persistence.transaction.TransactionManagerFactory.setTmForTest; import static google.registry.persistence.transaction.TransactionManagerFactory.setTmForTest;
import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
import static google.registry.testing.AppEngineExtension.makeRegistrar1; import static google.registry.testing.AppEngineExtension.makeRegistrar1;
import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.createTld;
import static google.registry.testing.DatabaseHelper.persistActiveContact; import static google.registry.testing.DatabaseHelper.persistActiveContact;
@ -49,7 +49,6 @@ import google.registry.model.reporting.Spec11ThreatMatch.ThreatType;
import google.registry.model.reporting.Spec11ThreatMatchDao; import google.registry.model.reporting.Spec11ThreatMatchDao;
import google.registry.persistence.transaction.JpaTestRules; import google.registry.persistence.transaction.JpaTestRules;
import google.registry.persistence.transaction.JpaTestRules.JpaIntegrationTestExtension; import google.registry.persistence.transaction.JpaTestRules.JpaIntegrationTestExtension;
import google.registry.persistence.transaction.TransactionManager;
import google.registry.testing.DatastoreEntityExtension; import google.registry.testing.DatastoreEntityExtension;
import google.registry.testing.FakeClock; import google.registry.testing.FakeClock;
import google.registry.testing.FakeSleeper; import google.registry.testing.FakeSleeper;
@ -230,7 +229,6 @@ class Spec11PipelineTest {
} }
private void setupCloudSql() { private void setupCloudSql() {
TransactionManager originalTm = tm();
setTmForTest(jpaTm()); setTmForTest(jpaTm());
persistNewRegistrar("TheRegistrar"); persistNewRegistrar("TheRegistrar");
persistNewRegistrar("NewRegistrar"); persistNewRegistrar("NewRegistrar");
@ -271,7 +269,7 @@ class Spec11PipelineTest {
persistResource(createDomain("no-email.com", "2A4BA9BBC-COM", registrar2, contact2)); persistResource(createDomain("no-email.com", "2A4BA9BBC-COM", registrar2, contact2));
persistResource( persistResource(
createDomain("anti-anti-anti-virus.dev", "555666888-DEV", registrar3, contact3)); createDomain("anti-anti-anti-virus.dev", "555666888-DEV", registrar3, contact3));
setTmForTest(originalTm); removeTmOverrideForTest();
} }
private void verifySaveToGcs() throws Exception { private void verifySaveToGcs() throws Exception {