//
// This file is part of the OpenNMS(R) Application.
//
// OpenNMS(R) is Copyright (C) 2005 The OpenNMS Group, Inc.  All rights reserved.
// OpenNMS(R) is a derivative work, containing both original code, included code and modified
// code that was published under the GNU General Public License. Copyrights for modified 
// and included code are below.
//
// OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
//
// Modifications:
//
// 2008 Feb 10: Simplify setUp() a bit. - dj@opennms.org
//
// Original code base Copyright (C) 1999-2001 Oculan Corp.  All rights reserved.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//
// For more information contact:
// OpenNMS Licensing       <license@opennms.org>
//     http://www.opennms.org/
//     http://www.opennms.com/
//
package org.opennms.netmgt.config;

import java.io.Reader;

import junit.framework.TestCase;

import org.opennms.netmgt.mock.MockDatabase;
import org.opennms.netmgt.mock.MockNetwork;
import org.opennms.test.ConfigurationTestUtils;

public class CollectdConfigFactoryTest extends TestCase {

    private CollectdConfigFactory m_factory;

    @Override
    protected void setUp() throws Exception {
        super.setUp();

        MockNetwork network = new MockNetwork();

        MockDatabase db = new MockDatabase();
        db.populate(network);

        DataSourceFactory.setInstance(db);

        Reader rdr = ConfigurationTestUtils.getReaderForResource(this, "collectd-testdata.xml");
        try {
            m_factory = new CollectdConfigFactory(rdr, "localhost", false);
        } finally {
            rdr.close();
        }
    }

    @Override
    protected void tearDown() throws Exception {
        // TODO Auto-generated method stub
        super.tearDown();
    }

    public void testGetName() {
        String pkgName = "example1";
        CollectdPackage wpkg = m_factory.getPackage(pkgName);
        assertNotNull(wpkg);
        assertEquals(pkgName, wpkg.getName());
    }

}

@@ -1498,196 +1498,746 @@
 ort 
-java.io.Reader;%0A%0Aimport junit.framework.TestCase;%0A%0Aimport org.opennms.netmgt.mock.MockDatabase;%0Aimport org.opennms.netmgt.mock.MockNetwork;%0Aimport org.opennms.test.ConfigurationTestUtils;%0A
+static org.junit.Assert.assertEquals;%0Aimport static org.junit.Assert.assertNotNull;%0A%0Aimport java.io.Reader;%0A%0Aimport junit.framework.TestCase;%0A%0Aimport org.junit.Before;%0Aimport org.junit.Test;%0Aimport org.junit.runner.RunWith;%0Aimport org.opennms.netmgt.dao.db.OpenNMSConfigurationExecutionListener;%0Aimport org.opennms.netmgt.filter.FilterDaoFactory;%0Aimport org.opennms.netmgt.mock.MockDatabase;%0Aimport org.opennms.netmgt.mock.MockNetwork;%0Aimport org.opennms.test.ConfigurationTestUtils;%0Aimport org.springframework.test.context.TestExecutionListeners;%0Aimport org.springframework.test.context.junit4.SpringJUnit4ClassRunner;%0A%0A@RunWith(SpringJUnit4ClassRunner.class)%0A@TestExecutionListeners(%7B%0A    OpenNMSConfigurationExecutionListener.class,%0A%7D)
 %0Apub
@@ -2276,25 +2276,8 @@
 est 
-extends TestCase 
 %7B%0A%0A 
@@ -2326,38 +2326,33 @@
 ;%0A%0A    @
-Override%0A    protected
+Before%0A    public
  void se
@@ -2379,31 +2379,8 @@
 on %7B
-%0A        super.setUp();
 %0A%0A  
@@ -2546,16 +2546,65 @@
 nce(db);
+%0A        %0A        FilterDaoFactory.getInstance();
 %0A%0A      
@@ -2855,141 +2855,12 @@
    @
-Override%0A    protected void tearDown() throws Exception %7B%0A        // TODO Auto-generated method stub%0A        super.tearDown();%0A    %7D%0A
+Test
 %0A   

Switch test to JUnit4 so we can use the OpenNMSConfigurationExecutionListener