[DMAAP-DR] Remove cadi/aaf from dr-node

[dmaap/datarouter.git] / datarouter-node / src / test / java / org / onap / dmaap / datarouter / node / NodeConfigManagerTest.java

diff --git a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeConfigManagerTest.java b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeConfigManagerTest.java
index 88e6e48..10732df 100644 (file)
--- a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeConfigManagerTest.java
+++ b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeConfigManagerTest.java
@@ -45,9 +45,12 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.mockito.Mock;
+import org.onap.dmaap.datarouter.node.config.NodeConfig;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
 
+@SuppressStaticInitializationFor({"org.onap.dmaap.datarouter.node.NodeConfigManager"})
 @PowerMockIgnore({"javax.net.ssl.*", "javax.security.auth.x500.X500Principal", "javax.crypto.*"})
 @PrepareForTest({InetAddress.class})
 public class NodeConfigManagerTest {
@@ -75,7 +78,6 @@ public class NodeConfigManagerTest {
         String href = "https://dmaap-dr-prov:8443/internal/prov";
         URLConnection urlConnection = mock(URLConnection.class);
         httpUrlStreamHandler.addConnection(new URL(href), urlConnection);
-        //File prov = new File("src/test/resources/prov_data.json");
         InputStream anyInputStream = new ByteArrayInputStream(Files.readAllBytes(Paths.get("src/test/resources/prov_data.json")));
         when(urlConnection.getInputStream()).thenReturn(anyInputStream);
     }
@@ -92,12 +94,10 @@ public class NodeConfigManagerTest {
     }
 
     @Test
-    public void Verify_NodeConfigMan_Getters() {
+    public void Verify_NodeConfigMan_Getters_Secure() {
         NodeConfigManager nodeConfigManager = NodeConfigManager.getInstance();
-        Assert.assertEquals("legacy", nodeConfigManager.getAafInstance());
         Assert.assertEquals("src/test/resources/spool/f", nodeConfigManager.getSpoolDir());
         Assert.assertEquals("src/test/resources/spool", nodeConfigManager.getSpoolBase());
-        Assert.assertEquals("PKCS12", nodeConfigManager.getKSType());
         Assert.assertEquals(8080, nodeConfigManager.getHttpPort());
         Assert.assertEquals(8443, nodeConfigManager.getHttpsPort());
         Assert.assertEquals(443, nodeConfigManager.getExtHttpsPort());
@@ -107,13 +107,9 @@ public class NodeConfigManagerTest {
         Assert.assertEquals(".log", nodeConfigManager.getEventLogSuffix());
         Assert.assertEquals("src/test/resources/logs", nodeConfigManager.getLogDir());
         Assert.assertEquals((86400000L * 30), nodeConfigManager.getLogRetention());
-        Assert.assertEquals(new String[] {"TLSv1.1", "TLSv1.2"}, nodeConfigManager.getEnabledprotocols());
-        Assert.assertEquals("org.onap.dmaap-dr.feed", nodeConfigManager.getAafType());
-        Assert.assertEquals("publish", nodeConfigManager.getAafAction());
-        Assert.assertFalse(nodeConfigManager.getCadiEnabled());
         Assert.assertFalse(nodeConfigManager.isShutdown());
+        Assert.assertFalse(nodeConfigManager.isTlsEnabled());
         Assert.assertTrue(nodeConfigManager.isConfigured());
-        Assert.assertEquals("legacy", nodeConfigManager.getAafInstance("1"));
         Assert.assertNotNull(nodeConfigManager.getPublishId());
         Assert.assertNotNull(nodeConfigManager.getAllDests());
         Assert.assertEquals(10000, nodeConfigManager.getInitFailureTimer());
@@ -125,18 +121,14 @@ public class NodeConfigManagerTest {
         Assert.assertEquals(60000, nodeConfigManager.getFairTimeLimit());
         Assert.assertNotNull(nodeConfigManager.getTargets("1"));
         Assert.assertEquals("src/test/resources/spool/f", nodeConfigManager.getSpoolDir());
-        Assert.assertEquals("src/test/resources/aaf/org.onap.dmaap-dr.p12", nodeConfigManager.getKSFile());
-        Assert.assertEquals("jks", nodeConfigManager.getTstype());
-        Assert.assertEquals("src/test/resources/aaf/org.onap.dmaap-dr.trust.jks", nodeConfigManager.getTsfile());
         Assert.assertEquals(40, nodeConfigManager.getDeliveryThreads());
         Assert.assertEquals("30", nodeConfigManager.getEventLogInterval());
         Assert.assertFalse(nodeConfigManager.isFollowRedirects());
         Assert.assertNotNull(nodeConfigManager.getTimer());
         Assert.assertEquals("1", nodeConfigManager.getFeedId("1"));
-        Assert.assertEquals("Basic ZG1hYXAtZHItbm9kZTpsaEFUNHY2N3F3blY3QVFxV3ByMm84WXNuVjg9", nodeConfigManager.getMyAuth());
+        Assert.assertEquals("Basic ZG1hYXAtZHItbm9kZTp2OStFanZpWVBXSURrazVxRlF5ZkoxSC9LdHBuYWo4K0NVTXlNL0lRRUp2UGdjOUxpU2s5ZnpKTjdFazl3SzZkaG11S1E4S3RtcC9kelpBU3BRUGZCdz09", nodeConfigManager.getMyAuth());
         Assert.assertEquals(0.05, nodeConfigManager.getFreeDiskStart(), 0.0);
         Assert.assertEquals(0.2, nodeConfigManager.getFreeDiskStop(), 0.0);
-        Assert.assertEquals("org.onap.dmaap-dr.feed|legacy|publish", nodeConfigManager.getPermission("legacy"));
     }
 
     /**