[Asterisk-java-cvs] CVS: asterisk-java/src/test/net/sf/asterisk/fastagi/impl AGIReaderImplTest.java,1.1,1.2

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

Update of /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/fastagi/impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22035/src/test/net/sf/asterisk/fastagi/impl

Modified Files:
	AGIReaderImplTest.java 
Log Message:
Added getLocalAddress(), getLocalPort(), getRemoteAddress() and getRemotePort() to AGIRequest (AJ-14)

Index: AGIReaderImplTest.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/fastagi/impl/AGIReaderImplTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- AGIReaderImplTest.java	11 Mar 2005 15:20:39 -0000	1.1
+++ AGIReaderImplTest.java	27 Sep 2005 21:07:26 -0000	1.2
@@ -16,6 +16,8 @@
  */
 package net.sf.asterisk.fastagi.impl;
 
+import java.net.InetAddress;
+
 import junit.framework.TestCase;
 import net.sf.asterisk.fastagi.AGIHangupException;
 import net.sf.asterisk.fastagi.AGIReader;
@@ -54,6 +56,26 @@ public class AGIReaderImplTest extends T
         socket.readLine();
         socketMC.setReturnValue("");
 
+        byte[] ipLocal = new byte[4];
+        ipLocal[0] = new Integer(192).byteValue();
+        ipLocal[1] = new Integer(168).byteValue();
+        ipLocal[2] = new Integer(0).byteValue();
+        ipLocal[3] = new Integer(1).byteValue();
+        socket.getLocalAddress();
+        socketMC.setReturnValue(InetAddress.getByAddress(ipLocal));
+        socket.getLocalPort();
+        socketMC.setReturnValue(1234);
+
+        byte[] ipRemote = new byte[4];
+        ipRemote[0] = new Integer(192).byteValue();
+        ipRemote[1] = new Integer(168).byteValue();
+        ipRemote[2] = new Integer(0).byteValue();
+        ipRemote[3] = new Integer(2).byteValue();
+        socket.getRemoteAddress();
+        socketMC.setReturnValue(InetAddress.getByAddress(ipRemote));
+        socket.getRemotePort();
+        socketMC.setReturnValue(1235);
+
         socketMC.replay();
 
         request = agiReader.readRequest();
@@ -62,6 +84,16 @@ public class AGIReaderImplTest extends T
         assertEquals("incorrect requestURL", "agi://host/myscript.agi", request
                 .getRequestURL());
         assertEquals("incorrect channel", "SIP/1234-d715", request.getChannel());
+        assertEquals("incorrect local address", ipLocal[0], request.getLocalAddress().getAddress()[0]);
+        assertEquals("incorrect local address", ipLocal[1], request.getLocalAddress().getAddress()[1]);
+        assertEquals("incorrect local address", ipLocal[2], request.getLocalAddress().getAddress()[2]);
+        assertEquals("incorrect local address", ipLocal[3], request.getLocalAddress().getAddress()[3]);
+        assertEquals("incorrect local port", 1234, request.getLocalPort());
+        assertEquals("incorrect remote address", ipRemote[0], request.getRemoteAddress().getAddress()[0]);
+        assertEquals("incorrect remote address", ipRemote[1], request.getRemoteAddress().getAddress()[1]);
+        assertEquals("incorrect remote address", ipRemote[2], request.getRemoteAddress().getAddress()[2]);
+        assertEquals("incorrect remote address", ipRemote[3], request.getRemoteAddress().getAddress()[3]);
+        assertEquals("incorrect remote port", 1235, request.getRemotePort());
 
         socketMC.verify();
     }