zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-21 10:16:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

Rename all testdata loading files to conform to a single naming scheme

Browse source 
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:
guyben 2017-12-01 10:16:22 -08:00 • committed by jianglai
parent ebfa27b3ad
commit b8970bfe1b
94 changed files with 428 additions and 449 deletions
Download patch file Download diff file Expand all files Collapse all files

11
javatests/google/registry/rdap/RdapDomainSearchActionTest.java
View file

@ -30,7 +30,7 @@ import static google.registry.testing.FullFieldsTestEntityHelper.makeDomainResou
import static google.registry.testing.FullFieldsTestEntityHelper.makeHistoryEntry;
import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrar;
import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrarContacts;
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.when;
@ -405,7 +405,7 @@ public class RdapDomainSearchActionTest extends RdapSearchActionTestCase {
String domain1Handle,
String domain2Name,
String domain2Handle) {
return JSONValue.parse(loadFileWithSubstitutions(
return JSONValue.parse(loadFile(
this.getClass(),
"rdap_domains_two.json",
ImmutableMap.of(
@ -427,7 +427,7 @@ public class RdapDomainSearchActionTest extends RdapSearchActionTestCase {
String domain4Handle,
String expectedOutputFile) {
return JSONValue.parse(
loadFileWithSubstitutions(
loadFile(
this.getClass(),
expectedOutputFile,
new ImmutableMap.Builder<String, String>()
@ -481,8 +481,7 @@ public class RdapDomainSearchActionTest extends RdapSearchActionTestCase {
}
}
return JSONValue.parse(
loadFileWithSubstitutions(
this.getClass(), expectedOutputFile, substitutionsBuilder.build()));
loadFile(this.getClass(), expectedOutputFile, substitutionsBuilder.build()));
}
private Object generateExpectedJsonForDomain(
@ -568,7 +567,7 @@ public class RdapDomainSearchActionTest extends RdapSearchActionTestCase {
String domainHandle3,
String domainName4,
String domainHandle4) {
return JSONValue.parse(loadFileWithSubstitutions(
return JSONValue.parse(loadFile(
this.getClass(),
fileName,
new ImmutableMap.Builder<String, String>()