From 3c19d4cbf6066cca062ece6af21817f976a374af Mon Sep 17 00:00:00 2001 From: Lai Jiang Date: Tue, 22 Mar 2022 09:49:14 -0400 Subject: [PATCH] Some code health fixes (#1563) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. testRun_withPrefix() in RdeUploadActionTest does calls a mock lock handler and does not actually try to read from the fake GCS implementation. Therefore there's no point settig it up. 2. Remove an unused field in UploadDatastoreBackupActionTest. --- This change is [Reviewable](https://reviewable.io/reviews/google/nomulus/1563) --- .../registry/export/UploadDatastoreBackupActionTest.java | 2 -- .../java/google/registry/rde/RdeUploadActionTest.java | 9 --------- 2 files changed, 11 deletions(-) diff --git a/core/src/test/java/google/registry/export/UploadDatastoreBackupActionTest.java b/core/src/test/java/google/registry/export/UploadDatastoreBackupActionTest.java index b6220100d..5d11e861d 100644 --- a/core/src/test/java/google/registry/export/UploadDatastoreBackupActionTest.java +++ b/core/src/test/java/google/registry/export/UploadDatastoreBackupActionTest.java @@ -48,7 +48,6 @@ import google.registry.testing.AppEngineExtension; import google.registry.testing.CloudTasksHelper; import google.registry.testing.CloudTasksHelper.TaskMatcher; import google.registry.testing.FakeClock; -import google.registry.util.CloudTasksUtils; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.ObjectInputStream; @@ -73,7 +72,6 @@ public class UploadDatastoreBackupActionTest { mock(Bigquery.Datasets.Insert.class); private UploadDatastoreBackupAction action; private CloudTasksHelper cloudTasksHelper = new CloudTasksHelper(); - private CloudTasksUtils cloudTasksUtils = cloudTasksHelper.getTestCloudTasksUtils(); @BeforeEach void beforeEach() throws Exception { diff --git a/core/src/test/java/google/registry/rde/RdeUploadActionTest.java b/core/src/test/java/google/registry/rde/RdeUploadActionTest.java index 83d4d834f..83638cef8 100644 --- a/core/src/test/java/google/registry/rde/RdeUploadActionTest.java +++ b/core/src/test/java/google/registry/rde/RdeUploadActionTest.java @@ -234,15 +234,6 @@ public class RdeUploadActionTest { RdeUploadAction action = createAction(null); action.prefix = Optional.of("job-name/"); action.tld = "lol"; - gcsUtils.delete(GHOSTRYDE_FILE); - gcsUtils.createFromBytes( - GHOSTRYDE_FILE_WITH_PREFIX, Ghostryde.encode(DEPOSIT_XML.read(), encryptKey)); - gcsUtils.delete(LENGTH_FILE); - gcsUtils.createFromBytes( - LENGTH_FILE_WITH_PREFIX, Long.toString(DEPOSIT_XML.size()).getBytes(UTF_8)); - gcsUtils.delete(REPORT_FILE); - gcsUtils.createFromBytes( - REPORT_FILE_WITH_PREFIX, Ghostryde.encode(REPORT_XML.read(), encryptKey)); action.run(); verify(runner) .lockRunAndRollForward(