diff options
Diffstat (limited to 'controlloop/common/guard')
| -rw-r--r-- | controlloop/common/guard/src/test/java/org/onap/policy/guard/GuardUtilTest.java | 4 | ||||
| -rw-r--r-- | controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardYamlToXacmlTest.java | 16 | ||||
| -rw-r--r-- | controlloop/common/guard/src/test/java/org/onap/policy/guard/SupportTextFileUtils.java (renamed from controlloop/common/guard/src/test/java/org/onap/policy/guard/TextFileUtils.java) | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/controlloop/common/guard/src/test/java/org/onap/policy/guard/GuardUtilTest.java b/controlloop/common/guard/src/test/java/org/onap/policy/guard/GuardUtilTest.java index 8fc5a83da..1f7002a7d 100644 --- a/controlloop/common/guard/src/test/java/org/onap/policy/guard/GuardUtilTest.java +++ b/controlloop/common/guard/src/test/java/org/onap/policy/guard/GuardUtilTest.java @@ -45,7 +45,7 @@ public class GuardUtilTest { Yaml clYaml = new Yaml(new Constructor(ControlLoopPolicy.class)); String clYamlString = clYaml.dump(clPolicy); - TextFileUtils.putStringAsFile(clYamlString, tempYamlFile); + SupportTextFileUtils.putStringAsFile(clYamlString, tempYamlFile); Pair<ControlLoopPolicy, String> result = Util.loadYaml(tempYamlFile.getCanonicalPath()); @@ -74,7 +74,7 @@ public class GuardUtilTest { Yaml clYaml = new Yaml(new Constructor(ControlLoopPolicy.class)); String clYamlString = clYaml.dump(clGuardPolicy); - TextFileUtils.putStringAsFile(clYamlString, tempYamlFile); + SupportTextFileUtils.putStringAsFile(clYamlString, tempYamlFile); ControlLoopGuard result = Util.loadYamlGuard(tempYamlFile.getCanonicalPath()); diff --git a/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardYamlToXacmlTest.java b/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardYamlToXacmlTest.java index 3b517bcc1..dced2889d 100644 --- a/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardYamlToXacmlTest.java +++ b/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardYamlToXacmlTest.java @@ -86,11 +86,11 @@ public class PolicyGuardYamlToXacmlTest { Yaml clYaml = new Yaml(new Constructor(ControlLoopGuard.class)); String clYamlString = clYaml.dump(clGuard); - TextFileUtils.putStringAsFile(clYamlString, tempYamlFile); + SupportTextFileUtils.putStringAsFile(clYamlString, tempYamlFile); PolicyGuardYamlToXacml.fromYamlToXacml(tempYamlFile.getCanonicalPath(), tempXacmlTemplateFile.getCanonicalPath(), tempXacmlOutputFile.getCanonicalPath()); - String result = TextFileUtils.getTextFileAsString(tempXacmlOutputFile.getCanonicalPath()); + String result = SupportTextFileUtils.getTextFileAsString(tempXacmlOutputFile.getCanonicalPath()); // Assert no mote "${}" are left assertFalse(result.contains("${")); @@ -124,11 +124,11 @@ public class PolicyGuardYamlToXacmlTest { Yaml clYaml = new Yaml(new Constructor(ControlLoopGuard.class)); String clYamlString = clYaml.dump(clGuard); - TextFileUtils.putStringAsFile(clYamlString, tempYamlFile); + SupportTextFileUtils.putStringAsFile(clYamlString, tempYamlFile); PolicyGuardYamlToXacml.fromYamlToXacml(tempYamlFile.getCanonicalPath(), tempXacmlTemplateFile.getCanonicalPath(), tempXacmlOutputFile.getCanonicalPath()); - String result = TextFileUtils.getTextFileAsString(tempXacmlOutputFile.getCanonicalPath()); + String result = SupportTextFileUtils.getTextFileAsString(tempXacmlOutputFile.getCanonicalPath()); // Assert no mote "${}" are left assertFalse(result.contains("${")); @@ -184,11 +184,11 @@ public class PolicyGuardYamlToXacmlTest { Yaml clYaml = new Yaml(new Constructor(ControlLoopGuard.class)); String clYamlString = clYaml.dump(clGuard); - TextFileUtils.putStringAsFile(clYamlString, tempYamlFile); + SupportTextFileUtils.putStringAsFile(clYamlString, tempYamlFile); PolicyGuardYamlToXacml.fromYamlToXacmlBlacklist(tempYamlFile.getCanonicalPath(), tempXacmlTemplateFile.getCanonicalPath(), tempXacmlOutputFile.getCanonicalPath()); - String result = TextFileUtils.getTextFileAsString(tempXacmlOutputFile.getCanonicalPath()); + String result = SupportTextFileUtils.getTextFileAsString(tempXacmlOutputFile.getCanonicalPath()); System.err.println(result); // Assert no mote "${}" are left assertFalse(result.contains("${")); @@ -220,11 +220,11 @@ public class PolicyGuardYamlToXacmlTest { Yaml clYaml = new Yaml(new Constructor(ControlLoopGuard.class)); String clYamlString = clYaml.dump(clGuard); - TextFileUtils.putStringAsFile(clYamlString, tempYamlFile); + SupportTextFileUtils.putStringAsFile(clYamlString, tempYamlFile); PolicyGuardYamlToXacml.fromYamlToXacmlBlacklist(tempYamlFile.getCanonicalPath(), tempXacmlTemplateFile.getCanonicalPath(), tempXacmlOutputFile.getCanonicalPath()); - String result = TextFileUtils.getTextFileAsString(tempXacmlOutputFile.getCanonicalPath()); + String result = SupportTextFileUtils.getTextFileAsString(tempXacmlOutputFile.getCanonicalPath()); System.err.println(result); // Assert no mote "${}" are left assertFalse(result.contains("${")); diff --git a/controlloop/common/guard/src/test/java/org/onap/policy/guard/TextFileUtils.java b/controlloop/common/guard/src/test/java/org/onap/policy/guard/SupportTextFileUtils.java index 46a2762cc..03260ada9 100644 --- a/controlloop/common/guard/src/test/java/org/onap/policy/guard/TextFileUtils.java +++ b/controlloop/common/guard/src/test/java/org/onap/policy/guard/SupportTextFileUtils.java @@ -31,7 +31,7 @@ import java.io.IOException; * * @author Liam Fallon (liam.fallon@ericsson.com) */ -public abstract class TextFileUtils { +public abstract class SupportTextFileUtils { /** * Method to return the contents of a text file as a string. * |