X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=ONAP-PDP-REST%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpdp%2Frest%2FPapUrlResolverTest.java;h=fb768f7d744472ca52a763d6a4a18c8e32ece675;hp=cf3ddb3b21a6a4c065dde88db668a356fc9db3e4;hb=c2ca6ea5cb44103903e1409e8dd6db80167e61e8;hpb=766f999081e73b301062f1b96bffb9c52d7e9852 diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/PapUrlResolverTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/PapUrlResolverTest.java index cf3ddb3b2..fb768f7d7 100644 --- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/PapUrlResolverTest.java +++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/PapUrlResolverTest.java @@ -28,7 +28,7 @@ import java.util.Date; import java.util.Properties; import org.junit.Assert; import org.junit.Test; -import org.onap.policy.rest.XACMLRestProperties; +import org.onap.policy.rest.XacmlRestProperties; public class PapUrlResolverTest { @@ -41,7 +41,7 @@ public class PapUrlResolverTest { String failed = "-1,-1,-1,-1"; String succeeded = "-1,-1,-1,-1"; PapUrlResolver rs = PapUrlResolver.getInstance(urls, failed, succeeded); - Assert.assertEquals(rs.getProperties().getProperty(XACMLRestProperties.PROP_PAP_URLS), + Assert.assertEquals(rs.getProperties().getProperty(XacmlRestProperties.PROP_PAP_URLS), urls); rs.failed(); @@ -51,12 +51,12 @@ public class PapUrlResolverTest { Assert.assertFalse(rs.hasMoreUrls()); Properties prop = rs.getProperties(); Assert.assertEquals(df.format(new Date()) + ",-1,-1,-1", - prop.getProperty(XACMLRestProperties.PROP_PAP_FAILED_URLS)); + prop.getProperty(XacmlRestProperties.PROP_PAP_FAILED_URLS)); Assert.assertEquals("-1," + df.format(new Date()) + ",-1,-1", - prop.getProperty(XACMLRestProperties.PROP_PAP_SUCCEEDED_URLS)); + prop.getProperty(XacmlRestProperties.PROP_PAP_SUCCEEDED_URLS)); - failed = prop.getProperty(XACMLRestProperties.PROP_PAP_FAILED_URLS); - succeeded = prop.getProperty(XACMLRestProperties.PROP_PAP_SUCCEEDED_URLS); + failed = prop.getProperty(XacmlRestProperties.PROP_PAP_FAILED_URLS); + succeeded = prop.getProperty(XacmlRestProperties.PROP_PAP_SUCCEEDED_URLS); rs = PapUrlResolver.getInstance(urls, failed, succeeded); Assert.assertTrue(rs.hasMoreUrls()); Assert.assertEquals("http://two.localhost.com", rs.getUrl()); @@ -74,10 +74,10 @@ public class PapUrlResolverTest { Assert.assertFalse(rs.hasMoreUrls()); prop = rs.getProperties(); Assert.assertEquals("-1,-1,-1,-1", - prop.getProperty(XACMLRestProperties.PROP_PAP_FAILED_URLS)); + prop.getProperty(XacmlRestProperties.PROP_PAP_FAILED_URLS)); - failed = prop.getProperty(XACMLRestProperties.PROP_PAP_FAILED_URLS); - succeeded = prop.getProperty(XACMLRestProperties.PROP_PAP_SUCCEEDED_URLS); + failed = prop.getProperty(XacmlRestProperties.PROP_PAP_FAILED_URLS); + succeeded = prop.getProperty(XacmlRestProperties.PROP_PAP_SUCCEEDED_URLS); rs = PapUrlResolver.getInstance(urls, failed, succeeded); Assert.assertTrue(rs.hasMoreUrls()); Assert.assertEquals("http://one.localhost.com", rs.getUrl()); @@ -85,8 +85,8 @@ public class PapUrlResolverTest { rs.getNext(); Assert.assertFalse(rs.hasMoreUrls()); prop = rs.getProperties(); - failed = prop.getProperty(XACMLRestProperties.PROP_PAP_FAILED_URLS); - succeeded = prop.getProperty(XACMLRestProperties.PROP_PAP_SUCCEEDED_URLS); + failed = prop.getProperty(XacmlRestProperties.PROP_PAP_FAILED_URLS); + succeeded = prop.getProperty(XacmlRestProperties.PROP_PAP_SUCCEEDED_URLS); rs = PapUrlResolver.getInstance(urls, failed, succeeded); Assert.assertTrue(rs.hasMoreUrls()); Assert.assertEquals("http://one.localhost.com", rs.getUrl()); @@ -94,8 +94,8 @@ public class PapUrlResolverTest { rs.getNext(); Assert.assertFalse(rs.hasMoreUrls()); prop = rs.getProperties(); - failed = prop.getProperty(XACMLRestProperties.PROP_PAP_FAILED_URLS); - succeeded = prop.getProperty(XACMLRestProperties.PROP_PAP_SUCCEEDED_URLS); + failed = prop.getProperty(XacmlRestProperties.PROP_PAP_FAILED_URLS); + succeeded = prop.getProperty(XacmlRestProperties.PROP_PAP_SUCCEEDED_URLS); rs = PapUrlResolver.getInstance(urls, failed, succeeded); Assert.assertTrue(rs.hasMoreUrls()); Assert.assertEquals("http://one.localhost.com", rs.getUrl()); @@ -104,7 +104,7 @@ public class PapUrlResolverTest { Assert.assertFalse(rs.hasMoreUrls()); prop = rs.getProperties(); - succeeded = prop.getProperty(XACMLRestProperties.PROP_PAP_SUCCEEDED_URLS); + succeeded = prop.getProperty(XacmlRestProperties.PROP_PAP_SUCCEEDED_URLS); } @SuppressWarnings("unused")