xmpp4js-commit Mailing List for xmpp4js: javascript xmpp/jabber library (Page 4)
Status: Beta
Brought to you by:
h-iverson
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
(18) |
Mar
(1) |
Apr
|
May
(4) |
Jun
(6) |
Jul
(47) |
Aug
(7) |
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: <h-i...@us...> - 2008-02-23 00:43:39
|
Revision: 692
http://xmpp4js.svn.sourceforge.net/xmpp4js/?rev=692&view=rev
Author: h-iverson
Date: 2008-02-22 16:43:44 -0800 (Fri, 22 Feb 2008)
Log Message:
-----------
moved gui stuff to a subproject of soashable (task #146599)
Modified Paths:
--------------
trunk/src/assembler/xmpp4js.xml
Removed Paths:
-------------
trunk/src/test/javascript/BoundRosterTreeTest.html
trunk/src/test/javascript/ChatRendererTest.html
trunk/src/test/javascript/RosterTreeTest.html
Modified: trunk/src/assembler/xmpp4js.xml
===================================================================
--- trunk/src/assembler/xmpp4js.xml 2008-02-23 00:43:36 UTC (rev 691)
+++ trunk/src/assembler/xmpp4js.xml 2008-02-23 00:43:44 UTC (rev 692)
@@ -78,10 +78,9 @@
<include>muc/ext/**.js</include>
<include>ext/**.js</include>
- <include>gui/**.js</include>
<include>workflow/**.js</include>
</includes>
</script>
</scripts>
-</assembler>
\ No newline at end of file
+</assembler>
Deleted: trunk/src/test/javascript/BoundRosterTreeTest.html
===================================================================
--- trunk/src/test/javascript/BoundRosterTreeTest.html 2008-02-23 00:43:36 UTC (rev 691)
+++ trunk/src/test/javascript/BoundRosterTreeTest.html 2008-02-23 00:43:44 UTC (rev 692)
@@ -1,233 +0,0 @@
-<html>
- <head>
- <title>JSUnit - RosterWindowTest</title>
- <script language="javascript" src="app/jsUnitCore.js"></script>
-
- <script type="text/javascript" src="includes.js"></script>
- <script type="text/javascript" src="common-test-library.js"></script>
-
- </head>
- <body>
- <script type="text/javascript">
-
-var GROUP1 = "Group 1";
-var GROUP2 = "Group 2";
-
-var ALIAS1 = "Alias 1";
-var ALIAS2 = "Alias 2";
-
-var JID1 = "som...@so...";
-var JID2 = "som...@so...";
-
-var JID_WITH_RESOURCE = JID1+"/resource1";
-
-var tree;
-var pm = null;
-var rim = null;
-
-function setUp() {
- pm = new Xmpp4Js.Roster.PresenceManager();
- rim = new Xmpp4Js.Roster.RosterItemManager();
-
- tree = new Xmpp4Js.UI.Roster.BoundRosterTree({
- renderTo: document.body,
- rim: rim,
- pm: pm
- });
-}
-
-function tearDown() {
- delete tree;
-}
-
-/**
- * Ensure that item and group are created with first roster item packet.
- * Make sure that it is null before presence but not after.
- */
-function testAdd_SingleGroup_() {
- rim.update( JID1, ALIAS1, "none", null, [GROUP1] );
-
- var pres = new Xmpp4Js.Packet.Presence( "available", "lo...@so...", null, "normal", null );
- pres.setFrom( JID1+"/resource1" );
- pm.update( pres );
-
- var group = tree.getGroup( GROUP1 );
- assertNotNull( "Group 1 is null", group );
-
- item = tree.getItem( GROUP1, JID1 );
- assertNotNull( "Item is null after presence", item );
-}
-
-/**
- * Ensure that multiple groups are created on first rotser item packet.
- * Make sure that it is null before presence but not after.
- */
-function testAdd_TwoGroups() {
- rim.update( JID1, ALIAS1, "none", null, [GROUP1, GROUP2] );
-
- var pres = new Xmpp4Js.Packet.Presence( "available", "lo...@so...", null, "normal", null );
- pres.setFrom( JID1+"/resource1" );
- pm.update( pres );
-
- var group = tree.getGroup( GROUP1 );
- assertNotNull( "Group 1 is null but shouldn't be", group );
-
- group = tree.getGroup( GROUP2 );
- assertNotNull( "Group 2 is null but shouldn't be", group );
-
- var item = tree.getItem( GROUP1, JID1 );
- assertNotNull( "Item in Group 1 is null but shouldn't be", item );
-
- item = tree.getItem( GROUP2, JID1 );
- assertNotNull( "Item in Group 2 is null but shouldn't be", item );
-}
-
-/**
- * Ensure that there are no problems updating an entry in its own group
- * Make sure that it is not null before presence nor after.
- */
-function testUpdate_SingleGroup() {
- rim.update( JID1, ALIAS1, "none", null, [GROUP1] );
- rim.update( JID1, ALIAS1, "none", null, [GROUP1] );
-
- var pres = new Xmpp4Js.Packet.Presence( "available", "lo...@so...", null, "normal", null );
- pres.setFrom( JID1+"/resource1" );
- pm.update( pres );
-
- var group = tree.getGroup( GROUP1 );
- assertNotNull( "Group 1 is null", group );
-
- var item = tree.getItem( GROUP1, JID1 );
- assertNotNull( "Item is null", item );
-}
-
-/**
- * Ensure that there are no problems when an entry changes groups.
- */
-function testUpdate_Group1ToGroup2() {
- rim.update( JID1, ALIAS1, "none", null, [GROUP1] );
- rim.update( JID1, ALIAS1, "none", null, [GROUP2] );
-
- var pres = new Xmpp4Js.Packet.Presence( "available", "lo...@so...", null, "normal", null );
- pres.setFrom( JID1+"/resource1" );
- pm.update( pres );
-
- // TODO remove group when it's completely empty
- var group = tree.getGroup( GROUP1 );
- assertNotNull( "Group 1 is null", group );
-
- group = tree.getGroup( GROUP2 );
- assertNotNull( "Group 2 is null", group );
-
- // make sure item isn't in group 1
- var item = tree.getItem( GROUP1, JID1 );
- assertNull( "Item from Group 1 IS NOT null but should be", item );
-
- item = tree.getItem( GROUP2, JID1 );
- assertNotNull( "Item from Group 2 IS null but shouldn't be", item );
-}
-
-/**
- * Try removing an entry that exists in one gorup, and ensure that the item is gone.
- * NOTE: groups are typically not specified in remove packets.
- */
-function testRemove_SingleGroup() {
- rim.update( JID1, ALIAS1, "none", null, [GROUP1] );
- rim.update( JID1, ALIAS1, "remove", null, [] );
-
- var pres = new Xmpp4Js.Packet.Presence( "available", "lo...@so...", null, "normal", null );
- pres.setFrom( JID1+"/resource1" );
- pm.update( pres );
-
- var group = tree.getGroup( GROUP1 );
- assertNotNull( group );
-
- var item = tree.getItem( GROUP1, JID1 );
- assertNull( item );
-}
-
-/**
- * Remove an entry that exists in multiple groups, and ensure that all items are gone.
- * NOTE: groups are typically not specified in remove packets.
- */
-function testRemove_MultupleGroups() {
- rim.update( JID1, ALIAS1, "none", null, [GROUP1, GROUP2] );
- rim.update( JID1, ALIAS1, "remove", null, [] );
-
- var pres = new Xmpp4Js.Packet.Presence( "available", "lo...@so...", null, "normal", null );
- pres.setFrom( JID1+"/resource1" );
- pm.update( pres );
-
- var group = tree.getGroup( GROUP1 );
- assertNotNull( group );
-
- var item = tree.getItem( GROUP1, JID1 );
- assertNull( item );
-
- item = tree.getItem( GROUP2, JID1 );
- assertNull( item );
-}
-
-function testPresence_RosterBeforePresence() {
- rim.update( JID1, ALIAS1, "none", null, [GROUP1, GROUP2] );
-
- var group = tree.getGroup( GROUP1 );
- assertNotNull( group );
-
- group = tree.getGroup( GROUP2 );
- assertNotNull( group );
-
- var item = tree.getItem( GROUP1, JID1 );
- assertNull( item );
-
- item = tree.getItem( GROUP2, JID1 );
- assertNull( item );
-
- item = tree.getItem( Xmpp4Js.UI.Roster.RosterTree.OFFLINE_GROUP, JID1 );
- assertNotNull( item );
-
- var pres = new Xmpp4Js.Packet.Presence( "available", "lo...@so...", null, "normal", null );
- pres.setFrom( JID1+"/resource1" );
- pm.update( pres );
-
- item = tree.getItem( GROUP1, JID1 );
- assertNotNull( item );
-
- item = tree.getItem( GROUP2, JID1 );
- assertNotNull( item );
-
- item = tree.getItem( Xmpp4Js.UI.Roster.RosterTree.OFFLINE_GROUP, JID1 );
- assertNull( item );
-}
-
-function testPresence_PresenceBeforeRoster() {
-
- var pres = new Xmpp4Js.Packet.Presence( "available", "lo...@so...", null, "normal", null );
- pres.setFrom( JID1+"/resource1" );
- pm.update( pres );
-
- rim.update( JID1, ALIAS1, "none", null, [GROUP1, GROUP2] );
-
- var group = tree.getGroup( GROUP1 );
- assertNotNull( "Expected Group 1 to exist", group );
-
- group = tree.getGroup( GROUP2 );
- assertNotNull( "Expected Group 2 to exist", group );
-
- item = tree.getItem( GROUP1, JID1 );
- assertNotNull( "Expected item to exist in Group 1", item );
-
- item = tree.getItem( GROUP2, JID1 );
- assertNotNull( "Expected item to exist in Group 2", item );
-
- item = tree.getItem( Xmpp4Js.UI.Roster.RosterTree.OFFLINE_GROUP, JID1 );
- assertNull( "Expected item to not exist in offline group", item );
-}
-
- </script>
- </body>
-</html>
-
-
-
-
Deleted: trunk/src/test/javascript/ChatRendererTest.html
===================================================================
--- trunk/src/test/javascript/ChatRendererTest.html 2008-02-23 00:43:36 UTC (rev 691)
+++ trunk/src/test/javascript/ChatRendererTest.html 2008-02-23 00:43:44 UTC (rev 692)
@@ -1,26 +0,0 @@
-<html>
- <head>
- <title>JSUnit - RosterWindowTest</title>
- <script language="javascript" src="app/jsUnitCore.js"></script>
-
- <script type="text/javascript" src="includes.js"></script>
- <script type="text/javascript" src="common-test-library.js"></script>
-
- </head>
- <body>
- <div id="chatRenderer"></div>
- <script type="text/javascript">
-
-
-function testChatRenderer() {
- var cr = new Xmpp4Js.UI.Chat.ChatRenderer( "chatRenderer" );
-
- cr.render();
-}
-
-
- </script>
- </body>
-</html>
-
-
Deleted: trunk/src/test/javascript/RosterTreeTest.html
===================================================================
--- trunk/src/test/javascript/RosterTreeTest.html 2008-02-23 00:43:36 UTC (rev 691)
+++ trunk/src/test/javascript/RosterTreeTest.html 2008-02-23 00:43:44 UTC (rev 692)
@@ -1,267 +0,0 @@
-<html>
- <head>
- <title>JSUnit - RosterWindowTest</title>
- <script language="javascript" src="app/jsUnitCore.js"></script>
-
- <script type="text/javascript" src="includes.js"></script>
- <script type="text/javascript" src="common-test-library.js"></script>
-
- </head>
- <body>
- <script type="text/javascript">
-
-var GROUP1 = "Group 1";
-var GROUP2 = "Group 2";
-
-var JID1 = "som...@so...";
-var JID2 = "som...@so...";
-
-var JID_WITH_RESOURCE = JID1+"/resource1";
-
-var tree;
-
-function setUp() {
- tree = new Xmpp4Js.UI.Roster.RosterTree({
- renderTo: document.body
- });
-}
-
-function tearDown() {
- delete tree;
-}
-
-/**
- * Try to create a group and make sure that it exists.
- */
-function testCreateGroup() {
- tree.createGroup( GROUP1 );
-
- var group = tree.getGroup( GROUP1 );
- assertNotNull( group );
-}
-
-/**
- * Try to create a group and make sure an error is thrown.
- */
-function testCreateGroup_Again() {
- tree.createGroup( GROUP1 );
- try {
- tree.createGroup( GROUP1 );
- fail( "Should have errored when trying to create an existing group." );
- } catch(e) {
- // TODO test exception type
- }
-
- var group = tree.getGroup( GROUP1 );
- assertNotNull( group );
- // TODO make sure it doesn't exist twice.
-}
-
-/**
- * Try creating two fresh groups.
- */
-function testCreateGroups() {
- tree.createGroups( [GROUP1, GROUP2] );
-
- assertNotNull( tree.getGroup( GROUP1 ) );
- assertNotNull( tree.getGroup( GROUP2 ) );
-}
-
-/**
- * Create two groups, one of which exists. DO NOT error.
- */
-function testCreateGroups_GroupExists() {
- tree.createGroup( GROUP1 );
-
- try {
- tree.createGroups( [GROUP1, GROUP2] );
- } catch(e) {
- fail( "We should not have errored when a group already existed." );
- }
-
- assertNotNull( tree.getGroup( GROUP1 ) );
- assertNotNull( tree.getGroup( GROUP2 ) );
-}
-
-/**
- * Create a group and add an item to it.
- */
-function testCreateItem() {
- tree.createGroup( GROUP1 );
- tree.createItem( GROUP1, JID1 );
-
- assertNotNull( tree.getItem( GROUP1, JID1 ) );
-}
-
-/**
- * Create an item in two groups
- */
-function testCreateItem_DifferentGroup() {
- tree.createGroup( GROUP1 );
- tree.createItem( GROUP1, JID1 );
-
- tree.createGroup( GROUP2 );
- tree.createItem( GROUP2, JID1 );
-
- assertNotNull( tree.getItem( GROUP1, JID1 ) );
- assertNotNull( tree.getItem( GROUP2, JID1 ) );
-}
-
-/**
- * Try to create an item that already exists. expect an error.
- */
-function testCreateItem_SameGroup() {
- tree.createGroup( GROUP1 );
- tree.createItem( GROUP1, JID1 );
- try {
- tree.createItem( GROUP1, JID1 );
- fail( "Should have errored when trying to create an existing item." );
- } catch(e) {
- // TODO test exception type
- }
-}
-
-/**
- * Creates two groups and an item in group 1. moves that item to group 1.
- * ensures that item exists in group 2 but not group 1.
- */
-function testMoveItem() {
- tree.createGroup( GROUP1 );
- tree.createGroup( GROUP2 );
-
- tree.createItem( GROUP1, JID1 );
-
- tree.moveItem( GROUP1, GROUP2, JID1 );
-
- assertNull( tree.getItem( GROUP1, JID1 ) );
- assertNotNull( tree.getItem( GROUP2, JID1 ) );
-}
-
-
-/**
- * Creates two groups each with a jid. tries to move from group 1 to 2. errors
- * because it already exists in group 2.
- */
-function testMoveItem_JidAlreadyExists() {
- tree.createGroup( GROUP1 );
- tree.createGroup( GROUP2 );
-
- tree.createItem( GROUP1, JID1 );
- tree.createItem( GROUP2, JID1 );
-
- try {
- tree.moveItem( GROUP1, GROUP2, JID1 );
- fail( "Should have errored moving to a group where jid already exists." );
- } catch(e){
-
- }
-}
-
-/**
- * Test the getItemInAllGroups method by creating two groups with an item,
- * and ensuring that there are two items in the returned list
- */
-function testGetItemInAllGroups() {
- tree.createGroup( GROUP1 );
- tree.createGroup( GROUP2 );
-
- tree.createItem( GROUP1, JID1 );
- tree.createItem( GROUP2, JID1 );
-
- var items = tree.getItemInAllGroups( JID1 );
-
- assertEquals( "The item does not exist in the expected number of groups", 2, items.length );
-
- // TODO ensure that the names match.
-}
-
-/**
- * Test the removeItemFromAllGroups method.
- */
-function testRemoveItemFromAllGroups() {
- tree.createGroup( GROUP1 );
- tree.createGroup( GROUP2 );
-
- tree.createItem( GROUP1, JID1 );
- tree.createItem( GROUP2, JID1 );
-
- tree.removeItemFromAllGroups( JID1 );
-
- assertNull( tree.getItem( GROUP1, JID1 ) );
- assertNull( tree.getItem( GROUP2, JID1 ) );
-}
-
-/**
- * Update the groups an item belongs to with all requisite groups existing.
- */
-function testUpdateItemGroups_Group1ToGroup2_GroupsExist() {
- tree.createGroup( GROUP1 );
- tree.createGroup( GROUP2 );
-
- tree.createItem( GROUP1, JID1 );
-
- tree.updateItemGroups( JID1, [GROUP2] );
-
- assertNull( tree.getItem( GROUP1, JID1 ) );
- assertNotNull( tree.getItem( GROUP2, JID1 ) );
-}
-
-/**
- * Update the groups an item belongs to with a requisite group missing. will
- * error.
- */
-function testUpdateItemGroups_Group1ToGroup2_Group2Missing() {
- tree.createGroup( GROUP1 );
-
- tree.createItem( GROUP1, JID1 );
-
- try {
- tree.updateItemGroups( JID1, [GROUP2] );
- fail( "Should have errored when Group 2 didn't exist" );
- } catch(e) {
-
- }
-}
-
-/**
- * Creates an item that exists in a single group. then updates groups, including
- * the one it already exists in. should NOT error.
- */
-function testUpdateItemGroups_Group1ToGroup1AndGroup2_GroupsExist() {
- tree.createGroup( GROUP1 );
- tree.createGroup( GROUP2 );
-
- tree.createItem( GROUP1, JID1 );
-
- try {
- tree.updateItemGroups( JID1, [GROUP1, GROUP2] );
-
- } catch(e) {
- fail( "Should not have errored when already existing in a group." );
- }
-}
-
-/**
- * Creates an item in group 1 and then updates it to exist in group 1 and 2. but
- * group 2 does not exist, so an error is thrown.
- */
-function testUpdateItemGroups_Group1ToGroup1AndGroup2_Group2Missing() {
- tree.createGroup( GROUP1 );
-
- tree.createItem( GROUP1, JID1 );
-
- try {
- tree.updateItemGroups( JID1, [GROUP1, GROUP2] );
- fail( "Should have errored when group 2 didn't exist" );
- } catch(e) {
-
- }
-}
-
- </script>
- </body>
-</html>
-
-
-
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <h-i...@us...> - 2008-02-23 00:43:34
|
Revision: 691
http://xmpp4js.svn.sourceforge.net/xmpp4js/?rev=691&view=rev
Author: h-iverson
Date: 2008-02-22 16:43:36 -0800 (Fri, 22 Feb 2008)
Log Message:
-----------
moved gui stuff to a subproject of soashable (task #146599)
Removed Paths:
-------------
trunk/src/main/javascript/gui/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <h-i...@us...> - 2008-02-22 23:57:08
|
Revision: 690
http://xmpp4js.svn.sourceforge.net/xmpp4js/?rev=690&view=rev
Author: h-iverson
Date: 2008-02-22 15:56:54 -0800 (Fri, 22 Feb 2008)
Log Message:
-----------
updated arrays of items, etc
Modified Paths:
--------------
branches/xml4script-port/trunk/src/test/javascript/ChatManagerTest.html
branches/xml4script-port/trunk/src/test/javascript/ExtensionProviderTest.html
branches/xml4script-port/trunk/src/test/javascript/MUC_JoinTest.html
branches/xml4script-port/trunk/src/test/javascript/PacketFilterTest.html
branches/xml4script-port/trunk/src/test/javascript/PacketHelperTest.html
branches/xml4script-port/trunk/src/test/javascript/PacketReaderTest.html
branches/xml4script-port/trunk/src/test/javascript/RosterItemManagerTest.html
branches/xml4script-port/trunk/src/test/javascript/common-test-library.js
Modified: branches/xml4script-port/trunk/src/test/javascript/ChatManagerTest.html
===================================================================
--- branches/xml4script-port/trunk/src/test/javascript/ChatManagerTest.html 2008-02-22 06:17:06 UTC (rev 689)
+++ branches/xml4script-port/trunk/src/test/javascript/ChatManagerTest.html 2008-02-22 23:56:54 UTC (rev 690)
@@ -139,7 +139,7 @@
function testReceiveMessage_Event() {
var packet = loadTestPacket( "packets/incoming_message_chat.xml" );
- var stanzaNode = packet.getElementsByTagName("message" )[0];
+ var stanzaNode = packet.getElementsByTagName("message" ).item(0);
var wasInvoked = false;
@@ -162,7 +162,7 @@
function testReceiveMessage_Event_Two() {
var packet = loadTestPacket( "packets/incoming_message_chat.xml" );
- var stanzaNode = packet.getElementsByTagName("message" )[0];
+ var stanzaNode = packet.getElementsByTagName("message" ).item(0);
var invokationCount = 0;
@@ -186,7 +186,7 @@
function testReceiveMessage_Event_New() {
var packet = loadTestPacket( "packets/incoming_message_chat.xml" );
- var stanzaNode = packet.getElementsByTagName("message" )[0];
+ var stanzaNode = packet.getElementsByTagName("message" ).item(0);
Modified: branches/xml4script-port/trunk/src/test/javascript/ExtensionProviderTest.html
===================================================================
--- branches/xml4script-port/trunk/src/test/javascript/ExtensionProviderTest.html 2008-02-22 06:17:06 UTC (rev 689)
+++ branches/xml4script-port/trunk/src/test/javascript/ExtensionProviderTest.html 2008-02-22 23:56:54 UTC (rev 690)
@@ -37,9 +37,9 @@
var children = msg.getNode().getElementsByTagNameNS( msgEvent.getElementNS(), msgEvent.getElementName() );
- assertEquals( 1, children.length );
- assertEquals( 1, children[0].childNodes.length );
- assertEquals( "composing", children[0].firstChild.nodeName );
+ assertEquals( 1, children.getLength() );
+ assertEquals( 1, children.item(0).childNodes.length );
+ assertEquals( "composing", children.item(0).firstChild.nodeName );
}
function testMessageEvent_Multiple() {
@@ -49,9 +49,9 @@
var children = msg.getNode().getElementsByTagNameNS( msgEvent.getElementNS(), msgEvent.getElementName() );
- assertEquals( 1, children.length );
- assertEquals( 1, children[0].childNodes.length );
- assertEquals( "pooping", children[0].firstChild.nodeName );
+ assertEquals( 1, children.getLength() );
+ assertEquals( 1, children.item(0).childNodes.length );
+ assertEquals( "pooping", children.item(0).firstChild.nodeName );
}
function testMessageEvent_Empty() {
@@ -60,23 +60,23 @@
// test empty event constructor
var children = msg.getNode().getElementsByTagNameNS( msgEvent.getElementNS(), msgEvent.getElementName() );
- assertEquals( 1, children.length );
- assertEquals( 0, children[0].childNodes.length );
+ assertEquals( 1, children.getLength() );
+ assertEquals( 0, children.item(0).childNodes.length );
assertEquals( Xmpp4Js.Ext.MessageEvent.EVENT_EMPTY, msgEvent.getEvent() );
// set an event and make sure all is well
msgEvent.setEvent( "composing" );
children = msg.getNode().getElementsByTagNameNS( msgEvent.getElementNS(), msgEvent.getElementName() );
- assertEquals( 1, children.length );
- assertEquals( 1, children[0].childNodes.length );
- assertEquals( "composing", children[0].firstChild.nodeName );
+ assertEquals( 1, children.getLength() );
+ assertEquals( 1, children.item(0).childNodes.length );
+ assertEquals( "composing", children.item(0).firstChild.nodeName );
assertEquals( "composing", msgEvent.getEvent() );
// then set event back and make sure we'll still good
msgEvent.setEvent( Xmpp4Js.Ext.MessageEvent.EVENT_EMPTY );
children = msg.getNode().getElementsByTagNameNS( msgEvent.getElementNS(), msgEvent.getElementName() );
- assertEquals( 1, children.length );
- assertEquals( 0, children[0].childNodes.length );
+ assertEquals( 1, children.getLength() );
+ assertEquals( 0, children.item(0).childNodes.length );
assertEquals( Xmpp4Js.Ext.MessageEvent.EVENT_EMPTY, msgEvent.getEvent() );
}
@@ -88,8 +88,8 @@
var children = msg.getNode().getElementsByTagNameNS( chatState.getElementNS(), chatState.getElementName() );
- assertEquals( 1, children.length );
- assertEquals( "active", children[0].nodeName );
+ assertEquals( 1, children.getLength() );
+ assertEquals( "active", children.item(0).nodeName );
}
function testChatState_Multiple() {
@@ -100,10 +100,10 @@
assertEquals( "away", chatState.getElementName() );
var children = msg.getNode().getElementsByTagNameNS( chatState.getElementNS(), chatState.getElementName() );
- assertEquals( 1, children.length );
+ assertEquals( 1, children.getLength() );
var oldChildren = msg.getNode().getElementsByTagNameNS( "active", chatState.getElementName() );
- assertEquals( 0, oldChildren.length );
+ assertEquals( 0, oldchildren.getLength() );
}
function testPacket_GetExtension() {
@@ -224,7 +224,7 @@
assertUndefined( chatState );
var children = msg.getNode().getElementsByTagNameNS( Xmpp4Js.Ext.ChatStates.XMLNS, "active" );
- assertEquals( 0, children.length );
+ assertEquals( 0, children.getLength() );
}
function BROKEN_testErrorExtension_PacketDefaultNS() {
Modified: branches/xml4script-port/trunk/src/test/javascript/MUC_JoinTest.html
===================================================================
--- branches/xml4script-port/trunk/src/test/javascript/MUC_JoinTest.html 2008-02-22 06:17:06 UTC (rev 689)
+++ branches/xml4script-port/trunk/src/test/javascript/MUC_JoinTest.html 2008-02-22 23:56:54 UTC (rev 690)
@@ -49,8 +49,8 @@
// make a fake response
options.responsePacket = loadTestPacket( "packets/muc_roomlist.xml", function(packet) {
- packet.getElementsByTagName("iq" )[0].setAttribute( "id", txPacket.getElementsByTagName("iq" )[0].getAttribute( "id" ).toString() );
- packet.getElementsByTagName("iq" )[0].setAttribute( "from", txPacket.getElementsByTagName("iq" )[0].getAttribute( "to" ).toString() );
+ packet.getElementsByTagName("iq" ).item(0).setAttribute( "id", txPacket.getElementsByTagName("iq" ).item(0).getAttribute( "id" ).toString() );
+ packet.getElementsByTagName("iq" ).item(0).setAttribute( "from", txPacket.getElementsByTagName("iq" ).item(0).getAttribute( "to" ).toString() );
});
});
Modified: branches/xml4script-port/trunk/src/test/javascript/PacketFilterTest.html
===================================================================
--- branches/xml4script-port/trunk/src/test/javascript/PacketFilterTest.html 2008-02-22 06:17:06 UTC (rev 689)
+++ branches/xml4script-port/trunk/src/test/javascript/PacketFilterTest.html 2008-02-22 23:56:54 UTC (rev 690)
@@ -26,7 +26,7 @@
var pf = new Xmpp4Js.PacketFilter.RawPacketFilter();
var packet = DomBuilder.node( "body", {xmlns: "http://jabber.org/protocol/httpbind"} );
- var stanzaNode = packet.getElementsByTagName("iq" )[0];
+ var stanzaNode = packet.getElementsByTagName("iq" ).item(0);
// RawPacket filters are special and take packet rather than stanza.
var result = pf.accept( packet );
Modified: branches/xml4script-port/trunk/src/test/javascript/PacketHelperTest.html
===================================================================
--- branches/xml4script-port/trunk/src/test/javascript/PacketHelperTest.html 2008-02-22 06:17:06 UTC (rev 689)
+++ branches/xml4script-port/trunk/src/test/javascript/PacketHelperTest.html 2008-02-22 23:56:54 UTC (rev 690)
@@ -112,7 +112,7 @@
packet.setThread( "thread 2" );
assertEquals( "thread 2", packet.getThread() );
- assertEquals( 1, packet.getNode().getElementsByTagName("thread" ).length );
+ assertEquals( 1, packet.getNode().getElementsByTagName("thread" ).getLength() );
}
function testCreatePresence() {
Modified: branches/xml4script-port/trunk/src/test/javascript/PacketReaderTest.html
===================================================================
--- branches/xml4script-port/trunk/src/test/javascript/PacketReaderTest.html 2008-02-22 06:17:06 UTC (rev 689)
+++ branches/xml4script-port/trunk/src/test/javascript/PacketReaderTest.html 2008-02-22 23:56:54 UTC (rev 690)
@@ -36,7 +36,7 @@
function testAddPacketListenerNoFilter() {
var packet = loadTestPacket( "packets/iq_roster_result.xml" );
- var stanzaNode = packet.getElementsByTagName("iq" )[0];
+ var stanzaNode = packet.getElementsByTagName("iq" ).item(0);
var wasInvoked = false;
con.addPacketListener( function(stanza) {
@@ -52,7 +52,7 @@
function testRemovePacketListener() {
var packet = loadTestPacket( "packets/iq_roster_result.xml" );
- var stanzaNode = packet.getElementsByTagName("iq" )[0];
+ var stanzaNode = packet.getElementsByTagName("iq" ).item(0);
var wasInvoked = false;
var listener = function(stanza) {
@@ -67,7 +67,7 @@
function testAddMultiplePacketListenerWithErrors() {
var packet = loadTestPacket( "packets/iq_roster_result.xml" );
- var stanzaNode = packet.getElementsByTagName("iq" )[0];
+ var stanzaNode = packet.getElementsByTagName("iq" ).item(0);
var wasInvoked1 = false;
var wasInvoked2 = false;
Modified: branches/xml4script-port/trunk/src/test/javascript/RosterItemManagerTest.html
===================================================================
--- branches/xml4script-port/trunk/src/test/javascript/RosterItemManagerTest.html 2008-02-22 06:17:06 UTC (rev 689)
+++ branches/xml4script-port/trunk/src/test/javascript/RosterItemManagerTest.html 2008-02-22 23:56:54 UTC (rev 690)
@@ -242,7 +242,7 @@
provider.registerDefaultProviders();
var bodyElement = loadTestPacket( "packets/iq_roster_result.xml" );
- var iq = provider.fromNode( bodyElement.getElementsByTagName("iq")[0] );
+ var iq = provider.fromNode( bodyElement.getElementsByTagName("iq").item(0) );
rim.rosterPacketListener( iq );
Modified: branches/xml4script-port/trunk/src/test/javascript/common-test-library.js
===================================================================
--- branches/xml4script-port/trunk/src/test/javascript/common-test-library.js 2008-02-22 06:17:06 UTC (rev 689)
+++ branches/xml4script-port/trunk/src/test/javascript/common-test-library.js 2008-02-22 23:56:54 UTC (rev 690)
@@ -232,7 +232,7 @@
xhreq.open("GET", file, false);
xhreq.send(null);
- var doc = new DOMImplementation().loadXML( xhreq.responseText ).documentElement
+ var doc = new DOMImplementation().loadXML( xhreq.responseText )
var packet = doc.documentElement;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <h-i...@us...> - 2008-02-22 06:17:04
|
Revision: 689
http://xmpp4js.svn.sourceforge.net/xmpp4js/?rev=689&view=rev
Author: h-iverson
Date: 2008-02-21 22:17:06 -0800 (Thu, 21 Feb 2008)
Log Message:
-----------
localName to nodeName... and fixed a couple other misc things
Modified Paths:
--------------
branches/xml4script-port/trunk/pom.xml
branches/xml4script-port/trunk/src/main/javascript/StanzaProvider.js
branches/xml4script-port/trunk/src/main/javascript/ext/DataForm.js
branches/xml4script-port/trunk/src/main/javascript/ext/ServiceDisco.js
branches/xml4script-port/trunk/src/test/javascript/PacketHelperTest.html
branches/xml4script-port/trunk/src/test/javascript/common-test-library.js
Modified: branches/xml4script-port/trunk/pom.xml
===================================================================
--- branches/xml4script-port/trunk/pom.xml 2008-02-22 06:06:46 UTC (rev 688)
+++ branches/xml4script-port/trunk/pom.xml 2008-02-22 06:17:06 UTC (rev 689)
@@ -69,7 +69,7 @@
<strip>;;;</strip>
-->
<includes>
- <include>PacketHelperTest.html</include>
+ <include>*Test.html</include>
</includes>
<excludes>
<!-- hasn't been ported to new connection stuff yet -->
Modified: branches/xml4script-port/trunk/src/main/javascript/StanzaProvider.js
===================================================================
--- branches/xml4script-port/trunk/src/main/javascript/StanzaProvider.js 2008-02-22 06:06:46 UTC (rev 688)
+++ branches/xml4script-port/trunk/src/main/javascript/StanzaProvider.js 2008-02-22 06:17:06 UTC (rev 689)
@@ -106,7 +106,7 @@
}
Xmpp4Js.Packet.StanzaProvider._ElemNameProvider = function( stanzaNode, packetType ) {
- return stanzaNode.localName.toLowerCase() == packetType.toLowerCase();
+ return stanzaNode.nodeName.toLowerCase() == packetType.toLowerCase();
}
Xmpp4Js.Packet.StanzaProvider.IQProvider = function( stanzaNode ) {
Modified: branches/xml4script-port/trunk/src/main/javascript/ext/DataForm.js
===================================================================
--- branches/xml4script-port/trunk/src/main/javascript/ext/DataForm.js 2008-02-22 06:06:46 UTC (rev 688)
+++ branches/xml4script-port/trunk/src/main/javascript/ext/DataForm.js 2008-02-22 06:17:06 UTC (rev 689)
@@ -32,7 +32,7 @@
* Clones the given node and returns a reference to it
*/
DataForm.prototype.read = function(node) {
- if( node.localName != "x" || node.namespaceURI != "jabber:x:data" ) {
+ if( node.nodeName != "x" || node.namespaceURI != "jabber:x:data" ) {
//parentNode = node;
alert( "nothin" );
@@ -56,7 +56,7 @@
var newNode = this.node.cloneNode(true);
newNode = importNode( node.ownerDocument, newNode, true );
- if( node.localName == "x" && node.namespanamespaceURI == "jabber:x:data" ) {
+ if( node.nodeName == "x" && node.namespanamespaceURI == "jabber:x:data" ) {
var parentNode = node.parentNode;
newNode = parentNode.replaceChild( newNode, node );
} else {
Modified: branches/xml4script-port/trunk/src/main/javascript/ext/ServiceDisco.js
===================================================================
--- branches/xml4script-port/trunk/src/main/javascript/ext/ServiceDisco.js 2008-02-22 06:06:46 UTC (rev 688)
+++ branches/xml4script-port/trunk/src/main/javascript/ext/ServiceDisco.js 2008-02-22 06:17:06 UTC (rev 689)
@@ -209,7 +209,7 @@
var itemNodes = responseQuery.childNodes;
for ( var i=0; i < itemNodes.getLength(); i++ ) {
var item = itemNodes.item( i );
- if( item.localName == "item" ) {
+ if( item.nodeName == "item" ) {
items.push({
jid: item.getAttribute( "jid" ),
name: item.getAttribute( "name" ),
@@ -243,13 +243,13 @@
for ( var i=0; i < itemNodes.getLength(); i++ ) {
var item = itemNodes.item( i );
- if( item.localName == "identity" ) {
+ if( item.nodeName == "identity" ) {
identities.push({
category: item.getAttribute( "category" ),
name: item.getAttribute( "name" ),
type: item.getAttribute( "type" )
});
- } else if( item.localName == "feature" ) {
+ } else if( item.nodeName == "feature" ) {
features.push( item.getAttribute( "var" ) );
}
}
Modified: branches/xml4script-port/trunk/src/test/javascript/PacketHelperTest.html
===================================================================
--- branches/xml4script-port/trunk/src/test/javascript/PacketHelperTest.html 2008-02-22 06:06:46 UTC (rev 688)
+++ branches/xml4script-port/trunk/src/test/javascript/PacketHelperTest.html 2008-02-22 06:17:06 UTC (rev 689)
@@ -23,20 +23,20 @@
function testCreatePacket() {
var packet = packetHelper.createPacket();
- assertEquals( "body", packet.localName );
- assertEquals( null, packet.getAttribute("sid").toString() );
- assertEquals( null, packet.getAttribute("rid").toString() );
+ assertEquals( "body", packet.nodeName );
+ assertEquals( "", packet.getAttribute("sid").toString() );
+ assertEquals( "", packet.getAttribute("rid").toString() );
assertEquals( "http://jabber.org/protocol/httpbind", packet.getAttribute("xmlns").toString() );
}
function testCreateIQ() {
var iq = packetHelper.createIQ( "te...@te...", "set", "jabber:iq:roster" );
- assertEquals( "iq", iq.getNode().localName );
+ assertEquals( "iq", iq.getNode().nodeName );
assertEquals( "te...@te...", iq.getTo() );
assertEquals( "set", iq.getType() );
assertNotNull( iq.getQuery() );
- assertNotNull( "query", iq.getQuery().localName );
+ assertNotNull( "query", iq.getQuery().nodeName );
assertNotNull( iq.getQuery().getAttribute( "xmlns" ).toString() );
assertEquals( "jabber:iq:roster", iq.getQuery().getAttribute( "xmlns" ).toString() );
assertEquals( "jabber:iq:roster", iq.getQueryXMLNS() );
@@ -46,7 +46,7 @@
function testCreateMessageTextBody() {
var packet = packetHelper.createMessage( "te...@te...", "normal", "body", "subject" );
- assertEquals( "message", packet.getNode().localName );
+ assertEquals( "message", packet.getNode().nodeName );
assertEquals( "te...@te...", packet.getTo() );
assertEquals( "normal", packet.getType() );
assertEquals( "body", packet.getBody() );
@@ -59,7 +59,7 @@
var packet = packetHelper.createMessage( "te...@te...", "normal", bodyNode, "subject" );
- assertEquals( "message", packet.getNode().localName );
+ assertEquals( "message", packet.getNode().nodeName );
assertEquals( "te...@te...", packet.getTo() );
assertEquals( "normal", packet.getType() );
assertEquals( bodyNode.getStringValue(), packet.getBodyNode().getStringValue() );
@@ -84,7 +84,7 @@
function testCreateMessageSubject() {
var packet = packetHelper.createMessage( "te...@te...", "normal", "body", "subject" );
- assertEquals( "body", packet.getBodyNode().localName );
+ assertEquals( "body", packet.getBodyNode().nodeName );
assertEquals( "body", packet.getBody() );
}
@@ -92,7 +92,7 @@
function testCreateMessageSubject() {
var packet = packetHelper.createMessage( "te...@te...", "normal", "body", "subject" );
- assertEquals( "subject", packet.getSubjectNode().localName );
+ assertEquals( "subject", packet.getSubjectNode().nodeName );
assertEquals( "subject", packet.getSubject() );
}
@@ -101,7 +101,7 @@
var packet = packetHelper.createMessage( "te...@te...", "normal", "body", "subject" );
packet.setThread( "abc123" );
- assertEquals( "thread", packet.getThreadNode().localName );
+ assertEquals( "thread", packet.getThreadNode().nodeName );
assertEquals( "abc123", packet.getThread() );
}
@@ -118,7 +118,7 @@
function testCreatePresence() {
var packet = packetHelper.createPresence( "te...@te...", "available", "status", "normal", "5");
- assertEquals( "presence", packet.getNode().localName );
+ assertEquals( "presence", packet.getNode().nodeName );
assertEquals( "te...@te...", packet.getTo() );
assertEquals( "available", packet.getType() );
assertEquals( "status", packet.getStatus() );
Modified: branches/xml4script-port/trunk/src/test/javascript/common-test-library.js
===================================================================
--- branches/xml4script-port/trunk/src/test/javascript/common-test-library.js 2008-02-22 06:06:46 UTC (rev 688)
+++ branches/xml4script-port/trunk/src/test/javascript/common-test-library.js 2008-02-22 06:17:06 UTC (rev 689)
@@ -231,8 +231,9 @@
var xhreq = new XMLHttpRequest();
xhreq.open("GET", file, false);
xhreq.send(null);
- var doc = xhreq.responseXML;
+ var doc = new DOMImplementation().loadXML( xhreq.responseText ).documentElement
+
var packet = doc.documentElement;
if(filter) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <h-i...@us...> - 2008-02-22 06:06:41
|
Revision: 688
http://xmpp4js.svn.sourceforge.net/xmpp4js/?rev=688&view=rev
Author: h-iverson
Date: 2008-02-21 22:06:46 -0800 (Thu, 21 Feb 2008)
Log Message:
-----------
call toString on all getAttribute calls
Modified Paths:
--------------
branches/xml4script-port/trunk/pom.xml
branches/xml4script-port/trunk/src/main/javascript/DomBuilder.js
branches/xml4script-port/trunk/src/main/javascript/packet/Base.js
branches/xml4script-port/trunk/src/main/javascript/packet/IQ.js
branches/xml4script-port/trunk/src/main/javascript/packet/PacketExtension.js
branches/xml4script-port/trunk/src/main/javascript/packet/Presence.js
branches/xml4script-port/trunk/src/main/javascript/packetfilter/Errors.js
branches/xml4script-port/trunk/src/main/javascript/roster/RosterItemManager.js
branches/xml4script-port/trunk/src/main/javascript/transport/BOSH.js
branches/xml4script-port/trunk/src/test/javascript/DomBuilderTest.html
branches/xml4script-port/trunk/src/test/javascript/MUC_JoinTest.html
branches/xml4script-port/trunk/src/test/javascript/PacketHelperTest.html
branches/xml4script-port/trunk/src/test/javascript/broken/BOSHTransportTest.html
branches/xml4script-port/trunk/src/test/javascript/common-test-library.js
Modified: branches/xml4script-port/trunk/pom.xml
===================================================================
--- branches/xml4script-port/trunk/pom.xml 2008-02-22 05:53:21 UTC (rev 687)
+++ branches/xml4script-port/trunk/pom.xml 2008-02-22 06:06:46 UTC (rev 688)
@@ -69,7 +69,7 @@
<strip>;;;</strip>
-->
<includes>
- <include>*Test.html</include>
+ <include>PacketHelperTest.html</include>
</includes>
<excludes>
<!-- hasn't been ported to new connection stuff yet -->
Modified: branches/xml4script-port/trunk/src/main/javascript/DomBuilder.js
===================================================================
--- branches/xml4script-port/trunk/src/main/javascript/DomBuilder.js 2008-02-22 05:53:21 UTC (rev 687)
+++ branches/xml4script-port/trunk/src/main/javascript/DomBuilder.js 2008-02-22 06:06:46 UTC (rev 688)
@@ -86,7 +86,7 @@
try {
elem.setAttribute( k, attributes[k] );
} catch(e) {
-;;; alert( "Could not set attribute: "+k+"="+attributes[k]+". current="+elem.getAttribute(k) );
+;;; alert( "Could not set attribute: "+k+"="+attributes[k]+". current="+elem.getAttribute(k).toString() );
}
}
// add childElements
Modified: branches/xml4script-port/trunk/src/main/javascript/packet/Base.js
===================================================================
--- branches/xml4script-port/trunk/src/main/javascript/packet/Base.js 2008-02-22 05:53:21 UTC (rev 687)
+++ branches/xml4script-port/trunk/src/main/javascript/packet/Base.js 2008-02-22 06:06:46 UTC (rev 688)
@@ -37,7 +37,7 @@
this.elem.setAttribute( "id", id );
},
getId : function() {
- var id = this.elem.getAttribute( "id" );
+ var id = this.elem.getAttribute( "id" ).toString();
if( !id ) {
id = "id" + Math.random( 0,100 );
this.setId( id );
@@ -53,7 +53,7 @@
this.elem.setAttribute( "to", to );
},
getTo : function() {
- return this.elem.getAttribute( "to" );
+ return this.elem.getAttribute( "to" ).toString();
},
/**
@@ -64,7 +64,7 @@
this.elem.setAttribute( "from", from );
},
getFrom : function() {
- return this.elem.getAttribute( "from" );
+ return this.elem.getAttribute( "from" ).toString();
},
/**
@@ -75,7 +75,7 @@
this.elem.setAttribute( "to", to.toString() );
},
getToJid : function() {
- return new Xmpp4Js.Jid(this.elem.getAttribute( "to" ));
+ return new Xmpp4Js.Jid(this.elem.getAttribute( "to" ).toString());
},
/**
@@ -86,7 +86,7 @@
this.elem.setAttribute( "from", from.toString() );
},
getFromJid : function() {
- return new Xmpp4Js.Jid(this.elem.getAttribute( "from" ));
+ return new Xmpp4Js.Jid(this.elem.getAttribute( "from" ).toString());
},
@@ -95,7 +95,7 @@
this.elem.setAttribute( "type", type );
},
getType : function() {
- return this.elem.getAttribute( "type" );
+ return this.elem.getAttribute( "type" ).toString();
},
setNode : function(node) {
Modified: branches/xml4script-port/trunk/src/main/javascript/packet/IQ.js
===================================================================
--- branches/xml4script-port/trunk/src/main/javascript/packet/IQ.js 2008-02-22 05:53:21 UTC (rev 687)
+++ branches/xml4script-port/trunk/src/main/javascript/packet/IQ.js 2008-02-22 06:06:46 UTC (rev 688)
@@ -39,7 +39,7 @@
/** @deprecated */
getQueryXMLNS : function() {
var query = this.getQuery();
- return query ? query.getAttribute("xmlns") : "";
+ return query ? query.getAttribute("xmlns").toString() : "";
}
}
Modified: branches/xml4script-port/trunk/src/main/javascript/packet/PacketExtension.js
===================================================================
--- branches/xml4script-port/trunk/src/main/javascript/packet/PacketExtension.js 2008-02-22 05:53:21 UTC (rev 687)
+++ branches/xml4script-port/trunk/src/main/javascript/packet/PacketExtension.js 2008-02-22 06:06:46 UTC (rev 688)
@@ -245,8 +245,8 @@
readNode : function() {
Xmpp4Js.Ext.Error.superclass.readNode.call( this );
- this.code = this.getNode().getAttribute( "code");
- this.type = this.getNode().getAttribute( "type");
+ this.code = this.getNode().getAttribute( "code").toString();
+ this.type = this.getNode().getAttribute( "type").toString();
},
createNode : function(code, type) {
// since getElementName returns this.state, and createNode creates
Modified: branches/xml4script-port/trunk/src/main/javascript/packet/Presence.js
===================================================================
--- branches/xml4script-port/trunk/src/main/javascript/packet/Presence.js 2008-02-22 05:53:21 UTC (rev 687)
+++ branches/xml4script-port/trunk/src/main/javascript/packet/Presence.js 2008-02-22 06:06:46 UTC (rev 688)
@@ -22,7 +22,7 @@
Xmpp4Js.Packet.Presence.prototype = {
getType : function() {
- var type = this.elem.getAttribute( "type" );
+ var type = this.elem.getAttribute( "type" ).toString();
return type ? type : "available";
},
Modified: branches/xml4script-port/trunk/src/main/javascript/packetfilter/Errors.js
===================================================================
--- branches/xml4script-port/trunk/src/main/javascript/packetfilter/Errors.js 2008-02-22 05:53:21 UTC (rev 687)
+++ branches/xml4script-port/trunk/src/main/javascript/packetfilter/Errors.js 2008-02-22 06:06:46 UTC (rev 688)
@@ -80,7 +80,7 @@
Xmpp4Js.PacketFilter.TerminalErrorPacketFilter.prototype = {
accept : function(bodyElement) {
- return bodyElement.getAttribute( "type" ) == "terminate" && Xmpp4Js.PacketFilter.TerminalErrorPacketFilter.conditions[ bodyElement.getAttribute("condition") ] != undefined;
+ return bodyElement.getAttribute( "type" ).toString() == "terminate" && Xmpp4Js.PacketFilter.TerminalErrorPacketFilter.conditions[ bodyElement.getAttribute("condition").toString() ] != undefined;
}
}
@@ -108,7 +108,7 @@
Xmpp4Js.PacketFilter.RecoverableErrorPacketFilter.prototype = {
accept : function(bodyElement) {
- return bodyElement.getAttribute( "type" ) == "error";
+ return bodyElement.getAttribute( "type" ).toString() == "error";
}
}
Modified: branches/xml4script-port/trunk/src/main/javascript/roster/RosterItemManager.js
===================================================================
--- branches/xml4script-port/trunk/src/main/javascript/roster/RosterItemManager.js 2008-02-22 05:53:21 UTC (rev 687)
+++ branches/xml4script-port/trunk/src/main/javascript/roster/RosterItemManager.js 2008-02-22 06:06:46 UTC (rev 688)
@@ -152,10 +152,10 @@
for ( var i=0; i < itemNodes.getLength(); i++ ) {
var item = itemNodes.item(i);
- var jid = item.getAttribute( "jid" );
- var name = item.getAttribute( "name" );
- var subscription = item.getAttribute( "subscription" ); // none, to, from, both, remove
- var ask = item.getAttribute( "ask" ); // subscribe, unsubscribe
+ var jid = item.getAttribute( "jid" ).toString();
+ var name = item.getAttribute( "name" ).toString();
+ var subscription = item.getAttribute( "subscription" ).toString(); // none, to, from, both, remove
+ var ask = item.getAttribute( "ask" ).toString(); // subscribe, unsubscribe
var groups = [];
@@ -197,9 +197,9 @@
for ( var i=0; i < itemNodes.getLength(); i++ ) {
var item = itemNodes.item(i);
- var name = item.getAttribute( "name" );
- var subscription = item.getAttribute( "subscription" ); // none, to, from, both, remove
- var ask = item.getAttribute( "ask" ); // subscribe, unsubscribe
+ var name = item.getAttribute( "name" ).toString();
+ var subscription = item.getAttribute( "subscription" ).toString(); // none, to, from, both, remove
+ var ask = item.getAttribute( "ask" ).toString(); // subscribe, unsubscribe
var groups = [];
Modified: branches/xml4script-port/trunk/src/main/javascript/transport/BOSH.js
===================================================================
--- branches/xml4script-port/trunk/src/main/javascript/transport/BOSH.js 2008-02-22 05:53:21 UTC (rev 687)
+++ branches/xml4script-port/trunk/src/main/javascript/transport/BOSH.js 2008-02-22 06:06:46 UTC (rev 688)
@@ -260,11 +260,11 @@
//this.un("recv", arguments.callee /* the current function */, this );
- this.sid = packetNode.getAttribute( "sid" );
- this.maxRequests = packetNode.getAttribute( "requests" );
+ this.sid = packetNode.getAttribute( "sid" ).toString();
+ this.maxRequests = packetNode.getAttribute( "requests" ).toString();
if( packetNode.hasAttribute("hold") ) {
- this.hold = packetNode.getAttribute("hold");
+ this.hold = packetNode.getAttribute("hold").toString();
} else {
// sensible default
this.hold = packetNode.maxRequests - 1;
@@ -272,7 +272,7 @@
if( packetNode.hasAttribute("wait") ) {
// FIXME ideally xhr's timeout should be updated
- this.wait = packetNode.getAttribute("wait");
+ this.wait = packetNode.getAttribute("wait").toString();
}
this.startup();
@@ -404,7 +404,7 @@
var condition = null;
if( packetNode != null ) {
- condition = packetNode.getAttribute( "condition" );
+ condition = packetNode.getAttribute( "condition" ).toString();
} else if( response.status != 200 ){
condition = "status."+response.status;
} else {
@@ -415,7 +415,7 @@
var message = Xmpp4Js.PacketFilter.TerminalErrorPacketFilter.conditions[ condition ].message;
this.fireEvent( "termerror", title, message, packetNode );
- } else if( packetNode.getAttribute("type") == "error" ) {
+ } else if( packetNode.getAttribute("type").toString() == "error" ) {
// 17.3 Recoverable Binding Conditions
// TODO this should attempt to resend all packets back
Modified: branches/xml4script-port/trunk/src/test/javascript/DomBuilderTest.html
===================================================================
--- branches/xml4script-port/trunk/src/test/javascript/DomBuilderTest.html 2008-02-22 05:53:21 UTC (rev 687)
+++ branches/xml4script-port/trunk/src/test/javascript/DomBuilderTest.html 2008-02-22 06:06:46 UTC (rev 688)
@@ -35,7 +35,7 @@
var elem = DomBuilder.node( ELEM_NAME, {"attr1": TEXT} );
assertTrue( elem.hasAttribute( "attr1" ) );
- assertEquals( TEXT, elem.getAttribute( "attr1" ) );
+ assertEquals( TEXT, elem.getAttribute( "attr1" ).toString() );
}
function testChildNodes() {
Modified: branches/xml4script-port/trunk/src/test/javascript/MUC_JoinTest.html
===================================================================
--- branches/xml4script-port/trunk/src/test/javascript/MUC_JoinTest.html 2008-02-22 05:53:21 UTC (rev 687)
+++ branches/xml4script-port/trunk/src/test/javascript/MUC_JoinTest.html 2008-02-22 06:06:46 UTC (rev 688)
@@ -49,8 +49,8 @@
// make a fake response
options.responsePacket = loadTestPacket( "packets/muc_roomlist.xml", function(packet) {
- packet.getElementsByTagName("iq" )[0].setAttribute( "id", txPacket.getElementsByTagName("iq" )[0].getAttribute( "id" ) );
- packet.getElementsByTagName("iq" )[0].setAttribute( "from", txPacket.getElementsByTagName("iq" )[0].getAttribute( "to" ) );
+ packet.getElementsByTagName("iq" )[0].setAttribute( "id", txPacket.getElementsByTagName("iq" )[0].getAttribute( "id" ).toString() );
+ packet.getElementsByTagName("iq" )[0].setAttribute( "from", txPacket.getElementsByTagName("iq" )[0].getAttribute( "to" ).toString() );
});
});
@@ -139,8 +139,8 @@
// make a fake response
options.responsePacket = loadTestPacket( "file://C:/Documents and Settings/Harlan/My Documents/NetBeansProjects/xmpp4js/trunk/target/jsunit/packets/muc_join.xml", function(packet) {
- packet.getElementsByTagName("presence" )[0].setAttribute( "id", txPacket.getElementsByTagName("presence" )[0].getAttribute( "id" ) );
- packet.getElementsByTagName("presence" )[0].setAttribute( "from", txPacket.getElementsByTagName("presence" )[0].getAttribute( "to" ) );
+ packet.getElementsByTagName("presence" )[0].setAttribute( "id", txPacket.getElementsByTagName("presence" )[0].getAttribute( "id" ).toString() );
+ packet.getElementsByTagName("presence" )[0].setAttribute( "from", txPacket.getElementsByTagName("presence" )[0].getAttribute( "to" ).toString() );
});
});
@@ -185,8 +185,8 @@
// make a fake response
options.responsePacket = loadTestPacket( "file://C:/Documents and Settings/Harlan/My Documents/NetBeansProjects/xmpp4js/trunk/target/jsunit/packets/muc_join_conflictingnick.xml", function(packet) {
- packet.getElementsByTagName("presence" )[0].setAttribute( "id", txPacket.getElementsByTagName("presence" )[0].getAttribute( "id" ) );
- packet.getElementsByTagName("presence" )[0].setAttribute( "from", txPacket.getElementsByTagName("presence" )[0].getAttribute( "to" ) );
+ packet.getElementsByTagName("presence" )[0].setAttribute( "id", txPacket.getElementsByTagName("presence" )[0].getAttribute( "id" ).toString() );
+ packet.getElementsByTagName("presence" )[0].setAttribute( "from", txPacket.getElementsByTagName("presence" )[0].getAttribute( "to" ).toString() );
});
});
@@ -219,8 +219,8 @@
// make a fake response
options.responsePacket = loadTestPacket( "file://C:/Documents and Settings/Harlan/My Documents/NetBeansProjects/xmpp4js/trunk/target/jsunit/packets/muc_join_roomfull.xml", function(packet) {
- packet.getElementsByTagName("presence" )[0].setAttribute( "id", txPacket.getElementsByTagName("presence" )[0].getAttribute( "id" ) );
- packet.getElementsByTagName("presence" )[0].setAttribute( "from", txPacket.getElementsByTagName("presence" )[0].getAttribute( "to" ) );
+ packet.getElementsByTagName("presence" )[0].setAttribute( "id", txPacket.getElementsByTagName("presence" )[0].getAttribute( "id" ).toString() );
+ packet.getElementsByTagName("presence" )[0].setAttribute( "from", txPacket.getElementsByTagName("presence" )[0].getAttribute( "to" ).toString() );
});
});
Modified: branches/xml4script-port/trunk/src/test/javascript/PacketHelperTest.html
===================================================================
--- branches/xml4script-port/trunk/src/test/javascript/PacketHelperTest.html 2008-02-22 05:53:21 UTC (rev 687)
+++ branches/xml4script-port/trunk/src/test/javascript/PacketHelperTest.html 2008-02-22 06:06:46 UTC (rev 688)
@@ -24,9 +24,9 @@
var packet = packetHelper.createPacket();
assertEquals( "body", packet.localName );
- assertEquals( null, packet.getAttribute("sid") );
- assertEquals( null, packet.getAttribute("rid") );
- assertEquals( "http://jabber.org/protocol/httpbind", packet.getAttribute("xmlns") );
+ assertEquals( null, packet.getAttribute("sid").toString() );
+ assertEquals( null, packet.getAttribute("rid").toString() );
+ assertEquals( "http://jabber.org/protocol/httpbind", packet.getAttribute("xmlns").toString() );
}
function testCreateIQ() {
@@ -37,8 +37,8 @@
assertEquals( "set", iq.getType() );
assertNotNull( iq.getQuery() );
assertNotNull( "query", iq.getQuery().localName );
- assertNotNull( iq.getQuery().getAttribute( "xmlns" ) );
- assertEquals( "jabber:iq:roster", iq.getQuery().getAttribute( "xmlns" ) );
+ assertNotNull( iq.getQuery().getAttribute( "xmlns" ).toString() );
+ assertEquals( "jabber:iq:roster", iq.getQuery().getAttribute( "xmlns" ).toString() );
assertEquals( "jabber:iq:roster", iq.getQueryXMLNS() );
}
Modified: branches/xml4script-port/trunk/src/test/javascript/broken/BOSHTransportTest.html
===================================================================
--- branches/xml4script-port/trunk/src/test/javascript/broken/BOSHTransportTest.html 2008-02-22 05:53:21 UTC (rev 687)
+++ branches/xml4script-port/trunk/src/test/javascript/broken/BOSHTransportTest.html 2008-02-22 06:06:46 UTC (rev 688)
@@ -99,7 +99,7 @@
pw.write( iq );
pw.flush();
assertTrue( txPacket.hasAttribute( "sid" ) );
- assertEquals( 1234, parseInt(txPacket.getAttribute( "sid" )) );
+ assertEquals( 1234, parseInt(txPacket.getAttribute( "sid" ).toString()) );
}
@@ -126,15 +126,15 @@
pw.write( iq );
pw.flush();
- assertEquals( initialRid, parseInt(txPacket.getAttribute( "rid" )) );
+ assertEquals( initialRid, parseInt(txPacket.getAttribute( "rid" ).toString()) );
pw.write( iq );
pw.flush();
- assertEquals( initialRid + 1, parseInt(txPacket.getAttribute( "rid" )) );
+ assertEquals( initialRid + 1, parseInt(txPacket.getAttribute( "rid" ).toString()) );
pw.write( iq );
pw.flush();
- assertEquals( initialRid + 2, parseInt(txPacket.getAttribute( "rid" )) );
+ assertEquals( initialRid + 2, parseInt(txPacket.getAttribute( "rid" ).toString()) );
}
Modified: branches/xml4script-port/trunk/src/test/javascript/common-test-library.js
===================================================================
--- branches/xml4script-port/trunk/src/test/javascript/common-test-library.js 2008-02-22 05:53:21 UTC (rev 687)
+++ branches/xml4script-port/trunk/src/test/javascript/common-test-library.js 2008-02-22 06:06:46 UTC (rev 688)
@@ -204,7 +204,7 @@
if( response.status != 200 ) {
var condition = null;
if( packetNode != null ) {
- condition = packetNode.getAttribute( "condition" );
+ condition = packetNode.getAttribute( "condition" ).toString();
} else if( response.status != 200 ){
condition = "status."+response.status;
} else {
@@ -215,7 +215,7 @@
var message = Xmpp4Js.PacketFilter.TerminalErrorPacketFilter.conditions[ condition ].message;
this.fireEvent( "termerror", title, message, packetNode );
- } else if( packetNode.getAttribute("type") == "error" ) {
+ } else if( packetNode.getAttribute("type").toString() == "error" ) {
this.fireEvent( "error", packetNode );
} else {
this.fireEvent( "recv", packetNode );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <h-i...@us...> - 2008-02-22 05:53:16
|
Revision: 687
http://xmpp4js.svn.sourceforge.net/xmpp4js/?rev=687&view=rev
Author: h-iverson
Date: 2008-02-21 21:53:21 -0800 (Thu, 21 Feb 2008)
Log Message:
-----------
changed textContent = to setTextContent. also changed instanceof Element to instanceof DOMElement
Modified Paths:
--------------
branches/xml4script-port/trunk/src/assembler/xmpp4js.xml
branches/xml4script-port/trunk/src/main/javascript/DomBuilder.js
branches/xml4script-port/trunk/src/main/javascript/ext/DataStorage.js
branches/xml4script-port/trunk/src/main/javascript/ext/ServiceDisco.js
branches/xml4script-port/trunk/src/main/javascript/packet/Base.js
branches/xml4script-port/trunk/src/main/javascript/packet/Registration.js
branches/xml4script-port/trunk/src/main/javascript/roster/RosterItemManager.js
branches/xml4script-port/trunk/src/main/javascript/roster/RosterPacket.js
branches/xml4script-port/trunk/src/main/javascript/transport/BOSH.js
branches/xml4script-port/trunk/src/test/javascript/DomBuilderTest.html
branches/xml4script-port/trunk/src/test/javascript/DomHacksTest.html
branches/xml4script-port/trunk/src/test/javascript/PacketHelperTest.html
branches/xml4script-port/trunk/src/test/javascript/broken/BOSHTransportTest.html
Added Paths:
-----------
branches/xml4script-port/trunk/nbactions.xml
Added: branches/xml4script-port/trunk/nbactions.xml
===================================================================
--- branches/xml4script-port/trunk/nbactions.xml (rev 0)
+++ branches/xml4script-port/trunk/nbactions.xml 2008-02-22 05:53:21 UTC (rev 687)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+ <action>
+ <actionName>build</actionName>
+ <packagings>
+ <packaging>*</packaging>
+ </packagings>
+ <goals>
+ <goal>install</goal>
+ </goals>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+ </action>
+ </actions>
Modified: branches/xml4script-port/trunk/src/assembler/xmpp4js.xml
===================================================================
--- branches/xml4script-port/trunk/src/assembler/xmpp4js.xml 2008-02-22 00:54:23 UTC (rev 686)
+++ branches/xml4script-port/trunk/src/assembler/xmpp4js.xml 2008-02-22 05:53:21 UTC (rev 687)
@@ -5,6 +5,7 @@
<fileName>xmpp4js.js</fileName>
<includes>
<!-- utils -->
+ <include>console.js</include>
<include>Jid.js</include>
<include>msie-createElementNS.js</include>
<include>DomBuilder.js</include>
Modified: branches/xml4script-port/trunk/src/main/javascript/DomBuilder.js
===================================================================
--- branches/xml4script-port/trunk/src/main/javascript/DomBuilder.js 2008-02-22 00:54:23 UTC (rev 686)
+++ branches/xml4script-port/trunk/src/main/javascript/DomBuilder.js 2008-02-22 05:53:21 UTC (rev 687)
@@ -55,7 +55,7 @@
// if content is set, append it to childElements
if(content) {
// if content isn't an element, create a text node for it
- if( !(content instanceof Element) ) {
+ if( !(content instanceof DOMElement) ) {
content = parentDoc.createTextNode( content );
}
Modified: branches/xml4script-port/trunk/src/main/javascript/ext/DataStorage.js
===================================================================
--- branches/xml4script-port/trunk/src/main/javascript/ext/DataStorage.js 2008-02-22 00:54:23 UTC (rev 686)
+++ branches/xml4script-port/trunk/src/main/javascript/ext/DataStorage.js 2008-02-22 05:53:21 UTC (rev 687)
@@ -30,7 +30,7 @@
contentNode.setAttribute( "xmlns", xmlns );
if( typeof(data) == 'string' ) {
- contentNode.textContent = data;
+ contentNode.setTextContent( data );
} else {
contentNode.appendChild( data );
}
Modified: branches/xml4script-port/trunk/src/main/javascript/ext/ServiceDisco.js
===================================================================
--- branches/xml4script-port/trunk/src/main/javascript/ext/ServiceDisco.js 2008-02-22 00:54:23 UTC (rev 686)
+++ branches/xml4script-port/trunk/src/main/javascript/ext/ServiceDisco.js 2008-02-22 05:53:21 UTC (rev 687)
@@ -363,8 +363,8 @@
var query = iq.getQuery();
- query.appendChild( iq.getDoc().createElement( "username" ) ).textContent = screenName;
- query.appendChild( iq.getDoc().createElement( "password" ) ).textContent = password;
+ query.appendChild( iq.getDoc().createElement( "username" ) ).setTextContent( screenName );
+ query.appendChild( iq.getDoc().createElement( "password" ) ).setTextContent( password );
con.send( iq, function( packet ) {
if( packet.getType() == "error" ) {
Modified: branches/xml4script-port/trunk/src/main/javascript/packet/Base.js
===================================================================
--- branches/xml4script-port/trunk/src/main/javascript/packet/Base.js 2008-02-22 00:54:23 UTC (rev 686)
+++ branches/xml4script-port/trunk/src/main/javascript/packet/Base.js 2008-02-22 05:53:21 UTC (rev 687)
@@ -133,11 +133,11 @@
childNode = DomBuilder.node( elemName );
childNode = this.elem.appendChild( childNode );
}
- if( content instanceof Element ) {
+ if( content instanceof DOMElement ) {
var importedContent = this.elem.ownerDocument.importNode( content, true );
childNode.appendChild( importedContent );
} else {
- childNode.textContent = content;
+ childNode.setTextContent( content );
}
},
@@ -157,7 +157,7 @@
var content = null;
if( node ) {
- content = node.textContent;
+ content = node.getStringValue();
}
if( content == null || content == "" ) {
Modified: branches/xml4script-port/trunk/src/main/javascript/packet/Registration.js
===================================================================
--- branches/xml4script-port/trunk/src/main/javascript/packet/Registration.js 2008-02-22 00:54:23 UTC (rev 686)
+++ branches/xml4script-port/trunk/src/main/javascript/packet/Registration.js 2008-02-22 05:53:21 UTC (rev 687)
@@ -13,7 +13,7 @@
for( var k in fields ) {
var child = queryNode.ownerDocument.createElement( k );
- child.textContent = fields[k];
+ child.setTextContent( fields[k] );
queryNode.appendChild( child );
}
Modified: branches/xml4script-port/trunk/src/main/javascript/roster/RosterItemManager.js
===================================================================
--- branches/xml4script-port/trunk/src/main/javascript/roster/RosterItemManager.js 2008-02-22 00:54:23 UTC (rev 686)
+++ branches/xml4script-port/trunk/src/main/javascript/roster/RosterItemManager.js 2008-02-22 05:53:21 UTC (rev 687)
@@ -162,7 +162,7 @@
var groupNodes = item.getElementsByTagName("group");
for( var j = 0; j < groupNodes.getLength(); j++ ) {
var node = groupNodes.item(j);
- groups.push( node.childNodes.item(0).toString() );
+ groups.push( node.getStringValue() );
}
this.update( jid, name, subscription, ask, groups );
@@ -206,7 +206,7 @@
var groupNodes = item.getElementsByTagName("group");
for( var j = 0; j < groupNodes.getLength(); j++ ) {
var node = groupNodes.item(j);
- groups.push( node.childNodes.item(0).toString() );
+ groups.push( node.getStringValue() );
}
this.update( jid, name, subscription, ask, groups );
Modified: branches/xml4script-port/trunk/src/main/javascript/roster/RosterPacket.js
===================================================================
--- branches/xml4script-port/trunk/src/main/javascript/roster/RosterPacket.js 2008-02-22 00:54:23 UTC (rev 686)
+++ branches/xml4script-port/trunk/src/main/javascript/roster/RosterPacket.js 2008-02-22 05:53:21 UTC (rev 687)
@@ -33,7 +33,7 @@
var group = groups[i];
var groupNode = item.appendChild( doc.createElement( "group" ) );
groupNode.setAttribute( "xmlns", "jabber:iq:roster" );
- groupNode.textContent = group;
+ groupNode.setTextContent( group );
}
}
}
Modified: branches/xml4script-port/trunk/src/main/javascript/transport/BOSH.js
===================================================================
--- branches/xml4script-port/trunk/src/main/javascript/transport/BOSH.js 2008-02-22 00:54:23 UTC (rev 686)
+++ branches/xml4script-port/trunk/src/main/javascript/transport/BOSH.js 2008-02-22 05:53:21 UTC (rev 687)
@@ -344,7 +344,7 @@
this.addFrameData( packetNode );
- var xml = serializeNode(packetNode);
+ var xml = packetNode.toString();
this.openRequestCount++;
Modified: branches/xml4script-port/trunk/src/test/javascript/DomBuilderTest.html
===================================================================
--- branches/xml4script-port/trunk/src/test/javascript/DomBuilderTest.html 2008-02-22 00:54:23 UTC (rev 686)
+++ branches/xml4script-port/trunk/src/test/javascript/DomBuilderTest.html 2008-02-22 05:53:21 UTC (rev 687)
@@ -53,7 +53,7 @@
var textNode = elem.childNodes[0];
assertEquals( NODETYPE_TEXT, textNode.nodeType );
- assertEquals( TEXT, textNode.textContent );
+ assertEquals( TEXT, textNode.getStringValue() );
}
function testChildNodesAndTextContent() {
@@ -65,7 +65,7 @@
var textNode = elem.childNodes[1];
assertEquals( NODETYPE_TEXT, textNode.nodeType );
- assertEquals( TEXT, textNode.textContent );
+ assertEquals( TEXT, textNode.getStringValue() );
}
function testParentDoc() {
Modified: branches/xml4script-port/trunk/src/test/javascript/DomHacksTest.html
===================================================================
--- branches/xml4script-port/trunk/src/test/javascript/DomHacksTest.html 2008-02-22 00:54:23 UTC (rev 686)
+++ branches/xml4script-port/trunk/src/test/javascript/DomHacksTest.html 2008-02-22 05:53:21 UTC (rev 687)
@@ -36,7 +36,7 @@
var elem2 = doc2.importNode( elem, true );
- assertTrue( elem2 instanceof Element );
+ assertTrue( elem2 instanceof DOMElement );
// jsunit bug?
//assertObjectEquals( elem2.ownerDocument, doc2 );
assertNotEquals( elem, elem2 );
Modified: branches/xml4script-port/trunk/src/test/javascript/PacketHelperTest.html
===================================================================
--- branches/xml4script-port/trunk/src/test/javascript/PacketHelperTest.html 2008-02-22 00:54:23 UTC (rev 686)
+++ branches/xml4script-port/trunk/src/test/javascript/PacketHelperTest.html 2008-02-22 05:53:21 UTC (rev 687)
@@ -62,7 +62,7 @@
assertEquals( "message", packet.getNode().localName );
assertEquals( "te...@te...", packet.getTo() );
assertEquals( "normal", packet.getType() );
- assertEquals( bodyNode.textContent, packet.getBodyNode().textContent );
+ assertEquals( bodyNode.getStringValue(), packet.getBodyNode().getStringValue() );
assertEquals( "subject", packet.getSubject() );
}
Modified: branches/xml4script-port/trunk/src/test/javascript/broken/BOSHTransportTest.html
===================================================================
--- branches/xml4script-port/trunk/src/test/javascript/broken/BOSHTransportTest.html 2008-02-22 00:54:23 UTC (rev 686)
+++ branches/xml4script-port/trunk/src/test/javascript/broken/BOSHTransportTest.html 2008-02-22 05:53:21 UTC (rev 687)
@@ -49,7 +49,7 @@
// make sure that txPacket is an Element
assertNotUndefined( txPacket );
- assertTrue( txPacket instanceof Element );
+ assertTrue( txPacket instanceof DOMElement );
// make sure we are adding attributes to raw packets
assertTrue( txPacket.hasAttribute( "rid" ) );
@@ -76,7 +76,7 @@
pw.flush();
assertNotUndefined( txPacket );
- assertTrue( txPacket instanceof Element );
+ assertTrue( txPacket instanceof DOMElement );
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <h-i...@us...> - 2008-02-22 00:54:45
|
Revision: 686
http://xmpp4js.svn.sourceforge.net/xmpp4js/?rev=686&view=rev
Author: h-iverson
Date: 2008-02-21 16:54:23 -0800 (Thu, 21 Feb 2008)
Log Message:
-----------
made BOSH transport test work. will add more tests later, just wanted it to be ready. added write event to BOSHTransport. added beginSession with response to MockBOSHTransport
Modified Paths:
--------------
trunk/src/main/javascript/transport/BOSH.js
trunk/src/test/javascript/common-test-library.js
Added Paths:
-----------
trunk/src/test/javascript/BOSHTransportTest.html
Removed Paths:
-------------
trunk/src/test/javascript/broken/BOSHTransportTest.html
Modified: trunk/src/main/javascript/transport/BOSH.js
===================================================================
--- trunk/src/main/javascript/transport/BOSH.js 2008-02-21 05:40:03 UTC (rev 685)
+++ trunk/src/main/javascript/transport/BOSH.js 2008-02-22 00:54:23 UTC (rev 686)
@@ -167,7 +167,18 @@
*/
recv : true,
+
/**
+ * @event write
+ * @param {DomElement} the body element of the node about to be written.
+ *
+ * A packet node is about to be written. It includes all frame data, but
+ * the event is fired just before the open request count is incremented.
+ */
+ write : true,
+
+
+ /**
* @event error
* @param {DomElement} the body element of the node received.
*
@@ -346,6 +357,8 @@
var xml = serializeNode(packetNode);
+ this.fireEvent( "write", packetNode );
+
this.openRequestCount++;
this.xhr.request({
Copied: trunk/src/test/javascript/BOSHTransportTest.html (from rev 671, trunk/src/test/javascript/broken/BOSHTransportTest.html)
===================================================================
--- trunk/src/test/javascript/BOSHTransportTest.html (rev 0)
+++ trunk/src/test/javascript/BOSHTransportTest.html 2008-02-22 00:54:23 UTC (rev 686)
@@ -0,0 +1,126 @@
+<html>
+ <head>
+ <title>JSUnit - RosterWindowTest</title>
+ <script language="javascript" src="app/jsUnitCore.js"></script>
+
+ <script type="text/javascript" src="includes.js"></script>
+ <script type="text/javascript" src="common-test-library.js"></script>
+
+ </head>
+ <body>
+ <script type="text/javascript">
+
+
+
+
+var bosh;
+
+function setUp() {
+ bosh = new MockBOSHTransport({
+ domain: "test.com"
+ });
+}
+function tearDown() {
+ bosh = null;
+}
+
+function testBeginSession() {
+ // setup variable to be caught on tx
+ var txPacket = undefined;
+
+ // create listener to catch outgoing packet
+ bosh.on( "write", function(packetNode) {
+ txPacket = packetNode;
+ });
+
+ bosh.beginSession();
+
+ // make sure that txPacket is an Element
+ assertNotUndefined( "txPacket was empty", txPacket );
+ assertTrue( "txPacket was not an element.", txPacket instanceof Element );
+
+ // make sure we are adding attributes to raw packets
+ assertEquals( "txPacket did not have correct wait", bosh.wait, txPacket.getAttribute( "wait" ) );
+ assertEquals( "txPacket did not have correct to", bosh.domain, txPacket.getAttribute( "to" ) );
+
+ assertEquals( "txPacket did not have correct BOSH version", "1.6", txPacket.getAttribute( "ver" ) );
+ assertEquals( "txPacket did not have correct xmpp version", "1.0", txPacket.getAttribute( "xmpp:version" ) );
+
+ assertTrue( "txPacket did not have a route", txPacket.hasAttribute( "route" ) );
+ assertTrue( "txPacket does not have a rid", txPacket.hasAttribute( "rid" ) );
+ assertFalse( "txPacket has a sid", txPacket.hasAttribute( "sid" ) );
+}
+
+function testWriteRaw() {
+
+ var packetHelper = new Xmpp4Js.Packet.PacketHelper();
+
+ // create raw packet with IQ element
+ var packet = packetHelper.createPacket();
+ var iq = packetHelper.createIQ( "te...@te...", "set", "jabber:iq:roster" );
+
+ packet.appendChild( iq.getNode() );
+
+ // setup variable to be caught on tx
+ var txPacket = undefined;
+
+ bosh.beginSession();
+
+ // create listener to catch outgoing packet
+ bosh.on( "write", function(packetNode) {
+ txPacket = packetNode;
+ });
+
+ // send the packet
+ bosh.write( packet );
+
+ // make sure that txPacket is an Element
+ assertNotUndefined( "txPacket was empty", txPacket );
+ assertTrue( "txPacket was not an element.", txPacket instanceof Element );
+
+ // make sure we are adding attributes to raw packets
+ assertTrue( "txPacket did not have an RID", txPacket.hasAttribute( "rid" ) );
+ assertTrue( "txPacket did not have an SID", txPacket.hasAttribute( "sid" ) );
+}
+
+function testWrite_RID() {
+ var packetHelper = new Xmpp4Js.Packet.PacketHelper();
+
+ // create raw packet with IQ element
+ var packet = packetHelper.createPacket();
+ var iq = packetHelper.createIQ( "te...@te...", "set", "jabber:iq:roster" );
+
+ packet.appendChild( iq.getNode() );
+
+ bosh.beginSession();
+
+
+
+ var inititalRid = null;
+
+ bosh.on( "write", function(packetNode) {
+ inititalRid = parseInt(packetNode.getAttribute( "rid" ));
+ }, this, {single:true});
+
+ bosh.write( packet );
+
+ assertNotNull( "no intitial RID was set", inititalRid );
+
+ var nextRid = null;
+ bosh.on( "write", function(packetNode) {
+ nextRid = parseInt(packetNode.getAttribute( "rid" ));
+ }, this);
+
+ bosh.write( packet );
+ assertEquals( "Rid did not increment 1", inititalRid + 1, nextRid );
+
+ bosh.write( packet );
+ assertEquals( "Rid did not increment 2", inititalRid + 2, nextRid );
+}
+
+
+ </script>
+ </body>
+</html>
+
+
Deleted: trunk/src/test/javascript/broken/BOSHTransportTest.html
===================================================================
--- trunk/src/test/javascript/broken/BOSHTransportTest.html 2008-02-21 05:40:03 UTC (rev 685)
+++ trunk/src/test/javascript/broken/BOSHTransportTest.html 2008-02-22 00:54:23 UTC (rev 686)
@@ -1,145 +0,0 @@
-<html>
- <head>
- <title>JSUnit - RosterWindowTest</title>
- <script language="javascript" src="app/jsUnitCore.js"></script>
-
- <script type="text/javascript" src="includes.js"></script>
- <script type="text/javascript" src="common-test-library.js"></script>
-
- </head>
- <body>
- <script type="text/javascript">
-
-
-
-
-var pw;
-
-function setUp() {
- setupMockRequestPool();
-
- pw = new Xmpp4Js.IO.PacketWriter("/http-bind/");
-}
-function tearDown() {
- pw = null;
-}
-function testWriteRaw() {
-
- var packetHelper = new Xmpp4Js.Packet.PacketHelper();
-
- // create raw packet with IQ element
- var packet = packetHelper.createPacket();
- var iq = packetHelper.createIQ( "te...@te...", "set", "jabber:iq:roster" );
-
- packet.appendChild( iq.getNode() );
-
- // setup variable to be caught on tx
- var txPacket = undefined;
-
- // create listener to catch outgoing packet
- pw.getConnection().addListener( "beforerequest", function(conn, options) {
- txPacket = options.xmlNode;
- });
-
- pw.sid = 1234;
-
- // write the packet
- pw.writeRaw( packet );
- pw.flush();
-
- // make sure that txPacket is an Element
- assertNotUndefined( txPacket );
- assertTrue( txPacket instanceof Element );
-
- // make sure we are adding attributes to raw packets
- assertTrue( txPacket.hasAttribute( "rid" ) );
- assertTrue( txPacket.hasAttribute( "sid" ) );
-}
-
-
-function testWrite_ElementType() {
-
- var packetHelper = new Xmpp4Js.Packet.PacketHelper();
-
- var iq = packetHelper.createIQ( "te...@te...", "set", "jabber:iq:roster" );
-
- var txPacket = undefined;
-
- // create listener to catch outgoing packet
- pw.getConnection().addListener( "beforerequest", function(conn, options) {
- txPacket = options.xmlNode;
- });
-
- pw.sid = 1234;
-
- pw.write( iq );
- pw.flush();
-
- assertNotUndefined( txPacket );
- assertTrue( txPacket instanceof Element );
-}
-
-
-
-function testWrite_SID() {
-
- var packetHelper = new Xmpp4Js.Packet.PacketHelper();
-
- var iq = packetHelper.createIQ( "te...@te...", "set", "jabber:iq:roster" );
-
- // setup variable to be caught on tx
- var txPacket = undefined;
-
- // create listener to catch outgoing packet
- pw.getConnection().addListener( "beforerequest", function(conn, options) {
- txPacket = options.xmlNode;
- });
-
- pw.sid = 1234;
- pw.write( iq );
- pw.flush();
- assertTrue( txPacket.hasAttribute( "sid" ) );
- assertEquals( 1234, parseInt(txPacket.getAttribute( "sid" )) );
-}
-
-
-function testWrite_RID() {
-
- var initialRid = 1;
- var packetHelper = new Xmpp4Js.Packet.PacketHelper();
-
- var iq = packetHelper.createIQ( "te...@te...", "set", "jabber:iq:roster" );
-
- // setup variable to be caught on tx
- var txPacket = undefined;
-
- // create listener to catch outgoing packet
- pw.getConnection().addListener( "beforerequest", function(conn, options) {
- txPacket = options.xmlNode;
- console.info( "beforerequest for RID" );
- console.dir( options );
- });
-
- pw.sid = 1234;
- pw.rid = initialRid;
-
- pw.write( iq );
- pw.flush();
-
- assertEquals( initialRid, parseInt(txPacket.getAttribute( "rid" )) );
-
- pw.write( iq );
- pw.flush();
- assertEquals( initialRid + 1, parseInt(txPacket.getAttribute( "rid" )) );
-
- pw.write( iq );
- pw.flush();
- assertEquals( initialRid + 2, parseInt(txPacket.getAttribute( "rid" )) );
-}
-
-
- </script>
- </body>
-</html>
-
-
Modified: trunk/src/test/javascript/common-test-library.js
===================================================================
--- trunk/src/test/javascript/common-test-library.js 2008-02-21 05:40:03 UTC (rev 685)
+++ trunk/src/test/javascript/common-test-library.js 2008-02-22 00:54:23 UTC (rev 686)
@@ -94,6 +94,20 @@
send: function() {
MockBOSHTransport.superclass.send.call( this, arguments );
this.sendQueue();
+ },
+
+ beginSession: function() {
+ MockBOSHTransport.superclass.beginSession.call( this );
+
+ var packetNode = DomBuilder.node( "body", {
+ xmlns: "http://jabber.org/protocol/httpbind",
+ sid: "1234",
+ requests: "2",
+ hold: "1",
+ wait: "60"
+ });
+
+ this.onBeginSessionResponse( packetNode );
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <h-i...@us...> - 2008-02-21 05:40:03
|
Revision: 685
http://xmpp4js.svn.sourceforge.net/xmpp4js/?rev=685&view=rev
Author: h-iverson
Date: 2008-02-20 21:40:03 -0800 (Wed, 20 Feb 2008)
Log Message:
-----------
added condition for network failure, addressing issue #1897413
Modified Paths:
--------------
trunk/src/main/javascript/transport/BOSH.js
Modified: trunk/src/main/javascript/transport/BOSH.js
===================================================================
--- trunk/src/main/javascript/transport/BOSH.js 2008-02-19 07:23:03 UTC (rev 684)
+++ trunk/src/main/javascript/transport/BOSH.js 2008-02-21 05:40:03 UTC (rev 685)
@@ -405,6 +405,8 @@
var condition = null;
if( packetNode != null ) {
condition = packetNode.getAttribute( "condition" );
+ } else if( !response.status ) {
+ condition = "undefined-condition";
} else if( response.status != 200 ){
condition = "status."+response.status;
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|