test iteration

Author: marqh

lib/bald/tests/integration/TTL/ereefs_gbr4_ncld.ttl

@@ -75,8 +75,7 @@ ns1:salt a bald:Array ;
     ns1:substanceOrTaxon_id <http://sweet.jpl.nasa.gov/2.2/matrWater.owl#SaltWater> ;
     ns1:unit_id <http://environment.data.gov.au/water/quality/def/unit/PSU> ;
     ns1:units "PSU" ;
-    ns1:valid_range [ rdf:first 0.0 ;
-            rdf:rest ( 40.0 ) ] ;
+    ns1:valid_range ( 0.0 40.0 ) ;
     bald:references ns1:salt_time_ref ;
     bald:shape "(5, 47, 180, 600)" .
 
@@ -92,8 +91,7 @@ ns1:temp a bald:Array ;
     ns1:substanceOrTaxon_id <http://sweet.jpl.nasa.gov/2.2/matrWater.owl#SaltWater> ;
     ns1:unit_id <http://qudt.org/vocab/unit#DegreeCelsius> ;
     ns1:units "degrees C" ;
-    ns1:valid_range [ rdf:first 0.0 ;
-            rdf:rest ( 40.0 ) ] ;
+    ns1:valid_range ( 0.0 40.0 ) ;
     bald:references ns1:temp_time_ref ;
     bald:shape "(5, 47, 180, 600)" .
 

lib/bald/tests/integration/test_multi_array_reference.py

@@ -29,11 +29,14 @@ def test_load(self):
         cdlfile = os.path.join(self.cdl_path, 'multi_array_reference.cdl')
         with self.temp_filename('.nc') as tfile:
             subprocess.check_call(['ncgen', '-o', tfile, cdlfile])
-            inputs = bald.load_netcdf(tfile, cache=self.acache)
-            set_collection = inputs.bald__contains[6].bald__references
-            self.assertTrue(isinstance(set_collection, set))
-            list_collection = inputs.bald__contains[7].bald__references
-            self.assertTrue(isinstance(list_collection, list))
+            inputs = bald.load_netcdf(tfile, baseuri='file://CDL/multi_array_reference.nc',
+                                      cache=self.acache)
+
+            for contained in inputs.bald__contains:
+                if contained.identity == 'file://CDL/multi_array_reference.nc/list_collection':
+                    self.assertTrue(isinstance(contained.bald__references, list))
+                elif contained.identity == 'file://CDL/multi_array_reference.nc/set_collection':
+                    self.assertTrue(isinstance(contained.bald__references, set))
 
     def test_turtle(self):
         with self.temp_filename('.nc') as tfile:
@@ -43,8 +46,9 @@ def test_turtle(self):
             cdl_file_uri = 'file://CDL/{}'.format(cdlname)
             root_container = bald.load_netcdf(tfile, baseuri=cdl_file_uri, cache=self.acache)
             ttl = root_container.rdfgraph().serialize(format='n3').decode("utf-8")
-            # with open(os.path.join(self.ttl_path, 'multi_array_reference.ttl'), 'w') as sf:
-            #     sf.write(ttl)
+            if os.environ.get('bald_update_results') is not None:
+                with open(os.path.join(self.ttl_path, 'multi_array_reference.ttl'), 'w') as sf:
+                    sf.write(ttl)
             with open(os.path.join(self.ttl_path, 'multi_array_reference.ttl'), 'r') as sf:
                 expected_ttl = sf.read()
             self.assertEqual(expected_ttl, ttl)