zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-08-05 09:21:49 +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

4
javatests/google/registry/testing/EppLoader.java
View file

@ -15,7 +15,7 @@
package google.registry.testing;
import static google.registry.flows.EppXmlTransformer.unmarshal;
import static google.registry.testing.TestDataHelper.loadFileWithSubstitutions;
import static google.registry.testing.TestDataHelper.loadFile;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.common.collect.ImmutableMap;
@ -33,7 +33,7 @@ public class EppLoader {
}
public EppLoader(Object context, String eppXmlFilename, Map<String, String> substitutions) {
this.eppXml = loadFileWithSubstitutions(context.getClass(), eppXmlFilename, substitutions);
this.eppXml = loadFile(context.getClass(), eppXmlFilename, substitutions);
}
public EppInput getEpp() throws EppException {

2
javatests/google/registry/testing/TestDataHelper.java
View file

@ -55,7 +55,7 @@ public final class TestDataHelper {
* Loads a text file from the "testdata" directory relative to the location of the specified
* context class, and substitutes in values for placeholders of the form <code>%tagname%</code>.
*/
public static String loadFileWithSubstitutions(
public static String loadFile(
Class<?> context, String filename, Map<String, String> substitutions) {
String fileContents = loadFile(context, filename);
for (Entry<String, String> entry : nullToEmpty(substitutions).entrySet()) {