[svn-r7329] Purpose:

    Refactored test output

Description:
    Chase new output format of 'objno' in DDL and XML schema output

Platforms tested:
    h5committested

1 files changed, 39 insertions, 39 deletions

diff --git a/tools/testfiles/tsaf.h5.xml b/tools/testfiles/tsaf.h5.xml
index ea33d60..0a5d89f 100644
--- a/tools/testfiles/tsaf.h5.xml
+++ b/tools/testfiles/tsaf.h5.xml
@@ -3,8 +3,8 @@ Expected output for 'h5dump --xml tsaf.h5'
 #############################
 <?xml version="1.0" encoding="UTF-8"?>
 <hdf5:HDF5-File xmlns:hdf5="http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdf.ncsa.uiuc.edu/DTDs/HDF5File http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.xsd">
-<hdf5:RootGroup OBJ-XID="xid_696-0" H5Path="/">
-   <hdf5:Dataset Name=".DSL_METADATA" OBJ-XID="xid_744-0" H5Path= "/.DSL_METADATA" Parents="xid_696-0" H5ParentPaths="/">
+<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
+   <hdf5:Dataset Name=".DSL_METADATA" OBJ-XID="xid_744" H5Path= "/.DSL_METADATA" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ChunkedLayout Ndims="1">
             <hdf5:ChunkDimension DimSize="1024" />
@@ -314,7 +314,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="Blob" OBJ-XID="xid_17612-0" H5Path= "/Blob" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="Blob" OBJ-XID="xid_17612" H5Path= "/Blob" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ChunkedLayout Ndims="1">
             <hdf5:ChunkDimension DimSize="1024" />
@@ -397,7 +397,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="Cat" OBJ-XID="xid_169596-0" H5Path= "/Cat" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="Cat" OBJ-XID="xid_169596" H5Path= "/Cat" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ChunkedLayout Ndims="1">
             <hdf5:ChunkDimension DimSize="1024" />
@@ -546,7 +546,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="Collection" OBJ-XID="xid_425460-0" H5Path= "/Collection" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="Collection" OBJ-XID="xid_425460" H5Path= "/Collection" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ChunkedLayout Ndims="1">
             <hdf5:ChunkDimension DimSize="1024" />
@@ -772,7 +772,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="Field" OBJ-XID="xid_619980-0" H5Path= "/Field" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="Field" OBJ-XID="xid_619980" H5Path= "/Field" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ChunkedLayout Ndims="1">
             <hdf5:ChunkDimension DimSize="1024" />
@@ -1048,7 +1048,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="FieldTmpl" OBJ-XID="xid_518404-0" H5Path= "/FieldTmpl" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="FieldTmpl" OBJ-XID="xid_518404" H5Path= "/FieldTmpl" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ChunkedLayout Ndims="1">
             <hdf5:ChunkDimension DimSize="1024" />
@@ -1303,7 +1303,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="IndexSpec" OBJ-XID="xid_51916-0" H5Path= "/IndexSpec" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="IndexSpec" OBJ-XID="xid_51916" H5Path= "/IndexSpec" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ChunkedLayout Ndims="1">
             <hdf5:ChunkDimension DimSize="1024" />
@@ -1479,7 +1479,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="Relation" OBJ-XID="xid_465812-0" H5Path= "/Relation" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="Relation" OBJ-XID="xid_465812" H5Path= "/Relation" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ChunkedLayout Ndims="1">
             <hdf5:ChunkDimension DimSize="1024" />
@@ -1763,7 +1763,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="Set" OBJ-XID="xid_254332-0" H5Path= "/Set" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="Set" OBJ-XID="xid_254332" H5Path= "/Set" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ChunkedLayout Ndims="1">
             <hdf5:ChunkDimension DimSize="1024" />
