asterisk-java-cvs

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

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

Modified Files:
	EventBuilderImplTest.java 
Log Message:
Added CidCallingPres and CidCallingPresTxt attributes to NewCallerIdEvent

Index: EventBuilderImplTest.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/manager/impl/EventBuilderImplTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -p -r1.5 -r1.6
--- EventBuilderImplTest.java	27 Aug 2005 02:26:59 -0000	1.5
+++ EventBuilderImplTest.java	27 Aug 2005 02:57:54 -0000	1.6
@@ -25,6 +25,7 @@ import net.sf.asterisk.manager.event.Cdr
 import net.sf.asterisk.manager.event.ChannelEvent;
 import net.sf.asterisk.manager.event.HangupEvent;
 import net.sf.asterisk.manager.event.ManagerEvent;
+import net.sf.asterisk.manager.event.NewCallerIdEvent;
 import net.sf.asterisk.manager.event.NewChannelEvent;
 import net.sf.asterisk.manager.event.NewExtenEvent;
 import net.sf.asterisk.manager.event.ResponseEvent;
@@ -282,4 +283,69 @@ public class EventBuilderImplTest extend
         assertEquals("CauseTxt property not set correctly", "some text",
                 ((HangupEvent) event).getCauseTxt());
     }
+
+    public void testBuildEventWithCidCallingPres()
+    {
+        Map properties = new HashMap();
+        ManagerEvent event;
+
+        properties.put("event", "Newcallerid");
+        properties.put("cid-callingpres", "123 (nice description)");
+        event = eventBuilder.buildEvent(this, properties);
+
+        assertNotNull(event);
+        assertEquals("CidCallingPres property not set correctly", new Integer(123),
+                ((NewCallerIdEvent) event).getCidCallingPres());
+        assertEquals("CidCallingPresTxt property not set correctly", "nice description",
+                ((NewCallerIdEvent) event).getCidCallingPresTxt());
+    }
+
+    public void testBuildEventWithCidCallingPresAndEmptyTxt()
+    {
+        Map properties = new HashMap();
+        ManagerEvent event;
+
+        properties.put("event", "Newcallerid");
+        properties.put("cid-callingpres", "123 ()");
+        event = eventBuilder.buildEvent(this, properties);
+
+        assertNotNull(event);
+        assertEquals("CidCallingPres property not set correctly", new Integer(123),
+                ((NewCallerIdEvent) event).getCidCallingPres());
+        assertNull("CidCallingPresTxt property not set correctly (must be null)",
+                ((NewCallerIdEvent) event).getCidCallingPresTxt());
+    }
+
+    public void testBuildEventWithCidCallingPresAndMissingTxt()
+    {
+        Map properties = new HashMap();
+        ManagerEvent event;
+
+        properties.put("event", "Newcallerid");
+        properties.put("cid-callingpres", "123");
+        event = eventBuilder.buildEvent(this, properties);
+
+        assertNotNull(event);
+        assertEquals("CidCallingPres property not set correctly", new Integer(123),
+                ((NewCallerIdEvent) event).getCidCallingPres());
+        assertNull("CidCallingPresTxt property not set correctly (must be null)",
+                ((NewCallerIdEvent) event).getCidCallingPresTxt());
+    }
+
+
+    public void testBuildEventWithInvalidCidCallingPres()
+    {
+        Map properties = new HashMap();
+        ManagerEvent event;
+
+        properties.put("event", "Newcallerid");
+        properties.put("cid-callingpres", "abc");
+        event = eventBuilder.buildEvent(this, properties);
+
+        assertNotNull(event);
+        assertNull("CidCallingPres property not set correctly (must be null)",
+                ((NewCallerIdEvent) event).getCidCallingPres());
+        assertNull("CidCallingPresTxt property not set correctly (must be null)",
+                ((NewCallerIdEvent) event).getCidCallingPresTxt());
+    }
 }