Merge pull request #333 from ixcat/issue-87-ext2

TestPopulate serverID / jobs table test setup fixes

Author: guzman-raphael

tests/TestPopulate.m

@@ -5,13 +5,11 @@ function TestPopulate_testPopulate(testCase)
             disp(['---------------' st(1).name '---------------']);
             package = 'Lab';
 
-            c1 = dj.conn(...
-                testCase.CONN_INFO.host,... 
-                testCase.CONN_INFO.user,...
-                testCase.CONN_INFO.password,'',true);
-
             dj.createSchema(package,[testCase.test_root '/test_schemas'], ...
                 [testCase.PREFIX '_lab']);
+            
+            lab_schema = Lab.getSchema; % we need schema's connection id
+            sid = lab_schema.conn.serverId;
 
             insert(Lab.Subject, {
                100, '2010-04-02';
@@ -23,33 +21,35 @@ function TestPopulate_testPopulate(testCase)
                 'rig_note', 'FooLab Frobnicator v1.0' ...
             ));
 
-            % regular populate of 1 record
+            % parallel populate of 1 record
             % .. (SessionAnalysis logs session ID as session_analysis data)
+            % NOTE: need to call parpopulate 1st to ensure Jobs table
+            % exists
 
             insert(Lab.Session, struct( ...
                 'session_id', 0, ...
-                'subject_id', 0, ...
+                'subject_id', 100, ...
                 'rig_manufacturer', 'FooLab', ...
                 'rig_model', '1.0' ...
             ));
 
-            populate(Lab.SessionAnalysis);
+            parpopulate(Lab.SessionAnalysis);
             a_result = fetch(Lab.SessionAnalysis & 'session_id = 0', '*');
-            testCase.verifyEqual(a_result.session_analysis, 0);
+            testCase.verifyEqual(a_result.session_analysis.connection_id, sid);
 
-            % parallel populate of 1 record
+            % regular populate of 1 record
             % .. (SessionAnalysis logs jobs record as session_analysis data)
 
             insert(Lab.Session, struct( ...
                 'session_id', 1, ...
-                'subject_id', 0, ...
+                'subject_id', 100, ...
                 'rig_manufacturer', 'FooLab', ...
                 'rig_model', '1.0' ...
             ));
 
-            parpopulate(Lab.SessionAnalysis);
+            populate(Lab.SessionAnalysis);
             a_result = fetch(Lab.SessionAnalysis & 'session_id = 1', '*');
-            testCase.verifyEqual(a_result.session_analysis.connection_id, c1.serverId);
+            testCase.verifyEqual(a_result.session_analysis, 1);
 
         end
     end

tests/test_schemas/+Lab/SessionAnalysis.m

@@ -8,7 +8,7 @@
     methods(Access=protected)
         function makeTuples(self,key)
 
-            c = dj.conn();
+            c = self.schema.conn;
             r = sprintf('connection_id = %d', c.serverId);
 
             j = fetch(Lab.Jobs() & r, '*');