diff --git a/integrationtests/insert_model.py b/integrationtests/insert_model.py index d793b041549812aa00a030d5c7a456f45da66b09..3cff966d0699d52bfd3a45b31cecb3de7ed42475 100755 --- a/integrationtests/insert_model.py +++ b/integrationtests/insert_model.py @@ -5,22 +5,28 @@ from caosadvancedtools.cfoods.h5 import H5CFood from caosadvancedtools.models.data_model import DataModel from caosadvancedtools.models.parser import parse_model_from_yaml -# for teseting existing data model parts for the YANL Interface -db.RecordType(name="TestRT1", datatype=db.TEXT).insert() -db.Property(name="TestP1", datatype=db.TEXT).insert() - -model = parse_model_from_yaml("model.yml") -model.sync_data_model(noquestion=True) - -if len(db.execute_query("FIND Property alias")) == 0: - al = db.Property(name="alias") - al.add_parent(name="name") - al.insert() - -h5model = db.Container() -h5file = h5py.File('extroot/ExperimentalData/2010_TestProject/2019-02-03/hdf5_dummy_file.hdf5', 'r') -H5CFood.create_structure(h5file, create_recordTypes=True, collection=h5model, - root_name="ExampleH5") -print(h5model) -h5model = DataModel(h5model) -h5model.sync_data_model(noquestion=True) + +def main(): + + # for teseting existing data model parts for the YANL Interface + db.RecordType(name="TestRT1", datatype=db.TEXT).insert() + db.Property(name="TestP1", datatype=db.TEXT).insert() + + model = parse_model_from_yaml("model.yml") + model.sync_data_model(noquestion=True) + + if len(db.execute_query("FIND Property alias")) == 0: + al = db.Property(name="alias") + al.add_parent(name="name") + al.insert() + + h5model = db.Container() + h5file = h5py.File('extroot/ExperimentalData/2010_TestProject/2019-02-03/hdf5_dummy_file.hdf5', 'r') + H5CFood.create_structure(h5file, create_recordTypes=True, collection=h5model, + root_name="ExampleH5") + h5model = DataModel(h5model) + h5model.sync_data_model(noquestion=True) + + +if __name__ == "__main__": + main() diff --git a/integrationtests/test_crawl_with_datamodel_problems.py b/integrationtests/test_crawl_with_datamodel_problems.py index 2831bb67ec67f8c2b19519ef5457829712669a6e..61fec39026a1a3480ecc5b52551c712d7a459b08 100644 --- a/integrationtests/test_crawl_with_datamodel_problems.py +++ b/integrationtests/test_crawl_with_datamodel_problems.py @@ -34,6 +34,8 @@ from caosadvancedtools.models.parser import parse_model_from_yaml from caosadvancedtools.scifolder import (AnalysisCFood, ExperimentCFood, PublicationCFood, SimulationCFood) +from insert_model import main as insert_model + def setup_module(): """Clear problems and remove all entities except for built-in ones.""" @@ -67,8 +69,7 @@ def test_crawler_with_data_model_problems(): prefix="", dryrun=False, forceAllowSymlinks=False) # load and damage the model - model = parse_model_from_yaml("model.yml") - model.sync_data_model(noquestion=True) + insert_model() deleted_entities = {"Experiment", "Poster", "results"} for ent in deleted_entities: