Skip to content

Commit

Permalink
Merge branch 'feature-minimal-test-configs' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@soleger
soleger committed Mar 13, 2015
2 parents d0d4411 + 83a04e7 commit bc512ed
Show file tree
Hide file tree
Showing 169 changed files with 735 additions and 265 deletions.
4 changes: 2 additions & 2 deletions features/events/daemon/src/test/java/org/opennms/netmgt/eventd/EventUtilTest.java
View file
Expand Up @@ -53,8 +53,8 @@
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase(dirtiesContext=false)
Expand Down
4 changes: 2 additions & 2 deletions features/events/daemon/src/test/java/org/opennms/netmgt/eventd/EventdSpringTest.java
View file
Expand Up @@ -58,8 +58,8 @@
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
"classpath:/META-INF/opennms/applicationContext-eventDaemon.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-eventDaemon.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
Expand Down
2 changes: 1 addition & 1 deletion ...ts/daemon/src/test/java/org/opennms/netmgt/eventd/processor/HibernateEventWriterTest.java
View file
Expand Up @@ -59,11 +59,11 @@
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",

"classpath:/META-INF/opennms/applicationContext-eventDaemon.xml"
})
Expand Down
4 changes: 2 additions & 2 deletions features/events/traps/src/test/java/org/opennms/netmgt/trapd/HibernateTrapdIpMgrTest.java
View file
Expand Up @@ -52,8 +52,8 @@
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/org/opennms/netmgt/trapd/trapdIpMgr-test.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
Expand Down
1 change: 1 addition & 0 deletions features/events/traps/src/test/java/org/opennms/netmgt/trapd/TrapHandlerTestCase.java
View file
Expand Up @@ -72,6 +72,7 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
Expand Down
4 changes: 2 additions & 2 deletions features/events/traps/src/test/java/org/opennms/netmgt/trapd/TrapdTest.java
View file
Expand Up @@ -62,11 +62,11 @@
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/applicationContext-trapDaemon.xml",
// Overrides the port that Trapd binds to and sets newSuspectOnTrap to 'true'
"classpath:/org/opennms/netmgt/trapd/applicationContext-trapDaemonTest-snmpTrapPort.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
"classpath:/org/opennms/netmgt/trapd/applicationContext-trapDaemonTest-snmpTrapPort.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
Expand Down
1 change: 1 addition & 0 deletions ...juniper-tca-collector/src/test/java/org/opennms/netmgt/collectd/tca/TcaCollectorTest.java
View file
Expand Up @@ -85,6 +85,7 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/junit-component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
Expand Down
2 changes: 1 addition & 1 deletion ...r/remote/src/test/java/org/opennms/netmgt/poller/remote/PollerBackEndIntegrationTest.java
View file
Expand Up @@ -79,14 +79,14 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/applicationContext-pollerBackEnd.xml",
"classpath:/META-INF/opennms/applicationContext-exportedPollerBackEnd-http.xml",
//"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/org/opennms/netmgt/poller/remote/applicationContext-configOverride.xml"
})
@JUnitConfigurationEnvironment(systemProperties={
Expand Down
5 changes: 3 additions & 2 deletions .../remote/src/test/java/org/opennms/netmgt/poller/remote/PollerFrontEndIntegrationTest.java
View file
Expand Up @@ -53,15 +53,16 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/applicationContext-pollerBackEnd.xml",
"classpath:/META-INF/opennms/applicationContext-pollerFrontEnd.xml",
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/org/opennms/netmgt/poller/remote/applicationContext-configOverride.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment(systemProperties={
"opennms.pollerBackend.monitorCheckInterval=500",
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/java/org/opennms/features/poller/remote/gwt/server/LocationDataManagerTest.java
View file
Expand Up @@ -81,7 +81,7 @@
@ContextConfiguration(locations = {
"classpath:META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"file:src/main/webapp/WEB-INF/applicationContext-remote-poller.xml",
Expand Down
1 change: 1 addition & 0 deletions .../src/test/java/org/opennms/features/poller/remote/gwt/server/LocationDataServiceTest.java
View file
Expand Up @@ -81,6 +81,7 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations = {
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
Expand Down
5 changes: 5 additions & 0 deletions features/reporting/availability/pom.xml
View file
Expand Up @@ -136,6 +136,11 @@
<artifactId>org.opennms.core.test-api.http</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.opennms</groupId>
<artifactId>opennms-dao-mock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.opennms</groupId>
<artifactId>opennms-model</artifactId>
Expand Down
3 changes: 2 additions & 1 deletion ...y/src/test/java/org/opennms/reporting/availability/AvailabilityDatabasePopulatorTest.java
View file
Expand Up @@ -63,7 +63,8 @@
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-availabilityDatabasePopulator.xml",
"classpath:META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
Expand Down
2 changes: 1 addition & 1 deletion ...y/src/test/java/org/opennms/reporting/availability/AvailabilityReportIntegrationTest.java
View file
Expand Up @@ -55,7 +55,7 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-reportingCore.xml",
"classpath*:/META-INF/opennms/component-reporting.xml",
Expand Down
9 changes: 9 additions & 0 deletions features/rest-measurements-api/pom.xml
View file
Expand Up @@ -69,6 +69,11 @@
<artifactId>opennms-config</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.opennms</groupId>
<artifactId>opennms-dao-mock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.opennms.core.test-api</groupId>
<artifactId>org.opennms.core.test-api.xml</artifactId>
Expand All @@ -79,6 +84,10 @@
<artifactId>org.opennms.core.test-api.db</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.opennms.core.test-api</groupId>
<artifactId>org.opennms.core.test-api.services</artifactId>
</dependency>
<dependency>
<groupId>org.opennms.core.test-api</groupId>
<artifactId>org.opennms.core.test-api.rest</artifactId>
Expand Down
1 change: 1 addition & 0 deletions ...rements-api/src/test/java/org/opennms/web/rest/MeasurementRestServiceIntegrationTest.java
View file
Expand Up @@ -64,6 +64,7 @@
@WebAppConfiguration
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
Expand Down
1 change: 1 addition & 0 deletions ...asurements-api/src/test/java/org/opennms/web/rest/MeasurementsRestServiceWithJrbTest.java
View file
Expand Up @@ -57,6 +57,7 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
Expand Down
3 changes: 2 additions & 1 deletion ...asurements-api/src/test/java/org/opennms/web/rest/MeasurementsRestServiceWithRrdTest.java
View file
Expand Up @@ -61,8 +61,9 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-measurements-test-rrd.xml"
Expand Down
4 changes: 2 additions & 2 deletions ...src/test/java/org/opennms/web/springframework/security/AuthenticationIntegrationTest.java
View file
Expand Up @@ -57,11 +57,11 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/org/opennms/web/springframework/security/AuthenticationIntegrationTest-context.xml"
})
@JUnitConfigurationEnvironment
Expand Down
4 changes: 2 additions & 2 deletions ...src/test/java/org/opennms/web/springframework/security/SpringSecurityUserDaoImplTest.java
View file
Expand Up @@ -68,11 +68,11 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/org/opennms/web/springframework/security/AuthenticationIntegrationTest-context.xml"
})
@JUnitConfigurationEnvironment
Expand Down
1 change: 1 addition & 0 deletions ...res/system-report/src/test/java/org/opennms/systemreport/system/ReportPluginTestCase.java
View file
Expand Up @@ -49,6 +49,7 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
Expand Down
4 changes: 2 additions & 2 deletions ...ler-18/src/test/java/org/opennms/netmgt/poller/remote/PollerBackEnd18IntegrationTest.java
View file
Expand Up @@ -60,13 +60,13 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",

"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
// This overrides poller config and location monitor config with files from
// the org.opennms:opennms-services:test-jar artifact
"classpath:/org/opennms/netmgt/poller/remote/applicationContext-configOverride.xml"
Expand Down
6 changes: 3 additions & 3 deletions ...ng-adapter/src/test/java/org/opennms/netmgt/provision/SimplerProvisioningAdapterTest.java
View file
Expand Up @@ -56,8 +56,8 @@
@ContextConfiguration(locations= {
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-mockDao.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
Expand All @@ -70,7 +70,7 @@ public class SimplerProvisioningAdapterTest implements InitializingBean {
CountDownLatch updateLatch = new CountDownLatch(1);
CountDownLatch configChangeLatch = new CountDownLatch(1);

// From applicationContext-dao.xml
// From applicationContext-mockDao.xml
@Autowired
private TransactionTemplate m_txTemplate;

Expand Down
3 changes: 2 additions & 1 deletion ...rc/test/java/org/opennms/netmgt/provision/adapters/link/DefaultLinkMatchResolverTest.java
View file
Expand Up @@ -47,7 +47,8 @@
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
Expand Down
4 changes: 2 additions & 2 deletions .../src/test/java/org/opennms/netmgt/provision/adapters/link/DefaultNodeLinkServiceTest.java
View file
Expand Up @@ -72,14 +72,14 @@
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/provisiond-extensions.xml",
"classpath:/testConfigContext.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
"classpath:/testConfigContext.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
Expand Down
6 changes: 3 additions & 3 deletions ...src/test/java/org/opennms/netmgt/provision/adapters/link/LinkProvisioningAdapterTest.java
View file
Expand Up @@ -62,13 +62,13 @@
@ContextConfiguration(locations= {
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath*:/META-INF/opennms/provisiond-extensions.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:testConfigContext.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
"classpath:testConfigContext.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
Expand Down
6 changes: 3 additions & 3 deletions ...st/java/org/opennms/netmgt/provision/config/linkadapter/LinkAdapterConfigurationTest.java
View file
Expand Up @@ -70,13 +70,13 @@
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath*:/META-INF/opennms/provisiond-extensions.xml",
"classpath:/testConfigContext.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
"classpath:/testConfigContext.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
Expand Down
6 changes: 3 additions & 3 deletions .../src/test/java/org/opennms/netmgt/provision/RancidProvisioningAdapterIntegrationTest.java
View file
Expand Up @@ -59,13 +59,13 @@
@ContextConfiguration(locations= {
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath*:/META-INF/opennms/provisiond-extensions.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
"classpath*:/META-INF/opennms/provisiond-extensions.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
Expand Down
6 changes: 3 additions & 3 deletions ...ing-adapter/src/test/java/org/opennms/netmgt/provision/RancidProvisioningAdapterTest.java
View file
Expand Up @@ -54,13 +54,13 @@
@ContextConfiguration(locations= {
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath*:/META-INF/opennms/provisiond-extensions.xml",
"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
"classpath*:/META-INF/opennms/provisiond-extensions.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
Expand Down

0 comments on commit bc512ed

Please sign in to comment.