CHeckstyle and JUnit for base package in ONAP-REST

Added unit tests and fixed checkstyle and SONAR issues in the base
package of ONAPE-REST

There was a lot of knock-on automatic changes done by Eclipse when I
renamed the class XACMLRestProperties to XacmlRestProperties so ignore
the changes in all but the ONAP-REST package. I also didn't update the
licenses on files on those classes because the changes were automatic.

Issue-ID: POLICY-2131
Change-Id: I28823c844b5192f8d56de76a727996b13e7ea4a6
Signed-off-by: liamfallon <liam.fallon@est.tech>

1 files changed, 14 insertions, 14 deletions

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")