From: Parshad Patel Date: Thu, 27 Dec 2018 10:52:56 +0000 (+0900) Subject: Rename test classes in policy/engine X-Git-Tag: 1.4.0~63 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=commitdiff_plain;h=31e122b8c77b933db7475b2889efcfba83e378b5 Rename test classes in policy/engine Make test classes name consitence by adding 'Test' at end of junit test classes and adding 'Support' or 'Dummy' at start of util or dummy type of test classes Issue-ID: POLICY-1281 Change-Id: I5fa65d0cfc95edc8f2fe0ca678a43d2011a39670 Signed-off-by: Parshad Patel --- diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/getConfigTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/GetConfigServiceTest.java similarity index 98% rename from ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/getConfigTest.java rename to ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/GetConfigServiceTest.java index 2d79b234a..a3c1b2b05 100644 --- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/getConfigTest.java +++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/GetConfigServiceTest.java @@ -35,7 +35,7 @@ import org.onap.policy.api.PolicyConfigStatus; import org.onap.policy.pdp.rest.api.models.PolicyConfig; import org.onap.policy.pdp.rest.api.services.GetConfigService; -public class getConfigTest { +public class GetConfigServiceTest { private static final String TEST = "test"; @SuppressWarnings("unchecked") diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/getDictionaryTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/GetDictionaryServiceTest.java similarity index 99% rename from ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/getDictionaryTest.java rename to ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/GetDictionaryServiceTest.java index 38dafee35..b5706a8ed 100644 --- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/getDictionaryTest.java +++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/GetDictionaryServiceTest.java @@ -28,7 +28,7 @@ import org.junit.Test; import org.onap.policy.api.DictionaryParameters; import org.onap.policy.pdp.rest.api.services.GetDictionaryService; -public class getDictionaryTest { +public class GetDictionaryServiceTest { @Test public void dictionaryJsonTest() throws Exception{ diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/jmx/ServerContextImpl.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/jmx/DummyServerContextImpl.java similarity index 99% rename from ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/jmx/ServerContextImpl.java rename to ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/jmx/DummyServerContextImpl.java index 2f8683c5c..056b73199 100644 --- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/jmx/ServerContextImpl.java +++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/jmx/DummyServerContextImpl.java @@ -40,7 +40,7 @@ import javax.servlet.SessionCookieConfig; import javax.servlet.SessionTrackingMode; import javax.servlet.descriptor.JspConfigDescriptor; -public class ServerContextImpl implements ServletContext { +public class DummyServerContextImpl implements ServletContext { @Override public String getContextPath() { diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/jmx/PdpRestMBeanListenerTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/jmx/PdpRestMBeanListenerTest.java index ea689e663..59e14db1e 100644 --- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/jmx/PdpRestMBeanListenerTest.java +++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/jmx/PdpRestMBeanListenerTest.java @@ -37,7 +37,7 @@ public class PdpRestMBeanListenerTest { try { PdpRestMBeanListener listener = new PdpRestMBeanListener(); - ServerContextImpl source = new ServerContextImpl(); + DummyServerContextImpl source = new DummyServerContextImpl(); ServletContextEvent event = new ServletContextEvent(source); listener.contextInitialized(event); diff --git a/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/Handler.java b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/DummyNotificationHandler.java similarity index 97% rename from PolicyEngineAPI/src/test/java/org/onap/policy/std/test/Handler.java rename to PolicyEngineAPI/src/test/java/org/onap/policy/std/test/DummyNotificationHandler.java index 388ca078d..cdc717597 100644 --- a/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/Handler.java +++ b/PolicyEngineAPI/src/test/java/org/onap/policy/std/test/DummyNotificationHandler.java @@ -35,9 +35,9 @@ import org.onap.policy.api.RemovedPolicy; import org.onap.policy.common.logging.flexlogger.FlexLogger; import org.onap.policy.common.logging.flexlogger.Logger; -public class Handler implements NotificationHandler{ +public class DummyNotificationHandler implements NotificationHandler{ - private static final Logger LOGGER = FlexLogger.getLogger(Handler.class); + private static final Logger LOGGER = FlexLogger.getLogger(DummyNotificationHandler.class); @Override public void notificationReceived(PDPNotification notification) { diff --git a/PolicyEngineUtils/src/test/java/org/onap/policy/utils/test/testBackUpMonitor.java b/PolicyEngineUtils/src/test/java/org/onap/policy/utils/test/BackUpMonitorTest.java similarity index 95% rename from PolicyEngineUtils/src/test/java/org/onap/policy/utils/test/testBackUpMonitor.java rename to PolicyEngineUtils/src/test/java/org/onap/policy/utils/test/BackUpMonitorTest.java index 39434a7e7..83362fd0d 100644 --- a/PolicyEngineUtils/src/test/java/org/onap/policy/utils/test/testBackUpMonitor.java +++ b/PolicyEngineUtils/src/test/java/org/onap/policy/utils/test/BackUpMonitorTest.java @@ -56,7 +56,7 @@ import org.onap.policy.utils.PolicyUtils; import com.fasterxml.jackson.core.JsonProcessingException; -public class testBackUpMonitor { +public class BackUpMonitorTest { @Test (expected = PersistenceException.class) public void backUpMonitorTestFail() throws Exception{ @@ -65,7 +65,7 @@ public class testBackUpMonitor { properties.setProperty("javax.persistence.jdbc.url", "jdbc:mariadb://localhost:3306/onap_sdk"); properties.setProperty("javax.persistence.jdbc.user", "policy_user"); properties.setProperty("javax.persistence.jdbc.password", ""); - BackUpMonitor.getInstance(BackUpMonitor.ResourceNode.BRMS.toString(), "brms_test" , properties, new Handler()); + BackUpMonitor.getInstance(BackUpMonitor.ResourceNode.BRMS.toString(), "brms_test" , properties, new DummyBackUpHandler()); } @Test @@ -75,7 +75,7 @@ public class testBackUpMonitor { properties.setProperty("javax.persistence.jdbc.url", "jdbc:mariadb://localhost:3306/onap_sdk"); properties.setProperty("javax.persistence.jdbc.user", ""); properties.setProperty("javax.persistence.jdbc.password", "password"); - BackUpMonitor bum = BackUpMonitor.getInstance(BackUpMonitor.ResourceNode.BRMS.toString(), "brms_test" , properties, new Handler()); + BackUpMonitor bum = BackUpMonitor.getInstance(BackUpMonitor.ResourceNode.BRMS.toString(), "brms_test" , properties, new DummyBackUpHandler()); assertNull(bum); } @@ -87,7 +87,7 @@ public class testBackUpMonitor { properties.setProperty("javax.persistence.jdbc.user", "test"); properties.setProperty("javax.persistence.jdbc.password", "password"); properties.setProperty("ping_interval", "500"); - BackUpMonitor bum = BackUpMonitor.getInstance(BackUpMonitor.ResourceNode.BRMS.toString(), "brms_test" , properties, new Handler()); + BackUpMonitor bum = BackUpMonitor.getInstance(BackUpMonitor.ResourceNode.BRMS.toString(), "brms_test" , properties, new DummyBackUpHandler()); assertNull(bum); } @@ -99,7 +99,7 @@ public class testBackUpMonitor { properties.setProperty("javax.persistence.jdbc.user", "test"); properties.setProperty("javax.persistence.jdbc.password", "password"); properties.setProperty("ping_interval", "500"); - BackUpMonitor bum = BackUpMonitor.getInstance(BackUpMonitor.ResourceNode.BRMS.toString(), "brms_test" , properties, new Handler()); + BackUpMonitor bum = BackUpMonitor.getInstance(BackUpMonitor.ResourceNode.BRMS.toString(), "brms_test" , properties, new DummyBackUpHandler()); assertNull(bum); } @@ -111,7 +111,7 @@ public class testBackUpMonitor { properties.setProperty("javax.persistence.jdbc.user", "test"); properties.setProperty("javax.persistence.jdbc.password", "password"); properties.setProperty("ping_interval", ""); - BackUpMonitor bum = BackUpMonitor.getInstance(null, "brms_test" , properties, new Handler()); + BackUpMonitor bum = BackUpMonitor.getInstance(null, "brms_test" , properties, new DummyBackUpHandler()); assertNull(bum); } @@ -122,13 +122,13 @@ public class testBackUpMonitor { properties.setProperty("javax.persistence.jdbc.url", "jdbc:mariadb://localhost:3306/onap_sdk"); properties.setProperty("javax.persistence.jdbc.user", "test"); properties.setProperty("javax.persistence.jdbc.password", "password"); - BackUpMonitor bum = BackUpMonitor.getInstance(BackUpMonitor.ResourceNode.BRMS.toString(), null , properties, new Handler()); + BackUpMonitor bum = BackUpMonitor.getInstance(BackUpMonitor.ResourceNode.BRMS.toString(), null , properties, new DummyBackUpHandler()); assertNull(bum); } @Test public void backUpMonitorTestFailNoProperties() throws Exception{ - BackUpMonitor bum = BackUpMonitor.getInstance(BackUpMonitor.ResourceNode.BRMS.toString(), "brms_test" , null, new Handler()); + BackUpMonitor bum = BackUpMonitor.getInstance(BackUpMonitor.ResourceNode.BRMS.toString(), "brms_test" , null, new DummyBackUpHandler()); assertNull(bum); } @@ -153,7 +153,7 @@ public class testBackUpMonitor { properties.setProperty("javax.persistence.jdbc.password", ""); properties.setProperty("ping_interval", "123a"); properties.setProperty(PersistenceUnitProperties.ECLIPSELINK_PERSISTENCE_XML, "META-INF/persistencePUtest.xml"); - BackUpMonitor bum = BackUpMonitor.getInstance(BackUpMonitor.ResourceNode.BRMS.toString(), "brms_test" , properties, new Handler()); + BackUpMonitor bum = BackUpMonitor.getInstance(BackUpMonitor.ResourceNode.BRMS.toString(), "brms_test" , properties, new DummyBackUpHandler()); assertTrue(bum.getFlag()); } @@ -167,7 +167,7 @@ public class testBackUpMonitor { properties.setProperty("javax.persistence.jdbc.password", ""); properties.setProperty("ping_interval", "500"); properties.setProperty(PersistenceUnitProperties.ECLIPSELINK_PERSISTENCE_XML, "META-INF/persistencePUtest.xml"); - BackUpMonitor bum = BackUpMonitor.getInstance(BackUpMonitor.ResourceNode.BRMS.toString(), "brms_test" , properties, new Handler()); + BackUpMonitor bum = BackUpMonitor.getInstance(BackUpMonitor.ResourceNode.BRMS.toString(), "brms_test" , properties, new DummyBackUpHandler()); createPolicyNotification(); assertTrue(bum.getFlag()); // Start a slave check. diff --git a/PolicyEngineUtils/src/test/java/org/onap/policy/utils/test/Handler.java b/PolicyEngineUtils/src/test/java/org/onap/policy/utils/test/DummyBackUpHandler.java similarity index 96% rename from PolicyEngineUtils/src/test/java/org/onap/policy/utils/test/Handler.java rename to PolicyEngineUtils/src/test/java/org/onap/policy/utils/test/DummyBackUpHandler.java index 91f467b60..15fb33944 100644 --- a/PolicyEngineUtils/src/test/java/org/onap/policy/utils/test/Handler.java +++ b/PolicyEngineUtils/src/test/java/org/onap/policy/utils/test/DummyBackUpHandler.java @@ -23,7 +23,7 @@ package org.onap.policy.utils.test; import org.onap.policy.api.PDPNotification; import org.onap.policy.utils.BackUpHandler; -public class Handler implements BackUpHandler{ +public class DummyBackUpHandler implements BackUpHandler{ @Override public void notificationReceived(PDPNotification notification) {