@@ -1960,7 +1960,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="field-coords_0002" OBJ-XID="xid_14968-0" H5Path= "/field-coords_0002" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="field-coords_0002" OBJ-XID="xid_14968" H5Path= "/field-coords_0002" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
@@ -1986,7 +1986,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="field-displacements_0007" OBJ-XID="xid_15968-0" H5Path= "/field-displacements_0007" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="field-displacements_0007" OBJ-XID="xid_15968" H5Path= "/field-displacements_0007" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
@@ -2013,7 +2013,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="field-distribution_factors_0003" OBJ-XID="xid_15384-0" H5Path= "/field-distribution_factors_0003" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="field-distribution_factors_0003" OBJ-XID="xid_15384" H5Path= "/field-distribution_factors_0003" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
@@ -2038,7 +2038,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="field-pressure_0013" OBJ-XID="xid_17332-0" H5Path= "/field-pressure_0013" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="field-pressure_0013" OBJ-XID="xid_17332" H5Path= "/field-pressure_0013" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
@@ -2063,7 +2063,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="field-stress_0011" OBJ-XID="xid_16384-0" H5Path= "/field-stress_0011" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="field-stress_0011" OBJ-XID="xid_16384" H5Path= "/field-stress_0011" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
@@ -2088,7 +2088,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="field-temperature_0004" OBJ-XID="xid_15676-0" H5Path= "/field-temperature_0004" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="field-temperature_0004" OBJ-XID="xid_15676" H5Path= "/field-temperature_0004" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
@@ -2113,7 +2113,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="field-temperature_0012" OBJ-XID="xid_17032-0" H5Path= "/field-temperature_0012" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="field-temperature_0012" OBJ-XID="xid_17032" H5Path= "/field-temperature_0012" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
@@ -2138,7 +2138,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="metablob00000.blob" OBJ-XID="xid_761500-0" H5Path= "/metablob00000.blob" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="metablob00000.blob" OBJ-XID="xid_761500" H5Path= "/metablob00000.blob" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ChunkedLayout Ndims="1">
             <hdf5:ChunkDimension DimSize="32" />
@@ -2167,7 +2167,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="metablob00000.index" OBJ-XID="xid_758876-0" H5Path= "/metablob00000.index" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="metablob00000.index" OBJ-XID="xid_758876" H5Path= "/metablob00000.index" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ChunkedLayout Ndims="1">
             <hdf5:ChunkDimension DimSize="32" />
@@ -2210,7 +2210,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="ssrel-_0000" OBJ-XID="xid_8924-0" H5Path= "/ssrel-_0000" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="ssrel-_0000" OBJ-XID="xid_8924" H5Path= "/ssrel-_0000" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
@@ -2235,7 +2235,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="ssrel-_0001" OBJ-XID="xid_9232-0" H5Path= "/ssrel-_0001" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="ssrel-_0001" OBJ-XID="xid_9232" H5Path= "/ssrel-_0001" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
@@ -2260,7 +2260,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="ssrel-_0002" OBJ-XID="xid_9520-0" H5Path= "/ssrel-_0002" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="ssrel-_0002" OBJ-XID="xid_9520" H5Path= "/ssrel-_0002" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
@@ -2285,7 +2285,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="ssrel-_0003" OBJ-XID="xid_9820-0" H5Path= "/ssrel-_0003" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="ssrel-_0003" OBJ-XID="xid_9820" H5Path= "/ssrel-_0003" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
@@ -2310,7 +2310,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="ssrel-_0004" OBJ-XID="xid_10108-0" H5Path= "/ssrel-_0004" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="ssrel-_0004" OBJ-XID="xid_10108" H5Path= "/ssrel-_0004" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
@@ -2335,7 +2335,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="ssrel-_0005" OBJ-XID="xid_10400-0" H5Path= "/ssrel-_0005" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="ssrel-_0005" OBJ-XID="xid_10400" H5Path= "/ssrel-_0005" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
@@ -2360,7 +2360,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="ssrel-_0006" OBJ-XID="xid_10684-0" H5Path= "/ssrel-_0006" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="ssrel-_0006" OBJ-XID="xid_10684" H5Path= "/ssrel-_0006" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
@@ -2385,7 +2385,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="ssrel-_0007" OBJ-XID="xid_11300-0" H5Path= "/ssrel-_0007" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="ssrel-_0007" OBJ-XID="xid_11300" H5Path= "/ssrel-_0007" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
@@ -2410,7 +2410,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="ssrel-_0008" OBJ-XID="xid_11576-0" H5Path= "/ssrel-_0008" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="ssrel-_0008" OBJ-XID="xid_11576" H5Path= "/ssrel-_0008" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
@@ -2435,7 +2435,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="ssrel-_0009" OBJ-XID="xid_11888-0" H5Path= "/ssrel-_0009" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="ssrel-_0009" OBJ-XID="xid_11888" H5Path= "/ssrel-_0009" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
@@ -2460,7 +2460,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="ssrel-_0010" OBJ-XID="xid_12176-0" H5Path= "/ssrel-_0010" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="ssrel-_0010" OBJ-XID="xid_12176" H5Path= "/ssrel-_0010" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
@@ -2485,7 +2485,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="ssrel-_0011" OBJ-XID="xid_12788-0" H5Path= "/ssrel-_0011" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="ssrel-_0011" OBJ-XID="xid_12788" H5Path= "/ssrel-_0011" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
@@ -2510,7 +2510,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="ssrel-_0012" OBJ-XID="xid_13080-0" H5Path= "/ssrel-_0012" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="ssrel-_0012" OBJ-XID="xid_13080" H5Path= "/ssrel-_0012" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
@@ -2535,7 +2535,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="toporel-_0017" OBJ-XID="xid_13372-0" H5Path= "/toporel-_0017" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="toporel-_0017" OBJ-XID="xid_13372" H5Path= "/toporel-_0017" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
@@ -2560,7 +2560,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="toporel-_0018" OBJ-XID="xid_13708-0" H5Path= "/toporel-_0018" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="toporel-_0018" OBJ-XID="xid_13708" H5Path= "/toporel-_0018" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
@@ -2585,7 +2585,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="toporel-_0019" OBJ-XID="xid_14344-0" H5Path= "/toporel-_0019" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="toporel-_0019" OBJ-XID="xid_14344" H5Path= "/toporel-_0019" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
@@ -2610,7 +2610,7 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Dataset Name="toporel-_0020" OBJ-XID="xid_14632-0" H5Path= "/toporel-_0020" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="toporel-_0020" OBJ-XID="xid_14632" H5Path= "/toporel-_0020" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
@@ -2635,9 +2635,9 @@ Expected output for 'h5dump --xml tsaf.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Group Name=".attributes" OBJ-XID="xid_5072-0" H5Path="/.attributes" Parents="xid_696-0" H5ParentPaths="/" >
-      <hdf5:Group Name="database" OBJ-XID="xid_5728-0" H5Path="/.attributes/database" Parents="xid_5072-0" H5ParentPaths="/.attributes" >
-         <hdf5:Dataset Name=".SAF_DbProps" OBJ-XID="xid_6104-0" H5Path= "/.attributes/database/.SAF_DbProps" Parents="xid_5728-0" H5ParentPaths="/.attributes/database">
+   <hdf5:Group Name=".attributes" OBJ-XID="xid_5072" H5Path="/.attributes" Parents="xid_696" H5ParentPaths="/" >
+      <hdf5:Group Name="database" OBJ-XID="xid_5728" H5Path="/.attributes/database" Parents="xid_5072" H5ParentPaths="/.attributes" >
+         <hdf5:Dataset Name=".SAF_DbProps" OBJ-XID="xid_6104" H5Path= "/.attributes/database/.SAF_DbProps" Parents="xid_5728" H5ParentPaths="/.attributes/database">
             <hdf5:StorageLayout>
                <hdf5:ContiguousLayout/>
             </hdf5:StorageLayout>