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

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

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

Modified Files:
	AGIChannelImplTest.java ReplyBuilderImplTest.java 
	AGIReaderImplTest.java 
Log Message:
Added extra and attributes properties to AGIReply

Index: AGIChannelImplTest.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/fastagi/AGIChannelImplTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- AGIChannelImplTest.java	10 Mar 2005 23:57:07 -0000	1.1
+++ AGIChannelImplTest.java	11 Mar 2005 13:40:06 -0000	1.2
@@ -49,7 +49,7 @@ public class AGIChannelImplTest extends 
         
         reply = new AGIReply();
         reply.setStatus(AGIReply.SC_SUCCESS);
-        reply.setResult(0);
+        reply.setResult("0");
         
         command = new NoopCommand();
         

Index: ReplyBuilderImplTest.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/fastagi/ReplyBuilderImplTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- ReplyBuilderImplTest.java	9 Mar 2005 23:42:09 -0000	1.2
+++ ReplyBuilderImplTest.java	11 Mar 2005 13:40:06 -0000	1.3
@@ -38,13 +38,84 @@ public class ReplyBuilderImplTest extend
     {
         AGIReply reply;
 
+        lines.add("200 result=49");
+
+        reply = replyBuilder.buildReply(lines);
+
+        assertEquals("Incorrect status", AGIReply.SC_SUCCESS, reply.getStatus());
+        assertEquals("Incorrect result", 49, reply.getResultCode());
+        assertEquals("Incorrect result as character", '1', reply
+                .getResultCodeAsChar());
+        assertEquals("Incorrect result when get via getAttribute()", "49",
+                reply.getAttribute("result"));
+    }
+
+    public void testBuildReplyWithAdditionalAttribute()
+    {
+        AGIReply reply;
+
         lines.add("200 result=49 endpos=2240");
 
         reply = replyBuilder.buildReply(lines);
 
         assertEquals("Incorrect status", AGIReply.SC_SUCCESS, reply.getStatus());
-        assertEquals("Incorrect result", 49, reply.getResult());
-        assertEquals("Incorrect result as character", '1', reply.getResultAsChar());
+        assertEquals("Incorrect result", 49, reply.getResultCode());
+        assertEquals("Incorrect result as character", '1', reply
+                .getResultCodeAsChar());
+        assertEquals("Incorrect result when get via getAttribute()", "49",
+                reply.getAttribute("result"));
+        assertEquals("Incorrect endpos attribute", "2240", reply
+                .getAttribute("endpos"));
+    }
+
+    public void testBuildReplyWithMultipleAdditionalAttribute()
+    {
+        AGIReply reply;
+
+        lines.add("200 result=49 startpos=1234 endpos=2240");
+
+        reply = replyBuilder.buildReply(lines);
+
+        assertEquals("Incorrect status", AGIReply.SC_SUCCESS, reply.getStatus());
+        assertEquals("Incorrect result", 49, reply.getResultCode());
+        assertEquals("Incorrect result as character", '1', reply
+                .getResultCodeAsChar());
+        assertEquals("Incorrect result when get via getAttribute()", "49",
+                reply.getAttribute("result"));
+        assertEquals("Incorrect startpos attribute", "1234", reply
+                .getAttribute("startpos"));
+        assertEquals("Incorrect endpos attribute", "2240", reply
+                .getAttribute("endpos"));
+    }
+
+    public void testBuildReplyWithParenthesis()
+    {
+        AGIReply reply;
+
+        lines.add("200 result=1 ((hello)(world))");
+
+        reply = replyBuilder.buildReply(lines);
+
+        assertEquals("Incorrect status", AGIReply.SC_SUCCESS, reply.getStatus());
+        assertEquals("Incorrect result", 1, reply.getResultCode());
+        assertEquals("Incorrect parenthesis", "(hello)(world)", reply
+                .getExtra());
+    }
+
+    public void testBuildReplyWithAdditionalAttributeAndParenthesis()
+    {
+        AGIReply reply;
+
+        lines.add("200 result=1 ((hello)(world)) endpos=2240");
+
+        reply = replyBuilder.buildReply(lines);
+
+        assertEquals("Incorrect status", AGIReply.SC_SUCCESS, reply.getStatus());
+        assertEquals("Incorrect result", 1, reply.getResultCode());
+        assertEquals("Incorrect parenthesis", "(hello)(world)", reply
+                .getExtra());
+        assertEquals("Incorrect endpos attribute", "2240", reply
+                .getAttribute("endpos"));
     }
 
     public void testBuildReplyInvalidOrUnknownCommand()

Index: AGIReaderImplTest.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/fastagi/AGIReaderImplTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- AGIReaderImplTest.java	11 Mar 2005 00:23:25 -0000	1.3
+++ AGIReaderImplTest.java	11 Mar 2005 13:40:06 -0000	1.4
@@ -75,7 +75,7 @@ public class AGIReaderImplTest extends T
         reply = agiReader.readReply();
 
         assertEquals("Incorrect status", AGIReply.SC_SUCCESS, reply.getStatus());
-        assertEquals("Incorrect result", 49, reply.getResult());
+        assertEquals("Incorrect result", 49, reply.getResultCode());
 
         socketMC.verify();
     }