Finalized remote_lrs_test

Nolan · Nolan · commit 509a538e4ffd · 2014-06-24T17:21:07.000-05:00
diff --git a/test/about_test.py b/test/about_test.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 #    Copyright 2014 Rustici Software
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/attachment_test.py b/test/attachment_test.py
diff --git a/test/conversions/iso8601_test.py b/test/conversions/iso8601_test.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 #    Copyright 2014 Rustici Software
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/extensions_test.py b/test/extensions_test.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 #    Copyright 2014 Rustici Software
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/http_request_test.py b/test/http_request_test.py
@@ -13,6 +13,10 @@
 #    limitations under the License.
 
 import unittest
+
+if __name__ == '__main__':
+    from main import setup_tincan_path
+    setup_tincan_path()
 from tincan.http_request import HTTPRequest
 
 
@@ -27,7 +31,6 @@ def tearDown(self):
     def test_init_empty(self):
         req = HTTPRequest()
         self.assertIsInstance(req, HTTPRequest)
-        self.assertFalse(hasattr(req, "endpoint"))
         self.assertFalse(hasattr(req, "content"))
         self.assertFalse(hasattr(req, "ignore404"))
 
@@ -48,14 +51,14 @@ def test_init_kwarg_exception(self):
             HTTPRequest(bad_test="test")
 
     def test_init_arg_exception_dict(self):
-        d = {"bad_test": "test", "endpoint": "ok"}
+        d = {"bad_test": "test", "resource": "ok"}
         with self.assertRaises(AttributeError):
             HTTPRequest(d)
 
     def test_init_arg_exception_obj(self):
         class Tester(object):
-            def __init__(self, endpoint="ok", bad_test="test"):
-                self.endpoint = endpoint
+            def __init__(self, resource="ok", bad_test="test"):
+                self.resource = resource
                 self.bad_test = bad_test
 
         obj = Tester()
@@ -65,13 +68,11 @@ def __init__(self, endpoint="ok", bad_test="test"):
 
     def test_init_partial(self):
         req = HTTPRequest(
-            endpoint="endpoint test",
             method="method test",
             query_params={"test": "val"}
         )
         self.assertIsInstance(req, HTTPRequest)
 
-        self.assertEqual(req.endpoint, "endpoint test")
         self.assertEqual(req.method, "method test")
         self.assertEqual(req.query_params, {"test": "val"})
 
@@ -86,7 +87,6 @@ def test_init_partial(self):
 
     def test_init_all(self):
         req = HTTPRequest(
-            endpoint="endpoint test",
             method="method test",
             resource="resource test",
             headers={"test": "val"},
@@ -96,7 +96,6 @@ def test_init_all(self):
         )
         self.assertIsInstance(req, HTTPRequest)
 
-        self.assertEqual(req.endpoint, "endpoint test")
         self.assertEqual(req.method, "method test")
         self.assertEqual(req.resource, "resource test")
         self.assertEqual(req.headers, {"test": "val"})
@@ -107,7 +106,6 @@ def test_init_all(self):
     def test_setters(self):
         req = HTTPRequest()
 
-        req.endpoint = "endpoint test"
         req.method = "method test"
         req.resource = "resource test"
         req.headers = {"test": "val"}
@@ -117,7 +115,6 @@ def test_setters(self):
 
         self.assertIsInstance(req, HTTPRequest)
 
-        self.assertEqual(req.endpoint, "endpoint test")
         self.assertEqual(req.method, "method test")
         self.assertEqual(req.resource, "resource test")
         self.assertEqual(req.headers, {"test": "val"})
@@ -128,7 +125,6 @@ def test_setters(self):
     def test_setters_none(self):
         req = HTTPRequest()
 
-        req.endpoint = None
         req.method = None
         req.resource = None
         req.headers = None
@@ -138,9 +134,6 @@ def test_setters_none(self):
 
         self.assertIsInstance(req, HTTPRequest)
 
-        self.assertTrue(hasattr(req, "endpoint"))
-        self.assertIsNone(req.endpoint)
-
         self.assertTrue(hasattr(req, "content"))
         self.assertIsNone(req.content)
 
diff --git a/test/lrs_response_test.py b/test/lrs_response_test.py
@@ -14,6 +14,10 @@
 
 import unittest
 import httplib
+
+if __name__ == '__main__':
+    from main import setup_tincan_path
+    setup_tincan_path()
 from tincan.lrs_response import LRSResponse
 from tincan.http_request import HTTPRequest
 
diff --git a/test/main.py b/test/main.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 #    Copyright 2014 Rustici Software
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/remote_lrs_test.py b/test/remote_lrs_test.py
@@ -1,3 +1,17 @@
+#    Copyright 2014 Rustici Software
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
 import unittest
 import uuid
 from datetime import datetime
@@ -260,7 +274,7 @@ def test_retrieve_statement(self):
         self.assertTrue(response.success)
         self._vars_verifier(response.content, statement, ['_authority', '_stored'])
 
-    def test_query_statements_UTC(self):
+    def test_query_statements(self):
         tstamp = utc.localize(datetime.utcnow())
         s1 = Statement(
             actor=self.agent,
@@ -312,13 +326,14 @@ def test_query_statements_UTC(self):
 
     def test_query_none(self):
         query = {
-            "agent": Agent(mbox="unique@tincanapi.com"),
+            "agent": self.agent,
             "verb": self.verb,
             "activity": self.parent,
             "related_activities": True,
             "related_agents": True,
             "format": "ids",
-            "limit": 2
+            "limit": 2,
+            "registration": unicode(uuid.uuid4()),
         }
         response = self.lrs.query_statements(query)
 
diff --git a/test/result_test.py b/test/result_test.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 #    Copyright 2014 Rustici Software
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/score_test.py b/test/score_test.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 #    Copyright 2014 Rustici Software
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/statements_result_test.py b/test/statements_result_test.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 #    Copyright 2014 Rustici Software
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test/substatement_test.py b/test/substatement_test.py
@@ -132,6 +132,7 @@ def activityVerificationHelper(self, value):
         self.assertIsInstance(value, Activity)
         self.assertEqual(value.id, 'test')
 
+
 if __name__ == '__main__':
     suite = unittest.TestLoader().loadTestsFromTestCase(SubStatementTest)
     unittest.TextTestRunner(verbosity=2).run(suite)
diff --git a/test/template_test.py.template b/test/template_test.py.template
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 #    Copyright 2014 Rustici Software
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tincan/context.py b/tincan/context.py
@@ -32,7 +32,6 @@
 
 class Context(SerializableBase):
 
-    _UUID_REGEX = re.compile('^[a-f0-9]{8}-[a-f0-9]{4}-[1-5][a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}$')
     _LANG_REGEX = re.compile('^(((([A-Za-z]{2,3}(-([A-Za-z]{3}(-[A-Za-z]{3}){0,2}))?)|[A-Za-z]{4}|[A-Za-z]{5,8})(-([A-Za-z]{4}))?(-([A-Za-z]{2}|[0-9]{3}))?(-([A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*(-([0-9A-WY-Za-wy-z](-[A-Za-z0-9]{2,8})+))*(-(x(-[A-Za-z0-9]{1,8})+))?)|(x(-[A-Za-z0-9]{1,8})+)|((en-GB-oed|i-ami|i-bnn|i-default|i-enochian|i-hak|i-klingon|i-lux|i-mingo|i-navajo|i-pwn|i-tao|i-tay|i-tsu|sgn-BE-FR|sgn-BE-NL|sgn-CH-DE)|(art-lojban|cel-gaulish|no-bok|no-nyn|zh-guoyu|zh-hakka|zh-min|zh-min-nan|zh-xiang)))$')
 
     _props = [
diff --git a/tincan/conversions/iso8601.py b/tincan/conversions/iso8601.py
@@ -135,7 +135,7 @@ def jsonify_timedelta(value):
 
 def make_datetime(value):
     """Tries to convert the given value to a :class:`datetime.datetime`. If
-    no timezone is given, makes a naive `datetime.datetime`.
+    no timezone is given, raises a ValueError.
 
     Strings will be parsed as ISO 8601 timestamps.
 
@@ -152,6 +152,45 @@ def make_datetime(value):
     :type value: str | unicode | float | int | :class:`datetime.datetime` | dict | list | tuple
     :return: the value after conversion
     :rtype: :class:`datetime.datetime`
+    :raises ValueError | TypeError
+    """
+    result = _make_datetime(value)
+    if not result.tzinfo:
+        raise ValueError(
+            "value was a timestamp, but no timezone was set! "
+            "Value was a '%s' object: %s" %
+            (
+                result.__class__.__name__,
+                repr(result),
+            )
+        )
+
+    return result
+
+
+def _make_datetime(value):
+    """Helper function for `make_datetime()`.
+
+    Tries to convert the given value to a
+    :class:`datetime.datetime`. But, unlike make_datetime(), if no
+    timezone is given, makes a naive `datetime.datetime`.
+
+    Strings will be parsed as ISO 8601 timestamps.
+
+    If a number is provided, it will be interpreted as a UNIX
+    timestamp, which by definition is UTC.
+
+    If a `dict` is provided, does `datetime.datetime(**value)`.
+
+    If a `tuple` or a `list` is provided, does
+    `datetime.datetime(*value)`. Uses the timezone in the tuple or
+    list if provided.
+
+    :param value: something to convert
+    :type value: str | unicode | float | int | :class:`datetime.datetime` | dict | list | tuple
+    :return: the value after conversion
+    :rtype: :class:`datetime.datetime`
+    :raises ValueError | TypeError
     """
 
     if isinstance(value, basestring):
diff --git a/tincan/documents/document.py b/tincan/documents/document.py
@@ -131,7 +131,7 @@ def timestamp(self):
 
     @timestamp.setter
     def timestamp(self, value):
-        if value is None or isinstance(value, datetime.datetime):
+        if value is None:
             self._timestamp = value
             return
 
diff --git a/tincan/http_request.py b/tincan/http_request.py
@@ -42,33 +42,12 @@ class HTTPRequest(Base):
     ]
 
     _props = [
-        'endpoint',
         'content',
         'ignore404',
     ]
 
     _props.extend(_props_req)
 
-    @property
-    def endpoint(self):
-        """The remote lrs endpoint used for the HTTP connection
-
-        :setter: Tries to convert to unicode
-        :setter type: str | unicode
-        :rtype: unicode
-        """
-        return self._endpoint
-
-    @endpoint.setter
-    def endpoint(self, value):
-        if not isinstance(value, unicode) and value is not None:
-            unicode(value)
-        self._endpoint = value
-
-    @endpoint.deleter
-    def endpoint(self):
-        del self._endpoint
-
     @property
     def method(self):
         """Method for the HTTP connection ("GET", "POST", "DELETE", etc.)
diff --git a/tincan/remote_lrs.py b/tincan/remote_lrs.py
diff --git a/tincan/serializable_base.py b/tincan/serializable_base.py
diff --git a/tincan/statement.py b/tincan/statement.py
diff --git a/tincan/statement_base.py b/tincan/statement_base.py
diff --git a/tincan/statement_ref.py b/tincan/statement_ref.py
diff --git a/tincan/substatement.py b/tincan/substatement.py

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#!/usr/bin/env python`
`2`		`-`
`3`	`1`	`# Copyright 2014 Rustici Software`
`4`	`2`	`#`
`5`	`3`	`# Licensed under the Apache License, Version 2.0 (the "License");`