mirror of
https://github.com/google/nomulus.git
synced 2025-07-20 09:46:03 +02:00
Rename all testdata loading files to conform to a single naming scheme
The scheme is: - loadBytes: returns a ByteSource of the data - loadFile: returns a string using UTF8 encoding, optionally applying substitutions ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=177606406
This commit is contained in:
parent
ebfa27b3ad
commit
b8970bfe1b
94 changed files with 428 additions and 449 deletions
|
@ -19,7 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
|
|||
import static google.registry.request.Action.Method.GET;
|
||||
import static google.registry.request.Action.Method.HEAD;
|
||||
import static google.registry.testing.DatastoreHelper.createTld;
|
||||
import static google.registry.testing.TestDataHelper.loadFileWithSubstitutions;
|
||||
import static google.registry.testing.TestDataHelper.loadFile;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
|
@ -166,7 +166,7 @@ public class RdapActionBaseTest {
|
|||
@Test
|
||||
public void testValidName_works() throws Exception {
|
||||
assertThat(generateActualJson("no.thing")).isEqualTo(JSONValue.parse(
|
||||
loadFileWithSubstitutions(this.getClass(), "rdapjson_toplevel.json", null)));
|
||||
loadFile(this.getClass(), "rdapjson_toplevel.json")));
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
}
|
||||
|
||||
|
@ -234,7 +234,7 @@ public class RdapActionBaseTest {
|
|||
}
|
||||
|
||||
private String loadFileWithoutTrailingNewline(String fileName) {
|
||||
String contents = loadFileWithSubstitutions(this.getClass(), fileName, null);
|
||||
String contents = loadFile(this.getClass(), fileName);
|
||||
return contents.endsWith("\n") ? contents.substring(0, contents.length() - 1) : contents;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue