mirror of
https://github.com/google/nomulus.git
synced 2025-07-20 09:46:03 +02:00
Add octothorpes to disclaimer in exported reserved list
There's no real standard for commented lines in a CSV, but this seems to be the most well-supported option, so may as well use it. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=211847395
This commit is contained in:
parent
9436ce6f0e
commit
72bfd43e00
6 changed files with 27 additions and 12 deletions
|
@ -15,6 +15,8 @@
|
|||
package google.registry.config;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static google.registry.config.RegistryConfig.CONFIG_SETTINGS;
|
||||
import static google.registry.config.RegistryConfig.ConfigModule.provideReservedTermsExportDisclaimer;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
@ -23,13 +25,16 @@ import org.junit.runners.JUnit4;
|
|||
@RunWith(JUnit4.class)
|
||||
public class RegistryConfigTest {
|
||||
|
||||
public RegistryConfigTest() {}
|
||||
|
||||
@Test
|
||||
public void test_clientSecretFilename() {
|
||||
// Verify that we're pulling this from the default.
|
||||
assertThat(RegistryConfig.getClientSecretFilename()).isEqualTo(
|
||||
"/google/registry/tools/resources/client_secret.json");
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test_reservedTermsExportDisclaimer_isPrependedWithOctothorpes() {
|
||||
assertThat(provideReservedTermsExportDisclaimer(CONFIG_SETTINGS.get()))
|
||||
.isEqualTo("# Disclaimer line 1.\n" + "# Line 2 is this 1.");
|
||||
}
|
||||
}
|
||||
|
|
|
@ -60,7 +60,7 @@ public class ExportReservedTermsActionTest {
|
|||
ExportReservedTermsAction action = new ExportReservedTermsAction();
|
||||
action.response = response;
|
||||
action.driveConnection = driveConnection;
|
||||
action.exportUtils = new ExportUtils("This is a disclaimer.\n");
|
||||
action.exportUtils = new ExportUtils("# This is a disclaimer.");
|
||||
action.tld = tld;
|
||||
action.run();
|
||||
}
|
||||
|
@ -85,9 +85,7 @@ public class ExportReservedTermsActionTest {
|
|||
@Test
|
||||
public void test_uploadFileToDrive_succeeds() throws Exception {
|
||||
runAction("tld");
|
||||
byte[] expected =
|
||||
("This is a disclaimer.\ncat\nlol\n")
|
||||
.getBytes(UTF_8);
|
||||
byte[] expected = "# This is a disclaimer.\ncat\nlol\n".getBytes(UTF_8);
|
||||
verify(driveConnection)
|
||||
.createOrUpdateFile(RESERVED_TERMS_FILENAME, EXPORT_MIME_TYPE, "brouhaha", expected);
|
||||
verify(response).setStatus(SC_OK);
|
||||
|
|
|
@ -53,7 +53,7 @@ public class ExportUtilsTest {
|
|||
createTld("tld");
|
||||
persistResource(Registry.get("tld").asBuilder().setReservedLists(rl1, rl2, rl3).build());
|
||||
// Should not contain jimmy, tine, or oval.
|
||||
assertThat(new ExportUtils("This is a disclaimer.\n").exportReservedTerms(Registry.get("tld")))
|
||||
.isEqualTo("This is a disclaimer.\ncat\nlol\nsnow\n");
|
||||
assertThat(new ExportUtils("# This is a disclaimer.").exportReservedTerms(Registry.get("tld")))
|
||||
.isEqualTo("# This is a disclaimer.\ncat\nlol\nsnow\n");
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue