Formally add example and test reference data for ICAT 6.2, not yet

adapting the content, though

Author: RKrahl

doc/examples/icatdump-6.2.xml

@@ -105,7 +105,7 @@ def copy_test_data(self):
                              "ingest-datafiles.xml", "ingest-ds-params.xml",
                              "ingest-sample-ds.xml") )
         files += ( examples / ("icatdump-%s.%s" % (ver, ext))
-                   for ver in ("4.4", "4.7", "4.10", "5.0")
+                   for ver in ("4.4", "4.7", "4.10", "5.0", "6.2")
                    for ext in ("xml", "yaml") )
         files += doc.glob("icatdata-*.xsd")
         files += examples.glob("metadata-*.xml")

doc/examples/icatdump-6.2.yaml

@@ -177,6 +177,8 @@ def require_dumpfile_backend(backend):
     if backend not in icat.dumpfile.Backends.keys():
         _skip("need %s backend for icat.dumpfile" % (backend))
 
+# FIXME: replace all references to icat_version "6.2a0" below by "6.2"
+# as soon as icat.server 6.2 has been released.
 
 def get_icatdata_schema():
     if icat_version < "4.4":
@@ -187,8 +189,10 @@ def get_icatdata_schema():
         fname = "icatdata-4.7.xsd"
     elif icat_version < "5.0":
         fname = "icatdata-4.10.xsd"
-    else:
+    elif icat_version < "6.2a0":
         fname = "icatdata-5.0.xsd"
+    else:
+        fname = "icatdata-6.2.xsd"
     return gettestdata(fname)
 
 
@@ -200,16 +204,20 @@ def get_reference_dumpfile(ext = "yaml"):
         fname = "icatdump-4.7.%s" % ext
     elif icat_version < "5.0":
         fname = "icatdump-4.10.%s" % ext
-    else:
+    elif icat_version < "6.2a0":
         fname = "icatdump-5.0.%s" % ext
+    else:
+        fname = "icatdump-6.2.%s" % ext
     return gettestdata(fname)
 
 
 def get_reference_summary():
     if icat_version < "5.0":
         version_suffix = "4"
-    else:
+    elif icat_version < "6.2a0":
         version_suffix = "5"
+    else:
+        version_suffix = "6.2"
     users = [ "acord", "ahau", "jbotu", "jdoe", "nbour", "rbeck" ]
     refsummary = { "root": gettestdata("summary-%s" % version_suffix) }
     for u in users:

setup.py

@@ -0,0 +1,57 @@
+User: simple/root
+
+Entity                     count
+--------------------------------
+Affiliation              : 2
+Application              : 1
+DataCollection           : 5
+DataCollectionDatafile   : 4
+DataCollectionDataset    : 6
+DataCollectionInvestigation : 1
+DataCollectionParameter  : 1
+DataPublication          : 1
+DataPublicationDate      : 2
+DataPublicationFunding   : 1
+DataPublicationType      : 2
+DataPublicationUser      : 1
+Datafile                 : 11
+DatafileFormat           : 6
+DatafileParameter        : 10
+Dataset                  : 9
+DatasetInstrument        : 7
+DatasetParameter         : 6
+DatasetTechnique         : 5
+DatasetType              : 3
+Facility                 : 1
+FacilityCycle            : 20
+FundingReference         : 1
+Grouping                 : 15
+Instrument               : 3
+InstrumentScientist      : 3
+Investigation            : 3
+InvestigationFacilityCycle : 3
+InvestigationFunding     : 1
+InvestigationGroup       : 9
+InvestigationInstrument  : 3
+InvestigationParameter   : 3
+InvestigationType        : 5
+InvestigationUser        : 5
+Job                      : 1
+Keyword                  : 9
+ParameterType            : 9
+PermissibleStringValue   : 6
+PublicStep               : 37
+Publication              : 1
+RelatedDatafile          : 1
+RelatedItem              : 1
+Rule                     : 159
+Sample                   : 3
+SampleParameter          : 2
+SampleType               : 3
+Shift                    : 4
+Study                    : 1
+StudyInvestigation       : 2
+Technique                : 4
+User                     : 11
+UserGroup                : 19
+

tests/conftest.py

@@ -0,0 +1,57 @@
+User: db/acord
+
+Entity                     count
+--------------------------------
+Affiliation              : 0
+Application              : 1
+DataCollection           : 0
+DataCollectionDatafile   : 0
+DataCollectionDataset    : 0
+DataCollectionInvestigation : 0
+DataCollectionParameter  : 0
+DataPublication          : 1
+DataPublicationDate      : 0
+DataPublicationFunding   : 0
+DataPublicationType      : 2
+DataPublicationUser      : 0
+Datafile                 : 11
+DatafileFormat           : 6
+DatafileParameter        : 10
+Dataset                  : 9
+DatasetInstrument        : 7
+DatasetParameter         : 6
+DatasetTechnique         : 5
+DatasetType              : 3
+Facility                 : 1
+FacilityCycle            : 20
+FundingReference         : 0
+Grouping                 : 1
+Instrument               : 3
+InstrumentScientist      : 0
+Investigation            : 3
+InvestigationFacilityCycle : 0
+InvestigationFunding     : 0
+InvestigationGroup       : 0
+InvestigationInstrument  : 0
+InvestigationParameter   : 3
+InvestigationType        : 5
+InvestigationUser        : 0
+Job                      : 0
+Keyword                  : 9
+ParameterType            : 9
+PermissibleStringValue   : 6
+PublicStep               : 0
+Publication              : 1
+RelatedDatafile          : 0
+RelatedItem              : 0
+Rule                     : 0
+Sample                   : 3
+SampleParameter          : 2
+SampleType               : 3
+Shift                    : 4
+Study                    : 0
+StudyInvestigation       : 0
+Technique                : 4
+User                     : 11
+UserGroup                : 0
+

