[svn-r2278] changed the nested compound test. copied Elena's code from her test file for nested comp types.

more complicated test case

1 files changed, 72 insertions, 29 deletions

diff --git a/tools/testfiles/tnestcomp-1.ddl b/tools/testfiles/tnestcomp-1.ddl
index 7db8dc9..4d325f0 100644
--- a/tools/testfiles/tnestcomp-1.ddl
+++ b/tools/testfiles/tnestcomp-1.ddl
@@ -3,67 +3,110 @@ Expected output for 'h5dump tnestedcomp.h5'
 #############################
 HDF5 "tnestedcomp.h5" {
 GROUP "/" {
-   DATASET "nested compound" {
+   DATASET "ArrayOfStructures" {
       DATATYPE {
+         H5T_STD_I32LE "a_name";
+         H5T_IEEE_F32LE "b_name";
+         H5T_IEEE_F64LE "c_name";
          {
-            H5T_IEEE_F64BE "re";
-            H5T_IEEE_F64BE "im";
-         } "x";
-         {
-            H5T_IEEE_F64BE "re";
-            H5T_IEEE_F64BE "im";
-         } "y";
+            { STRSIZE 1;
+              STRPAD H5T_STR_NULLTERM;
+              CSET H5T_CSET_ASCII;
+              CTYPE H5T_C_S1;
+            } "char_name";
+            H5T_IEEE_F32LE "array_name"[2];
+         } "d_name";
       } 
-      DATASPACE { SIMPLE ( 5 ) / ( 5 ) } 
+      DATASPACE { SIMPLE ( 10 ) / ( 10 ) } 
       DATA {
          {
-            {
             0,
-            1
+            0,
+            1,
+            {
+            "A",
+            [ -100, 100 ]
+         }
          },
+         {
+            1,
+            1,
+            0.5,
             {
-            2,
-            4
+            "B",
+            [ -100, 100 ]
          }
          },
          {
+            2,
+            4,
+            0.333333,
             {
-            1,
-            3
+            "C",
+            [ -100, 100 ]
+         }
          },
+         {
+            3,
+            9,
+            0.25,
             {
-            4,
-            7
+            "D",
+            [ -100, 100 ]
          }
          },
          {
+            4,
+            16,
+            0.2,
             {
-            2,
-            5
+            "E",
+            [ -100, 100 ]
+         }
          },
+         {
+            5,
+            25,
+            0.166667,
             {
-            6,
-            10
+            "F",
+            [ -100, 100 ]
          }
          },
          {
+            6,
+            36,
+            0.142857,
             {
-            3,
-            7
+            "G",
+            [ -100, 100 ]
+         }
          },
+         {
+            7,
+            49,
+            0.125,
             {
-            8,
-            13
+            "H",
+            [ -100, 100 ]
          }
          },
          {
+            8,
+            64,
+            0.111111,
             {
-            4,
-            9
+            "I",
+            [ -100, 100 ]
+         }
          },
+         {
+            9,
+            81,
+            0.1,
             {
-            10,
-            16
+            "J",
+            [ -100, 100 ]
          }
          }
       }