Merge branch 'master' into config_file

bob/bio/base/test/dummy/database.py

-from bob.bio.db import ZTBioDatabase, AtntBioDatabase
+from bob.bio.db import ZTBioDatabase
 from bob.bio.base.test.utils import atnt_database_directory
 
 
@@ -14,13 +14,14 @@ class DummyDatabase(ZTBioDatabase):
             training_depends_on_protocol=False,
             models_depend_on_protocol=False
         )
-        self.__db = AtntBioDatabase()
+        import bob.db.atnt
+        self.__db = bob.db.atnt.Database()
 
-    def model_ids(self, groups=None, protocol=None, gender=None):
-        return self.__db.model_ids(groups, protocol, gender)
+    def model_ids_with_protocol(self, groups=None, protocol=None, **kwargs):
+        return self.__db.model_ids(groups, protocol)
 
     def objects(self, groups=None, protocol=None, purposes=None, model_ids=None, **kwargs):
-        return self.__db.objects(groups, protocol, purposes, model_ids, **kwargs)
+        return self.__db.objects(model_ids, groups, purposes, protocol, **kwargs)
 
     def tobjects(self, groups=None, protocol=None, model_ids=None, **kwargs):
         return []
@@ -28,13 +29,13 @@ class DummyDatabase(ZTBioDatabase):
     def zobjects(self, groups=None, protocol=None, **kwargs):
         return []
 
-    def tmodel_ids(self, protocol=None, groups=None, **kwargs):
+    def tmodel_ids_with_protocol(self, protocol=None, groups=None, **kwargs):
         return self.__db.model_ids(groups)
 
     def t_enroll_files(self, t_model_id, group='dev'):
-        return self.__db.enroll_files(t_model_id, group)
+        return self.enroll_files(t_model_id, group)
 
     def z_probe_files(self, group='dev'):
-        return self.__db.probe_files(None, group)
+        return self.probe_files(None, group)
 
 database = DummyDatabase()

bob/bio/base/test/dummy/fileset.py

-from bob.bio.db import ZTBioDatabase, BioFileSet, BioFile, AtntBioDatabase
+from bob.bio.db import ZTBioDatabase, BioFileSet, BioFile
 from bob.bio.base.test.utils import atnt_database_directory
 
 
@@ -14,7 +14,8 @@ class DummyDatabase(ZTBioDatabase):
             training_depends_on_protocol=False,
             models_depend_on_protocol=False
         )
-        self.__db = AtntBioDatabase()
+        import bob.db.atnt
+        self.__db = bob.db.atnt.Database()
 
     def uses_probe_file_sets(self):
         return True
@@ -33,11 +34,11 @@ class DummyDatabase(ZTBioDatabase):
             file_sets.append(file_set)
         return file_sets
 
-    def model_ids(self, groups=None, protocol=None, gender=None):
-        return self.__db.model_ids(groups, protocol, gender)
+    def model_ids_with_protocol(self, groups=None, protocol=None, **kwargs):
+        return self.__db.model_ids(groups, protocol)
 
     def objects(self, groups=None, protocol=None, purposes=None, model_ids=None, **kwargs):
-        return self.__db.objects(groups, protocol, purposes, model_ids, **kwargs)
+        return self.__db.objects(model_ids, groups, purposes, protocol, **kwargs)
 
     def tobjects(self, groups=None, protocol=None, model_ids=None, **kwargs):
         return []
@@ -45,14 +46,14 @@ class DummyDatabase(ZTBioDatabase):
     def zobjects(self, groups=None, protocol=None, **kwargs):
         return []
 
-    def tmodel_ids(self, protocol=None, groups=None, **kwargs):
+    def tmodel_ids_with_protocol(self, protocol=None, groups=None, **kwargs):
         return self.__db.model_ids(groups)
 
     def t_enroll_files(self, t_model_id, group='dev'):
-        return self.__db.enroll_files(t_model_id, group)
+        return self.enroll_files(t_model_id, group)
 
     def z_probe_files(self, group='dev'):
-        return self.__db.probe_files(None, group)
+        return self.probe_files(None, group)
 
     def z_probe_file_sets(self, group='dev'):
         return self.probe_file_sets(None, group)