//
// 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 static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;

import java.io.Reader;

import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.opennms.netmgt.dao.db.OpenNMSConfigurationExecutionListener;
import org.opennms.netmgt.filter.FilterDaoFactory;
import org.opennms.netmgt.mock.MockDatabase;
import org.opennms.netmgt.mock.MockNetwork;
import org.opennms.test.ConfigurationTestUtils;
import org.opennms.test.mock.MockLogAppender;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestExecutionListeners;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;


@RunWith(SpringJUnit4ClassRunner.class)
@TestExecutionListeners({
    OpenNMSConfigurationExecutionListener.class,
})
public class CollectdConfigFactoryTest  {

    private CollectdConfigFactory m_factory;

    @Before
    public void setUp() throws Exception {
        
        MockLogAppender.setupLogging();

        MockNetwork network = new MockNetwork();

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

        DataSourceFactory.setInstance(db);
        
        // ensure that this is working 
        FilterDaoFactory.getInstance();

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

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

}

@@ -1491,100 +1491,8 @@
 g;%0A%0A
-import static org.junit.Assert.assertEquals;%0Aimport static org.junit.Assert.assertNotNull;%0A%0A
 impo
@@ -1522,705 +1522,172 @@
 ort 
-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.opennms.test.mock.MockLogAppender;%0Aimport org.springframework.test.context.ContextConfiguration;%0Aimport org.springframework.test.context.TestExecutionListeners;%0Aimport org.springframework.test.context.junit4.SpringJUnit4ClassRunner;%0A%0A%0A@RunWith(SpringJUnit4ClassRunner.class)%0A@TestExecutionListeners(%7B%0A    OpenNMSConfigurationExecutionListener.class,%0A%7D)
+framework.TestCase;%0A%0Aimport org.opennms.netmgt.mock.MockDatabase;%0Aimport org.opennms.netmgt.mock.MockNetwork;%0Aimport org.opennms.test.ConfigurationTestUtils;%0A
 %0Apub
@@ -1722,16 +1722,32 @@
 oryTest 
+extends TestCase
  %7B%0A%0A    
@@ -1797,25 +1797,30 @@
    @
-Before%0A    public
+Override%0A    protected
  voi
@@ -1860,45 +1860,19 @@
     
-%0A        MockLogAppender.setupLogging
+super.setUp
 ();%0A
@@ -2045,97 +2045,8 @@
 db);
-%0A        %0A        // ensure that this is working %0A        FilterDaoFactory.getInstance();
 %0A%0A  
@@ -2297,20 +2297,149 @@
 %7D%0A%0A    @
-Test
+Override%0A    protected void tearDown() throws Exception %7B%0A        // TODO Auto-generated method stub%0A        super.tearDown();%0A    %7D%0A
 %0A    pub

Revert "Convert test to JUnit4 and use OpenNMSConfigurationExecutionListener"