tests/data/summary-6.2

@@ -0,0 +1,57 @@
+User: db/ahau
+
+Entity                     count
+--------------------------------
+Affiliation              : 0
+Application              : 1
+DataCollection           : 0
+DataCollectionDatafile   : 0
+DataCollectionDataset    : 0
+DataCollectionInvestigation : 0
+DataCollectionParameter  : 0
+DataPublication          : 1
+DataPublicationDate      : 0
+DataPublicationFunding   : 0
+DataPublicationType      : 2
+DataPublicationUser      : 0
+Datafile                 : 5
+DatafileFormat           : 6
+DatafileParameter        : 4
+Dataset                  : 4
+DatasetInstrument        : 3
+DatasetParameter         : 4
+DatasetTechnique         : 3
+DatasetType              : 3
+Facility                 : 1
+FacilityCycle            : 20
+FundingReference         : 0
+Grouping                 : 3
+Instrument               : 3
+InstrumentScientist      : 0
+Investigation            : 1
+InvestigationFacilityCycle : 0
+InvestigationFunding     : 0
+InvestigationGroup       : 0
+InvestigationInstrument  : 0
+InvestigationParameter   : 1
+InvestigationType        : 5
+InvestigationUser        : 0
+Job                      : 0
+Keyword                  : 4
+ParameterType            : 9
+PermissibleStringValue   : 6
+PublicStep               : 0
+Publication              : 1
+RelatedDatafile          : 0
+RelatedItem              : 0
+Rule                     : 0
+Sample                   : 1
+SampleParameter          : 1
+SampleType               : 3
+Shift                    : 2
+Study                    : 0
+StudyInvestigation       : 0
+Technique                : 4
+User                     : 11
+UserGroup                : 4
+

tests/data/summary-6.2.acord

@@ -0,0 +1,57 @@
+User: db/jbotu
+
+Entity                     count
+--------------------------------
+Affiliation              : 0
+Application              : 1
+DataCollection           : 1
+DataCollectionDatafile   : 1
+DataCollectionDataset    : 2
+DataCollectionInvestigation : 0
+DataCollectionParameter  : 0
+DataPublication          : 1
+DataPublicationDate      : 0
+DataPublicationFunding   : 0
+DataPublicationType      : 2
+DataPublicationUser      : 0
+Datafile                 : 6
+DatafileFormat           : 6
+DatafileParameter        : 5
+Dataset                  : 6
+DatasetInstrument        : 5
+DatasetParameter         : 4
+DatasetTechnique         : 5
+DatasetType              : 3
+Facility                 : 1
+FacilityCycle            : 20
+FundingReference         : 0
+Grouping                 : 4
+Instrument               : 3
+InstrumentScientist      : 0
+Investigation            : 2
+InvestigationFacilityCycle : 0
+InvestigationFunding     : 0
+InvestigationGroup       : 0
+InvestigationInstrument  : 0
+InvestigationParameter   : 2
+InvestigationType        : 5
+InvestigationUser        : 0
+Job                      : 0
+Keyword                  : 5
+ParameterType            : 9
+PermissibleStringValue   : 6
+PublicStep               : 0
+Publication              : 1
+RelatedDatafile          : 0
+RelatedItem              : 0
+Rule                     : 0
+Sample                   : 2
+SampleParameter          : 1
+SampleType               : 3
+Shift                    : 3
+Study                    : 0
+StudyInvestigation       : 0
+Technique                : 4
+User                     : 11
+UserGroup                : 4
+

tests/data/summary-6.2.ahau

@@ -0,0 +1,57 @@
+User: db/jdoe
+
+Entity                     count
+--------------------------------
+Affiliation              : 0
+Application              : 1
+DataCollection           : 0
+DataCollectionDatafile   : 0
+DataCollectionDataset    : 0
+DataCollectionInvestigation : 0
+DataCollectionParameter  : 0
+DataPublication          : 1
+DataPublicationDate      : 0
+DataPublicationFunding   : 0
+DataPublicationType      : 2
+DataPublicationUser      : 0
+Datafile                 : 6
+DatafileFormat           : 6
+DatafileParameter        : 5
+Dataset                  : 6
+DatasetInstrument        : 5
+DatasetParameter         : 4
+DatasetTechnique         : 5
+DatasetType              : 3
+Facility                 : 1
+FacilityCycle            : 20
+FundingReference         : 0
+Grouping                 : 2
+Instrument               : 3
+InstrumentScientist      : 0
+Investigation            : 2
+InvestigationFacilityCycle : 0
+InvestigationFunding     : 0
+InvestigationGroup       : 0
+InvestigationInstrument  : 0
+InvestigationParameter   : 2
+InvestigationType        : 5
+InvestigationUser        : 0
+Job                      : 0
+Keyword                  : 5
+ParameterType            : 9
+PermissibleStringValue   : 6
+PublicStep               : 0
+Publication              : 1
+RelatedDatafile          : 0
+RelatedItem              : 0
+Rule                     : 0
+Sample                   : 2
+SampleParameter          : 1
+SampleType               : 3
+Shift                    : 3
+Study                    : 0
+StudyInvestigation       : 0
+Technique                : 4
+User                     : 11
+UserGroup                : 0
+