Changed class name 'Substatement' to 'SubStatement'

Author: Chris Hooks

test/remote_lrs_test.py

@@ -19,7 +19,7 @@
 from tincan.context_activities import ContextActivities
 from tincan.score import Score
 from tincan.result import Result
-from tincan.substatement import Substatement
+from tincan.substatement import SubStatement
 from tincan.statement_ref import StatementRef
 from tincan.about import About
 from tincan.statements_result import StatementsResult
@@ -90,7 +90,7 @@ def setUp(self):
                 duration="PT120S"
             )
 
-            self.substatement = Substatement(
+            self.substatement = SubStatement(
                 actor=self.agent,
                 verb=self.verb,
                 object=self.activity,

test/statement_test.py

@@ -27,7 +27,7 @@
 from tincan.result import Result
 from tincan.context import Context
 from tincan.attachment import Attachment
-from tincan.substatement import Substatement
+from tincan.substatement import SubStatement
 from tincan.activity import Activity
 from tincan.statement_ref import StatementRef
 
@@ -307,8 +307,8 @@ def test_InitAgentObject(self):
         self.assertIsNone(statement.authority)
         self.agentVerificationHelper(statement.object)
 
-    def test_InitSubstatementObject(self):
-        statement = Statement(object=Substatement(object_type='Substatement'))
+    def test_InitSubStatementObject(self):
+        statement = Statement(object=SubStatement(object_type='SubStatement'))
         self.assertIsNone(statement.id)
         self.assertIsNone(statement.verb)
         self.assertIsNone(statement.actor)
@@ -457,7 +457,7 @@ def attachmentVerificationHelper(self, value):
         self.assertEqual(value.usage_type, 'test')
 
     def substatementVerificationHelper(self, value):
-        self.assertIsInstance(value, Substatement)
+        self.assertIsInstance(value, SubStatement)
         self.assertEqual(value.object_type, 'SubStatement')
 
     def statementrefVerificationHelper(self, value):

test/substatement_test.py

@@ -21,89 +21,89 @@
 from tincan.verb import Verb
 from tincan.statement_ref import StatementRef
 from tincan.activity import Activity
-from tincan.substatement import Substatement
+from tincan.substatement import SubStatement
 
-class SubstatementTest(unittest.TestCase):
+class SubStatementTest(unittest.TestCase):
 
     def test_InitAnonAgentActor(self):
-        substatement = Substatement(actor={'object_type':'Agent', 'name':'test'})
+        substatement = SubStatement(actor={'object_type':'Agent', 'name':'test'})
         self.agentVerificationHelper(substatement.actor)
 
     def test_InitAnonGroupActor(self):
-        substatement = Substatement(actor={'object_type':'Group', 'member':[{"name":"test"}]})
+        substatement = SubStatement(actor={'object_type':'Group', 'member':[{"name":"test"}]})
         self.groupVerificationHelper(substatement.actor)
 
     def test_InitAnonVerb(self):
-        substatement = Substatement(verb={'id':'test'})
+        substatement = SubStatement(verb={'id':'test'})
         self.verbVerificationHelper(substatement.verb)
 
     def test_InitAnonObject(self):
-        substatement = Substatement(object={'id':'test'})
+        substatement = SubStatement(object={'id':'test'})
         self.activityVerificationHelper(substatement.object)
 
     def test_InitAnonAgentObject(self):
-        substatement = Substatement(object={'object_type':'Agent', 'name':'test'})
+        substatement = SubStatement(object={'object_type':'Agent', 'name':'test'})
         self.agentVerificationHelper(substatement.object)
 
     def test_InitDifferentNamingObject(self):
-        substatement = Substatement(object={'objectType':'Agent', 'name':'test'})
+        substatement = SubStatement(object={'objectType':'Agent', 'name':'test'})
         self.agentVerificationHelper(substatement.object)
 
     def test_InitObjectType(self):
-        substatement = Substatement(object_type="SubStatement")
+        substatement = SubStatement(object_type="SubStatement")
         self.assertEqual(substatement.object_type, "SubStatement")
 
     def test_InitAgentActor(self):
-        substatement = Substatement(actor=Agent(name='test'))
+        substatement = SubStatement(actor=Agent(name='test'))
         self.agentVerificationHelper(substatement.actor)
 
     def test_InitGroupActor(self):
-        substatement = Substatement(actor=Group(member=[Agent(name='test')]))
+        substatement = SubStatement(actor=Group(member=[Agent(name='test')]))
         self.groupVerificationHelper(substatement.actor)
 
     def test_InitVerb(self):
-        substatement = Substatement(verb=Verb(id='test'))
+        substatement = SubStatement(verb=Verb(id='test'))
         self.verbVerificationHelper(substatement.verb)
 
     def test_InitAgentObject(self):
-        substatement = Substatement(object=Agent(name='test'))
+        substatement = SubStatement(object=Agent(name='test'))
         self.agentVerificationHelper(substatement.object)
 
     def test_InitGroupObject(self):
-        substatement = Substatement(object=Group(member=[Agent(name='test')]))
+        substatement = SubStatement(object=Group(member=[Agent(name='test')]))
         self.groupVerificationHelper(substatement.object)
 
     def test_InitActivityObject(self):
-        substatement = Substatement(object=Activity(id='test'))
+        substatement = SubStatement(object=Activity(id='test'))
         self.activityVerificationHelper(substatement.object)
 
     def test_InitUnpack(self):
         obj = {'object_type':'SubStatement', 'actor':{'name':'test'}, 'verb':{'id':'test'}, 'object':{'id':'test'}}
-        substatement = Substatement(**obj)
+        substatement = SubStatement(**obj)
         self.assertEqual(substatement.object_type, 'SubStatement')
         self.agentVerificationHelper(substatement.actor)
         self.verbVerificationHelper(substatement.verb)
         self.activityVerificationHelper(substatement.object)
 
     def test_FromJSON(self):
         json_str = '{"object_type":"SubStatement", "actor":{"name":"test"}, "verb":{"id":"test"}, "object":{"id":"test"}}'
-        substatement = Substatement.from_json(json_str)
+        substatement = SubStatement.from_json(json_str)
         self.assertEqual(substatement.object_type, 'SubStatement')
         self.agentVerificationHelper(substatement.actor)
         self.verbVerificationHelper(substatement.verb)
         self.activityVerificationHelper(substatement.object)
 
     def test_ToJSONEmpty(self):
-        substatement = Substatement()
+        substatement = SubStatement()
         self.assertEqual(substatement.to_json(), '{"objectType": "SubStatement"}')
 
     def test_ToJSON(self):
-        substatement = Substatement(object_type='SubStatement', actor=Agent(name='test'), verb=Verb(id='test'), object=Activity(id='test'))
+        substatement = SubStatement(object_type='SubStatement', actor=Agent(name='test'), verb=Verb(id='test'), object=Activity(id='test'))
         self.assertEqual(substatement.to_json(), '{"verb": {"id": "test"}, "object": {"id": "test"}, "actor": {"name": "test", "objectType": "Agent"}, "objectType": "SubStatement"}')
 
     def test_FromJSONToJSON(self):
         json_str = '{"object_type":"SubStatement", "actor":{"name":"test"}, "verb":{"id":"test"}, "object":{"id":"test"}}'
-        substatement = Substatement.from_json(json_str)
+        substatement = SubStatement.from_json(json_str)
         self.assertEqual(substatement.object_type, 'SubStatement')
         self.agentVerificationHelper(substatement.actor)
         self.verbVerificationHelper(substatement.verb)
@@ -133,5 +133,5 @@ def activityVerificationHelper(self, value):
         self.assertEqual(value.id, 'test')
 
 if __name__ == '__main__':
-    suite = unittest.TestLoader().loadTestsFromTestCase(SubstatementTest)
+    suite = unittest.TestLoader().loadTestsFromTestCase(SubStatementTest)
     unittest.TextTestRunner(verbosity=2).run(suite)

tincan/statement.py

@@ -24,7 +24,7 @@
 from tincan.attachment_list import AttachmentList
 from tincan.result import Result
 from tincan.context import Context
-from tincan.substatement import Substatement
+from tincan.substatement import SubStatement
 from tincan.statement_ref import StatementRef
 from tincan.activity import Activity
 from tincan.conversions.iso8601 import make_datetime
@@ -154,7 +154,7 @@ def object(self):
     @object.setter
     def object(self, value):
         if value is not None:
-            if not isinstance(value, Agent) and not isinstance(value, Group) and not isinstance(value, Substatement) and not isinstance(value, StatementRef) and not isinstance(value, Activity):
+            if not isinstance(value, Agent) and not isinstance(value, Group) and not isinstance(value, SubStatement) and not isinstance(value, StatementRef) and not isinstance(value, Activity):
                 if isinstance(value, dict):
                     if 'object_type' in value or 'objectType' in value:
                         if 'objectType' in value:
@@ -163,7 +163,7 @@ def object(self, value):
                         if value['object_type'] == 'Agent':
                             value = Agent(value)
                         elif value['object_type'] == 'SubStatement':
-                            value = Substatement(value)
+                            value = SubStatement(value)
                         elif value['object_type'] == 'StatementRef':
                             value = StatementRef(value)
                         elif value['object_type'] == 'Activity':

tincan/substatement.py

@@ -18,7 +18,7 @@
 from tincan.verb import Verb
 from tincan.activity import Activity
 
-class Substatement(SerializableBase):
+class SubStatement(SerializableBase):
 
     _props_req = [
         'object_type'
@@ -34,7 +34,7 @@ class Substatement(SerializableBase):
 
     @property
     def actor(self):
-        """Actor for Substatement
+        """Actor for SubStatement
 
         :setter: Tries to convert to Agent
         :setter type: :mod:`tincan.agent`
@@ -67,7 +67,7 @@ def actor(self):
 
     @property
     def verb(self):
-        """Verb for Substatement
+        """Verb for SubStatement
 
         :setter: Tries to convert to Verb
         :setter type: :mod:`tincan.verb`
@@ -88,7 +88,7 @@ def verb(self):
 
     @property
     def object(self):
-        """Object for Substatement
+        """Object for SubStatement
 
         :setter: Setter for object
         :setter type: :mod:`tincan.Agent` | :mod:`tincan.Group`
@@ -123,7 +123,7 @@ def object(self):
 
     @property
     def object_type(self):
-        """Object Type for Substatement. Will always be "SubStatement"
+        """Object Type for SubStatement. Will always be "SubStatement"
 
         :setter: Tries to convert to unicode
         :setter type: unicode