Merge pull request #11135 from shamser/issue19639

HPCC-19639 Update WUDetails regression with schema changes

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>

testing/esp/wudetails/key/dedup_all_hthor_testcase1.json

@@ -8,9 +8,11 @@ testCase(ScopeFilter={
     'Depth': None,
     'ScopeTypes': None
 }, PropertiesToReturn={
-    'AllStatistics': '1',
-    'AllAttributes': '1',
-    'AllHints': '1',
+    'AllStatistics': None,
+    'AllAttributes': None,
+    'AllHints': None,
+    'AllScopes': None,
+    'AllProperties': '1',
     'MinVersion': None,
     'Measure': None,
     'Properties': None,
@@ -92,18 +94,26 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'graph1',
-                'Id': 'graph1',
-                'ScopeType': 'graph',
+                'ScopeName': 'w1',
+                'Id': 'w1',
+                'ScopeType': 'workflow',
                 'Properties': {
                     'Property': [
                         {
-                            'Name': 'TimeElapsed',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
+                            'Name': 'IsScheduled',
+                            'RawValue': 'true',
+                            'Formatted': 'true',
+                            'Measure': None,
                             'Creator': '{masked}',
-                            'CreatorType': 'hthor'
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'State',
+                            'RawValue': 'done',
+                            'Formatted': 'done',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -121,6 +131,14 @@ testCase(ScopeFilter={
                             'Measure': 'ts',
                             'Creator': '{masked}',
                             'CreatorType': 'hthor'
+                        },
+                        {
+                            'Name': 'TimeElapsed',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': 'ns',
+                            'Creator': '{masked}',
+                            'CreatorType': 'hthor'
                         }
                     ]
                 }
@@ -205,17 +223,17 @@ testCase(ScopeFilter={
                             'CreatorType': 'hthor'
                         },
                         {
-                            'Name': 'Source',
-                            'RawValue': '2',
-                            'Formatted': '2',
+                            'Name': 'IdSource',
+                            'RawValue': 'a2',
+                            'Formatted': 'a2',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Target',
-                            'RawValue': '3',
-                            'Formatted': '3',
+                            'Name': 'IdTarget',
+                            'RawValue': 'a3',
+                            'Formatted': 'a3',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -278,17 +296,17 @@ testCase(ScopeFilter={
                             'CreatorType': 'hthor'
                         },
                         {
-                            'Name': 'Source',
-                            'RawValue': '3',
-                            'Formatted': '3',
+                            'Name': 'IdSource',
+                            'RawValue': 'a3',
+                            'Formatted': 'a3',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Target',
-                            'RawValue': '4',
-                            'Formatted': '4',
+                            'Name': 'IdTarget',
+                            'RawValue': 'a4',
+                            'Formatted': 'a4',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -349,6 +367,30 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclText',
+                            'RawValue': "DATASET([{'C','G'},...], myrec);\n",
+                            'Formatted': "DATASET([{'C','G'},...], myrec);\n",
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'RecordSize',
+                            'RawValue': '2',
+                            'Formatted': '2',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'PredictedCount',
+                            'RawValue': '5',
+                            'Formatted': '5',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -390,6 +432,30 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclText',
+                            'RawValue': "DEDUP(LEFT.value2  IN  ['G', 'C', 'X'] AND RIGHT.value2  IN  ['X', 'B', 'C'], all);\n",
+                            'Formatted': "DEDUP(LEFT.value2  IN  ['G', 'C', 'X'] AND RIGHT.value2  IN  ['X', 'B', 'C'], all);\n",
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'RecordSize',
+                            'RawValue': '2',
+                            'Formatted': '2',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'PredictedCount',
+                            'RawValue': '1..5[tiny]',
+                            'Formatted': '1..5[tiny]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -423,6 +489,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclText',
+                            'RawValue': 'OUTPUT(..., workunit);\n',
+                            'Formatted': 'OUTPUT(..., workunit);\n',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'RecordSize',
+                            'RawValue': '2',
+                            'Formatted': '2',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -507,17 +589,17 @@ testCase(ScopeFilter={
                             'CreatorType': 'hthor'
                         },
                         {
-                            'Name': 'Source',
-                            'RawValue': '6',
-                            'Formatted': '6',
+                            'Name': 'IdSource',
+                            'RawValue': 'a6',
+                            'Formatted': 'a6',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Target',
-                            'RawValue': '7',
-                            'Formatted': '7',
+                            'Name': 'IdTarget',
+                            'RawValue': 'a7',
+                            'Formatted': 'a7',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -580,17 +662,17 @@ testCase(ScopeFilter={
                             'CreatorType': 'hthor'
                         },
                         {
-                            'Name': 'Source',
-                            'RawValue': '7',
-                            'Formatted': '7',
+                            'Name': 'IdSource',
+                            'RawValue': 'a7',
+                            'Formatted': 'a7',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Target',
-                            'RawValue': '8',
-                            'Formatted': '8',
+                            'Name': 'IdTarget',
+                            'RawValue': 'a8',
+                            'Formatted': 'a8',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -651,6 +733,30 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclText',
+                            'RawValue': "DATASET([{'C','G'},...], myrec);\n",
+                            'Formatted': "DATASET([{'C','G'},...], myrec);\n",
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'RecordSize',
+                            'RawValue': '2',
+                            'Formatted': '2',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'PredictedCount',
+                            'RawValue': '5',
+                            'Formatted': '5',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -692,6 +798,30 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclText',
+                            'RawValue': "DEDUP(LEFT.value2  IN  ['G', 'C'] AND RIGHT.value2  IN  ['X', 'B'], all);\n",
+                            'Formatted': "DEDUP(LEFT.value2  IN  ['G', 'C'] AND RIGHT.value2  IN  ['X', 'B'], all);\n",
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'RecordSize',
+                            'RawValue': '2',
+                            'Formatted': '2',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'PredictedCount',
+                            'RawValue': '1..5[tiny]',
+                            'Formatted': '1..5[tiny]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -725,6 +855,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclText',
+                            'RawValue': 'OUTPUT(..., workunit);\n',
+                            'Formatted': 'OUTPUT(..., workunit);\n',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'RecordSize',
+                            'RawValue': '2',
+                            'Formatted': '2',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -809,17 +955,17 @@ testCase(ScopeFilter={
                             'CreatorType': 'hthor'
                         },
                         {
-                            'Name': 'Source',
-                            'RawValue': '10',
-                            'Formatted': '10',
+                            'Name': 'IdSource',
+                            'RawValue': 'a10',
+                            'Formatted': 'a10',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Target',
-                            'RawValue': '11',
-                            'Formatted': '11',
+                            'Name': 'IdTarget',
+                            'RawValue': 'a11',
+                            'Formatted': 'a11',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -882,17 +1028,17 @@ testCase(ScopeFilter={
                             'CreatorType': 'hthor'
                         },
                         {
-                            'Name': 'Source',
-                            'RawValue': '11',
-                            'Formatted': '11',
+                            'Name': 'IdSource',
+                            'RawValue': 'a11',
+                            'Formatted': 'a11',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Target',
-                            'RawValue': '12',
-                            'Formatted': '12',
+                            'Name': 'IdTarget',
+                            'RawValue': 'a12',
+                            'Formatted': 'a12',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -953,6 +1099,30 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclText',
+                            'RawValue': "DATASET([{'C','G'},...], myrec);\n",
+                            'Formatted': "DATASET([{'C','G'},...], myrec);\n",
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'RecordSize',
+                            'RawValue': '2',
+                            'Formatted': '2',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'PredictedCount',
+                            'RawValue': '5',
+                            'Formatted': '5',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -994,6 +1164,30 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclText',
+                            'RawValue': "DEDUP(LEFT.value2  IN  ['X', 'B'] AND RIGHT.value2  IN  ['G', 'C'], all);\n",
+                            'Formatted': "DEDUP(LEFT.value2  IN  ['X', 'B'] AND RIGHT.value2  IN  ['G', 'C'], all);\n",
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'RecordSize',
+                            'RawValue': '2',
+                            'Formatted': '2',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'PredictedCount',
+                            'RawValue': '1..5[tiny]',
+                            'Formatted': '1..5[tiny]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1027,6 +1221,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclText',
+                            'RawValue': 'OUTPUT(..., workunit);\n',
+                            'Formatted': 'OUTPUT(..., workunit);\n',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'RecordSize',
+                            'RawValue': '2',
+                            'Formatted': '2',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1065,8 +1275,8 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'compile:write c++',
-                'Id': 'write c++',
+                'ScopeName': 'compile:compile c++',
+                'Id': 'compile c++',
                 'ScopeType': 'compile',
                 'Properties': {
                     'Property': [
@@ -1090,8 +1300,8 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'compile:compile c++',
-                'Id': 'compile c++',
+                'ScopeName': 'compile:generate',
+                'Id': 'generate',
                 'ScopeType': 'compile',
                 'Properties': {
                     'Property': [
@@ -1115,8 +1325,8 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'compile:generate',
-                'Id': 'generate',
+                'ScopeName': 'compile:parse',
+                'Id': 'parse',
                 'ScopeType': 'compile',
                 'Properties': {
                     'Property': [
@@ -1140,8 +1350,8 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'compile:parse',
-                'Id': 'parse',
+                'ScopeName': 'compile:write c++',
+                'Id': 'write c++',
                 'ScopeType': 'compile',
                 'Properties': {
                     'Property': [

testing/esp/wudetails/key/dict1_hthor_testcase1.json

@@ -8,9 +8,11 @@ testCase(ScopeFilter={
     'Depth': None,
     'ScopeTypes': None
 }, PropertiesToReturn={
-    'AllStatistics': '1',
-    'AllAttributes': '1',
-    'AllHints': '1',
+    'AllStatistics': None,
+    'AllAttributes': None,
+    'AllHints': None,
+    'AllScopes': None,
+    'AllProperties': '1',
     'MinVersion': None,
     'Measure': None,
     'Properties': None,
@@ -92,18 +94,26 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'graph1',
-                'Id': 'graph1',
-                'ScopeType': 'graph',
+                'ScopeName': 'w1',
+                'Id': 'w1',
+                'ScopeType': 'workflow',
                 'Properties': {
                     'Property': [
                         {
-                            'Name': 'TimeElapsed',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
+                            'Name': 'IsScheduled',
+                            'RawValue': 'true',
+                            'Formatted': 'true',
+                            'Measure': None,
                             'Creator': '{masked}',
-                            'CreatorType': 'hthor'
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'State',
+                            'RawValue': 'done',
+                            'Formatted': 'done',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -121,6 +131,14 @@ testCase(ScopeFilter={
                             'Measure': 'ts',
                             'Creator': '{masked}',
                             'CreatorType': 'hthor'
+                        },
+                        {
+                            'Name': 'TimeElapsed',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': 'ns',
+                            'Creator': '{masked}',
+                            'CreatorType': 'hthor'
                         }
                     ]
                 }
@@ -205,17 +223,17 @@ testCase(ScopeFilter={
                             'CreatorType': 'hthor'
                         },
                         {
-                            'Name': 'Source',
-                            'RawValue': '2',
-                            'Formatted': '2',
+                            'Name': 'IdSource',
+                            'RawValue': 'a2',
+                            'Formatted': 'a2',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Target',
-                            'RawValue': '3',
-                            'Formatted': '3',
+                            'Name': 'IdTarget',
+                            'RawValue': 'a3',
+                            'Formatted': 'a3',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -278,17 +296,17 @@ testCase(ScopeFilter={
                             'CreatorType': 'hthor'
                         },
                         {
-                            'Name': 'Source',
-                            'RawValue': '3',
-                            'Formatted': '3',
+                            'Name': 'IdSource',
+                            'RawValue': 'a3',
+                            'Formatted': 'a3',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Target',
-                            'RawValue': '4',
-                            'Formatted': '4',
+                            'Name': 'IdTarget',
+                            'RawValue': 'a4',
+                            'Formatted': 'a4',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -341,6 +359,30 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclText',
+                            'RawValue': 'DATASET([{1,...},...], { unsigned8 top, DICTIONARY({ string8 name, unsigned8 iq }) nest });\n',
+                            'Formatted': 'DATASET([{1,...},...], { unsigned8 top, DICTIONARY({ string8 name, unsigned8 iq }) nest });\n',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'RecordSize',
+                            'RawValue': '20',
+                            'Formatted': '20',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'PredictedCount',
+                            'RawValue': '12',
+                            'Formatted': '12',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -374,6 +416,30 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclText',
+                            'RawValue': 'ROLLUP(LEFT.top = RIGHT.top, t(LEFT, RIGHT));\n',
+                            'Formatted': 'ROLLUP(LEFT.top = RIGHT.top, t(LEFT, RIGHT));\n',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'RecordSize',
+                            'RawValue': '20',
+                            'Formatted': '20',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'PredictedCount',
+                            'RawValue': '0..?[disk]',
+                            'Formatted': '0..?[disk]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -423,6 +489,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclText',
+                            'RawValue': 'OUTPUT(..., workunit);\n',
+                            'Formatted': 'OUTPUT(..., workunit);\n',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'RecordSize',
+                            'RawValue': '20',
+                            'Formatted': '20',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -461,8 +543,8 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'compile:write c++',
-                'Id': 'write c++',
+                'ScopeName': 'compile:compile c++',
+                'Id': 'compile c++',
                 'ScopeType': 'compile',
                 'Properties': {
                     'Property': [
@@ -486,8 +568,8 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'compile:compile c++',
-                'Id': 'compile c++',
+                'ScopeName': 'compile:generate',
+                'Id': 'generate',
                 'ScopeType': 'compile',
                 'Properties': {
                     'Property': [
@@ -511,8 +593,8 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'compile:generate',
-                'Id': 'generate',
+                'ScopeName': 'compile:parse',
+                'Id': 'parse',
                 'ScopeType': 'compile',
                 'Properties': {
                     'Property': [
@@ -536,8 +618,8 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'compile:parse',
-                'Id': 'parse',
+                'ScopeName': 'compile:write c++',
+                'Id': 'write c++',
                 'ScopeType': 'compile',
                 'Properties': {
                     'Property': [

testing/esp/wudetails/key/dict1_roxie_testcase1.json

@@ -8,9 +8,11 @@ testCase(ScopeFilter={
     'Depth': None,
     'ScopeTypes': None
 }, PropertiesToReturn={
-    'AllStatistics': '1',
-    'AllAttributes': '1',
-    'AllHints': '1',
+    'AllStatistics': None,
+    'AllAttributes': None,
+    'AllHints': None,
+    'AllScopes': None,
+    'AllProperties': '1',
     'MinVersion': None,
     'Measure': None,
     'Properties': None,
@@ -140,7 +142,32 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'graph1',
+                'ScopeName': 'w1',
+                'Id': 'w1',
+                'ScopeType': 'workflow',
+                'Properties': {
+                    'Property': [
+                        {
+                            'Name': 'IsScheduled',
+                            'RawValue': 'true',
+                            'Formatted': 'true',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'State',
+                            'RawValue': 'done',
+                            'Formatted': 'done',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        }
+                    ]
+                }
+            },
+            {
+                'ScopeName': 'w1:graph1',
                 'Id': 'graph1',
                 'ScopeType': 'graph',
                 'Properties': {
@@ -173,13 +200,13 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'graph1:sg1',
+                'ScopeName': 'w1:graph1:sg1',
                 'Id': 'sg1',
                 'ScopeType': 'subgraph',
                 'Properties': None
             },
             {
-                'ScopeName': 'graph1:sg1:e2_0',
+                'ScopeName': 'w1:graph1:sg1:e2_0',
                 'Id': 'e2_0',
                 'ScopeType': 'edge',
                 'Properties': {
@@ -215,12 +242,44 @@ testCase(ScopeFilter={
                             'Measure': 'cnt',
                             'Creator': '{masked}',
                             'CreatorType': 'roxie'
+                        },
+                        {
+                            'Name': 'IdSource',
+                            'RawValue': 'a2',
+                            'Formatted': 'a2',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'IdTarget',
+                            'RawValue': 'a3',
+                            'Formatted': 'a3',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'SourceIndex',
+                            'RawValue': '0',
+                            'Formatted': '0',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'TargetIndex',
+                            'RawValue': '0',
+                            'Formatted': '0',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
             },
             {
-                'ScopeName': 'graph1:sg1:e3_0',
+                'ScopeName': 'w1:graph1:sg1:e3_0',
                 'Id': 'e3_0',
                 'ScopeType': 'edge',
                 'Properties': {
@@ -256,12 +315,44 @@ testCase(ScopeFilter={
                             'Measure': 'cnt',
                             'Creator': '{masked}',
                             'CreatorType': 'roxie'
+                        },
+                        {
+                            'Name': 'IdSource',
+                            'RawValue': 'a3',
+                            'Formatted': 'a3',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'IdTarget',
+                            'RawValue': 'a4',
+                            'Formatted': 'a4',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'SourceIndex',
+                            'RawValue': '0',
+                            'Formatted': '0',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'TargetIndex',
+                            'RawValue': '0',
+                            'Formatted': '0',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
             },
             {
-                'ScopeName': 'graph1:sg1:e4_0',
+                'ScopeName': 'w1:graph1:sg1:e4_0',
                 'Id': 'e4_0',
                 'ScopeType': 'edge',
                 'Properties': {
@@ -302,7 +393,7 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'graph1:sg1:a2',
+                'ScopeName': 'w1:graph1:sg1:a2',
                 'Id': 'a2',
                 'ScopeType': 'activity',
                 'Properties': {
@@ -354,70 +445,61 @@ testCase(ScopeFilter={
                             'Measure': 'cnt',
                             'Creator': '{masked}',
                             'CreatorType': 'roxie'
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg1:a3',
-                'Id': 'a3',
-                'ScopeType': 'activity',
-                'Properties': {
-                    'Property': [
+                        },
                         {
-                            'Name': 'WhenFirstRow',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
+                            'Name': 'Label',
+                            'RawValue': 'Inline Dataset',
+                            'Formatted': 'Inline Dataset',
+                            'Measure': None,
                             'Creator': '{masked}',
-                            'CreatorType': 'roxie'
+                            'CreatorType': None
                         },
                         {
-                            'Name': 'TimeElapsed',
+                            'Name': 'Definition',
                             'RawValue': '{masked}',
                             'Formatted': '{masked}',
-                            'Measure': 'ns',
+                            'Measure': None,
                             'Creator': '{masked}',
-                            'CreatorType': 'roxie'
+                            'CreatorType': None
                         },
                         {
-                            'Name': 'TimeTotalExecute',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
+                            'Name': 'Kind',
+                            'RawValue': '148',
+                            'Formatted': '148',
+                            'Measure': None,
                             'Creator': '{masked}',
-                            'CreatorType': 'roxie'
+                            'CreatorType': None
                         },
                         {
-                            'Name': 'TimeFirstExecute',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
+                            'Name': 'EclText',
+                            'RawValue': 'DATASET([{1,...},...], { unsigned8 top, DICTIONARY({ string8 name, unsigned8 iq }) nest });\n',
+                            'Formatted': 'DATASET([{1,...},...], { unsigned8 top, DICTIONARY({ string8 name, unsigned8 iq }) nest });\n',
+                            'Measure': None,
                             'Creator': '{masked}',
-                            'CreatorType': 'roxie'
+                            'CreatorType': None
                         },
                         {
-                            'Name': 'TimeLocalExecute',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
+                            'Name': 'RecordSize',
+                            'RawValue': '20',
+                            'Formatted': '20',
+                            'Measure': None,
                             'Creator': '{masked}',
-                            'CreatorType': 'roxie'
+                            'CreatorType': None
                         },
                         {
-                            'Name': 'NumAllocations',
-                            'RawValue': '11',
-                            'Formatted': '11',
-                            'Measure': 'cnt',
+                            'Name': 'PredictedCount',
+                            'RawValue': '12',
+                            'Formatted': '12',
+                            'Measure': None,
                             'Creator': '{masked}',
-                            'CreatorType': 'roxie'
+                            'CreatorType': None
                         }
                     ]
                 }
             },
             {
-                'ScopeName': 'graph1:sg1:a4',
-                'Id': 'a4',
+                'ScopeName': 'w1:graph1:sg1:a3',
+                'Id': 'a3',
                 'ScopeType': 'activity',
                 'Properties': {
                     'Property': [
@@ -468,97 +550,51 @@ testCase(ScopeFilter={
                             'Measure': 'cnt',
                             'Creator': '{masked}',
                             'CreatorType': 'roxie'
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'w1:graph1',
-                'Id': 'graph1',
-                'ScopeType': 'graph',
-                'Properties': None
-            },
-            {
-                'ScopeName': 'w1:graph1:sg1',
-                'Id': 'sg1',
-                'ScopeType': 'subgraph',
-                'Properties': None
-            },
-            {
-                'ScopeName': 'w1:graph1:sg1:e2_0',
-                'Id': 'e2_0',
-                'ScopeType': 'edge',
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'Source',
-                            'RawValue': '2',
-                            'Formatted': '2',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
                         },
                         {
-                            'Name': 'Target',
-                            'RawValue': '3',
-                            'Formatted': '3',
+                            'Name': 'Label',
+                            'RawValue': 'Rollup',
+                            'Formatted': 'Rollup',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'SourceIndex',
-                            'RawValue': '0',
-                            'Formatted': '0',
+                            'Name': 'Definition',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'TargetIndex',
-                            'RawValue': '0',
-                            'Formatted': '0',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'w1:graph1:sg1:e3_0',
-                'Id': 'e3_0',
-                'ScopeType': 'edge',
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'Source',
-                            'RawValue': '3',
-                            'Formatted': '3',
+                            'Name': 'Kind',
+                            'RawValue': '8',
+                            'Formatted': '8',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Target',
-                            'RawValue': '4',
-                            'Formatted': '4',
+                            'Name': 'EclText',
+                            'RawValue': 'ROLLUP(LEFT.top = RIGHT.top, t(LEFT, RIGHT));\n',
+                            'Formatted': 'ROLLUP(LEFT.top = RIGHT.top, t(LEFT, RIGHT));\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'SourceIndex',
-                            'RawValue': '0',
-                            'Formatted': '0',
+                            'Name': 'RecordSize',
+                            'RawValue': '20',
+                            'Formatted': '20',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'TargetIndex',
-                            'RawValue': '0',
-                            'Formatted': '0',
+                            'Name': 'PredictedCount',
+                            'RawValue': '0..?[disk]',
+                            'Formatted': '0..?[disk]',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -567,77 +603,59 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'w1:graph1:sg1:a2',
-                'Id': 'a2',
+                'ScopeName': 'w1:graph1:sg1:a4',
+                'Id': 'a4',
                 'ScopeType': 'activity',
                 'Properties': {
                     'Property': [
                         {
-                            'Name': 'Label',
-                            'RawValue': 'Inline Dataset',
-                            'Formatted': 'Inline Dataset',
-                            'Measure': None,
+                            'Name': 'WhenFirstRow',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': 'ts',
                             'Creator': '{masked}',
-                            'CreatorType': None
+                            'CreatorType': 'roxie'
                         },
                         {
-                            'Name': 'Definition',
+                            'Name': 'TimeElapsed',
                             'RawValue': '{masked}',
                             'Formatted': '{masked}',
-                            'Measure': None,
+                            'Measure': 'ns',
                             'Creator': '{masked}',
-                            'CreatorType': None
+                            'CreatorType': 'roxie'
                         },
                         {
-                            'Name': 'Kind',
-                            'RawValue': '148',
-                            'Formatted': '148',
-                            'Measure': None,
+                            'Name': 'TimeTotalExecute',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': 'ns',
                             'Creator': '{masked}',
-                            'CreatorType': None
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'w1:graph1:sg1:a3',
-                'Id': 'a3',
-                'ScopeType': 'activity',
-                'Properties': {
-                    'Property': [
+                            'CreatorType': 'roxie'
+                        },
                         {
-                            'Name': 'Label',
-                            'RawValue': 'Rollup',
-                            'Formatted': 'Rollup',
-                            'Measure': None,
+                            'Name': 'TimeFirstExecute',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': 'ns',
                             'Creator': '{masked}',
-                            'CreatorType': None
+                            'CreatorType': 'roxie'
                         },
                         {
-                            'Name': 'Definition',
+                            'Name': 'TimeLocalExecute',
                             'RawValue': '{masked}',
                             'Formatted': '{masked}',
-                            'Measure': None,
+                            'Measure': 'ns',
                             'Creator': '{masked}',
-                            'CreatorType': None
+                            'CreatorType': 'roxie'
                         },
                         {
-                            'Name': 'Kind',
-                            'RawValue': '8',
-                            'Formatted': '8',
-                            'Measure': None,
+                            'Name': 'NumAllocations',
+                            'RawValue': '11',
+                            'Formatted': '11',
+                            'Measure': 'cnt',
                             'Creator': '{masked}',
-                            'CreatorType': None
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'w1:graph1:sg1:a4',
-                'Id': 'a4',
-                'ScopeType': 'activity',
-                'Properties': {
-                    'Property': [
+                            'CreatorType': 'roxie'
+                        },
                         {
                             'Name': 'Label',
                             'RawValue': 'Output\nResult #1',
@@ -677,6 +695,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclText',
+                            'RawValue': 'OUTPUT(..., workunit);\n',
+                            'Formatted': 'OUTPUT(..., workunit);\n',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'RecordSize',
+                            'RawValue': '20',
+                            'Formatted': '20',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -715,8 +749,8 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'compile:write c++',
-                'Id': 'write c++',
+                'ScopeName': 'compile:compile c++',
+                'Id': 'compile c++',
                 'ScopeType': 'compile',
                 'Properties': {
                     'Property': [
@@ -740,8 +774,8 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'compile:compile c++',
-                'Id': 'compile c++',
+                'ScopeName': 'compile:generate',
+                'Id': 'generate',
                 'ScopeType': 'compile',
                 'Properties': {
                     'Property': [
@@ -765,8 +799,8 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'compile:generate',
-                'Id': 'generate',
+                'ScopeName': 'compile:parse',
+                'Id': 'parse',
                 'ScopeType': 'compile',
                 'Properties': {
                     'Property': [
@@ -790,8 +824,8 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'compile:parse',
-                'Id': 'parse',
+                'ScopeName': 'compile:write c++',
+                'Id': 'write c++',
                 'ScopeType': 'compile',
                 'Properties': {
                     'Property': [

testing/esp/wudetails/key/sort_thor_testcase10.json

@@ -13,6 +13,8 @@ testCase(ScopeFilter={
     'AllStatistics': '1',
     'AllAttributes': None,
     'AllHints': None,
+    'AllScopes': None,
+    'AllProperties': None,
     'MinVersion': None,
     'Measure': None,
     'Properties': None,

testing/esp/wudetails/key/sort_thor_testcase12.json

@@ -11,6 +11,8 @@ testCase(ScopeFilter={
     'AllStatistics': '1',
     'AllAttributes': '1',
     'AllHints': None,
+    'AllScopes': None,
+    'AllProperties': None,
     'MinVersion': None,
     'Measure': None,
     'Properties': None,
@@ -92,432 +94,24 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'graph1',
+                'ScopeName': 'w1',
                 'Id': None,
                 'ScopeType': None,
                 'Properties': {
                     'Property': [
                         {
-                            'Name': 'WhenStarted',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'WhenFinished',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg1',
-                'Id': None,
-                'ScopeType': None,
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg5',
-                'Id': None,
-                'ScopeType': None,
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg9',
-                'Id': None,
-                'ScopeType': None,
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg13',
-                'Id': None,
-                'ScopeType': None,
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg17',
-                'Id': None,
-                'ScopeType': None,
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg21',
-                'Id': None,
-                'ScopeType': None,
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg25',
-                'Id': None,
-                'ScopeType': None,
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg29',
-                'Id': None,
-                'ScopeType': None,
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg36',
-                'Id': None,
-                'ScopeType': None,
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg39',
-                'Id': None,
-                'ScopeType': None,
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg44',
-                'Id': None,
-                'ScopeType': None,
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg49',
-                'Id': None,
-                'ScopeType': None,
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg54',
-                'Id': None,
-                'ScopeType': None,
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg59',
-                'Id': None,
-                'ScopeType': None,
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg64',
-                'Id': None,
-                'ScopeType': None,
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg69',
-                'Id': None,
-                'ScopeType': None,
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
+                            'Name': 'IsScheduled',
                             'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
+                            'Formatted': 'true',
+                            'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'TimeElapsed',
+                            'Name': 'State',
                             'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
+                            'Formatted': 'done',
+                            'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         }
@@ -525,7 +119,7 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'graph1:sg74',
+                'ScopeName': 'w1:graph1',
                 'Id': None,
                 'ScopeType': None,
                 'Properties': {
@@ -545,56 +139,14 @@ testCase(ScopeFilter={
                             'Measure': 'ns',
                             'Creator': '{masked}',
                             'CreatorType': None
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg77',
-                'Id': None,
-                'ScopeType': None,
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': None
                         },
                         {
-                            'Name': 'TimeElapsed',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg90',
-                'Id': None,
-                'ScopeType': None,
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
+                            'Name': 'WhenFinished',
                             'RawValue': None,
                             'Formatted': '{masked}',
                             'Measure': 'ts',
                             'Creator': '{masked}',
                             'CreatorType': None
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': None,
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': None
                         }
                     ]
                 }
@@ -633,7 +185,7 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'compile:write c++',
+                'ScopeName': 'compile:compile c++',
                 'Id': None,
                 'ScopeType': None,
                 'Properties': {
@@ -658,7 +210,7 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'compile:compile c++',
+                'ScopeName': 'compile:generate',
                 'Id': None,
                 'ScopeType': None,
                 'Properties': {
@@ -683,7 +235,7 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'compile:generate',
+                'ScopeName': 'compile:parse',
                 'Id': None,
                 'ScopeType': None,
                 'Properties': {
@@ -708,7 +260,7 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'compile:parse',
+                'ScopeName': 'compile:write c++',
                 'Id': None,
                 'ScopeType': None,
                 'Properties': {

testing/esp/wudetails/key/sort_thor_testcase25.json

@@ -1,7 +1,7 @@
 testCase(ScopeFilter={
     'MaxDepth': '2',
     'Scopes': {
-        'Scope': 'graph1:sg1'
+        'Scope': 'w1:graph1:sg1'
     },
     'Ids': None,
     'ScopeTypes': None,
@@ -13,6 +13,8 @@ testCase(ScopeFilter={
     'AllStatistics': '1',
     'AllAttributes': '1',
     'AllHints': None,
+    'AllScopes': None,
+    'AllProperties': None,
     'MinVersion': None,
     'Measure': None,
     'Properties': None,
@@ -37,7 +39,7 @@ testCase(ScopeFilter={
     'Scopes': {
         'Scope': [
             {
-                'ScopeName': 'graph1:sg1',
+                'ScopeName': 'w1:graph1:sg1',
                 'Id': 'sg1',
                 'ScopeType': 'subgraph',
                 'Properties': {

testing/esp/wudetails/key/sort_thor_testcase26.json

@@ -1,7 +1,7 @@
 testCase(ScopeFilter={
     'MaxDepth': '2',
     'Scopes': {
-        'Scope': 'graph1:sg1'
+        'Scope': 'w1:graph1:sg1'
     },
     'Ids': None,
     'ScopeTypes': None,
@@ -13,6 +13,8 @@ testCase(ScopeFilter={
     'AllStatistics': None,
     'AllAttributes': None,
     'AllHints': None,
+    'AllScopes': None,
+    'AllProperties': None,
     'MinVersion': None,
     'Measure': None,
     'Properties': {
@@ -52,7 +54,7 @@ testCase(ScopeFilter={
     'Scopes': {
         'Scope': [
             {
-                'ScopeName': 'graph1:sg1',
+                'ScopeName': 'w1:graph1:sg1',
                 'Id': 'sg1',
                 'ScopeType': 'subgraph',
                 'Properties': {
@@ -69,7 +71,7 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'graph1:sg1:e2_0',
+                'ScopeName': 'w1:graph1:sg1:e2_0',
                 'Id': 'e2_0',
                 'ScopeType': 'edge',
                 'Properties': {
@@ -84,8 +86,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'NumStops',
-                            'RawValue': '4',
-                            'Formatted': '4',
+                            'RawValue': '1',
+                            'Formatted': '1',
                             'Measure': 'cnt',
                             'Creator': '{masked}',
                             'CreatorType': 'thor'
@@ -94,7 +96,7 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'graph1:sg1:e3_0',
+                'ScopeName': 'w1:graph1:sg1:e3_0',
                 'Id': 'e3_0',
                 'ScopeType': 'edge',
                 'Properties': {
@@ -109,8 +111,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'NumStops',
-                            'RawValue': '4',
-                            'Formatted': '4',
+                            'RawValue': '1',
+                            'Formatted': '1',
                             'Measure': 'cnt',
                             'Creator': '{masked}',
                             'CreatorType': 'thor'
@@ -119,19 +121,19 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'graph1:sg1:a2',
+                'ScopeName': 'w1:graph1:sg1:a2',
                 'Id': 'a2',
                 'ScopeType': 'activity',
                 'Properties': None
             },
             {
-                'ScopeName': 'graph1:sg1:a3',
+                'ScopeName': 'w1:graph1:sg1:a3',
                 'Id': 'a3',
                 'ScopeType': 'activity',
                 'Properties': None
             },
             {
-                'ScopeName': 'graph1:sg1:a4',
+                'ScopeName': 'w1:graph1:sg1:a4',
                 'Id': 'a4',
                 'ScopeType': 'activity',
                 'Properties': None

testing/esp/wudetails/key/sort_thor_testcase27.json

@@ -18,6 +18,8 @@ testCase(ScopeFilter={
     'AllStatistics': '1',
     'AllAttributes': '1',
     'AllHints': None,
+    'AllScopes': None,
+    'AllProperties': None,
     'MinVersion': None,
     'Measure': None,
     'Properties': None,

testing/esp/wudetails/key/sort_thor_testcase28.json

@@ -18,6 +18,8 @@ testCase(ScopeFilter={
     'AllStatistics': '1',
     'AllAttributes': '1',
     'AllHints': None,
+    'AllScopes': None,
+    'AllProperties': None,
     'MinVersion': None,
     'Measure': None,
     'Properties': None,

testing/esp/wudetails/key/sort_thor_testcase29.json

@@ -18,6 +18,8 @@ testCase(ScopeFilter={
     'AllStatistics': '1',
     'AllAttributes': '1',
     'AllHints': None,
+    'AllScopes': None,
+    'AllProperties': None,
     'MinVersion': None,
     'Measure': None,
     'Properties': None,

testing/esp/wudetails/key/sort_thor_testcase30.json

@@ -26,6 +26,8 @@ testCase(ScopeFilter={
     'AllStatistics': '1',
     'AllAttributes': '1',
     'AllHints': None,
+    'AllScopes': None,
+    'AllProperties': None,
     'MinVersion': None,
     'Measure': None,
     'Properties': None,

testing/esp/wudetails/key/sort_thor_testcase4.json

@@ -11,6 +11,8 @@ testCase(ScopeFilter={
     'AllStatistics': None,
     'AllAttributes': None,
     'AllHints': '1',
+    'AllScopes': None,
+    'AllProperties': None,
     'MinVersion': None,
     'Measure': None,
     'Properties': None,
@@ -35,6 +37,12 @@ testCase(ScopeFilter={
     'Scopes': {
         'Scope': [
             {
+                'ScopeName': 'w1',
+                'Id': 'w1',
+                'ScopeType': 'workflow',
+                'Properties': None
+            },
+            {
                 'ScopeName': 'w1:graph1',
                 'Id': 'graph1',
                 'ScopeType': 'graph',

testing/esp/wudetails/key/sort_thor_testcase6.json

@@ -10,9 +10,11 @@ testCase(ScopeFilter={
     'Depth': '1',
     'ScopeTypes': None
 }, PropertiesToReturn={
-    'AllStatistics': '1',
-    'AllAttributes': '1',
-    'AllHints': '1',
+    'AllStatistics': None,
+    'AllAttributes': None,
+    'AllHints': None,
+    'AllScopes': None,
+    'AllProperties': '1',
     'MinVersion': None,
     'Measure': None,
     'Properties': None,
@@ -34,516 +36,5 @@ testCase(ScopeFilter={
     'Exceptions': None,
     'MaxVersion': '{masked number}',
     'WUID': '{masked WUID - matches request}',
-    'Scopes': {
-        'Scope': [
-            {
-                'ScopeName': 'graph1',
-                'Id': 'graph1',
-                'ScopeType': 'graph',
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        },
-                        {
-                            'Name': 'WhenFinished',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg1',
-                'Id': 'sg1',
-                'ScopeType': 'subgraph',
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg5',
-                'Id': 'sg5',
-                'ScopeType': 'subgraph',
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg9',
-                'Id': 'sg9',
-                'ScopeType': 'subgraph',
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg13',
-                'Id': 'sg13',
-                'ScopeType': 'subgraph',
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg17',
-                'Id': 'sg17',
-                'ScopeType': 'subgraph',
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg21',
-                'Id': 'sg21',
-                'ScopeType': 'subgraph',
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg25',
-                'Id': 'sg25',
-                'ScopeType': 'subgraph',
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg29',
-                'Id': 'sg29',
-                'ScopeType': 'subgraph',
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg36',
-                'Id': 'sg36',
-                'ScopeType': 'subgraph',
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg39',
-                'Id': 'sg39',
-                'ScopeType': 'subgraph',
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg44',
-                'Id': 'sg44',
-                'ScopeType': 'subgraph',
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg49',
-                'Id': 'sg49',
-                'ScopeType': 'subgraph',
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg54',
-                'Id': 'sg54',
-                'ScopeType': 'subgraph',
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg59',
-                'Id': 'sg59',
-                'ScopeType': 'subgraph',
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg64',
-                'Id': 'sg64',
-                'ScopeType': 'subgraph',
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg69',
-                'Id': 'sg69',
-                'ScopeType': 'subgraph',
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg74',
-                'Id': 'sg74',
-                'ScopeType': 'subgraph',
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg77',
-                'Id': 'sg77',
-                'ScopeType': 'subgraph',
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        }
-                    ]
-                }
-            },
-            {
-                'ScopeName': 'graph1:sg90',
-                'Id': 'sg90',
-                'ScopeType': 'subgraph',
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'WhenStarted',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ts',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        },
-                        {
-                            'Name': 'TimeElapsed',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': 'ns',
-                            'Creator': '{masked}',
-                            'CreatorType': 'thor'
-                        }
-                    ]
-                }
-            }
-        ]
-    }
+    'Scopes': None
 }

testing/esp/wudetails/wutest.py

@@ -218,14 +218,14 @@ testCase = namedtuple('testCase', ['ScopeFilter',
 
 #scopeFilter(MaxDepth='999', Scopes=set(), Ids=set(), ScopeTypes=set()),
 #nestedFilter(Depth='999', ScopeTypes=set()),
-#propertiesToReturn(AllStatistics='1', AllAttributes='1', AllHints='1', MinVersion='0', Measure='', Properties=set(), ExtraProperties=set()),
+#propertiesToReturn(AllProperties='1', MinVersion='0', Measure='', Properties=set(), ExtraProperties=set()),
 #scopeOptions(IncludeMatchedScopesInResults='1', IncludeScope='1', IncludeId='1', IncludeScopeType='1'),
 #propertyOptions(IncludeName='1', IncludeRawValue='1', IncludeFormatted='1', IncludeMeasure='1', IncludeCreator='1', IncludeCreatorType='1')
 testCases = [ 
              testCase(
                  scopeFilter(MaxDepth='999'),
                  nestedFilter(),
-                 propertiesToReturn(AllStatistics='1', AllAttributes='1', AllHints='1'),
+                 propertiesToReturn(AllProperties='1'),
                  scopeOptions(IncludeMatchedScopesInResults='1', IncludeScope='1', IncludeId='1', IncludeScopeType='1'),
                  propertyOptions(IncludeName='1', IncludeRawValue='1', IncludeFormatted='1', IncludeMeasure='1', IncludeCreator='1', IncludeCreatorType='1')
              ),
@@ -251,16 +251,16 @@ testCases = [
                  propertyOptions(IncludeName='1', IncludeRawValue='1', IncludeMeasure='1', IncludeCreator='1', IncludeCreatorType='1')
              ),
              testCase(
-                 scopeFilter(MaxDepth='999', Scopes={'Scope':'graph1'}),
+                 scopeFilter(MaxDepth='999', Scopes={'Scope':'w1:graph1'}),
                  nestedFilter(),
-                 propertiesToReturn(AllStatistics='1', AllAttributes='1', AllHints='1'),
+                 propertiesToReturn(AllProperties='1'),
                  scopeOptions(IncludeMatchedScopesInResults='1', IncludeScope='1', IncludeId='1', IncludeScopeType='1'),
                  propertyOptions(IncludeName='1', IncludeRawValue='1', IncludeMeasure='1', IncludeCreator='1', IncludeCreatorType='1')
              ),
              testCase(
                  scopeFilter(MaxDepth='1', ScopeTypes={'ScopeType':'graph'}),
                  nestedFilter(Depth='1'),
-                 propertiesToReturn(AllStatistics='1', AllAttributes='1', AllHints='1'),
+                 propertiesToReturn(AllProperties='1'),
                  scopeOptions(IncludeMatchedScopesInResults='1', IncludeScope='1', IncludeId='1', IncludeScopeType='1'),
                  propertyOptions(IncludeName='1', IncludeRawValue='1', IncludeMeasure='1', IncludeCreator='1', IncludeCreatorType='1')
              ),
@@ -391,14 +391,14 @@ testCases = [
                  propertyOptions(IncludeCreatorType='0')
              ),
              testCase(
-                 scopeFilter(MaxDepth='2', Scopes={'Scope':'graph1:sg1'}),
+                 scopeFilter(MaxDepth='2', Scopes={'Scope':'w1:graph1:sg1'}),
                  nestedFilter(Depth=0),
                  propertiesToReturn(AllStatistics='1', AllAttributes='1'),
                  scopeOptions(IncludeMatchedScopesInResults='1', IncludeScope='1', IncludeId='1', IncludeScopeType='1'),
                  propertyOptions(IncludeName='1', IncludeRawValue='1', IncludeMeasure='1', IncludeCreator='1', IncludeCreatorType='1')
              ),
              testCase(
-                 scopeFilter(MaxDepth='2', Scopes={'Scope':'graph1:sg1'}),
+                 scopeFilter(MaxDepth='2', Scopes={'Scope':'w1:graph1:sg1'}),
                  nestedFilter(Depth=1),
                  propertiesToReturn(Properties={'Property':['WhenStarted','WhenCreated']}, ExtraProperties={'Extra':{'scopeType':'edge','Properties':{'Property':['NumStarts','NumStops']}}}),
                  scopeOptions(IncludeMatchedScopesInResults='1', IncludeScope='1', IncludeId='1', IncludeScopeType='1'),