Convert to tm() some low-hanging ofy fruit (#1029)

* Convert to tm() some low-hanging ofy fruit

core/src/test/java/google/registry/tools/DeleteTldCommandTest.java

@@ -27,11 +27,13 @@ import com.google.common.collect.ImmutableSortedMap;
 import google.registry.model.registry.Registry;
 import google.registry.model.registry.Registry.RegistryNotFoundException;
 import google.registry.model.registry.Registry.TldType;
+import google.registry.testing.DualDatabaseTest;
+import google.registry.testing.TestOfyAndSql;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 
 /** Unit tests for {@link DeleteTldCommand}. */
+@DualDatabaseTest
 class DeleteTldCommandTest extends CommandTestCase<DeleteTldCommand> {
 
   private static final String TLD_REAL = "tldreal";
@@ -53,7 +55,7 @@ class DeleteTldCommandTest extends CommandTestCase<DeleteTldCommand> {
             TldType.TEST));
   }
 
-  @Test
+  @TestOfyAndSql
   void testSuccess_otherTldUnaffected() throws Exception {
     runCommandForced("--tld=" + TLD_TEST);
 
@@ -61,24 +63,24 @@ class DeleteTldCommandTest extends CommandTestCase<DeleteTldCommand> {
     assertThrows(RegistryNotFoundException.class, () -> Registry.get(TLD_TEST));
   }
 
-  @Test
+  @TestOfyAndSql
   void testFailure_whenTldDoesNotExist() {
     assertThrows(RegistryNotFoundException.class, () -> runCommandForced("--tld=nonexistenttld"));
   }
 
-  @Test
+  @TestOfyAndSql
   void testFailure_whenTldIsReal() {
     assertThrows(IllegalStateException.class, () -> runCommandForced("--tld=" + TLD_REAL));
   }
 
-  @Test
+  @TestOfyAndSql
   void testFailure_whenDomainsArePresent() {
     persistDeletedDomain("domain." + TLD_TEST, DateTime.parse("2000-01-01TZ"));
 
     assertThrows(IllegalStateException.class, () -> runCommandForced("--tld=" + TLD_TEST));
   }
 
-  @Test
+  @TestOfyAndSql
   void testFailure_whenRegistrarLinksToTld() {
     allowRegistrarAccess("TheRegistrar", TLD_TEST);
 

core/src/test/java/google/registry/tools/ListCursorsCommandTest.java

@@ -24,14 +24,15 @@ import google.registry.model.common.Cursor;
 import google.registry.model.common.Cursor.CursorType;
 import google.registry.model.ofy.Ofy;
 import google.registry.model.registry.Registry;
-import google.registry.testing.FakeClock;
+import google.registry.testing.DualDatabaseTest;
 import google.registry.testing.InjectExtension;
+import google.registry.testing.TestOfyAndSql;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 /** Unit tests for {@link ListCursorsCommand}. */
+@DualDatabaseTest
 public class ListCursorsCommandTest extends CommandTestCase<ListCursorsCommand> {
 
   private static final String HEADER_ONE =
@@ -44,17 +45,17 @@ public class ListCursorsCommandTest extends CommandTestCase<ListCursorsCommand>
 
   @BeforeEach
   void beforeEach() {
-    inject.setStaticField(
-        Ofy.class, "clock", new FakeClock(DateTime.parse("1984-12-21T06:07:08.789Z")));
+    fakeClock.setTo(DateTime.parse("1984-12-21T06:07:08.789Z"));
+    inject.setStaticField(Ofy.class, "clock", fakeClock);
   }
 
-  @Test
+  @TestOfyAndSql
   void testListCursors_noTlds_printsNothing() throws Exception {
     runCommand("--type=BRDA");
     assertThat(getStdoutAsString()).isEmpty();
   }
 
-  @Test
+  @TestOfyAndSql
   void testListCursors_twoTldsOneAbsent_printsAbsentAndTimestampSorted() throws Exception {
     createTlds("foo", "bar");
     persistResource(
@@ -69,19 +70,19 @@ public class ListCursorsCommandTest extends CommandTestCase<ListCursorsCommand>
         .inOrder();
   }
 
-  @Test
+  @TestOfyAndSql
   void testListCursors_badCursor_throwsIae() {
     ParameterException thrown =
         assertThrows(ParameterException.class, () -> runCommand("--type=love"));
     assertThat(thrown).hasMessageThat().contains("Invalid value for --type parameter.");
   }
 
-  @Test
+  @TestOfyAndSql
   void testListCursors_lowercaseCursor_isAllowed() throws Exception {
     runCommand("--type=brda");
   }
 
-  @Test
+  @TestOfyAndSql
   void testListCursors_filterEscrowEnabled_doesWhatItSays() throws Exception {
     createTlds("foo", "bar");
     persistResource(Registry.get("bar").asBuilder().setEscrowEnabled(true).build());

core/src/test/java/google/registry/tools/server/ListHostsActionTest.java

@@ -17,13 +17,15 @@ package google.registry.tools.server;
 import static google.registry.testing.DatabaseHelper.createTld;
 import static google.registry.testing.DatabaseHelper.persistActiveHost;
 
+import google.registry.testing.DualDatabaseTest;
 import google.registry.testing.FakeClock;
+import google.registry.testing.TestOfyAndSql;
 import java.util.Optional;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 
 /** Unit tests for {@link ListHostsAction}. */
+@DualDatabaseTest
 class ListHostsActionTest extends ListActionTestCase {
 
   private ListHostsAction action;
@@ -35,7 +37,7 @@ class ListHostsActionTest extends ListActionTestCase {
     action.clock = new FakeClock(DateTime.parse("2000-01-01TZ"));
   }
 
-  @Test
+  @TestOfyAndSql
   void testRun_noParameters() {
     testRunSuccess(
         action,
@@ -44,7 +46,7 @@ class ListHostsActionTest extends ListActionTestCase {
         null);
   }
 
-  @Test
+  @TestOfyAndSql
   void testRun_twoLinesWithRepoId() {
     persistActiveHost("example2.foo");
     persistActiveHost("example1.foo");
@@ -59,7 +61,7 @@ class ListHostsActionTest extends ListActionTestCase {
         "^example2.foo\\s+2-ROID\\s*$");
   }
 
-  @Test
+  @TestOfyAndSql
   void testRun_twoLinesWithWildcard() {
     persistActiveHost("example2.foo");
     persistActiveHost("example1.foo");
@@ -74,7 +76,7 @@ class ListHostsActionTest extends ListActionTestCase {
         "^example2.foo\\s+.*1");
   }
 
-  @Test
+  @TestOfyAndSql
   void testRun_twoLinesWithWildcardAndAnotherField() {
     persistActiveHost("example2.foo");
     persistActiveHost("example1.foo");
@@ -89,7 +91,7 @@ class ListHostsActionTest extends ListActionTestCase {
         "^example2.foo\\s+.*1");
   }
 
-  @Test
+  @TestOfyAndSql
   void testRun_withBadField_returnsError() {
     persistActiveHost("example2.foo");
     persistActiveHost("example1.foo");

core/src/test/java/google/registry/tools/server/ListPremiumListsActionTest.java

@@ -16,11 +16,15 @@ package google.registry.tools.server;
 
 import static google.registry.testing.DatabaseHelper.persistPremiumList;
 
+import google.registry.testing.DualDatabaseTest;
+import google.registry.testing.TestOfyAndSql;
+import google.registry.testing.TestOfyOnly;
+import google.registry.testing.TestSqlOnly;
 import java.util.Optional;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 
 /** Unit tests for {@link ListPremiumListsAction}. */
+@DualDatabaseTest
 class ListPremiumListsActionTest extends ListActionTestCase {
 
   private ListPremiumListsAction action;
@@ -32,7 +36,7 @@ class ListPremiumListsActionTest extends ListActionTestCase {
     action = new ListPremiumListsAction();
   }
 
-  @Test
+  @TestOfyAndSql
   void testRun_noParameters() {
     testRunSuccess(
         action,
@@ -43,7 +47,7 @@ class ListPremiumListsActionTest extends ListActionTestCase {
         "^xn--q9jyb4c$");
   }
 
-  @Test
+  @TestOfyOnly // only ofy has revisionKey
   void testRun_withParameters() {
     testRunSuccess(
         action,
@@ -56,7 +60,20 @@ class ListPremiumListsActionTest extends ListActionTestCase {
         "^xn--q9jyb4c\\s+.*PremiumList.*$");
   }
 
-  @Test
+  @TestSqlOnly
+  void testRun_withLabelsToPrices() {
+    testRunSuccess(
+        action,
+        Optional.of("labelsToPrices"),
+        Optional.empty(),
+        Optional.empty(),
+        "^name\\s+labelsToPrices\\s*$",
+        "^-+\\s+-+\\s*$",
+        "^how\\s+\\{richer=5000\\.00\\}$",
+        "^xn--q9jyb4c\\s+\\{rich=100\\.00\\}\\s+$");
+  }
+
+  @TestOfyOnly
   void testRun_withWildcard() {
     testRunSuccess(
         action,
@@ -69,7 +86,7 @@ class ListPremiumListsActionTest extends ListActionTestCase {
         "^xn--q9jyb4c\\s+.*PremiumList");
   }
 
-  @Test
+  @TestOfyAndSql
   void testRun_withBadField_returnsError() {
     testRunError(
         action,

core/src/test/java/google/registry/tools/server/ListReservedListsActionTest.java

@@ -20,11 +20,13 @@ import static google.registry.testing.DatabaseHelper.persistResource;
 
 import google.registry.model.registry.Registry;
 import google.registry.model.registry.label.ReservedList;
+import google.registry.testing.DualDatabaseTest;
+import google.registry.testing.TestOfyAndSql;
 import java.util.Optional;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 
 /** Unit tests for {@link ListReservedListsAction}. */
+@DualDatabaseTest
 class ListReservedListsActionTest extends ListActionTestCase {
 
   private ListReservedListsAction action;
@@ -38,7 +40,7 @@ class ListReservedListsActionTest extends ListActionTestCase {
     action = new ListReservedListsAction();
   }
 
-  @Test
+  @TestOfyAndSql
   void testRun_noParameters() {
     testRunSuccess(
         action,
@@ -49,7 +51,7 @@ class ListReservedListsActionTest extends ListActionTestCase {
         "^xn--q9jyb4c-published\\s*$");
   }
 
-  @Test
+  @TestOfyAndSql
   void testRun_withParameters() {
     testRunSuccess(
         action,
@@ -62,7 +64,7 @@ class ListReservedListsActionTest extends ListActionTestCase {
         "^xn--q9jyb4c-published\\s+true\\s*$");
   }
 
-  @Test
+  @TestOfyAndSql
   void testRun_withWildcard() {
     testRunSuccess(
         action,
@@ -75,7 +77,7 @@ class ListReservedListsActionTest extends ListActionTestCase {
         "^xn--q9jyb4c-published\\s+.*true");
   }
 
-  @Test
+  @TestOfyAndSql
   void testRun_withBadField_returnsError() {
     testRunError(
         action,