do not test for uri resolution by default

Author: marqh

lib/bald/__init__.py

@@ -1011,26 +1011,26 @@ def load_netcdf(afilepath, baseuri=None, alias_dict=None, cache=None):
     return root_container
 
 
-def validate_netcdf(afilepath, baseuri=None, cache=None):
+def validate_netcdf(afilepath, baseuri=None, cache=None, uris_resolve=False):
     """
     Validate a file with respect to binary-array-linked-data.
     Returns a :class:`bald.validation.Validation`
 
     """
     root_container = load_netcdf(afilepath, baseuri=baseuri, cache=cache)
-    return validate(root_container, cache=cache)
+    return validate(root_container, cache=cache, uris_resolve=uris_resolve)
 
 
-def validate_hdf5(afilepath, baseuri=None, cache=None):
+def validate_hdf5(afilepath, baseuri=None, cache=None, uris_resolve=False):
     """
     Validate a file with respect to binary-array-linked-data.
     Returns a :class:`bald.validation.Validation`
 
     """
     root_container = load_hdf5(afilepath, baseuri=baseuri, cache=cache)
-    return validate(root_container, cache=cache)
+    return validate(root_container, cache=cache, uris_resolve=uris_resolve)
 
-def validate(root_container, sval=None, cache=None):
+def validate(root_container, sval=None, cache=None, uris_resolve=False):
     """
     Validate a Container with respect to binary-array-linked-data.
     Returns a :class:`bald.validation.Validation`
@@ -1039,16 +1039,20 @@ def validate(root_container, sval=None, cache=None):
     if sval is None:
         sval = bv.StoredValidation()
 
-    root_val = bv.ContainerValidation(subject=root_container, httpcache=cache)
+    root_val = bv.ContainerValidation(subject=root_container, httpcache=cache,
+                                      uris_resolve=uris_resolve)
     sval.stored_exceptions += root_val.exceptions()
     for subject in root_container.attrs.get('bald__contains', set()):
         if isinstance(subject, Array):
-            array_val = bv.ArrayValidation(subject, httpcache=cache)
+            array_val = bv.ArrayValidation(subject, httpcache=cache,
+                                           uris_resolve=uris_resolve)
             sval.stored_exceptions += array_val.exceptions()
         elif isinstance(subject, Container):
-            sval = validate(subject, sval=sval, cache=cache)
+            sval = validate(subject, sval=sval, cache=cache,
+                            uris_resolve=uris_resolve)
         elif isinstance(subject, Subject):
-            subject_val = bv.SubjectValidation(subject, httpcache=cache)
+            subject_val = bv.SubjectValidation(subject, httpcache=cache,
+                                               uris_resolve=uris_resolve)
             sval.stored_exceptions += subject_val.exceptions()
 
     return sval

lib/bald/tests/integration/test_aliases.py

@@ -52,7 +52,8 @@ def test_invalid_uri(self):
             dsetp = f.create_dataset("parent_dataset", (11, 17), dtype='i')
             dsetp.attrs['skosPrefLabel'] = 'alabel'
             f.close()
-            validation = bald.validate_hdf5(tfile, cache=self.acache)
+            validation = bald.validate_hdf5(tfile, cache=self.acache,
+                                            uris_resolve=True)
             exns = validation.exceptions()
             expected = ['http://binary-array-ld.net/latest/turtle is not resolving as a resource (404).',
                         'http://binary-array-ld.net/latest/walnut is not resolving as a resource (404).']

lib/bald/tests/integration/test_cdl.py

@@ -30,46 +30,47 @@ def atest(self):
     setattr(Test, 'test_{}'.format(file_id), make_a_test(cdl_file))
 
 
-def test_ereefs_gbr4_ncld(self):
-    """Override ereefs test with currently accepted failures"""
-    with self.temp_filename('.nc') as tfile:
-        cdl_file = os.path.join(self.cdl_path, 'ereefs_gbr4_ncld.cdl')
-        subprocess.check_call(['ncgen', '-o', tfile, cdl_file])
-        validation = bald.validate_netcdf(tfile, cache=self.acache)
-        exns = validation.exceptions()
-        exns.sort()
-        # expected = ['http://qudt.org/vocab/unit#Meter is not resolving as a resource (404).',
-        #             'http://qudt.org/vocab/unit#MeterPerSecond is not resolving as a resource (404).',
-        #             'http://qudt.org/vocab/unit#MeterPerSecond is not resolving as a resource (404).',
-        #             'http://qudt.org/vocab/unit#DegreeCelsius is not resolving as a resource (404).']
-        # expected.sort()
-        # self.assertTrue(not validation.is_valid() and exns == expected,
-        #                 msg='{} \n!= \n{}'.format(exns, expected))
-        self.assertTrue(not validation.is_valid())
-
-setattr(Test, 'test_ereefs_gbr4_ncld', test_ereefs_gbr4_ncld)
-
-
-def test_ProcessChain0300(self):
-    """Override ProcessChain 0300 test with currently accepted failures"""
-    self.assertTrue(True)
-
-setattr(Test, 'test_ProcessChain0300', test_ProcessChain0300)
-
-
-def test_grid_OISST_GHRSST(self):
-    """Override grid OISST GHRSST test with currently accepted failures"""
-    with self.temp_filename('.nc') as tfile:
-        cdl_file = os.path.join(self.cdl_path, 'grid_OISST_GHRSST.cdl')
-        subprocess.check_call(['ncgen', '-o', tfile, cdl_file])
-        validation = bald.validate_netcdf(tfile, cache=self.acache)
-        exns = validation.exceptions()
-        exns.sort()
-        expected = ['http://doi.org/10.7289/V5SQ8XB5 is not resolving as a resource (404).',
-                    'http://www.ncdc.noaa.gov/sst is not resolving as a resource (404).',
-                    'http://www.ncdc.noaa.gov/sst/ is not resolving as a resource (404).']
-        expected.sort()
-        self.assertTrue(not validation.is_valid() and exns == expected,
-                        msg='{} \n!= \n{}'.format(exns, expected))
-
-setattr(Test, 'test_grid_OISST_GHRSST', test_grid_OISST_GHRSST)
+# def test_ereefs_gbr4_ncld(self):
+#     """Override ereefs test with currently accepted failures"""
+#     with self.temp_filename('.nc') as tfile:
+#         cdl_file = os.path.join(self.cdl_path, 'ereefs_gbr4_ncld.cdl')
+#         subprocess.check_call(['ncgen', '-o', tfile, cdl_file])
+#         validation = bald.validate_netcdf(tfile, cache=self.acache)
+#         exns = validation.exceptions()
+#         exns.sort()
+#         # expected = ['http://qudt.org/vocab/unit#Meter is not resolving as a resource (404).',
+#         #             'http://qudt.org/vocab/unit#MeterPerSecond is not resolving as a resource (404).',
+#         #             'http://qudt.org/vocab/unit#MeterPerSecond is not resolving as a resource (404).',
+#         #             'http://qudt.org/vocab/unit#DegreeCelsius is not resolving as a resource (404).']
+#         # expected.sort()
+#         # self.assertTrue(not validation.is_valid() and exns == expected,
+#         #                 msg='{} \n!= \n{}'.format(exns, expected))
+#         self.assertTrue(not validation.is_valid())
+
+# setattr(Test, 'test_ereefs_gbr4_ncld', test_ereefs_gbr4_ncld)
+
+
+# def test_ProcessChain0300(self):
+#     """Override ProcessChain 0300 test with currently accepted failures"""
+#     self.assertTrue(True)
+
+# setattr(Test, 'test_ProcessChain0300', test_ProcessChain0300)
+
+
+# def test_grid_OISST_GHRSST(self):
+#     """Override grid OISST GHRSST test with currently accepted failures"""
+#     with self.temp_filename('.nc') as tfile:
+#         cdl_file = os.path.join(self.cdl_path, 'grid_OISST_GHRSST.cdl')
+#         subprocess.check_call(['ncgen', '-o', tfile, cdl_file])
+#         validation = bald.validate_netcdf(tfile, cache=self.acache)
+#         exns = validation.exceptions()
+#         self.assertTrue(validation.is_valid(), msg='{}  != []'.format(exns))
+#         # exns.sort()
+#         # expected = ['http://doi.org/10.7289/V5SQ8XB5 is not resolving as a resource (404).',
+#         #             'http://www.ncdc.noaa.gov/sst is not resolving as a resource (404).',
+#         #             'http://www.ncdc.noaa.gov/sst/ is not resolving as a resource (404).']
+#         # expected.sort()
+#         # self.assertTrue(not validation.is_valid() and exns == expected,
+#         #                 msg='{} \n!= \n{}'.format(exns, expected))
+
+# setattr(Test, 'test_grid_OISST_GHRSST', test_grid_OISST_GHRSST)

lib/bald/tests/integration/test_netcdf.py

@@ -51,10 +51,11 @@ def test_invalid_uri(self):
             f.close()
             validation = bald.validate_netcdf(tfile, cache=self.acache)
             exns = validation.exceptions()
-            expected = ['http://binary-array-ld.net/latest/turtle is not resolving as a resource (404).',
-                        'http://binary-array-ld.net/latest/walnut is not resolving as a resource (404).']
-            self.assertTrue((not validation.is_valid()) and exns == expected,
-                             msg='{}  != {}'.format(exns, expected))
+            self.assertTrue(validation.is_valid(), msg='{}  != []'.format(exns))
+            # expected = ['http://binary-array-ld.net/latest/turtle is not resolving as a resource (404).',
+            #             'http://binary-array-ld.net/latest/walnut is not resolving as a resource (404).']
+            # self.assertTrue((not validation.is_valid()) and exns == expected,
+            #                  msg='{}  != {}'.format(exns, expected))
 
 
 class TestArrayReference(BaldTestCase):

lib/bald/tests/integration/test_netcdf4_classic.py

@@ -47,9 +47,10 @@ def test_invalid_uri(self):
             f = _fattrs(f)
             setattr(f, 'bald__turtle', 'bald__walnut')
             f.close()
-            validation = bald.validate_netcdf(tfile, cache=self.acache)
+            validation = bald.validate_netcdf(tfile, cache=self.acache,
+                                              uris_resolve=True)
             exns = validation.exceptions()
-            
+
             expected = ['http://binary-array-ld.net/latest/turtle is not resolving as a resource (404).',
                         'http://binary-array-ld.net/latest/walnut is not resolving as a resource (404).']
             self.assertTrue((not validation.is_valid()) and exns == expected,

lib/bald/tests/integration/test_validation.py

@@ -44,7 +44,8 @@ def test_invalid_uri(self):
             f = _create_parent_child(f, (11, 17), (11, 17))
             f.attrs['bald__turtle'] = 'bald__walnut'
             f.close()
-            validation = bald.validate_hdf5(tfile, cache=self.acache)
+            validation = bald.validate_hdf5(tfile, cache=self.acache,
+                                            uris_resolve=True)
             exns = validation.exceptions()
             expected = ['http://binary-array-ld.net/latest/turtle is not resolving as a resource (404).',
                         'http://binary-array-ld.net/latest/walnut is not resolving as a resource (404).']

lib/bald/validation.py

@@ -62,19 +62,23 @@ def exceptions(self):
 
 
 class SubjectValidation(Validation):
-    def __init__(self, subject, httpcache=None):
+    def __init__(self, subject, httpcache=None, uris_resolve=False):
         self.subject = subject
         if isinstance(httpcache, bald.HttpCache):
             self.cache = httpcache
         else:
             self.cache = bald.HttpCache()
+        self.uris_resolve = False
+        if uris_resolve == True:
+            self.uris_resolve = True
 
     def is_valid(self):
         return not self.exceptions()
 
     def exceptions(self):
         exceptions = []
-        exceptions = self.check_attr_uris(exceptions)
+        if self.uris_resolve:
+            exceptions = self.check_attr_uris(exceptions)
         exceptions = self.check_attr_domain_range(exceptions)
         exceptions = self._extra_exceptions(exceptions)
         return exceptions
@@ -158,10 +162,9 @@ def __init__(self, **kwargs):
 
 
 class ArrayValidation(SubjectValidation):
-
-    def __init__(self, array, httpcache=None):
+    def __init__(self, array, httpcache=None, uris_resolve=False):
         self.array = array
-        super(ArrayValidation, self).__init__(array, httpcache)
+        super(ArrayValidation, self).__init__(array, httpcache, uris_resolve)
 
     def _extra_exceptions(self, exceptions):
         exceptions = self.check_array_references(exceptions)