Partial Toolbox tests; fix some toolbox conversion issues.

doc/notes/TODO

@@ -19,13 +19,15 @@
 - [D] GUnicorn
 - [W] Tests
   - [D] Framework + config
-  - [W] HTTP layer
-  - [ ] Unit tests
+  - [D] HTTP layer
+  - [W] Toolbox
+  - [ ] Storage layer (RDF + file)
+  - [ ] LDP layer
 - [W] Bootstrap
 - [ ] Optimize queries
 - [ ] Messaging SPI
 - [ ] Hook up Hyrax
-- [ ] Documentation
+- [ ] Reformat documentation
 
 # Alpha 2 TODO
 

lakesuperior/toolbox.py

@@ -41,7 +41,9 @@ class Toolbox:
 
         @return URIRef
         '''
-        return URIRef('{}/{}'.format(self.base_url, uuid))
+        uri = '{}/{}'.format(self.base_url, uuid) if uuid else self.base_url
+
+        return URIRef(uri)
 
 
     def uri_to_uuid(self, uri):
@@ -49,10 +51,12 @@ class Toolbox:
 
         @return string
         '''
-        if uri.startswith(nsc['fcres']):
+        if uri == self.ROOT_NODE_URN:
+            return ''
+        elif uri.startswith(nsc['fcres']):
             return str(uri).replace(nsc['fcres'], '')
         else:
-            return str(uri).replace(self.base_url, '')
+            return str(uri).replace(self.base_url, '').strip('/')
 
 
     def localize_string(self, s):
@@ -62,8 +66,10 @@ class Toolbox:
 
         @return string
         '''
-        return s.replace(self.base_url+'/', str(nsc['fcres']))\
-                .replace(self.base_url, str(nsc['fcres']))
+        if s.strip('/') == self.base_url:
+            return str(self.ROOT_NODE_URN)
+        else:
+            return s.strip('/').replace(self.base_url+'/', str(nsc['fcres']))
 
 
     def localize_term(self, uri):
@@ -74,10 +80,6 @@ class Toolbox:
 
         @return rdflib.term.URIRef
         '''
-        self._logger.debug('Input URI: {}'.format(uri))
-        if uri.strip('/') == self.base_url:
-            return self.ROOT_NODE_URN
-
         return URIRef(self.localize_string(str(uri)))
 
 

tests/test_toolbox.py

@@ -1,8 +1,62 @@
 import pytest
 
+from rdflib.term import URIRef
+
+from lakesuperior.dictionaries.namespaces import ns_collection as nsc
 from lakesuperior.toolbox import Toolbox
 
-def test_camelcase(client):
+
+@pytest.fixture
+def tb(client):
     c = client.get('/ldp')
-    in_str = 'test_input_string'
-    assert Toolbox().camelcase(in_str) == 'TestInputString'
+    return Toolbox()
+
+
+
+class TestToolbox:
+    '''
+    Unit tests for toolbox methods.
+    '''
+    def test_camelcase(self, tb):
+        '''
+        Test conversion from underscore notation to camelcase.
+        '''
+        assert tb.camelcase('test_input_string') == 'TestInputString'
+        assert tb.camelcase('_test_input_string') == '_TestInputString'
+        assert tb.camelcase('test__input__string') == 'Test_Input_String'
+
+
+    def test_uuid_to_uri(self, tb):
+        assert tb.uuid_to_uri('1234') == URIRef(tb.base_url + '/1234')
+        assert tb.uuid_to_uri('') == URIRef(tb.base_url)
+
+
+    def test_uri_to_uuid(self, tb):
+        assert tb.uri_to_uuid(URIRef(tb.base_url) + '/test01') == 'test01'
+        assert tb.uri_to_uuid(URIRef(tb.base_url) + '/test01/test02') == \
+                'test01/test02'
+        assert tb.uri_to_uuid(URIRef(tb.base_url)) == ''
+        assert tb.uri_to_uuid(nsc['fcsystem'].root) == ''
+        assert tb.uri_to_uuid(nsc['fcres']['1234']) == '1234'
+        assert tb.uri_to_uuid(nsc['fcres']['1234/5678']) == '1234/5678'
+
+
+    def test_localize_string(self, tb):
+        '''
+        Test string localization.
+        '''
+        assert tb.localize_string(tb.base_url + '/test/uid') == \
+                tb.localize_string(tb.base_url + '/test/uid/') == \
+                str(nsc['fcres']['test/uid'])
+        assert tb.localize_string(tb.base_url) == str(nsc['fcsystem'].root)
+        assert tb.localize_string('http://bogus.org/test/uid') == \
+                'http://bogus.org/test/uid'
+
+
+    def test_localize_term(self, tb):
+        '''
+        Test term localization.
+        '''
+        assert tb.localize_term(tb.base_url + '/test/uid') == \
+                tb.localize_term(tb.base_url + '/test/uid/') == \
+                nsc['fcres']['test/uid']