[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, 16 insertions, 16 deletions

diff --git a/tools/testfiles/tcompound.h5.xml b/tools/testfiles/tcompound.h5.xml
index 1b3b1f0..b85bd5b 100644
--- a/tools/testfiles/tcompound.h5.xml
+++ b/tools/testfiles/tcompound.h5.xml
@@ -3,8 +3,8 @@ Expected output for 'h5dump --xml tcompound.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:NamedDataType Name="#6632:0" OBJ-XID="xid_4294967294-4294967293" Parents="xid_696-0" H5ParentPaths="/">
+<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
+   <hdf5:NamedDataType Name="#6632" OBJ-XID="xid_18446744073709551614" Parents="xid_696" H5ParentPaths="/">
       <hdf5:DataType>
       <hdf5:CompoundType>
          <hdf5:Field FieldName="int">
@@ -24,7 +24,7 @@ Expected output for 'h5dump --xml tcompound.h5'
       </hdf5:CompoundType>
       </hdf5:DataType>
    </hdf5:NamedDataType>
-   <hdf5:NamedDataType Name="type1" OBJ-XID="xid_1424-0" H5Path="/type1" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:NamedDataType Name="type1" OBJ-XID="xid_1424" H5Path="/type1" Parents="xid_696" H5ParentPaths="/">
       <hdf5:DataType>
       <hdf5:CompoundType>
          <hdf5:Field FieldName="int_name">
@@ -44,7 +44,7 @@ Expected output for 'h5dump --xml tcompound.h5'
       </hdf5:CompoundType>
       </hdf5:DataType>
    </hdf5:NamedDataType>
-   <hdf5:NamedDataType Name="type2" OBJ-XID="xid_2792-0" H5Path="/type2" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:NamedDataType Name="type2" OBJ-XID="xid_2792" H5Path="/type2" Parents="xid_696" H5ParentPaths="/">
       <hdf5:DataType>
       <hdf5:CompoundType>
          <hdf5:Field FieldName="int_array">
@@ -75,7 +75,7 @@ Expected output for 'h5dump --xml tcompound.h5'
       </hdf5:CompoundType>
       </hdf5:DataType>
    </hdf5:NamedDataType>
-   <hdf5:Dataset Name="dset1" OBJ-XID="xid_744-0" H5Path= "/dset1" Parents="xid_696-0" H5ParentPaths="/">
+   <hdf5:Dataset Name="dset1" OBJ-XID="xid_744" H5Path= "/dset1" Parents="xid_696" H5ParentPaths="/">
       <hdf5:StorageLayout>
          <hdf5:ContiguousLayout/>
       </hdf5:StorageLayout>
@@ -121,8 +121,8 @@ Expected output for 'h5dump --xml tcompound.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Dataset>
-   <hdf5:Group Name="group1" OBJ-XID="xid_2104-0" H5Path="/group1" Parents="xid_696-0" H5ParentPaths="/" >
-      <hdf5:NamedDataType Name="type3" OBJ-XID="xid_5592-0" H5Path="/group1/type3" Parents="xid_2104-0" H5ParentPaths="/group1">
+   <hdf5:Group Name="group1" OBJ-XID="xid_2104" H5Path="/group1" Parents="xid_696" H5ParentPaths="/" >
+      <hdf5:NamedDataType Name="type3" OBJ-XID="xid_5592" H5Path="/group1/type3" Parents="xid_2104" H5ParentPaths="/group1">
          <hdf5:DataType>
          <hdf5:CompoundType>
             <hdf5:Field FieldName="int">
@@ -142,7 +142,7 @@ Expected output for 'h5dump --xml tcompound.h5'
          </hdf5:CompoundType>
          </hdf5:DataType>
       </hdf5:NamedDataType>
-      <hdf5:Dataset Name="dset2" OBJ-XID="xid_2152-0" H5Path= "/group1/dset2" Parents="xid_2104-0" H5ParentPaths="/group1">
+      <hdf5:Dataset Name="dset2" OBJ-XID="xid_2152" H5Path= "/group1/dset2" Parents="xid_2104" H5ParentPaths="/group1">
          <hdf5:StorageLayout>
             <hdf5:ContiguousLayout/>
          </hdf5:StorageLayout>
@@ -156,7 +156,7 @@ Expected output for 'h5dump --xml tcompound.h5'
                <hdf5:Dimension  DimSize="5" MaxDimSize="5"/>
             </hdf5:SimpleDataspace>
          </hdf5:Dataspace>
-         <hdf5:NamedDataTypePtr OBJ-XID="xid_1424-0" H5Path="/type1" />
+         <hdf5:NamedDataTypePtr OBJ-XID="xid_1424" H5Path="/type1" />
       <!-- Note: format of compound data not specified -->
          <hdf5:Data>
             <hdf5:DataFromFile>
@@ -164,7 +164,7 @@ Expected output for 'h5dump --xml tcompound.h5'
             </hdf5:DataFromFile>
          </hdf5:Data>
       </hdf5:Dataset>
-      <hdf5:Dataset Name="dset3" OBJ-XID="xid_2872-0" H5Path= "/group1/dset3" Parents="xid_2104-0" H5ParentPaths="/group1">
+      <hdf5:Dataset Name="dset3" OBJ-XID="xid_2872" H5Path= "/group1/dset3" Parents="xid_2104" H5ParentPaths="/group1">
          <hdf5:StorageLayout>
             <hdf5:ContiguousLayout/>
          </hdf5:StorageLayout>
@@ -179,7 +179,7 @@ Expected output for 'h5dump --xml tcompound.h5'
                <hdf5:Dimension  DimSize="6" MaxDimSize="6"/>
             </hdf5:SimpleDataspace>
          </hdf5:Dataspace>
-         <hdf5:NamedDataTypePtr OBJ-XID="xid_2792-0" H5Path="/type2" />
+         <hdf5:NamedDataTypePtr OBJ-XID="xid_2792" H5Path="/type2" />
       <!-- Note: format of compound data not specified -->
          <hdf5:Data>
             <hdf5:DataFromFile>
@@ -276,7 +276,7 @@ Expected output for 'h5dump --xml tcompound.h5'
             </hdf5:DataFromFile>
          </hdf5:Data>
       </hdf5:Dataset>
-      <hdf5:Dataset Name="dset4" OBJ-XID="xid_5672-0" H5Path= "/group1/dset4" Parents="xid_2104-0" H5ParentPaths="/group1">
+      <hdf5:Dataset Name="dset4" OBJ-XID="xid_5672" H5Path= "/group1/dset4" Parents="xid_2104" H5ParentPaths="/group1">
          <hdf5:StorageLayout>
             <hdf5:ContiguousLayout/>
          </hdf5:StorageLayout>
@@ -290,7 +290,7 @@ Expected output for 'h5dump --xml tcompound.h5'
                <hdf5:Dimension  DimSize="5" MaxDimSize="5"/>
             </hdf5:SimpleDataspace>
          </hdf5:Dataspace>
-         <hdf5:NamedDataTypePtr OBJ-XID="xid_5592-0" H5Path="/group1/type3" />
+         <hdf5:NamedDataTypePtr OBJ-XID="xid_5592" H5Path="/group1/type3" />
       <!-- Note: format of compound data not specified -->
          <hdf5:Data>
             <hdf5:DataFromFile>
@@ -299,8 +299,8 @@ Expected output for 'h5dump --xml tcompound.h5'
          </hdf5:Data>
       </hdf5:Dataset>
    </hdf5:Group>
-   <hdf5:Group Name="group2" OBJ-XID="xid_6584-0" H5Path="/group2" Parents="xid_696-0" H5ParentPaths="/" >
-      <hdf5:Dataset Name="dset5" OBJ-XID="xid_7040-0" H5Path= "/group2/dset5" Parents="xid_6584-0" H5ParentPaths="/group2">
+   <hdf5:Group Name="group2" OBJ-XID="xid_6584" H5Path="/group2" Parents="xid_696" H5ParentPaths="/" >
+      <hdf5:Dataset Name="dset5" OBJ-XID="xid_7040" H5Path= "/group2/dset5" Parents="xid_6584" H5ParentPaths="/group2">
          <hdf5:StorageLayout>
             <hdf5:ContiguousLayout/>
          </hdf5:StorageLayout>
@@ -314,7 +314,7 @@ Expected output for 'h5dump --xml tcompound.h5'
                <hdf5:Dimension  DimSize="5" MaxDimSize="5"/>
             </hdf5:SimpleDataspace>
          </hdf5:Dataspace>
-         <hdf5:NamedDataTypePtr OBJ-XID="xid_7040-0"/>
+         <hdf5:NamedDataTypePtr OBJ-XID="xid_7040"/>
       <!-- Note: format of compound data not specified -->
          <hdf5:Data>
             <hdf5:DataFromFile>