Merge remote-tracking branch 'upstream/master'

Author: Chris Hooks

test/remote_lrs_test.py

@@ -1,5 +1,6 @@
 import unittest
 import uuid
+from datetime import datetime
 from datetime import timedelta
 
 if __name__ == '__main__':
@@ -241,7 +242,8 @@ def test_retrieve_statement(self):
             object=self.activity,
             context=self.context,
             result=self.result,
-            id=str(uuid.uuid4())
+            id=str(uuid.uuid4()),
+            timestamp=datetime.utcnow()
         )
         save_resp = self.lrs.save_statement(statement)
 
@@ -258,7 +260,8 @@ def test_query_statements(self):
             verb=self.verb,
             object=self.parent,
             result=self.result,
-            id=str(uuid.uuid4())
+            id=str(uuid.uuid4()),
+            timestamp=datetime.utcnow()
         )
         self.lrs.save_statement(s1)
 
@@ -267,7 +270,8 @@ def test_query_statements(self):
             verb=self.verb,
             object=self.parent,
             result=self.result,
-            id=str(uuid.uuid4())
+            id=str(uuid.uuid4()),
+            timestamp=datetime.utcnow()
         )
         self.lrs.save_statement(s2)
 
@@ -276,7 +280,8 @@ def test_query_statements(self):
             verb=self.verb,
             object=self.parent,
             result=self.result,
-            id=str(uuid.uuid4())
+            id=str(uuid.uuid4()),
+            timestamp=datetime.utcnow()
         )
         self.lrs.save_statement(s3)
 
@@ -468,7 +473,7 @@ def test_delete_agent_profile(self):
 
     def shallow_compare(self, s1, s2, compare_ids=False):
         for k, v in vars(s1).iteritems():
-            if not k == '_id' or compare_ids:
+            if (not k == '_stored' and not k == '_authority') or compare_ids:
                 self.assertTrue(hasattr(s2, k))
                 if isinstance(v, Base):
                     self.shallow_compare(v, getattr(s2, k), True)

test/statements_result_test.py

@@ -15,25 +15,29 @@
 #    limitations under the License.
 
 import unittest
+import uuid
 
 if __name__ == '__main__':
     from main import setup_tincan_path
     setup_tincan_path()
 from tincan.statements_result import StatementsResult
+from tincan.statement import Statement
 from test_utils import TinCanBaseTestCase
 
 
 class StatementsResultTest(TinCanBaseTestCase):
     def test_serialize_deserialize(self):
         sr = StatementsResult()
-        sr.statements = [1, 2, 3, ]
+        uuid_str = '016699c6-d600-48a7-96ab-86187498f16f'
+        sr.statements = [Statement(id=uuid_str), Statement(id=uuid_str), Statement(id=uuid_str), ]
         sr.more = 'http://www.example.com/more/1234'
 
         self.assertSerializeDeserialize(sr)
 
     def test_serialize_deserialize_init(self):
+        uuid_str = '016699c6-d600-48a7-96ab-86187498f16f'
         data = {
-            'statements': [1, 2, 3, 4, ],
+            'statements': [Statement(id=uuid_str), Statement(id=uuid_str), Statement(id=uuid_str), Statement(id=uuid_str), ],
             'more': 'http://www.example.com/more/1234',
         }
 
@@ -44,11 +48,12 @@ def test_read_write(self):
         sr = StatementsResult()
         self.assertEqual(len(sr.statements), 0, 'Empty StatementsResult inited as non-empty!')
 
-        sr.statements = (1, 2, 3,)
+        uuid_str = '016699c6-d600-48a7-96ab-86187498f16f'
+        sr.statements = (Statement(id=uuid_str), Statement(id=uuid_str), Statement(id=uuid_str),)
         self.assertIsInstance(sr.statements, list, 'Did not convert tuple to list!')
 
-        sr.statements.append(4)
-        self.assertEqual(sr.statements[3], 4, 'Did not append value!')
+        sr.statements.append(Statement(id=uuid_str))
+        self.assertEqual(sr.statements[3].id, uuid.UUID('016699c6-d600-48a7-96ab-86187498f16f'), 'Did not append value!')
 
         self.assertIsNone(sr.more)
 
@@ -59,4 +64,4 @@ def test_read_write(self):
 
 if __name__ == '__main__':
     suite = unittest.TestLoader().loadTestsFromTestCase(StatementsResultTest)
-    unittest.TextTestRunner(verbosity=2).run(suite)
+    unittest.TextTestRunner(verbosity=2).run(suite)

tincan/statement_list.py

@@ -24,4 +24,4 @@
 
 class StatementList(TypedList):
 
-    _cls = Statement
+    _cls = Statement