From 9811cdb85c5cd184386ee665b46dec186f868b2b Mon Sep 17 00:00:00 2001 From: sarahcaseybot Date: Mon, 9 Aug 2021 13:04:35 -0400 Subject: [PATCH] Initialize data in cloudSqlOnly tests (#1266) * Initialize data in cloudSqlOnly tests * combine conditionals --- .../registry/model/registry/label/PremiumListTest.java | 3 +-- .../java/google/registry/testing/AppEngineExtension.java | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/core/src/test/java/google/registry/model/registry/label/PremiumListTest.java b/core/src/test/java/google/registry/model/registry/label/PremiumListTest.java index 760b0005a..985b919d6 100644 --- a/core/src/test/java/google/registry/model/registry/label/PremiumListTest.java +++ b/core/src/test/java/google/registry/model/registry/label/PremiumListTest.java @@ -40,8 +40,7 @@ import org.junit.jupiter.api.extension.RegisterExtension; public class PremiumListTest { @RegisterExtension - public final AppEngineExtension appEngine = - AppEngineExtension.builder().withDatastoreAndCloudSql().build(); + public final AppEngineExtension appEngine = AppEngineExtension.builder().withCloudSql().build(); @BeforeEach void before() { diff --git a/core/src/test/java/google/registry/testing/AppEngineExtension.java b/core/src/test/java/google/registry/testing/AppEngineExtension.java index 67dab888f..92f53674d 100644 --- a/core/src/test/java/google/registry/testing/AppEngineExtension.java +++ b/core/src/test/java/google/registry/testing/AppEngineExtension.java @@ -391,11 +391,7 @@ public final class AppEngineExtension implements BeforeEachCallback, AfterEachCa if (isWithDatastoreAndCloudSql()) { injectTmForDualDatabaseTest(context); } - if (tm().isOfy()) { - if (withDatastore && !withoutCannedData) { - loadInitialData(); - } - } else if (withCloudSql && !withJpaUnitTest && !withoutCannedData) { + if (!withoutCannedData && (tm().isOfy() || (withCloudSql && !withJpaUnitTest))) { loadInitialData(); } }