@@ -19,44 +19,44 @@ def setup_class(cls):
1919 cls .channel = Ephys .Channel ()
2020
2121 def test_schema_decorator (self , schema_any ):
22- assert_true ( issubclass (Subject , dj .Lookup ) )
23- assert_true ( not issubclass (Subject , dj .Part ) )
22+ assert issubclass (Subject , dj .Lookup )
23+ assert not issubclass (Subject , dj .Part )
2424
2525 def test_class_help (self , schema_any ):
2626 help (TTest )
2727 help (TTest2 )
28- assert_true ( TTest .definition in TTest .__doc__ )
29- assert_true ( TTest .definition in TTest2 .__doc__ )
28+ assert TTest .definition in TTest .__doc__
29+ assert TTest .definition in TTest2 .__doc__
3030
3131 def test_instance_help (self , schema_any ):
3232 help (TTest ())
3333 help (TTest2 ())
34- assert_true ( TTest ().definition in TTest ().__doc__ )
35- assert_true ( TTest2 ().definition in TTest2 ().__doc__ )
34+ assert TTest ().definition in TTest ().__doc__
35+ assert TTest2 ().definition in TTest2 ().__doc__
3636
3737 def test_describe (self , schema_any ):
3838 """real_definition should match original definition"""
3939 rel = Experiment ()
4040 context = inspect .currentframe ().f_globals
4141 s1 = declare (rel .full_table_name , rel .definition , context )
4242 s2 = declare (rel .full_table_name , rel .describe (), context )
43- assert_equal ( s1 , s2 )
43+ assert s1 == s2
4444
4545 def test_describe_indexes (self , schema_any ):
4646 """real_definition should match original definition"""
4747 rel = IndexRich ()
4848 context = inspect .currentframe ().f_globals
4949 s1 = declare (rel .full_table_name , rel .definition , context )
5050 s2 = declare (rel .full_table_name , rel .describe (), context )
51- assert_equal ( s1 , s2 )
51+ assert s1 == s2
5252
5353 def test_describe_dependencies (self , schema_any ):
5454 """real_definition should match original definition"""
5555 rel = ThingC ()
5656 context = inspect .currentframe ().f_globals
5757 s1 = declare (rel .full_table_name , rel .definition , context )
5858 s2 = declare (rel .full_table_name , rel .describe (), context )
59- assert_equal ( s1 , s2 )
59+ assert s1 == s2
6060
6161 def test_part (self , schema_any ):
6262 # Lookup and part with the same name. See issue #365
@@ -83,20 +83,19 @@ class Type(dj.Part):
8383
8484 def test_attributes (self , schema_any ):
8585 # test autoincrement declaration
86- assert_list_equal ( auto .heading .names , ["id" , "name" ])
87- assert_true ( auto .heading .attributes ["id" ].autoincrement )
86+ assert auto .heading .names == ["id" , "name" ]
87+ assert auto .heading .attributes ["id" ].autoincrement
8888
8989 # test attribute declarations
90- assert_list_equal (
91- subject .heading .names ,
92- ["subject_id" , "real_id" , "species" , "date_of_birth" , "subject_notes" ],
93- )
94- assert_list_equal (subject .primary_key , ["subject_id" ])
95- assert_true (subject .heading .attributes ["subject_id" ].numeric )
96- assert_false (subject .heading .attributes ["real_id" ].numeric )
97-
98- assert_list_equal (
99- experiment .heading .names ,
90+ assert (
91+ subject .heading .names ==
92+ ["subject_id" , "real_id" , "species" , "date_of_birth" , "subject_notes" ])
93+ assert subject .primary_key == ["subject_id" ]
94+ assert subject .heading .attributes ["subject_id" ].numeric
95+ assert not subject .heading .attributes ["real_id" ].numeric
96+
97+ assert (
98+ experiment .heading .names ==
10099 [
101100 "subject_id" ,
102101 "experiment_id" ,
@@ -105,97 +104,78 @@ def test_attributes(self, schema_any):
105104 "data_path" ,
106105 "notes" ,
107106 "entry_time" ,
108- ],
109- )
110- assert_list_equal (experiment .primary_key , ["subject_id" , "experiment_id" ])
111-
112- assert_list_equal (
113- trial .heading .names , # tests issue #516
114- ["animal" , "experiment_id" , "trial_id" , "start_time" ],
115- )
116- assert_list_equal (trial .primary_key , ["animal" , "experiment_id" , "trial_id" ])
117-
118- assert_list_equal (
119- ephys .heading .names ,
120- ["animal" , "experiment_id" , "trial_id" , "sampling_frequency" , "duration" ],
121- )
122- assert_list_equal (ephys .primary_key , ["animal" , "experiment_id" , "trial_id" ])
123-
124- assert_list_equal (
125- channel .heading .names ,
126- ["animal" , "experiment_id" , "trial_id" , "channel" , "voltage" , "current" ],
127- )
128- assert_list_equal (
129- channel .primary_key , ["animal" , "experiment_id" , "trial_id" , "channel" ]
130- )
131- assert_true (channel .heading .attributes ["voltage" ].is_blob )
107+ ])
108+ assert experiment .primary_key == ["subject_id" , "experiment_id" ]
109+
110+ assert (
111+ trial .heading .names == # tests issue #516
112+ ["animal" , "experiment_id" , "trial_id" , "start_time" ])
113+ assert trial .primary_key == ["animal" , "experiment_id" , "trial_id" ]
114+
115+ assert (
116+ ephys .heading .names ==
117+ ["animal" , "experiment_id" , "trial_id" , "sampling_frequency" , "duration" ])
118+ assert ephys .primary_key == ["animal" , "experiment_id" , "trial_id" ]
119+
120+ assert (
121+ channel .heading .names ==
122+ ["animal" , "experiment_id" , "trial_id" , "channel" , "voltage" , "current" ])
123+ assert (
124+ channel .primary_key == ["animal" , "experiment_id" , "trial_id" , "channel" ])
125+ assert channel .heading .attributes ["voltage" ].is_blob
132126
133127 def test_dependencies (self , schema_any ):
134- assert_true ( experiment .full_table_name in user .children (primary = False ) )
135- assert_equal ( set (experiment .parents (primary = False )), {user .full_table_name })
136- assert_true ( experiment .full_table_name in user .children (primary = False ) )
137- assert_set_equal ( set (experiment .parents (primary = False )), {user .full_table_name })
138- assert_set_equal (
128+ assert experiment .full_table_name in user .children (primary = False )
129+ assert set (experiment .parents (primary = False )) == {user .full_table_name }
130+ assert experiment .full_table_name in user .children (primary = False )
131+ assert set (experiment .parents (primary = False )) == {user .full_table_name }
132+ assert (
139133 set (
140134 s .full_table_name
141135 for s in experiment .parents (primary = False , as_objects = True )
142- ),
143- {user .full_table_name },
144- )
145-
146- assert_true (experiment .full_table_name in subject .descendants ())
147- assert_true (
148- experiment .full_table_name
149- in {s .full_table_name for s in subject .descendants (as_objects = True )}
150- )
151- assert_true (subject .full_table_name in experiment .ancestors ())
152- assert_true (
153- subject .full_table_name
154- in {s .full_table_name for s in experiment .ancestors (as_objects = True )}
155- )
156-
157- assert_true (trial .full_table_name in experiment .descendants ())
158- assert_true (
159- trial .full_table_name
160- in {s .full_table_name for s in experiment .descendants (as_objects = True )}
161- )
162- assert_true (experiment .full_table_name in trial .ancestors ())
163- assert_true (
164- experiment .full_table_name
165- in {s .full_table_name for s in trial .ancestors (as_objects = True )}
166- )
167-
168- assert_set_equal (
169- set (trial .children (primary = True )),
170- {ephys .full_table_name , trial .Condition .full_table_name },
171- )
172- assert_set_equal (set (trial .parts ()), {trial .Condition .full_table_name })
173- assert_set_equal (
174- set (s .full_table_name for s in trial .parts (as_objects = True )),
175- {trial .Condition .full_table_name },
176- )
177- assert_set_equal (set (ephys .parents (primary = True )), {trial .full_table_name })
178- assert_set_equal (
136+ ) ==
137+ {user .full_table_name })
138+
139+ assert experiment .full_table_name in subject .descendants ()
140+ assert (experiment .full_table_name
141+ in {s .full_table_name for s in subject .descendants (as_objects = True )})
142+ assert subject .full_table_name in experiment .ancestors ()
143+ assert (subject .full_table_name
144+ in {s .full_table_name for s in experiment .ancestors (as_objects = True )})
145+
146+ assert trial .full_table_name in experiment .descendants ()
147+ assert (trial .full_table_name
148+ in {s .full_table_name for s in experiment .descendants (as_objects = True )})
149+ assert experiment .full_table_name in trial .ancestors ()
150+ assert (experiment .full_table_name
151+ in {s .full_table_name for s in trial .ancestors (as_objects = True )})
152+
153+ assert (
154+ set (trial .children (primary = True )) ==
155+ {ephys .full_table_name , trial .Condition .full_table_name })
156+ assert set (trial .parts ()) == {trial .Condition .full_table_name }
157+ assert (
158+ set (s .full_table_name for s in trial .parts (as_objects = True )) ==
159+ {trial .Condition .full_table_name })
160+ assert set (ephys .parents (primary = True )) == {trial .full_table_name }
161+ assert (
179162 set (
180163 s .full_table_name for s in ephys .parents (primary = True , as_objects = True )
181- ),
182- {trial .full_table_name },
183- )
184- assert_set_equal (set (ephys .children (primary = True )), {channel .full_table_name })
185- assert_set_equal (
164+ ) ==
165+ {trial .full_table_name })
166+ assert set (ephys .children (primary = True )) == {channel .full_table_name }
167+ assert (
186168 set (
187169 s .full_table_name for s in ephys .children (primary = True , as_objects = True )
188- ),
189- {channel .full_table_name },
190- )
191- assert_set_equal (set (channel .parents (primary = True )), {ephys .full_table_name })
192- assert_set_equal (
170+ ) ==
171+ {channel .full_table_name })
172+ assert set (channel .parents (primary = True )) == {ephys .full_table_name }
173+ assert (
193174 set (
194175 s .full_table_name
195176 for s in channel .parents (primary = True , as_objects = True )
196- ),
197- {ephys .full_table_name },
198- )
177+ ) ==
178+ {ephys .full_table_name })
199179
200180 def test_descendants_only_contain_part_table (self , schema_any ):
201181 """issue #927"""
0 commit comments