NMS-19032 : Move test utility classes from source to test directory for better code organization.

features/bsm/daemon/pom.xml

@@ -143,5 +143,12 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-config</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

features/bsm/daemon/src/test/java/org/opennms/netmgt/bsm/daemon/BsmdIT.java

@@ -59,7 +59,7 @@
 import org.opennms.netmgt.bsm.service.model.BusinessService;
 import org.opennms.netmgt.bsm.service.model.Status;
 import org.opennms.netmgt.config.DefaultEventConfDao;
-import org.opennms.netmgt.config.EventConfUtil;
+import org.opennms.netmgt.config.EventConfTestUtil;
 import org.opennms.netmgt.dao.DatabasePopulator;
 import org.opennms.netmgt.dao.api.AlarmDao;
 import org.opennms.netmgt.dao.api.ApplicationDao;
@@ -503,7 +503,7 @@ public void verifyStartupWithoutRequiredEventData() throws Exception {
     public void verifyStartupWithoutAlarmData() throws Exception {
         // Load custom events
         DefaultEventConfDao eventConfDao = new DefaultEventConfDao();
-        List<EventConfEvent> eventConfEventList = EventConfUtil.parseResourcesAsEventConfEvents(new ClassPathResource("/eventconf.xml"));
+        List<EventConfEvent> eventConfEventList = EventConfTestUtil.parseResourcesAsEventConfEvents(new ClassPathResource("/eventconf.xml"));
         eventConfDao.loadEventsFromDB(eventConfEventList);
 
         // Remove Alarm Data
@@ -526,7 +526,7 @@ public void verifyStartupWithoutAlarmData() throws Exception {
     public void verifyStartupWithChangedReductionKey() throws Exception {
         // Load custom events
         DefaultEventConfDao eventConfDao = new DefaultEventConfDao();
-        List<EventConfEvent> eventConfEventList = EventConfUtil.parseResourcesAsEventConfEvents(new ClassPathResource("/eventconf.xml"));
+        List<EventConfEvent> eventConfEventList = EventConfTestUtil.parseResourcesAsEventConfEvents(new ClassPathResource("/eventconf.xml"));
         eventConfDao.loadEventsFromDB(eventConfEventList);
 
         // change reduction key

features/discovery/pom.xml

@@ -125,5 +125,12 @@
       <artifactId>org.opennms.features.events.daemon</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-config</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

features/discovery/src/test/java/org/opennms/netmgt/discovery/NewSuspectLocationTest.java

@@ -29,7 +29,7 @@
 import org.junit.Test;
 import org.opennms.core.test.ConfigurationTestUtils;
 import org.opennms.netmgt.config.DefaultEventConfDao;
-import org.opennms.netmgt.config.EventConfUtil;
+import org.opennms.netmgt.config.EventConfTestUtil;
 import org.opennms.netmgt.eventd.EventExpander;
 import org.opennms.netmgt.eventd.EventUtilDaoImpl;
 import org.opennms.netmgt.model.EventConfEvent;
@@ -51,7 +51,7 @@ public class NewSuspectLocationTest {
     @Before
     public void setUp() throws Exception {
         m_eventConfDao = new DefaultEventConfDao();
-        List<EventConfEvent> eventConfEventList = EventConfUtil.parseResourcesAsEventConfEvents(new org.springframework.core.io.ClassPathResource("etc/eventconf.xml"));
+        List<EventConfEvent> eventConfEventList = EventConfTestUtil.parseResourcesAsEventConfEvents(new org.springframework.core.io.ClassPathResource("etc/eventconf.xml"));
         m_eventConfDao.loadEventsFromDB(eventConfEventList);
 
         m_eventExpander = new EventExpander(new MetricRegistry());

features/events/collector/pom.xml

@@ -97,5 +97,12 @@
         <artifactId>opennms-services</artifactId>
         <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-config</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

features/events/collector/src/test/java/org/opennms/netmgt/collection/EventMetricsCollectorIT.java

@@ -34,7 +34,7 @@
 import org.opennms.netmgt.collection.support.IndexStorageStrategy;
 import org.opennms.netmgt.collection.support.PersistAllSelectorStrategy;
 import org.opennms.netmgt.config.DefaultEventConfDao;
-import org.opennms.netmgt.config.EventConfUtil;
+import org.opennms.netmgt.config.EventConfTestUtil;
 import org.opennms.netmgt.dao.api.IpInterfaceDao;
 import org.opennms.netmgt.dao.api.SnmpInterfaceDao;
 import org.opennms.netmgt.events.api.EventSubscriptionService;
@@ -91,7 +91,7 @@ public class EventMetricsCollectorIT {
     private EventMetricsCollector getCollector(Persister persister) throws IOException {
         // load testing eventconf
         DefaultEventConfDao eventConfDao = new DefaultEventConfDao();
-        List<EventConfEvent> eventConfEventList = EventConfUtil.parseResourcesAsEventConfEvents(new FileSystemResource("src/test/resources/events/collection.events.xml"));
+        List<EventConfEvent> eventConfEventList = EventConfTestUtil.parseResourcesAsEventConfEvents(new FileSystemResource("src/test/resources/events/collection.events.xml"));
         eventConfDao.loadEventsFromDB(eventConfEventList);
 
         // fake interface info

features/events/traps/pom.xml

@@ -186,5 +186,12 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-config</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

features/events/traps/src/test/java/org/opennms/netmgt/trapd/JoeSnmpTrapHandlerIT.java

@@ -24,7 +24,7 @@
 
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.opennms.netmgt.config.EventConfUtil;
+import org.opennms.netmgt.config.EventConfTestUtil;
 import org.opennms.netmgt.config.api.EventConfDao;
 import org.opennms.netmgt.model.EventConfEvent;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,7 +49,7 @@ public static void setUpBeforeClass() throws Exception {
 
     @Before
     public void setUp() throws Exception {
-        List<EventConfEvent> events = EventConfUtil.parseResourcesAsEventConfEvents(
+        List<EventConfEvent> events = EventConfTestUtil.parseResourcesAsEventConfEvents(
                 new FileSystemResource("src/test/resources/org/opennms/netmgt/trapd/eventconf.xml"));
         // Load into DB
         eventConfDao.loadEventsFromDB(events);

features/events/traps/src/test/java/org/opennms/netmgt/trapd/Snmp4JTrapHandlerIT.java

@@ -25,7 +25,7 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.opennms.netmgt.config.EventConfUtil;
+import org.opennms.netmgt.config.EventConfTestUtil;
 import org.opennms.netmgt.config.api.EventConfDao;
 import org.opennms.netmgt.model.EventConfEvent;
 import org.opennms.netmgt.snmp.SnmpConfiguration;
@@ -60,7 +60,7 @@ public static void setUpBeforeClass() throws Exception {
 
     @Before
     public void setUp() throws Exception {
-        List<EventConfEvent> events = EventConfUtil.parseResourcesAsEventConfEvents(
+        List<EventConfEvent> events = EventConfTestUtil.parseResourcesAsEventConfEvents(
                 new FileSystemResource("src/test/resources/org/opennms/netmgt/trapd/eventconf.xml"));
         // Load into DB
         eventConfDao.loadEventsFromDB(events);

features/events/traps/src/test/java/org/opennms/netmgt/trapd/TrapdIT.java

@@ -45,7 +45,7 @@
 import org.opennms.core.utils.InetAddressUtils;
 import org.opennms.features.scv.api.Credentials;
 import org.opennms.features.scv.api.SecureCredentialsVault;
-import org.opennms.netmgt.config.EventConfUtil;
+import org.opennms.netmgt.config.EventConfTestUtil;
 import org.opennms.netmgt.config.TrapdConfigFactory;
 import org.opennms.netmgt.config.api.EventConfDao;
 import org.opennms.netmgt.config.trapd.Snmpv3User;
@@ -136,7 +136,7 @@ public void deleteCredentials(String alias) {
     @Before
     public void setUp() throws Exception {
 
-        List<EventConfEvent> events = EventConfUtil.parseResourcesAsEventConfEvents(
+        List<EventConfEvent> events = EventConfTestUtil.parseResourcesAsEventConfEvents(
                 new FileSystemResource("src/test/resources/org/opennms/netmgt/trapd/eventconf.xml"));
         // Load into DB
         eventConfDao.loadEventsFromDB(events);

features/events/traps/src/test/resources/org/opennms/netmgt/trapd/applicationContext-trapDaemonTest.xml

@@ -12,7 +12,7 @@
     <constructor-arg value="org/opennms/netmgt/trapd/eventconf.xml"/>
   </bean>
 
-  <bean id="eventConfEventList" class="org.opennms.netmgt.config.EventConfUtil" factory-method="parseResourcesAsEventConfEvents">
+  <bean id="eventConfEventList" class="org.opennms.netmgt.config.EventConfTestUtil" factory-method="parseResourcesAsEventConfEvents">
     <constructor-arg ref="eventConfTestResource"/>
   </bean>
 

features/vaadin-snmp-events-and-metrics/pom.xml

@@ -124,7 +124,13 @@
             <artifactId>org.opennms.core.test-api.lib</artifactId> 
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.opennms</groupId>
+            <artifactId>opennms-config</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

features/vaadin-snmp-events-and-metrics/src/test/java/org/opennms/features/vaadin/events/EventFormTest.java

@@ -21,19 +21,16 @@
  */
 package org.opennms.features.vaadin.events;
 
-import java.io.File;
 import java.util.List;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.opennms.core.test.ConfigurationTestUtils;
 import org.opennms.netmgt.config.DefaultEventConfDao;
-import org.opennms.netmgt.config.EventConfUtil;
+import org.opennms.netmgt.config.EventConfTestUtil;
 import org.opennms.netmgt.model.EventConfEvent;
 import org.opennms.netmgt.xml.eventconf.Event;
 import org.opennms.netmgt.xml.eventconf.LogDestType;
-import org.springframework.core.io.FileSystemResource;
 
 import com.vaadin.v7.data.fieldgroup.FieldGroup;
 import com.vaadin.v7.ui.ComboBox;
@@ -58,7 +55,7 @@ public class EventFormTest {
     @Before
     public void setUp() throws Exception {
         dao = new DefaultEventConfDao();
-        List<EventConfEvent> eventConfEventList = EventConfUtil.parseResourcesAsEventConfEvents(
+        List<EventConfEvent> eventConfEventList = EventConfTestUtil.parseResourcesAsEventConfEvents(
             new org.springframework.core.io.ClassPathResource("etc/events/MPLS.events.xml"));
         dao.loadEventsFromDB(eventConfEventList);
     }

opennms-config/pom.xml

@@ -11,6 +11,17 @@
   <packaging>bundle</packaging>
   <build>
     <plugins>
+    <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+            <execution>
+                <goals>
+                    <goal>test-jar</goal>
+                </goals>
+            </execution>
+        </executions>
+    </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>

opennms-config/src/test/java/org/opennms/netmgt/config/EventConfDaoReloadTest.java

@@ -65,12 +65,12 @@ public void tearDown() {
     public void canReloadEventsInClasspath() throws IOException {
         // Load
         DefaultEventConfDao eventConfDao = new DefaultEventConfDao();
-        List<EventConfEvent> eventConfEventList = EventConfUtil.parseResourcesAsEventConfEvents(getResourceForRelativePath("reloaded/eventconf.xml"));
+        List<EventConfEvent> eventConfEventList = EventConfTestUtil.parseResourcesAsEventConfEvents(getResourceForRelativePath("reloaded/eventconf.xml"));
         eventConfDao.loadEventsFromDB(eventConfEventList);
         assertEquals(3, eventConfDao.getAllEvents().size());
 
         // Reload
-        eventConfEventList = EventConfUtil.parseResourcesAsEventConfEvents(getResourceForRelativePath("reloaded/eventconf.xml"));
+        eventConfEventList = EventConfTestUtil.parseResourcesAsEventConfEvents(getResourceForRelativePath("reloaded/eventconf.xml"));
         eventConfDao.loadEventsFromDB(eventConfEventList);
         assertEquals(3, eventConfDao.getAllEvents().size());
     }
@@ -92,12 +92,12 @@ public void canReloadEventsOnDisk() throws IOException {
 
         // Load
         DefaultEventConfDao eventConfDao = new DefaultEventConfDao();
-        List<EventConfEvent> eventConfEventList = EventConfUtil.parseResourcesAsEventConfEvents(new FileSystemResource(eventconfXml));
+        List<EventConfEvent> eventConfEventList = EventConfTestUtil.parseResourcesAsEventConfEvents(new FileSystemResource(eventconfXml));
         eventConfDao.loadEventsFromDB(eventConfEventList);
         assertEquals(3, eventConfDao.getAllEvents().size());
 
         // Reload
-        eventConfEventList = EventConfUtil.parseResourcesAsEventConfEvents(new FileSystemResource(eventconfXml));
+        eventConfEventList = EventConfTestUtil.parseResourcesAsEventConfEvents(new FileSystemResource(eventconfXml));
         eventConfDao.loadEventsFromDB(eventConfEventList);
         assertEquals(3, eventConfDao.getAllEvents().size());
     }
@@ -124,7 +124,7 @@ public void canReloadEvents() throws Exception {
 
         // Load
         DefaultEventConfDao eventConfDao = new DefaultEventConfDao();
-        List<EventConfEvent> eventConfEventList = EventConfUtil.parseResourcesAsEventConfEvents(new FileSystemResource(eventconfXml));
+        List<EventConfEvent> eventConfEventList = EventConfTestUtil.parseResourcesAsEventConfEvents(new FileSystemResource(eventconfXml));
         eventConfDao.loadEventsFromDB(eventConfEventList);
         assertEquals(3, eventConfDao.getAllEvents().size());
 
@@ -134,7 +134,7 @@ public void canReloadEvents() throws Exception {
                 eventconfXml);
 
         // Reload
-        eventConfEventList = EventConfUtil.parseResourcesAsEventConfEvents(new FileSystemResource(eventconfXml));
+        eventConfEventList = EventConfTestUtil.parseResourcesAsEventConfEvents(new FileSystemResource(eventconfXml));
         eventConfDao.loadEventsFromDB(eventConfEventList);
         assertEquals(1, eventConfDao.getAllEvents().size());
 
@@ -143,7 +143,7 @@ public void canReloadEvents() throws Exception {
                 eventconfXml);
 
         // Reload
-        eventConfEventList = EventConfUtil.parseResourcesAsEventConfEvents(new FileSystemResource(eventconfXml));
+        eventConfEventList = EventConfTestUtil.parseResourcesAsEventConfEvents(new FileSystemResource(eventconfXml));
         eventConfDao.loadEventsFromDB(eventConfEventList);
         assertEquals(3, eventConfDao.getAllEvents().size());
 
@@ -153,7 +153,7 @@ public void canReloadEvents() throws Exception {
                 bgp4eventsXml);
 
         // Reload
-        eventConfEventList = EventConfUtil.parseResourcesAsEventConfEvents(new FileSystemResource(eventconfXml));
+        eventConfEventList = EventConfTestUtil.parseResourcesAsEventConfEvents(new FileSystemResource(eventconfXml));
         eventConfDao.loadEventsFromDB(eventConfEventList);
         assertEquals(5, eventConfDao.getAllEvents().size());
     }
@@ -169,7 +169,7 @@ public void canMaintainOrderOnReload() throws Exception {
 
         // Load
         DefaultEventConfDao eventConfDao = new DefaultEventConfDao();
-        List<EventConfEvent> eventConfEventList = EventConfUtil.parseResourcesAsEventConfEvents(new FileSystemResource(eventconfXml));
+        List<EventConfEvent> eventConfEventList = EventConfTestUtil.parseResourcesAsEventConfEvents(new FileSystemResource(eventconfXml));
         eventConfDao.loadEventsFromDB(eventConfEventList);
         assertEquals(0, eventConfDao.getAllEvents().size());
 
@@ -183,7 +183,7 @@ public void canMaintainOrderOnReload() throws Exception {
         copyEventConfig("order/1.events.xml", "1.events.xml");
 
         // Reload
-        eventConfEventList = EventConfUtil.parseResourcesAsEventConfEvents(new FileSystemResource(eventconfXml));
+        eventConfEventList = EventConfTestUtil.parseResourcesAsEventConfEvents(new FileSystemResource(eventconfXml));
         eventConfDao.loadEventsFromDB(eventConfEventList);
         assertEquals(1, eventConfDao.getAllEvents().size());
 
@@ -196,7 +196,7 @@ public void canMaintainOrderOnReload() throws Exception {
         copyEventConfig("order/2.events.xml", "2.events.xml");
 
         // Reload
-        eventConfEventList = EventConfUtil.parseResourcesAsEventConfEvents(new FileSystemResource(eventconfXml));
+        eventConfEventList = EventConfTestUtil.parseResourcesAsEventConfEvents(new FileSystemResource(eventconfXml));
         eventConfDao.loadEventsFromDB(eventConfEventList);
         assertEquals(2, eventConfDao.getAllEvents().size());
 
@@ -217,12 +217,12 @@ private Resource getResourceForRelativePath(String resourceSuffix) {
     @Test
     public void NMS15289_working() throws IOException {
         DefaultEventConfDao eventConfDao = new DefaultEventConfDao();
-        List<EventConfEvent> eventConfEventList = EventConfUtil.parseResourcesAsEventConfEvents(getResourceForRelativePath("reloaded/eventconf.xml"));
+        List<EventConfEvent> eventConfEventList = EventConfTestUtil.parseResourcesAsEventConfEvents(getResourceForRelativePath("reloaded/eventconf.xml"));
         eventConfDao.loadEventsFromDB(eventConfEventList);
 
         assertEquals(3, eventConfDao.getAllEvents().size());
 
-        eventConfEventList = EventConfUtil.parseResourcesAsEventConfEvents(getResourceForRelativePath("NMS-15289/working-eventconf.xml"));
+        eventConfEventList = EventConfTestUtil.parseResourcesAsEventConfEvents(getResourceForRelativePath("NMS-15289/working-eventconf.xml"));
         eventConfDao.loadEventsFromDB(eventConfEventList);
 
         // reload should work
@@ -232,12 +232,12 @@ public void NMS15289_working() throws IOException {
     @Test(expected = DataRetrievalFailureException.class)
     public void NMS15289_notFound() throws IOException {
         DefaultEventConfDao eventConfDao = new DefaultEventConfDao();
-        List<EventConfEvent> eventConfEventList = EventConfUtil.parseResourcesAsEventConfEvents(getResourceForRelativePath("reloaded/eventconf.xml"));
+        List<EventConfEvent> eventConfEventList = EventConfTestUtil.parseResourcesAsEventConfEvents(getResourceForRelativePath("reloaded/eventconf.xml"));
         eventConfDao.loadEventsFromDB(eventConfEventList);
 
         assertEquals(3, eventConfDao.getAllEvents().size());
 
-        eventConfEventList = EventConfUtil.parseResourcesAsEventConfEvents(getResourceForRelativePath("NMS-15289/broken0-eventconf.xml"));
+        eventConfEventList = EventConfTestUtil.parseResourcesAsEventConfEvents(getResourceForRelativePath("NMS-15289/broken0-eventconf.xml"));
         eventConfDao.loadEventsFromDB(eventConfEventList);
 
         // reload should be skipped
@@ -247,12 +247,12 @@ public void NMS15289_notFound() throws IOException {
     @Test(expected = DataRetrievalFailureException.class)
     public void NMS15289_brokenRoot() throws IOException {
         DefaultEventConfDao eventConfDao = new DefaultEventConfDao();
-        List<EventConfEvent> eventConfEventList = EventConfUtil.parseResourcesAsEventConfEvents(getResourceForRelativePath("reloaded/eventconf.xml"));
+        List<EventConfEvent> eventConfEventList = EventConfTestUtil.parseResourcesAsEventConfEvents(getResourceForRelativePath("reloaded/eventconf.xml"));
         eventConfDao.loadEventsFromDB(eventConfEventList);
 
         assertEquals(3, eventConfDao.getAllEvents().size());
 
-        eventConfEventList = EventConfUtil.parseResourcesAsEventConfEvents(getResourceForRelativePath("NMS-15289/broken1-eventconf.xml"));
+        eventConfEventList = EventConfTestUtil.parseResourcesAsEventConfEvents(getResourceForRelativePath("NMS-15289/broken1-eventconf.xml"));
         eventConfDao.loadEventsFromDB(eventConfEventList);
 
         // reload should be skipped
@@ -262,12 +262,12 @@ public void NMS15289_brokenRoot() throws IOException {
     @Test(expected = DataRetrievalFailureException.class)
     public void NMS15289_brokenChild() throws IOException {
         DefaultEventConfDao eventConfDao = new DefaultEventConfDao();
-        List<EventConfEvent> eventConfEventList = EventConfUtil.parseResourcesAsEventConfEvents(getResourceForRelativePath("reloaded/eventconf.xml"));
+        List<EventConfEvent> eventConfEventList = EventConfTestUtil.parseResourcesAsEventConfEvents(getResourceForRelativePath("reloaded/eventconf.xml"));
         eventConfDao.loadEventsFromDB(eventConfEventList);
 
         assertEquals(3, eventConfDao.getAllEvents().size());
 
-        eventConfEventList = EventConfUtil.parseResourcesAsEventConfEvents(getResourceForRelativePath("NMS-15289/broken2-eventconf.xml"));
+        eventConfEventList = EventConfTestUtil.parseResourcesAsEventConfEvents(getResourceForRelativePath("NMS-15289/broken2-eventconf.xml"));
         eventConfDao.loadEventsFromDB(eventConfEventList);
 
         // reload should be skipped