Convert ActionReference to TypedField and add tests.

This fixes a bug that manifests itself in python-maec.

Author: gtback

cybox/bindings/cybox_core.py

@@ -1587,12 +1587,7 @@ def factory(*args_, **kwargs_):
     def get_action_id(self): return self.action_id
     def set_action_id(self, action_id): self.action_id = action_id
     def hasContent_(self):
-        if (
-
-            ):
-            return True
-        else:
-            return False
+        return False
     def export(self, lwrite, level, namespace_='cybox:', name_='ActionReferenceType', namespacedef_='', pretty_print=True):
         if pretty_print:
             eol_ = '\n'
@@ -1610,7 +1605,6 @@ def export(self, lwrite, level, namespace_='cybox:', name_='ActionReferenceType'
             lwrite('/>%s' % (eol_, ))
     def exportAttributes(self, lwrite, level, already_processed, namespace_='cybox:', name_='ActionReferenceType'):
         if self.action_id is not None:
-
             lwrite(' action_id=%s' % (quote_attrib(self.action_id), ))
     def exportChildren(self, lwrite, level, namespace_='cybox:', name_='ActionReferenceType', fromsubclass_=False, pretty_print=True):
         pass
@@ -1623,7 +1617,6 @@ def build(self, node):
     def buildAttributes(self, node, attrs, already_processed):
         value = find_attr_value_('action_id', node)
         if value is not None:
-
             self.action_id = value
     def buildChildren(self, child_, node, nodeName_, fromsubclass_=False):
         pass

cybox/core/action_reference.py

@@ -4,42 +4,16 @@
 """CybOX Action Reference Class"""
 
 import cybox
-import cybox.bindings.cybox_core as cybox_core_binding
+import cybox.bindings.cybox_core as core_binding
 
 
 class ActionReference(cybox.Entity):
+    _binding = core_binding
+    _binding_class = core_binding.ActionReferenceType
     _namespace = 'http://cybox.mitre.org/cybox-2'
 
+    action_id = cybox.TypedField("action_id")
+
     def __init__(self, action_id=None):
         super(ActionReference, self).__init__()
         self.action_id = action_id
-
-    def to_obj(self, return_obj=None, ns_info=None):
-        self._collect_ns_info(ns_info)
-
-        action_reference_obj = cybox_core_binding.ActionReferenceType()
-        if self.action_id is not None:
-            action_reference_obj.action_id = self.action_id
-        return action_reference_obj
-
-    def to_dict(self):
-        action_reference_dict = {}
-        if self.action_id is not None:
-            action_reference_dict['action_id'] = self.action_id
-        return action_reference_dict
-
-    @staticmethod
-    def from_dict(action_reference_dict):
-        if not action_reference_dict:
-            return None
-        action_reference_ = ActionReference()
-        action_reference_.action_id = action_reference_dict.get('action_id')
-        return action_reference_
-
-    @staticmethod
-    def from_obj(action_reference_obj):
-        if not action_reference_obj:
-            return None
-        action_reference_ = ActionReference()
-        action_reference_.action_id = action_reference_obj.action_id
-        return action_reference_

cybox/test/core/action_reference_test.py

@@ -0,0 +1,25 @@
+# Copyright (c) 2015, The MITRE Corporation. All rights reserved.
+# See LICENSE.txt for complete terms.
+
+import unittest
+
+from cybox.core import ActionReference
+from cybox.test import EntityTestCase
+
+
+class TestActionReference(EntityTestCase, unittest.TestCase):
+    klass = ActionReference
+    _full_dict = {
+        'action_id': "example:Action-1",
+    }
+
+    def test_construction(self):
+        aref = ActionReference(action_id="example:Action-1")
+        print aref.to_xml()
+        print aref.to_dict()
+        self.assertTrue("example:Action-1" in aref.to_xml())
+        self.assertTrue("example:Action-1" in aref.to_json())
+
+
+if __name__ == "__main__":
+    unittest.main()