Changeset 1684

Timestamp:

09/15/08 00:03:44 (3 months ago)

Author:

nick

Message:

Work so far

Location:

pyamf/branches/messaging-static-attrs-357/pyamf

Files:

• flex/messaging.py (modified) (7 diffs)
• tests/test_flex_messaging.py (modified) (2 diffs)

pyamf/branches/messaging-static-attrs-357/pyamf/flex/messaging.py

@@ -21 +21 @@
     'ErrorMessage'
 ]
+
+NAMESPACE = 'flex.messaging.messages'
 
 class AbstractMessage(object):
@@ -84 +86 @@
         return m + " />"
 
+pyamf.register_class(AbstractMessage, attrs=['body', 'clientId', 'destination',
+    'headers', 'messageId', 'timeToLive', 'timestamp'])
+
 class AsyncMessage(AbstractMessage):
     """
@@ -104 +109 @@
         self.correlationId = kwargs.get('correlationId', None)
 
+pyamf.register_class(AsyncMessage, '%s.%s' % (NAMESPACE, AsyncMessage.__name__),
+    attrs=['correlationId'], metadata=['amf3'])
+
 class AcknowledgeMessage(AsyncMessage):
     """
@@ -118 +126 @@
     #: generated an error.
     ERROR_HINT_HEADER = "DSErrorHint"
+
+pyamf.register_class(AcknowledgeMessage, '%s.%s' % (NAMESPACE, AcknowledgeMessage.__name__), metadata=['amf3'])
 
 class CommandMessage(AsyncMessage):
@@ -178 +188 @@
         self.messageRefType = kwargs.get('messageRefType', None)
 
+pyamf.register_class(CommandMessage, '%s.%s' % (NAMESPACE, CommandMessage.__name__),
+    attrs=['operation', 'messageRefType'], metadata=['amf3'])
+
 class ErrorMessage(AcknowledgeMessage):
     """
@@ -212 +225 @@
         self.rootCause = kwargs.get('rootCause', {})
 
+pyamf.register_class(ErrorMessage, '%s.%s' % (NAMESPACE, ErrorMessage.__name__),
+    attrs=['extendedData', 'faultCode', 'faultDetail', 'faultString'], metadata=['amf3'])
+
 class RemotingMessage(AbstractMessage):
     """
@@ -228 +244 @@
         self.source = kwargs.get('source', None)
 
-for x in (RemotingMessage, ErrorMessage, CommandMessage, AcknowledgeMessage, AsyncMessage):
-    pyamf.register_class(x, 'flex.messaging.messages.%s' % x.__name__, metadata=['amf3'])
-del x
+pyamf.register_class(RemotingMessage, '%s.%s' % (NAMESPACE, RemotingMessage.__name__),
+    attrs=['operation', 'source'], metadata=['amf3'])

pyamf/branches/messaging-static-attrs-357/pyamf/tests/test_flex_messaging.py

@@ -13 +13 @@
 
 from pyamf.flex import messaging
+import pyamf
 
 class AbstractMessageTestCase(unittest.TestCase):
@@ -25 +26 @@
             self.fail()
 
+class EncodingTestcase(unittest.TestCase):
+    def test_async_message(self):
+        m = messaging.AsyncMessage()
+
+        self.assertEquals(pyamf.encode(m).getvalue(), '')
+
 def suite():
     suite = unittest.TestSuite()
 
     suite.addTest(unittest.makeSuite(AbstractMessageTestCase))
+    suite.addTest(unittest.makeSuite(EncodingTestcase))
 
     return suite