[Asterisk-java-cvs] CVS: asterisk-java/src/integrationtest/net/sf/asterisk/manager AsteriskManagerTestCase.java,NONE,1.1 SofthangupTest.java,NONE,1.1 TestDefaultAsteriskManager.java,1.1,1.2

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/integrationtest/net/sf/asterisk/manager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11223/src/integrationtest/net/sf/asterisk/manager

Modified Files:
	TestDefaultAsteriskManager.java 
Added Files:
	AsteriskManagerTestCase.java SofthangupTest.java 
Log Message:
Refactored integration tests

--- NEW FILE: AsteriskManagerTestCase.java ---
/*
 * Copyright  2004-2005 Stefan Reuter
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
 *  You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 *  Unless required by applicable law or agreed to in writing, software
 *  distributed under the License is distributed on an "AS IS" BASIS,
 *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *  See the License for the specific language governing permissions and
 *  limitations under the License.
 *
 */
package net.sf.asterisk.manager;

import junit.framework.TestCase;

public class AsteriskManagerTestCase extends TestCase
{
    protected DefaultAsteriskManager manager;
    protected DefaultManagerConnection managerConnection;

    public void setUp() throws Exception
    {
        managerConnection = new DefaultManagerConnection();
        managerConnection.setHostname("deprecated");
        managerConnection.setUsername("manager");
        managerConnection.setPassword("obelisk");

        manager = new DefaultAsteriskManager();
        manager.setManagerConnection(managerConnection);
        manager.initialize();
    }

    public void tearDown() throws Exception
    {
        managerConnection.logoff();
    }
}

--- NEW FILE: SofthangupTest.java ---
/*
 * (c) 2004 Stefan Reuter
 *
 * Created on Oct 28, 2004
 */
package net.sf.asterisk.manager;

import net.sf.asterisk.manager.action.OriginateAction;
import net.sf.asterisk.manager.response.ManagerResponse;


/**
 * @author srt
 * @version $Id: SofthangupTest.java,v 1.1 2005/04/30 16:45:15 srt Exp $
 */
public class SofthangupTest extends AsteriskManagerTestCase
{
    public void testSofthangup() throws Exception
    {
        OriginateAction originate;
        
        originate = new OriginateAction();
        originate.setChannel("Local/1310");
        originate.setContext("default");
        originate.setExten("1340");
        originate.setPriority(new Integer(1));
        
        ManagerResponse response = managerConnection.sendAction(originate);
        
        System.out.println("Response: " + response);
        
        Thread.sleep(10000);
    }
}

Index: TestDefaultAsteriskManager.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/integrationtest/net/sf/asterisk/manager/TestDefaultAsteriskManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- TestDefaultAsteriskManager.java	13 Mar 2005 11:39:06 -0000	1.1
+++ TestDefaultAsteriskManager.java	30 Apr 2005 16:45:15 -0000	1.2
@@ -5,32 +5,15 @@
  */
 package net.sf.asterisk.manager;
 
-import junit.framework.TestCase;
 
 /**
  * @author srt
  * @version $Id$
  */
-public class TestDefaultAsteriskManager extends TestCase
+public class TestDefaultAsteriskManager extends AsteriskManagerTestCase
 {
-    protected DefaultAsteriskManager getDefaultManager()
-    {
-        DefaultAsteriskManager dm = new DefaultAsteriskManager();
-        DefaultManagerConnection dmc = new DefaultManagerConnection();
-        dmc.setHostname("deprecated");
-        dmc.setUsername("manager");
-        dmc.setPassword("obelisk");
-        dm.setManagerConnection(dmc);
-
-        return dm;
-    }
-
     public void testInit() throws Exception
     {
-        DefaultAsteriskManager dm = getDefaultManager();
-
-        dm.initialize();
-
         try
         {
             Thread.sleep(30000);
@@ -39,6 +22,6 @@ public class TestDefaultAsteriskManager 
         {
         }
 
-        System.out.println(dm.getChannels());
+        System.out.println(manager.getChannels());
     }
 }