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

Initialize data in cloudSqlOnly tests (#1266)

Browse source 
* Initialize data in cloudSqlOnly tests

* combine conditionals
This commit is contained in:
sarahcaseybot 2021-08-09 13:04:35 -04:00 • committed by GitHub
parent 761ae612fd
commit 9811cdb85c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/src/test/java/google/registry/model/registry/label/PremiumListTest.java
View file

@ -40,8 +40,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
public class PremiumListTest { public class PremiumListTest {
@RegisterExtension @RegisterExtension
public final AppEngineExtension appEngine = public final AppEngineExtension appEngine = AppEngineExtension.builder().withCloudSql().build();
AppEngineExtension.builder().withDatastoreAndCloudSql().build();
@BeforeEach @BeforeEach
void before() { void before() {

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

@ -391,11 +391,7 @@ public final class AppEngineExtension implements BeforeEachCallback, AfterEachCa
if (isWithDatastoreAndCloudSql()) { if (isWithDatastoreAndCloudSql()) {
injectTmForDualDatabaseTest(context); injectTmForDualDatabaseTest(context);
} }
if (tm().isOfy()) { if (!withoutCannedData && (tm().isOfy() || (withCloudSql && !withJpaUnitTest))) {
if (withDatastore && !withoutCannedData) {
loadInitialData();
}
} else if (withCloudSql && !withJpaUnitTest && !withoutCannedData) {
loadInitialData(); loadInitialData();
} }
} }