Changeset 1230 for branches/4.2/bindings/python/nxstest.py

Timestamp:

14/04/09 18:56:40 (3 years ago)

Author:

Freddie Akeroyd

Message:

Merg in r1212:r1222 from trunk. Refs #115.

File:

• branches/4.2/bindings/python/nxstest.py (modified) (4 diffs)

branches/4.2/bindings/python/nxstest.py

@@ -132 +132 @@
     # .. demonstrate extensible data
     file.makedata('flush_data','int32',[nxs.UNLIMITED])
+    file.opendata('flush_data')
     for i in range(7):
-        file.opendata('flush_data')
         file.putslab(i,[i],[1])
-        file.flush()
-        # Oops... why isn't there a closedata()?
+    file.closedata()
+    file.flush()
     file.closegroup()
 
@@ -142 +142 @@
     file.makegroup('sample','NXsample')
     file.opengroup('sample','NXsample')
-    file.makedata('ch_data','char',[12])
+    file.makedata('ch_data','char',[20])
     file.opendata('ch_data')
     file.putdata('NeXus sample')
@@ -231 +231 @@
             fail("%s retrieved %s"%(dtype,get))
 
+
     # Check attribute types
     file.opendata('r8_data')
@@ -255 +256 @@
     for i in range(100): comp_array[i,:] *= i
     expected = comp_array
-    file.opengroup('data','NXdata')
-    file.opendata('comp_data')
+    file.opengroup('data','NXdata') #/entry/data
+    file.opendata('comp_data')      #/entry/data/comp_data
     get = file.getdata()
-    file.closedata()  #/entry/data/comp_data
-    file.closegroup() #/entry/data
+    file.closedata()                #/entry/data/comp_data
+    file.closegroup()               #/entry/data
     if not (get == expected).all():
         fail("compressed data differs")
         print get
+        
+    # Check strings
+    file.opengroup('sample','NXsample') #/entry/sample
+    file.opendata('ch_data')            #/entry/sample/ch_data
+    rawshape,rawdtype = file.getrawinfo()
+    shape,dtype = file.getinfo()
+    get = file.getdata()
+    file.closedata()                    #/entry/sample/ch_data
+    file.closegroup()                   #/entry/sample
+    if not (shape[0]==12 and dtype=='char'):
+        fail("returned string info is incorrect")
+        print shape,dtype
+    if not (rawshape[0]==20 and rawdtype=='char'):
+        fail("returned string storage info is incorrect")
+        print shape,dtype
+    if not (get == "NeXus sample"):
+        fail("returned string is incorrect")
+        print shape,dtype
+
+
     file.closegroup() #/entry
-        
+
     # Check read slab (e.g., from extensible)