improve tests for adapted attributes

Author: dimitri-yatsenko

tests/schema_adapted.py

@@ -1,5 +1,6 @@
 import datajoint as dj
 import networkx as nx
+import json
 from pathlib import Path
 import tempfile
 from datajoint import errors
@@ -11,8 +12,8 @@
         S3_CONN_INFO,
         protocol='s3',
         location='adapted/repo',
-        stage=tempfile.mkdtemp())
-}
+        stage=tempfile.mkdtemp())}
+
 dj.config['stores'] = stores_config
 
 schema_name = PREFIX + '_test_custom_datatype'
@@ -53,37 +54,36 @@ class Connectivity(dj.Manual):
 errors._switch_filepath_types(True)
 
 
-class Filepath2GraphAdapter(dj.AttributeAdapter):
+class LayoutToFilepath(dj.AttributeAdapter):
+    """
+    An adapted data type that saves a graph layout into fixed filepath
+    """
 
     attribute_type = 'filepath@repo_s3'
 
     @staticmethod
-    def get(obj):
-        s = open(obj, "r").read()
-        return nx.spring_layout(
-            nx.lollipop_graph(4, 2), seed=int(s))
+    def get(path):
+        with open(path, "r") as f:
+            return json.load(f)
 
     @staticmethod
-    def put(obj):
-        path = Path(
-            dj.config['stores']['repo_s3']['stage'], 'sample.txt')
-
-        f = open(path, "w")
-        f.write(str(obj*obj))
-        f.close()
-
+    def put(layout):
+        path = Path(dj.config['stores']['repo_s3']['stage'], 'layout.json')
+        with open(str(path), "w") as f:
+            json.dump(layout, f)
         return path
 
 
-file2graph = Filepath2GraphAdapter()
+layout_to_filepath = LayoutToFilepath()
 
 
 @schema
-class Position(dj.Manual):
+class Layout(dj.Manual):
     definition = """
-    pos_id : int
+    # stores graph layout
+    -> Connectivity
     ---
-    seed_root: <file2graph>
+    layout: <layout_to_filepath>
     """
 
 errors._switch_filepath_types(False)

tests/test_adapted_attributes.py

@@ -1,9 +1,9 @@
 import datajoint as dj
 import networkx as nx
 from itertools import zip_longest
-from nose.tools import assert_true, assert_equal
+from nose.tools import assert_true, assert_equal, assert_dict_equal
 from . import schema_adapted as adapted
-from .schema_adapted import graph, file2graph
+from .schema_adapted import graph, layout_to_filepath
 
 
 def test_adapted_type():
@@ -22,17 +22,25 @@ def test_adapted_type():
 
 def test_adapted_filepath_type():
     # https://github.com/datajoint/datajoint-python/issues/684
+
     dj.errors._switch_adapted_types(True)
     dj.errors._switch_filepath_types(True)
-    c = adapted.Position()
-    Position.insert([{'pos_id': 0, 'seed_root': 3}])
-    result = (Position & 'pos_id=0').fetch1('seed_root')
 
-    assert_true(isinstance(result, dict))
-    assert_equal(0.3761992090175474, result[1][0])
-    assert_true(6 == len(result))
+    c = adapted.Connectivity()
+    c.delete()
+    c.insert1((0, nx.lollipop_graph(4, 2)))
 
+    layout = nx.spring_layout(c.fetch1('conn_graph'))
+    # make json friendly
+    layout = {str(k): [round(r, ndigits=4) for r in v] for k, v in layout.items()}
+    t = adapted.Layout()
+    t.insert1((0, layout))
+    result = t.fetch1('layout')
+    assert_dict_equal(result, layout)
+
+    t.delete()
     c.delete()
+
     dj.errors._switch_filepath_types(False)
     dj.errors._switch_adapted_types(False)