HPCC-19553 Generate repeatable attributes as a list format

Signed-off-by: Shamser Ahmed <shamser.ahmed@lexisnexis.co.uk>

common/workunit/workunit.cpp

@@ -1779,17 +1779,13 @@ public:
     {
         if (whichProperties & PTattributes)
         {
-#if 0
-            //Enable this code when the mapping from multiple instance attributes to lists is implemented in the service layer above
-            //At that point remove WaDependencyList from the list below.
             {
                 StringBuffer scratchpad;
                 Owned<IWorkflowDependencyIterator> depends = workflow.item(curWorkflow).getDependencies();
                 ForEach(*depends)
                         visitor.noteAttribute(WaIdDependency, getValueText(depends->query(), scratchpad, WorkflowScopePrefix));
             }
-#endif
-            play(visitor, { WaIdDependencyList, WaIsScheduled, WaIdSuccess, WaIdFailure, WaIdRecovery, WaIdPersist, WaIdScheduled,
+            play(visitor, { WaIsScheduled, WaIdSuccess, WaIdFailure, WaIdRecovery, WaIdPersist, WaIdScheduled,
                             WaPersistName, WaLabel, WaMode, WaType, WaState, WaCluster, WaCriticalSection });
         }
     }
@@ -2609,10 +2605,17 @@ WuScopeFilter & WuScopeFilter::addId(const char * id)
 
 WuScopeFilter & WuScopeFilter::addOutput(const char * prop)
 {
-    if (queryStatisticKind(prop, StMax) != StMax)
+    WuAttr attr = queryWuAttribute(prop, WaNone);
+    if (attr != WaNone)
+    {
+        WuAttr singleKindAttr = getSingleKindOfListAttribute(attr);
+        if (singleKindAttr != WaNone)
+            addOutputAttribute(singleKindAttr);
+        else
+            addOutputAttribute(attr);
+
+    } else if (queryStatisticKind(prop, StMax) != StMax)
         addOutputStatistic(prop);
-    else if (queryWuAttribute(prop, WaMax) != WaMax)
-        addOutputAttribute(prop);
     else
         addOutputHint(prop);
     return *this;

common/workunit/wuattr.cpp

@@ -324,3 +324,9 @@ WuAttr getListAttribute(WuAttr kind)
     WuAttr multiKind = info.multiKind;
     return (multiKind != WaNone) && (multiKind != kind) ? multiKind : WaNone;
 }
+
+WuAttr getSingleKindOfListAttribute(WuAttr kind)
+{
+    const WuAttrInfo & info = attrInfo[kind-WaNone];
+    return info.singleKind;
+}

common/workunit/wuattr.hpp

@@ -148,5 +148,6 @@ extern WORKUNIT_API void setAttributeValueInt(IPropertyTree & tgt, WuAttr kind,
 extern WORKUNIT_API bool isListAttribute(WuAttr kind);
 extern WORKUNIT_API bool isMultiAttribute(WuAttr kind);
 extern WORKUNIT_API WuAttr getListAttribute(WuAttr kind);
+extern WORKUNIT_API WuAttr getSingleKindOfListAttribute(WuAttr kind);
 
 #endif

esp/services/ws_workunits/ws_wudetails.cpp

@@ -23,6 +23,12 @@
 #include "jset.hpp"
 #include "jstatcodes.h"
 
+typedef std::pair<WuAttr, StringBuffer> AttribValuePair;
+bool operator==(const AttribValuePair & p1, const AttribValuePair & p2)
+{
+    return p1.first==p2.first;
+}
+
 class WUDetailsVisitor : public IWuScopeVisitor
 {
 public:
@@ -34,7 +40,7 @@ public:
 
     void resetScope();
     void noteScopeType(const StatisticScopeType _sst);
-    IArrayOf<IEspWUResponseProperty> & getResponseProperties() { return EspWUResponseProperties;}
+    IArrayOf<IEspWUResponseProperty> & getResponseProperties() { endListAttr(); return EspWUResponseProperties;}
     unsigned __int64 getMaxTimestamp() const { return maxTimestamp;}
 
 private:
@@ -48,22 +54,72 @@ private:
     bool includeCreator = false;
     bool includeCreatorType = false;
 
-    bool extraStatisticsRequested = false;
-    std::set<StatisticKind> extraStatistics[SSTmax];
-    bool extraAttributesRequested = false;
-    std::set<WuAttr> extraAttributes[SSTmax];
+    bool statisticsPostFilterRequired = false;        // Does statistics have be filtered in the visited method (noteStatistic)
+                                                      // Only when true, does the following 3 variables have valid values
+    std::set<StatisticKind> extraStatistics[SSTmax];  // Extra statistics returned for a given scope type
+    const std::set<StatisticKind> * extraStatisticsForCurScope = nullptr; // Tracks statistics required for current scope type
+    Owned<IBitSet> propertiesToReturnStats;           // Statistic to be returned for every scope/scope type
 
-    bool returnStatisticListSpecified = false;
-    Owned<IBitSet> returnStatisticList;
-    bool returnAttributeSpecified = false;
-    Owned<IBitSet> returnAttributeList;
 
-    const std::set<StatisticKind> * additionalStatsForCurScope = nullptr;
-    const std::set<WuAttr> * additionalAttribsForCurScope = nullptr;
+    bool attributesPostFilterRequired = false;         // Does attributes have be filtered in the visited method (noteAttribute)
+                                                      // Only when true, does the following 3 variables have valid values
+    std::set<WuAttr> extraAttributes[SSTmax];         // Extra attributes returned for a given scope type
+    const std::set<WuAttr> * extraAttributesForCurScope = nullptr; // Tracks attributes required for current scope type
+    Owned<IBitSet> propertiesToReturnAttribs;         // Attributes to be returned for every scope/scope type
+
     unsigned __int64 maxTimestamp = 0;
     IArrayOf<IEspWUResponseProperty> EspWUResponseProperties;
     StatisticScopeType currentStatisticScopeType = SSTnone;
 
+    class MultiListValues
+    {
+    public:
+        void add(WuAttr attr, const char *value)
+        {
+            AttribValuePair tmp(attr,"");
+
+            auto cur = find(attribValuePairs.begin(), attribValuePairs.end(), tmp);
+            if (cur!=attribValuePairs.end())
+            {
+                cur->second.appendf(", \"%s\"",  value);
+            }
+            else
+            {
+                tmp.second.appendf("[\"%s\"",  value);
+                attribValuePairs.emplace_back(tmp);
+            }
+        }
+
+        void flushListAttributes(WUDetailsVisitor & parent)
+        {
+            for(AttribValuePair & ap: attribValuePairs)
+            {
+                parent.addAttribToResp(ap.first, ap.second.append("]").str());
+            }
+            attribValuePairs.clear();
+        }
+    private:
+        std::vector<AttribValuePair> attribValuePairs;
+    } multiListValues;
+
+    void addAttribToResp(WuAttr attr, const char * value)
+    {
+        Owned<IEspWUResponseProperty> EspWUResponseProperty = createWUResponseProperty("","");
+        EspWUResponseProperty->setName(queryWuAttributeName(attr));
+        if (includeFormatted)
+            EspWUResponseProperty->setFormatted(value);
+        if (includeRawValue)
+            EspWUResponseProperty->setRawValue(value);
+
+        EspWUResponseProperties.append(*EspWUResponseProperty.getClear());
+    }
+
+    void endListAttr()
+    {
+        multiListValues.flushListAttributes(*this);
+    }
+    bool includeAttribute(WuAttr w);
+
     void buildAttribListToReturn(IConstWUPropertiesToReturn & propertiesToReturn);
 };
 
@@ -81,16 +137,22 @@ WUDetailsVisitor::WUDetailsVisitor(IConstWUPropertyOptions & propertyOptions, IC
 
 void WUDetailsVisitor::noteStatistic(StatisticKind kind, unsigned __int64 value, IConstWUStatistic & extra)
 {
-    if (extraStatisticsRequested)
+    endListAttr();
+
+    // This section handles the special case where there are Statistics in ExtraProperties.
+    // When ExtraProperties are provided, this filter handles both PropertiesToReturn
+    // and ExtraProperties. (In all other cases, the scope iterator will filter before visiting
+    if (statisticsPostFilterRequired)
     {
-        // If the statistic is not in the standard return statistic list,
-        // then check if it's in the additional property list
-        if (returnStatisticListSpecified && !returnStatisticList->test(kind))
+        // Check first if the StatisticKind is listed in the main list (propertiesToReturnStats)
+        // If there's no match there, check if the StatisticKind is in the scope type specific list
+        if (!propertiesToReturnStats->test(kind))
         {
-            if (additionalStatsForCurScope==nullptr ||
-                additionalStatsForCurScope->find(kind)==additionalStatsForCurScope->end())
+            // If it's not in propertiesToReturnStats, then check the extraStatisticsForCurScope
+            if (extraStatisticsForCurScope==nullptr ||
+                extraStatisticsForCurScope->find(kind)==extraStatisticsForCurScope->end())
             {
-                return;
+                return; // It is in neither list so filter out
             }
         }
     }
@@ -120,39 +182,78 @@ void WUDetailsVisitor::noteStatistic(StatisticKind kind, unsigned __int64 value,
         maxTimestamp = extra.getTimestamp();
 }
 
+bool WUDetailsVisitor::includeAttribute(WuAttr attr)
+{
+    if (propertiesToReturnAttribs->test(attr-WaNone))
+        return true;
+    if (extraAttributesForCurScope!=nullptr &&
+        extraAttributesForCurScope->find(attr)!=extraAttributesForCurScope->end())
+        return true;
+    return false;
+}
+
 void WUDetailsVisitor::noteAttribute(WuAttr attr, const char * value)
 {
-    if (extraAttributesRequested)
+    // Note: For attributes that may have its values as MultiList, return it as
+    // a MultiList only. That is unless the Single kind is specifically requested
+    // as there is no reason to provide both.
+
+    // Try to get  the MultiList equivalent.  If it can't, listAttr==WaNone
+    // e.g. if attr==WaDefinition, then listAttr==WaDefinitionList
+    WuAttr listAttr = getListAttribute(attr);
+    // If values may be returned as MultiList (listAttr!=WaNone), set flag to
+    // assuming that values will be returned as MultiList
+    bool returnAttrAsMultiList = (listAttr!=WaNone);
+    bool returnAttrAsSingleValue = true;
+
+    if (attributesPostFilterRequired)
     {
-        // If the Attribute is not in the standard return statistic list,
-        // then check if it's in the additional attribute list
-        if ((returnAttributeSpecified && !returnAttributeList->test(attr-WaNone)))
+        if (includeAttribute(attr))             // Single item specifically requested
         {
-            if (additionalAttribsForCurScope==nullptr ||
-                additionalAttribsForCurScope->find(attr)==additionalAttribsForCurScope->end())
+            if (isListAttribute(attr))          // Check to see if attr is multilist type
             {
-                return;
+                returnAttrAsMultiList = true;
+                returnAttrAsSingleValue = false;
+                listAttr=attr;
             }
+            else
+                returnAttrAsMultiList = false;  // so don't return as MultiList value
+        }
+        else
+        {
+            returnAttrAsSingleValue = false;    // Attribute as single value not selected
+            if (returnAttrAsMultiList && !includeAttribute(listAttr))
+                return;
         }
     }
+    if (!returnAttrAsMultiList && !returnAttrAsSingleValue)
+        return;
 
-    Owned<IEspWUResponseProperty> EspWUResponseProperty = createWUResponseProperty("","");
-    EspWUResponseProperty->setName(queryWuAttributeName(attr));
-    if (includeFormatted)
-        EspWUResponseProperty->setFormatted(value);
-    if (includeRawValue)
-        EspWUResponseProperty->setRawValue(value);
+    StringBuffer encoded;
+    encodeXML(value, encoded);
 
-    EspWUResponseProperties.append(*EspWUResponseProperty.getClear());
+    if (returnAttrAsMultiList)
+        multiListValues.add(listAttr,encoded.str());
+    else
+        addAttribToResp(attr, encoded.str());
 }
 
 void WUDetailsVisitor::noteHint(const char * kind, const char * value)
 {
+    endListAttr();
     Owned<IEspWUResponseProperty> EspWUResponseProperty = createWUResponseProperty("","");
 
     StringBuffer hint("hint:");
     hint.append(kind);
     EspWUResponseProperty->setName(hint);
+
+    StringBuffer encoded;
+    if (includeFormatted || includeRawValue)
+    {
+        encodeXML(value, encoded);
+        value = encoded.str();
+    }
+
     if (includeFormatted)
         EspWUResponseProperty->setFormatted(value);
     if (includeRawValue)
@@ -161,14 +262,31 @@ void WUDetailsVisitor::noteHint(const char * kind, const char * value)
     EspWUResponseProperties.append(*EspWUResponseProperty.getClear());
 }
 
+// Get StatisticKind or WuAttr from property name and return true
+// When neither possible, return false.
+static bool getPropertyIdFromName(const char *propName, StatisticKind & sk, WuAttr & wa )
+{
+    wa = WaNone;
+    sk = queryStatisticKind(propName, StKindNone);
+    if (sk!=StKindNone)
+        return true;
+
+    wa = queryWuAttribute(propName, WaNone);
+    if (wa!=WaNone)
+        return true;
+
+    return false;
+}
+
 void WUDetailsVisitor::buildAttribListToReturn(IConstWUPropertiesToReturn & propertiesToReturn)
 {
-    const bool allStatistics = propertiesToReturn.getAllStatistics();
-    const bool allAttributes = propertiesToReturn.getAllAttributes();
+    bool returnAllStatistic = propertiesToReturn.getAllStatistics();
+    bool returnAllAttributes = propertiesToReturn.getAllAttributes();
 
-    if (propertiesToReturn.getAllProperties() || (allStatistics && allAttributes) )
+    if ( (returnAllStatistic && returnAllAttributes) || propertiesToReturn.getAllProperties())
         return;
 
+    // ScopeType specific properties (extra properties specific to given scope types)
     IArrayOf<IConstWUExtraProperties> & extraProperties = propertiesToReturn.getExtraProperties();
     ForEachItemIn(idx, extraProperties)
     {
@@ -177,92 +295,112 @@ void WUDetailsVisitor::buildAttribListToReturn(IConstWUPropertiesToReturn & prop
         if (!scopeTypeWithAdditionalProps || !*scopeTypeWithAdditionalProps)
             continue;
 
-        StatisticScopeType sst = queryScopeType(scopeTypeWithAdditionalProps,SSTnone);
-        if(sst==SSTnone)
+        StatisticScopeType sst = queryScopeType(scopeTypeWithAdditionalProps, SSTnone);
+        if (sst==SSTnone)
             throw MakeStringException(ECLWATCH_INVALID_INPUT, "Invalid ScopeType (%s) in ExtraProperties",scopeTypeWithAdditionalProps);
 
+        // Generate list of properties for this Scope Type
         const StringArray & props = cur.getProperties();
         ForEachItemIn(idx2, props)
         {
-            StatisticKind sk = queryStatisticKind(props[idx2], StKindNone);
-            if (sk==StKindAll)
-                throw MakeStringException(ECLWATCH_INVALID_INPUT, "Invalid property name (%s) in ExtraProperties",props[idx2]);
+            StatisticKind sk;
+            WuAttr wa;
+            const char *propName = props[idx2];
+
+            if (!getPropertyIdFromName(propName, sk, wa))
+                throw MakeStringException(ECLWATCH_INVALID_INPUT, "Invalid property name (%s) in ExtraProperties",propName);
+
             if (sk!=StKindNone)
             {
-                if (!allStatistics)
+                if (!returnAllStatistic)
                 {
                     extraStatistics[sst].insert(sk);
-                    extraStatisticsRequested = true;
+                    statisticsPostFilterRequired = true;
                 }
             }
             else
             {
-                const WuAttr wa = queryWuAttribute(props[idx2], WaMax);
-                if (wa==WaMax)
-                    throw MakeStringException(ECLWATCH_INVALID_INPUT, "Invalid property name (%s) in ExtraProperties",props[idx2]);
-                if (!allAttributes)
+                if (!returnAllAttributes)
                 {
                     extraAttributes[sst].insert(wa);
-                    extraAttributesRequested = true;
+                    attributesPostFilterRequired = true;
                 }
             }
         }
     }
 
-    // If additional stats or attributes specified for scope type,
-    // then noteStatistic & noteAttribute will need to work out what to return
-    if (extraStatisticsRequested || extraAttributesRequested)
+    // Examine propertiesToReturn to see if any thing there will require a post filter
+    if (!attributesPostFilterRequired)
     {
+        // If single kind list is requested, it must be handled by post filter as the default behaviour
+        // is to only return multi list kind. (Scope iterator's filtering is not able to handle this
+        // and like with any other filtering that cannot be handled by the scope iterator it must be
+        // handled by the post filter. By adding the single kind item to the post filter, noteAttribute
+        // is forced to return the single kind.)
+        //
+        // Note: if attributesPostFilterRequired is set to true, then the second propertiesToReturnList
+        // loop is processed to add the single kind list items as well as all other attibutes required.
         StringArray & propertiesToReturnList = propertiesToReturn.getProperties();
-        ForEachItemIn(idx,propertiesToReturnList)
+        ForEachItemIn(idx1,propertiesToReturnList)
         {
-            const char * attributeName = propertiesToReturnList[idx];
-            if (!attributeName || *attributeName==0) continue;
-
-            const StatisticKind sk = queryStatisticKind(attributeName, StKindNone);
-            if (sk==StKindAll)
-                throw MakeStringException(ECLWATCH_INVALID_INPUT, "Invalid Attribute name in AttributeToReturn(%s)", attributeName);
-            if (sk!=StKindNone)
+            const char * propName = propertiesToReturnList[idx1];
+            WuAttr wa = queryWuAttribute(propName, WaNone);
+            if (wa!=WaNone)
             {
-                if (!returnStatisticListSpecified)
+                if (getListAttribute(wa)!=WaNone)
                 {
-                    returnStatisticList.set(createBitSet(StatisticFilterMaskSize));
-                    returnStatisticListSpecified=true;
+                    attributesPostFilterRequired = true;
+                    break;
                 }
-                returnStatisticList->set(sk, true);
-            }
-            else
-            {
-              const WuAttr wa = queryWuAttribute(attributeName, WaMax);
-              if (wa!=WaMax)
-              {
-                  if (!returnAttributeSpecified)
-                  {
-                      returnAttributeList.set(createBitSet(AttributeFilterMaskSize));
-                      returnAttributeSpecified=true;
-                  }
-                  returnAttributeList->set(wa-WaNone,true);
-              }
-              else
-                  throw MakeStringException(ECLWATCH_INVALID_INPUT, "Invalid Attribute name in AttributeToReturn(%s)", attributeName);
             }
         }
     }
+    // Post Filtering (filtering within in visited method) required if statistics or attributes requested in ExtraProperties
+    if (!statisticsPostFilterRequired && !attributesPostFilterRequired)
+        return;
+
+    if (statisticsPostFilterRequired)
+        propertiesToReturnStats.set(createBitSet(StatisticFilterMaskSize));
+    if (attributesPostFilterRequired)
+        propertiesToReturnAttribs.set(createBitSet(AttributeFilterMaskSize));
+
+    StringArray & propertiesToReturnList = propertiesToReturn.getProperties();
+    ForEachItemIn(idx1,propertiesToReturnList)
+    {
+        const char * propName = propertiesToReturnList[idx1];
+        if (!propName || *propName==0) continue;
+
+        StatisticKind sk;
+        WuAttr wa;
+        if (!getPropertyIdFromName(propName, sk, wa))
+            throw MakeStringException(ECLWATCH_INVALID_INPUT, "Invalid property name (%s) in PropertiesToReturn",propName);
+        if (sk!=StKindNone)
+        {
+            if (statisticsPostFilterRequired)
+                propertiesToReturnStats->set(sk, true);
+        }
+        else
+        {
+            if (attributesPostFilterRequired)
+                propertiesToReturnAttribs->set(wa-WaNone,true);
+        }
+    }
 }
 
 void WUDetailsVisitor::resetScope()
 {
     currentStatisticScopeType = SSTnone;
-    additionalStatsForCurScope = nullptr;
-    additionalAttribsForCurScope = nullptr;
+    extraStatisticsForCurScope = nullptr;
+    extraAttributesForCurScope = nullptr;
     EspWUResponseProperties.clear();
+    endListAttr();
 }
 
 void WUDetailsVisitor::noteScopeType(const StatisticScopeType _sst)
 {
     currentStatisticScopeType = _sst;
-    additionalStatsForCurScope = & extraStatistics[currentStatisticScopeType];
-    additionalAttribsForCurScope = & extraAttributes[currentStatisticScopeType];
+    extraStatisticsForCurScope = & extraStatistics[currentStatisticScopeType];
+    extraAttributesForCurScope = & extraAttributes[currentStatisticScopeType];
 }
 
 WUDetails::WUDetails(IConstWorkUnit *_workunit, const char *_wuid)
@@ -360,10 +498,9 @@ void WUDetails::buildWuScopeFilter(IConstWUScopeFilter & requestScopeFilter, ICo
     StringArray & properties = propertiesToReturn.getProperties();
     ForEachItemIn(idx5,properties)
     {
-        if (properties.item(idx5) && *properties.item(idx5))
-        {
-            wuScopeFilter.addOutput(properties.item(idx5));
-        }
+        const char * propName = properties.item(idx5);
+        if (propName && *propName)
+            wuScopeFilter.addOutput(propName);
     }
 
     IArrayOf<IConstWUExtraProperties> & extraProperties= propertiesToReturn.getExtraProperties();

testing/esp/wudetails/key/childds1_hthor_testcase1.json

@@ -117,14 +117,6 @@ testCase(ScopeFilter={
                 'Properties': {
                     'Property': [
                         {
-                            'Name': 'IdDependencyList',
-                            'RawValue': '["w1"]',
-                            'Formatted': '["w1"]',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'IsScheduled',
                             'RawValue': 'true',
                             'Formatted': 'true',
@@ -139,6 +131,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'IdDependencyList',
+                            'RawValue': '["w1"]',
+                            'Formatted': '["w1"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -746,14 +746,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '148',
                             'Formatted': '148',
@@ -784,6 +776,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -803,14 +803,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '43',
                             'Formatted': '43',
@@ -820,8 +812,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "SPILL('~spill::3', __compressed__);\n",
-                            'Formatted': "SPILL('~spill::3', __compressed__);\n",
+                            'RawValue': 'SPILL('~spill::3', __compressed__);\n',
+                            'Formatted': 'SPILL('~spill::3', __compressed__);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -857,6 +849,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -876,14 +876,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '5',
                             'Formatted': '5',
@@ -893,8 +885,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "FILTER(asserttrue(....seq < 10, 'seq < 10'));\n",
-                            'Formatted': "FILTER(asserttrue(....seq < 10, 'seq < 10'));\n",
+                            'RawValue': 'FILTER(asserttrue(....seq &lt; 10, &apos;seq &lt; 10&apos;));\n',
+                            'Formatted': 'FILTER(asserttrue(....seq &lt; 10, &apos;seq &lt; 10&apos;));\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -914,6 +906,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -975,8 +975,8 @@ testCase(ScopeFilter={
                     'Property': [
                         {
                             'Name': 'Label',
-                            'RawValue': "Output\nInternal('spill1')",
-                            'Formatted': "Output\nInternal('spill1')",
+                            'RawValue': 'Output\nInternal(&apos;spill1&apos;)',
+                            'Formatted': 'Output\nInternal(&apos;spill1&apos;)',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -999,8 +999,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "OUTPUT(..., named('spill1'), __compressed__);\n",
-                            'Formatted': "OUTPUT(..., named('spill1'), __compressed__);\n",
+                            'RawValue': 'OUTPUT(..., named(&apos;spill1&apos;), __compressed__);\n',
+                            'Formatted': 'OUTPUT(..., named(&apos;spill1&apos;), __compressed__);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1145,14 +1145,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '195',
                             'Formatted': '195',
@@ -1162,8 +1154,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "DATASET('~spill::3', { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\nFILTER(seq != <...>.value  +  100000);\n",
-                            'Formatted': "DATASET('~spill::3', { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\nFILTER(seq != <...>.value  +  100000);\n",
+                            'RawValue': 'DATASET(&apos;~spill::3&apos;, { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\nFILTER(seq != &lt;...&gt;.value  +  100000);\n',
+                            'Formatted': 'DATASET(&apos;~spill::3&apos;, { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\nFILTER(seq != &lt;...&gt;.value  +  100000);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1185,41 +1177,41 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
+                            'Name': 'Filename',
+                            'RawValue': '~spill::3',
+                            'Formatted': '~spill::3',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'EclName',
-                            'RawValue': 'ds',
-                            'Formatted': 'ds',
+                            'Name': 'IsTransformSpill',
+                            'RawValue': '1',
+                            'Formatted': '1',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Filename',
-                            'RawValue': '~spill::3',
-                            'Formatted': '~spill::3',
+                            'Name': 'SignedBy',
+                            'RawValue': 'hpcc',
+                            'Formatted': 'hpcc',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'IsTransformSpill',
-                            'RawValue': '1',
-                            'Formatted': '1',
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'SignedBy',
-                            'RawValue': 'hpcc',
-                            'Formatted': 'hpcc',
+                            'Name': 'EclNameList',
+                            'RawValue': '["ds"]',
+                            'Formatted': '["ds"]',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1242,14 +1234,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '16',
                             'Formatted': '16',
@@ -1272,6 +1256,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1347,8 +1339,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "DATASET('~spill::3', { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\nFILTER(asserttrue(....seq > 10, 'seq > 10'));\n",
-                            'Formatted': "DATASET('~spill::3', { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\nFILTER(asserttrue(....seq > 10, 'seq > 10'));\n",
+                            'RawValue': 'DATASET(&apos;~spill::3&apos;, { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\nFILTER(asserttrue(....seq &gt; 10, &apos;seq &gt; 10&apos;));\n',
+                            'Formatted': 'DATASET(&apos;~spill::3&apos;, { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\nFILTER(asserttrue(....seq &gt; 10, &apos;seq &gt; 10&apos;));\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1370,14 +1362,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Filename',
                             'RawValue': '~spill::3',
                             'Formatted': '~spill::3',
@@ -1400,6 +1384,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1412,8 +1404,8 @@ testCase(ScopeFilter={
                     'Property': [
                         {
                             'Name': 'Label',
-                            'RawValue': "Output\nInternal('spill2')",
-                            'Formatted': "Output\nInternal('spill2')",
+                            'RawValue': 'Output\nInternal(&apos;spill2&apos;)',
+                            'Formatted': 'Output\nInternal(&apos;spill2&apos;)',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1436,8 +1428,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "OUTPUT(..., named('spill2'), __compressed__);\n",
-                            'Formatted': "OUTPUT(..., named('spill2'), __compressed__);\n",
+                            'RawValue': 'OUTPUT(..., named(&apos;spill2&apos;), __compressed__);\n',
+                            'Formatted': 'OUTPUT(..., named(&apos;spill2&apos;), __compressed__);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1762,8 +1754,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "DATASET('~spill::3', { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n",
-                            'Formatted': "DATASET('~spill::3', { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n",
+                            'RawValue': 'DATASET(&apos;~spill::3&apos;, { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n',
+                            'Formatted': 'DATASET(&apos;~spill::3&apos;, { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1785,41 +1777,41 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
+                            'Name': 'Filename',
+                            'RawValue': '~spill::3',
+                            'Formatted': '~spill::3',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'EclName',
-                            'RawValue': 'ds',
-                            'Formatted': 'ds',
+                            'Name': 'IsTransformSpill',
+                            'RawValue': '1',
+                            'Formatted': '1',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Filename',
-                            'RawValue': '~spill::3',
-                            'Formatted': '~spill::3',
+                            'Name': 'SignedBy',
+                            'RawValue': 'hpcc',
+                            'Formatted': 'hpcc',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'IsTransformSpill',
-                            'RawValue': '1',
-                            'Formatted': '1',
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'SignedBy',
-                            'RawValue': 'hpcc',
-                            'Formatted': 'hpcc',
+                            'Name': 'EclNameList',
+                            'RawValue': '["ds"]',
+                            'Formatted': '["ds"]',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1851,8 +1843,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "DATASET('~spill::3', { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n",
-                            'Formatted': "DATASET('~spill::3', { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n",
+                            'RawValue': 'DATASET(&apos;~spill::3&apos;, { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n',
+                            'Formatted': 'DATASET(&apos;~spill::3&apos;, { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1874,41 +1866,41 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
+                            'Name': 'Filename',
+                            'RawValue': '~spill::3',
+                            'Formatted': '~spill::3',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'EclName',
-                            'RawValue': 'ds',
-                            'Formatted': 'ds',
+                            'Name': 'IsTransformSpill',
+                            'RawValue': '1',
+                            'Formatted': '1',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Filename',
-                            'RawValue': '~spill::3',
-                            'Formatted': '~spill::3',
+                            'Name': 'SignedBy',
+                            'RawValue': 'hpcc',
+                            'Formatted': 'hpcc',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'IsTransformSpill',
-                            'RawValue': '1',
-                            'Formatted': '1',
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'SignedBy',
-                            'RawValue': 'hpcc',
-                            'Formatted': 'hpcc',
+                            'Name': 'EclNameList',
+                            'RawValue': '["ds"]',
+                            'Formatted': '["ds"]',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1931,14 +1923,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '5',
                             'Formatted': '5',
@@ -1948,8 +1932,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': 'FILTER(seq != <...>.value  +  100000, hint(testhintissupported(1)));\n',
-                            'Formatted': 'FILTER(seq != <...>.value  +  100000, hint(testhintissupported(1)));\n',
+                            'RawValue': 'FILTER(seq != &lt;...&gt;.value  +  100000, hint(testhintissupported(1)));\n',
+                            'Formatted': 'FILTER(seq != &lt;...&gt;.value  +  100000, hint(testhintissupported(1)));\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1971,6 +1955,14 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
                             'Name': 'hint:testhintissupported',
                             'RawValue': '1',
                             'Formatted': '1',
@@ -1996,22 +1988,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'EclName',
-                            'RawValue': 'cond',
-                            'Formatted': 'cond',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '28',
                             'Formatted': '28',
@@ -2021,8 +1997,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "IF(STORED('truevalue'), ds, ...);\n",
-                            'Formatted': "IF(STORED('truevalue'), ds, ...);\n",
+                            'RawValue': 'IF(STORED(&apos;truevalue&apos;), ds, ...);\n',
+                            'Formatted': 'IF(STORED(&apos;truevalue&apos;), ds, ...);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -2050,6 +2026,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclNameList',
+                            'RawValue': '["cond"]',
+                            'Formatted': '["cond"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -2069,14 +2061,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '16',
                             'Formatted': '16',
@@ -2099,6 +2083,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }

testing/esp/wudetails/key/childds1_roxie_testcase1.json

@@ -165,14 +165,6 @@ testCase(ScopeFilter={
                 'Properties': {
                     'Property': [
                         {
-                            'Name': 'IdDependencyList',
-                            'RawValue': '["w1"]',
-                            'Formatted': '["w1"]',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'IsScheduled',
                             'RawValue': 'true',
                             'Formatted': 'true',
@@ -187,6 +179,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'IdDependencyList',
+                            'RawValue': '["w1"]',
+                            'Formatted': '["w1"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1198,14 +1198,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '148',
                             'Formatted': '148',
@@ -1236,6 +1228,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1295,14 +1295,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '6',
                             'Formatted': '6',
@@ -1333,6 +1325,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1392,14 +1392,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '6',
                             'Formatted': '6',
@@ -1430,6 +1422,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1449,14 +1449,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '5',
                             'Formatted': '5',
@@ -1466,8 +1458,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "FILTER(asserttrue(....seq > 10, 'seq > 10'));\n",
-                            'Formatted': "FILTER(asserttrue(....seq > 10, 'seq > 10'));\n",
+                            'RawValue': 'FILTER(asserttrue(....seq > 10, 'seq > 10'));\n',
+                            'Formatted': 'FILTER(asserttrue(....seq > 10, 'seq > 10'));\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1487,6 +1479,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1548,8 +1548,8 @@ testCase(ScopeFilter={
                     'Property': [
                         {
                             'Name': 'Label',
-                            'RawValue': "Output\nInternal('spill2')",
-                            'Formatted': "Output\nInternal('spill2')",
+                            'RawValue': 'Output\nInternal('spill2')',
+                            'Formatted': 'Output\nInternal('spill2')',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1572,8 +1572,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "OUTPUT(..., named('spill2'), __compressed__);\n",
-                            'Formatted': "OUTPUT(..., named('spill2'), __compressed__);\n",
+                            'RawValue': 'OUTPUT(..., named('spill2'), __compressed__);\n',
+                            'Formatted': 'OUTPUT(..., named('spill2'), __compressed__);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1652,14 +1652,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '5',
                             'Formatted': '5',
@@ -1669,8 +1661,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "FILTER(asserttrue(....seq < 10, 'seq < 10'));\n",
-                            'Formatted': "FILTER(asserttrue(....seq < 10, 'seq < 10'));\n",
+                            'RawValue': 'FILTER(asserttrue(....seq &lt; 10, &apos;seq &lt; 10&apos;));\n',
+                            'Formatted': 'FILTER(asserttrue(....seq &lt; 10, &apos;seq &lt; 10&apos;));\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1690,6 +1682,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1839,8 +1839,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'Label',
-                            'RawValue': "Output\nInternal('spill1')",
-                            'Formatted': "Output\nInternal('spill1')",
+                            'RawValue': 'Output\nInternal(&apos;spill1&apos;)',
+                            'Formatted': 'Output\nInternal(&apos;spill1&apos;)',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1863,8 +1863,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "OUTPUT(..., named('spill1'), __compressed__);\n",
-                            'Formatted': "OUTPUT(..., named('spill1'), __compressed__);\n",
+                            'RawValue': 'OUTPUT(..., named(&apos;spill1&apos;), __compressed__);\n',
+                            'Formatted': 'OUTPUT(..., named(&apos;spill1&apos;), __compressed__);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1960,8 +1960,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "OUTPUT(..., , '~spill::3', __compressed__);\n",
-                            'Formatted': "OUTPUT(..., , '~spill::3', __compressed__);\n",
+                            'RawValue': 'OUTPUT(..., , &apos;~spill::3&apos;, __compressed__);\n',
+                            'Formatted': 'OUTPUT(..., , &apos;~spill::3&apos;, __compressed__);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -2250,8 +2250,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "DATASET('~spill::3', { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n",
-                            'Formatted': "DATASET('~spill::3', { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n",
+                            'RawValue': 'DATASET(&apos;~spill::3&apos;, { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n',
+                            'Formatted': 'DATASET(&apos;~spill::3&apos;, { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -2273,41 +2273,41 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
+                            'Name': 'Filename',
+                            'RawValue': '~spill::3',
+                            'Formatted': '~spill::3',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'EclName',
-                            'RawValue': 'ds',
-                            'Formatted': 'ds',
+                            'Name': 'IsSpill',
+                            'RawValue': '1',
+                            'Formatted': '1',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Filename',
-                            'RawValue': '~spill::3',
-                            'Formatted': '~spill::3',
+                            'Name': 'SignedBy',
+                            'RawValue': 'hpcc',
+                            'Formatted': 'hpcc',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'IsSpill',
-                            'RawValue': '1',
-                            'Formatted': '1',
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'SignedBy',
-                            'RawValue': 'hpcc',
-                            'Formatted': 'hpcc',
+                            'Name': 'EclNameList',
+                            'RawValue': '["ds"]',
+                            'Formatted': '["ds"]',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -2370,14 +2370,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '5',
                             'Formatted': '5',
@@ -2387,8 +2379,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': 'FILTER(seq != <...>.value  +  100000);\n',
-                            'Formatted': 'FILTER(seq != <...>.value  +  100000);\n',
+                            'RawValue': 'FILTER(seq != &lt;...&gt;.value  +  100000);\n',
+                            'Formatted': 'FILTER(seq != &lt;...&gt;.value  +  100000);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -2408,6 +2400,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -2467,14 +2467,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '16',
                             'Formatted': '16',
@@ -2497,6 +2489,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -2856,8 +2856,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "DATASET('~spill::3', { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n",
-                            'Formatted': "DATASET('~spill::3', { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n",
+                            'RawValue': 'DATASET(&apos;~spill::3&apos;, { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n',
+                            'Formatted': 'DATASET(&apos;~spill::3&apos;, { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -2879,41 +2879,41 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
+                            'Name': 'Filename',
+                            'RawValue': '~spill::3',
+                            'Formatted': '~spill::3',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'EclName',
-                            'RawValue': 'ds',
-                            'Formatted': 'ds',
+                            'Name': 'IsSpill',
+                            'RawValue': '1',
+                            'Formatted': '1',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Filename',
-                            'RawValue': '~spill::3',
-                            'Formatted': '~spill::3',
+                            'Name': 'SignedBy',
+                            'RawValue': 'hpcc',
+                            'Formatted': 'hpcc',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'IsSpill',
-                            'RawValue': '1',
-                            'Formatted': '1',
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'SignedBy',
-                            'RawValue': 'hpcc',
-                            'Formatted': 'hpcc',
+                            'Name': 'EclNameList',
+                            'RawValue': '["ds"]',
+                            'Formatted': '["ds"]',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -2945,8 +2945,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "DATASET('~spill::3', { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n",
-                            'Formatted': "DATASET('~spill::3', { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n",
+                            'RawValue': 'DATASET(&apos;~spill::3&apos;, { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n',
+                            'Formatted': 'DATASET(&apos;~spill::3&apos;, { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -2968,41 +2968,41 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
+                            'Name': 'Filename',
+                            'RawValue': '~spill::3',
+                            'Formatted': '~spill::3',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'EclName',
-                            'RawValue': 'ds',
-                            'Formatted': 'ds',
+                            'Name': 'IsSpill',
+                            'RawValue': '1',
+                            'Formatted': '1',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Filename',
-                            'RawValue': '~spill::3',
-                            'Formatted': '~spill::3',
+                            'Name': 'SignedBy',
+                            'RawValue': 'hpcc',
+                            'Formatted': 'hpcc',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'IsSpill',
-                            'RawValue': '1',
-                            'Formatted': '1',
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'SignedBy',
-                            'RawValue': 'hpcc',
-                            'Formatted': 'hpcc',
+                            'Name': 'EclNameList',
+                            'RawValue': '["ds"]',
+                            'Formatted': '["ds"]',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -3025,14 +3025,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '5',
                             'Formatted': '5',
@@ -3042,8 +3034,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': 'FILTER(seq != <...>.value  +  100000, hint(testhintissupported(1)));\n',
-                            'Formatted': 'FILTER(seq != <...>.value  +  100000, hint(testhintissupported(1)));\n',
+                            'RawValue': 'FILTER(seq != &lt;...&gt;.value  +  100000, hint(testhintissupported(1)));\n',
+                            'Formatted': 'FILTER(seq != &lt;...&gt;.value  +  100000, hint(testhintissupported(1)));\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -3065,6 +3057,14 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
                             'Name': 'hint:testhintissupported',
                             'RawValue': '1',
                             'Formatted': '1',
@@ -3130,22 +3130,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'EclName',
-                            'RawValue': 'cond',
-                            'Formatted': 'cond',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '28',
                             'Formatted': '28',
@@ -3155,8 +3139,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "IF(STORED('truevalue'), ds, ...);\n",
-                            'Formatted': "IF(STORED('truevalue'), ds, ...);\n",
+                            'RawValue': 'IF(STORED(&apos;truevalue&apos;), ds, ...);\n',
+                            'Formatted': 'IF(STORED(&apos;truevalue&apos;), ds, ...);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -3184,6 +3168,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclNameList',
+                            'RawValue': '["cond"]',
+                            'Formatted': '["cond"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -3243,14 +3243,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '16',
                             'Formatted': '16',
@@ -3273,6 +3265,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }

testing/esp/wudetails/key/childds1_thor_testcase1.json

@@ -117,14 +117,6 @@ testCase(ScopeFilter={
                 'Properties': {
                     'Property': [
                         {
-                            'Name': 'IdDependencyList',
-                            'RawValue': '["w1"]',
-                            'Formatted': '["w1"]',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'IsScheduled',
                             'RawValue': 'true',
                             'Formatted': 'true',
@@ -139,6 +131,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'IdDependencyList',
+                            'RawValue': '["w1"]',
+                            'Formatted': '["w1"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -867,14 +867,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '148',
                             'Formatted': '148',
@@ -905,6 +897,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -948,14 +948,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '6',
                             'Formatted': '6',
@@ -986,6 +978,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1029,14 +1029,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '5',
                             'Formatted': '5',
@@ -1046,8 +1038,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "FILTER(asserttrue(....seq < 10, 'seq < 10'));\n",
-                            'Formatted': "FILTER(asserttrue(....seq < 10, 'seq < 10'));\n",
+                            'RawValue': 'FILTER(asserttrue(....seq &lt; 10, &apos;seq &lt; 10&apos;));\n',
+                            'Formatted': 'FILTER(asserttrue(....seq &lt; 10, &apos;seq &lt; 10&apos;));\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1067,6 +1059,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1176,8 +1176,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'Label',
-                            'RawValue': "Output\nInternal('spill1')",
-                            'Formatted': "Output\nInternal('spill1')",
+                            'RawValue': 'Output\nInternal(&apos;spill1&apos;)',
+                            'Formatted': 'Output\nInternal(&apos;spill1&apos;)',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1200,8 +1200,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "OUTPUT(..., named('spill1'), __compressed__);\n",
-                            'Formatted': "OUTPUT(..., named('spill1'), __compressed__);\n",
+                            'RawValue': 'OUTPUT(..., named(&apos;spill1&apos;), __compressed__);\n',
+                            'Formatted': 'OUTPUT(..., named(&apos;spill1&apos;), __compressed__);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1353,8 +1353,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "OUTPUT(..., , '~spill::3', __compressed__);\n",
-                            'Formatted': "OUTPUT(..., , '~spill::3', __compressed__);\n",
+                            'RawValue': 'OUTPUT(..., , &apos;~spill::3&apos;, __compressed__);\n',
+                            'Formatted': 'OUTPUT(..., , &apos;~spill::3&apos;, __compressed__);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1457,8 +1457,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "DATASET('~spill::3', { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\nFILTER(asserttrue(....seq > 10, 'seq > 10'));\n",
-                            'Formatted': "DATASET('~spill::3', { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\nFILTER(asserttrue(....seq > 10, 'seq > 10'));\n",
+                            'RawValue': 'DATASET(&apos;~spill::3&apos;, { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\nFILTER(asserttrue(....seq &gt; 10, &apos;seq &gt; 10&apos;));\n',
+                            'Formatted': 'DATASET(&apos;~spill::3&apos;, { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\nFILTER(asserttrue(....seq &gt; 10, &apos;seq &gt; 10&apos;));\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1480,14 +1480,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Filename',
                             'RawValue': '~spill::3',
                             'Formatted': '~spill::3',
@@ -1510,6 +1502,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1522,8 +1522,8 @@ testCase(ScopeFilter={
                     'Property': [
                         {
                             'Name': 'Label',
-                            'RawValue': "Output\nInternal('spill2')",
-                            'Formatted': "Output\nInternal('spill2')",
+                            'RawValue': 'Output\nInternal(&apos;spill2&apos;)',
+                            'Formatted': 'Output\nInternal(&apos;spill2&apos;)',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1546,8 +1546,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "OUTPUT(..., named('spill2'), __compressed__);\n",
-                            'Formatted': "OUTPUT(..., named('spill2'), __compressed__);\n",
+                            'RawValue': 'OUTPUT(..., named(&apos;spill2&apos;), __compressed__);\n',
+                            'Formatted': 'OUTPUT(..., named(&apos;spill2&apos;), __compressed__);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -2041,8 +2041,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "DATASET('~spill::3', { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n",
-                            'Formatted': "DATASET('~spill::3', { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n",
+                            'RawValue': 'DATASET(&apos;~spill::3&apos;, { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n',
+                            'Formatted': 'DATASET(&apos;~spill::3&apos;, { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -2064,41 +2064,41 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
+                            'Name': 'Filename',
+                            'RawValue': '~spill::3',
+                            'Formatted': '~spill::3',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'EclName',
-                            'RawValue': 'ds',
-                            'Formatted': 'ds',
+                            'Name': 'IsTransformSpill',
+                            'RawValue': '1',
+                            'Formatted': '1',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Filename',
-                            'RawValue': '~spill::3',
-                            'Formatted': '~spill::3',
+                            'Name': 'SignedBy',
+                            'RawValue': 'hpcc',
+                            'Formatted': 'hpcc',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'IsTransformSpill',
-                            'RawValue': '1',
-                            'Formatted': '1',
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'SignedBy',
-                            'RawValue': 'hpcc',
-                            'Formatted': 'hpcc',
+                            'Name': 'EclNameList',
+                            'RawValue': '["ds"]',
+                            'Formatted': '["ds"]',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -2130,8 +2130,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "DATASET('~spill::3', { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n",
-                            'Formatted': "DATASET('~spill::3', { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n",
+                            'RawValue': 'DATASET(&apos;~spill::3&apos;, { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n',
+                            'Formatted': 'DATASET(&apos;~spill::3&apos;, { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -2153,41 +2153,41 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
+                            'Name': 'Filename',
+                            'RawValue': '~spill::3',
+                            'Formatted': '~spill::3',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'EclName',
-                            'RawValue': 'ds',
-                            'Formatted': 'ds',
+                            'Name': 'IsTransformSpill',
+                            'RawValue': '1',
+                            'Formatted': '1',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Filename',
-                            'RawValue': '~spill::3',
-                            'Formatted': '~spill::3',
+                            'Name': 'SignedBy',
+                            'RawValue': 'hpcc',
+                            'Formatted': 'hpcc',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'IsTransformSpill',
-                            'RawValue': '1',
-                            'Formatted': '1',
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'SignedBy',
-                            'RawValue': 'hpcc',
-                            'Formatted': 'hpcc',
+                            'Name': 'EclNameList',
+                            'RawValue': '["ds"]',
+                            'Formatted': '["ds"]',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -2210,14 +2210,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '5',
                             'Formatted': '5',
@@ -2227,8 +2219,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': 'FILTER(seq != <...>.value  +  100000, hint(testhintissupported(1)));\n',
-                            'Formatted': 'FILTER(seq != <...>.value  +  100000, hint(testhintissupported(1)));\n',
+                            'RawValue': 'FILTER(seq != &lt;...&gt;.value  +  100000, hint(testhintissupported(1)));\n',
+                            'Formatted': 'FILTER(seq != &lt;...&gt;.value  +  100000, hint(testhintissupported(1)));\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -2250,6 +2242,14 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
                             'Name': 'hint:testhintissupported',
                             'RawValue': '1',
                             'Formatted': '1',
@@ -2299,22 +2299,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'EclName',
-                            'RawValue': 'cond',
-                            'Formatted': 'cond',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '28',
                             'Formatted': '28',
@@ -2324,8 +2308,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "IF(STORED('truevalue'), ds, ...);\n",
-                            'Formatted': "IF(STORED('truevalue'), ds, ...);\n",
+                            'RawValue': 'IF(STORED(&apos;truevalue&apos;), ds, ...);\n',
+                            'Formatted': 'IF(STORED(&apos;truevalue&apos;), ds, ...);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -2353,6 +2337,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclNameList',
+                            'RawValue': '["cond"]',
+                            'Formatted': '["cond"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -2396,14 +2396,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '16',
                             'Formatted': '16',
@@ -2426,6 +2418,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -2541,14 +2541,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '195',
                             'Formatted': '195',
@@ -2558,8 +2550,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "DATASET('~spill::3', { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\nFILTER(seq != <...>.value  +  100000);\n",
-                            'Formatted': "DATASET('~spill::3', { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\nFILTER(seq != <...>.value  +  100000);\n",
+                            'RawValue': 'DATASET(&apos;~spill::3&apos;, { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\nFILTER(seq != &lt;...&gt;.value  +  100000);\n',
+                            'Formatted': 'DATASET(&apos;~spill::3&apos;, { unsigned8 seq, DATASET(idrec) ids }, THOR, __compressed__);\nFILTER(seq != &lt;...&gt;.value  +  100000);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -2581,41 +2573,41 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
+                            'Name': 'Filename',
+                            'RawValue': '~spill::3',
+                            'Formatted': '~spill::3',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'EclName',
-                            'RawValue': 'ds',
-                            'Formatted': 'ds',
+                            'Name': 'IsTransformSpill',
+                            'RawValue': '1',
+                            'Formatted': '1',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Filename',
-                            'RawValue': '~spill::3',
-                            'Formatted': '~spill::3',
+                            'Name': 'SignedBy',
+                            'RawValue': 'hpcc',
+                            'Formatted': 'hpcc',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'IsTransformSpill',
-                            'RawValue': '1',
-                            'Formatted': '1',
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'SignedBy',
-                            'RawValue': 'hpcc',
-                            'Formatted': 'hpcc',
+                            'Name': 'EclNameList',
+                            'RawValue': '["ds"]',
+                            'Formatted': '["ds"]',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -2662,14 +2654,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '16',
                             'Formatted': '16',
@@ -2692,6 +2676,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }

testing/esp/wudetails/key/dedup_all_hthor_testcase1.json

@@ -345,22 +345,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'EclName',
-                            'RawValue': 'somefile',
-                            'Formatted': 'somefile',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '133',
                             'Formatted': '133',
@@ -370,8 +354,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "DATASET([{'C','G'},...], myrec);\n",
-                            'Formatted': "DATASET([{'C','G'},...], myrec);\n",
+                            'RawValue': 'DATASET([{'C','G'},...], myrec);\n',
+                            'Formatted': 'DATASET([{'C','G'},...], myrec);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -391,6 +375,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclNameList',
+                            'RawValue': '["somefile"]',
+                            'Formatted': '["somefile"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -410,22 +410,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'EclName',
-                            'RawValue': 'dedup1',
-                            'Formatted': 'dedup1',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '4',
                             'Formatted': '4',
@@ -435,8 +419,8 @@ testCase(ScopeFilter={
                         },
                         {
                             '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",
+                            '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
@@ -456,6 +440,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclNameList',
+                            'RawValue': '["dedup1"]',
+                            'Formatted': '["dedup1"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -475,14 +475,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '16',
                             'Formatted': '16',
@@ -505,6 +497,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -711,22 +711,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'EclName',
-                            'RawValue': 'somefile',
-                            'Formatted': 'somefile',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '133',
                             'Formatted': '133',
@@ -736,8 +720,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "DATASET([{'C','G'},...], myrec);\n",
-                            'Formatted': "DATASET([{'C','G'},...], myrec);\n",
+                            'RawValue': 'DATASET([{'C','G'},...], myrec);\n',
+                            'Formatted': 'DATASET([{'C','G'},...], myrec);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -757,6 +741,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclNameList',
+                            'RawValue': '["somefile"]',
+                            'Formatted': '["somefile"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -776,22 +776,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'EclName',
-                            'RawValue': 'dedup2',
-                            'Formatted': 'dedup2',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '4',
                             'Formatted': '4',
@@ -801,8 +785,8 @@ testCase(ScopeFilter={
                         },
                         {
                             '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",
+                            '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
@@ -822,6 +806,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclNameList',
+                            'RawValue': '["dedup2"]',
+                            'Formatted': '["dedup2"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -841,14 +841,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '16',
                             'Formatted': '16',
@@ -871,6 +863,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1077,22 +1077,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'EclName',
-                            'RawValue': 'somefile',
-                            'Formatted': 'somefile',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '133',
                             'Formatted': '133',
@@ -1102,8 +1086,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "DATASET([{'C','G'},...], myrec);\n",
-                            'Formatted': "DATASET([{'C','G'},...], myrec);\n",
+                            'RawValue': 'DATASET([{'C','G'},...], myrec);\n',
+                            'Formatted': 'DATASET([{'C','G'},...], myrec);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1123,6 +1107,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclNameList',
+                            'RawValue': '["somefile"]',
+                            'Formatted': '["somefile"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1142,22 +1142,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'EclName',
-                            'RawValue': 'dedup3',
-                            'Formatted': 'dedup3',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '4',
                             'Formatted': '4',
@@ -1167,8 +1151,8 @@ testCase(ScopeFilter={
                         },
                         {
                             '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",
+                            '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
@@ -1188,6 +1172,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclNameList',
+                            'RawValue': '["dedup3"]',
+                            'Formatted': '["dedup3"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1207,14 +1207,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '16',
                             'Formatted': '16',
@@ -1237,6 +1229,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }

testing/esp/wudetails/key/dedup_all_roxie_testcase1.json

@@ -886,22 +886,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'EclName',
-                            'RawValue': 'somefile',
-                            'Formatted': 'somefile',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '133',
                             'Formatted': '133',
@@ -911,8 +895,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "DATASET([{'C','G'},...], myrec);\n",
-                            'Formatted': "DATASET([{'C','G'},...], myrec);\n",
+                            'RawValue': 'DATASET([{'C','G'},...], myrec);\n',
+                            'Formatted': 'DATASET([{'C','G'},...], myrec);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -932,6 +916,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclNameList',
+                            'RawValue': '["somefile"]',
+                            'Formatted': '["somefile"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -991,14 +991,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '6',
                             'Formatted': '6',
@@ -1029,6 +1021,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1088,22 +1088,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'EclName',
-                            'RawValue': 'dedup3',
-                            'Formatted': 'dedup3',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '4',
                             'Formatted': '4',
@@ -1113,8 +1097,8 @@ testCase(ScopeFilter={
                         },
                         {
                             '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",
+                            '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
@@ -1134,6 +1118,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclNameList',
+                            'RawValue': '["dedup3"]',
+                            'Formatted': '["dedup3"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1193,14 +1193,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '16',
                             'Formatted': '16',
@@ -1223,6 +1215,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1282,22 +1282,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'EclName',
-                            'RawValue': 'dedup2',
-                            'Formatted': 'dedup2',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '4',
                             'Formatted': '4',
@@ -1307,8 +1291,8 @@ testCase(ScopeFilter={
                         },
                         {
                             '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",
+                            '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
@@ -1328,6 +1312,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclNameList',
+                            'RawValue': '["dedup2"]',
+                            'Formatted': '["dedup2"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1387,14 +1387,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '16',
                             'Formatted': '16',
@@ -1417,6 +1409,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1476,22 +1476,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'EclName',
-                            'RawValue': 'dedup1',
-                            'Formatted': 'dedup1',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '4',
                             'Formatted': '4',
@@ -1501,8 +1485,8 @@ testCase(ScopeFilter={
                         },
                         {
                             '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",
+                            '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
@@ -1522,6 +1506,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclNameList',
+                            'RawValue': '["dedup1"]',
+                            'Formatted': '["dedup1"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1581,14 +1581,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '16',
                             'Formatted': '16',
@@ -1611,6 +1603,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }

testing/esp/wudetails/key/dict1_hthor_testcase1.json

@@ -345,14 +345,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '148',
                             'Formatted': '148',
@@ -383,6 +375,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -402,14 +402,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '8',
                             'Formatted': '8',
@@ -440,6 +432,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -459,49 +459,41 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'EclName',
-                            'RawValue': 'dict1',
-                            'Formatted': 'dict1',
+                            'Name': 'Kind',
+                            'RawValue': '16',
+                            'Formatted': '16',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
+                            'Name': 'EclText',
+                            'RawValue': 'OUTPUT(..., workunit);\n',
+                            'Formatted': 'OUTPUT(..., workunit);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Kind',
-                            'RawValue': '16',
-                            'Formatted': '16',
+                            'Name': 'RecordSize',
+                            'RawValue': '20',
+                            'Formatted': '20',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'EclText',
-                            'RawValue': 'OUTPUT(..., workunit);\n',
-                            'Formatted': 'OUTPUT(..., workunit);\n',
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'RecordSize',
-                            'RawValue': '20',
-                            'Formatted': '20',
+                            'Name': 'EclNameList',
+                            'RawValue': '["dict1"]',
+                            'Formatted': '["dict1"]',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None

testing/esp/wudetails/key/dict1_roxie_testcase1.json

@@ -455,14 +455,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '148',
                             'Formatted': '148',
@@ -493,6 +485,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -560,14 +560,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '8',
                             'Formatted': '8',
@@ -598,6 +590,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -665,49 +665,41 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'EclName',
-                            'RawValue': 'dict1',
-                            'Formatted': 'dict1',
+                            'Name': 'Kind',
+                            'RawValue': '16',
+                            'Formatted': '16',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
+                            'Name': 'EclText',
+                            'RawValue': 'OUTPUT(..., workunit);\n',
+                            'Formatted': 'OUTPUT(..., workunit);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Kind',
-                            'RawValue': '16',
-                            'Formatted': '16',
+                            'Name': 'RecordSize',
+                            'RawValue': '20',
+                            'Formatted': '20',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'EclText',
-                            'RawValue': 'OUTPUT(..., workunit);\n',
-                            'Formatted': 'OUTPUT(..., workunit);\n',
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'RecordSize',
-                            'RawValue': '20',
-                            'Formatted': '20',
+                            'Name': 'EclNameList',
+                            'RawValue': '["dict1"]',
+                            'Formatted': '["dict1"]',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None

testing/esp/wudetails/key/dict1_thor_testcase1.json

@@ -507,14 +507,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '148',
                             'Formatted': '148',
@@ -545,6 +537,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -636,14 +636,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '15',
                             'Formatted': '15',
@@ -674,6 +666,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -717,14 +717,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '8',
                             'Formatted': '8',
@@ -763,6 +755,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -806,14 +806,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '14',
                             'Formatted': '14',
@@ -844,6 +836,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -887,49 +887,41 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'EclName',
-                            'RawValue': 'dict1',
-                            'Formatted': 'dict1',
+                            'Name': 'Kind',
+                            'RawValue': '16',
+                            'Formatted': '16',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
+                            'Name': 'EclText',
+                            'RawValue': 'OUTPUT(..., workunit);\n',
+                            'Formatted': 'OUTPUT(..., workunit);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Kind',
-                            'RawValue': '16',
-                            'Formatted': '16',
+                            'Name': 'RecordSize',
+                            'RawValue': '12..?(268)',
+                            'Formatted': '12..?(268)',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'EclText',
-                            'RawValue': 'OUTPUT(..., workunit);\n',
-                            'Formatted': 'OUTPUT(..., workunit);\n',
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'RecordSize',
-                            'RawValue': '12..?(268)',
-                            'Formatted': '12..?(268)',
+                            'Name': 'EclNameList',
+                            'RawValue': '["dict1"]',
+                            'Formatted': '["dict1"]',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None

testing/esp/wudetails/key/indexread2-multiPart(true)_hthor_testcase1.json

@@ -242,55 +242,6 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'w1:graph1:e16_3',
-                'Id': 'e16_3',
-                'ScopeType': 'edge',
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'Label',
-                            'RawValue': 'Child',
-                            'Formatted': 'Child',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'IdSource',
-                            'RawValue': 'a16',
-                            'Formatted': 'a16',
-                            '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': 'w1:graph1:sg1',
                 'Id': 'sg1',
                 'ScopeType': 'subgraph',
@@ -478,31 +429,64 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'w1:graph1:sg1:a2',
-                'Id': 'a2',
-                'ScopeType': 'activity',
+                'ScopeName': 'w1:graph1:sg1:e16_3',
+                'Id': 'e16_3',
+                'ScopeType': 'edge',
                 'Properties': {
                     'Property': [
                         {
                             'Name': 'Label',
-                            'RawValue': 'Inline Dataset',
-                            'Formatted': 'Inline Dataset',
+                            'RawValue': 'Child',
+                            'Formatted': 'Child',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
+                            'Name': 'IdSource',
+                            'RawValue': 'a16',
+                            'Formatted': 'a16',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
                         },
                         {
-                            'Name': 'EclName',
-                            'RawValue': 'in',
-                            'Formatted': 'in',
+                            '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': 'w1:graph1:sg1:a2',
+                'Id': 'a2',
+                'ScopeType': 'activity',
+                'Properties': {
+                    'Property': [
+                        {
+                            'Name': 'Label',
+                            'RawValue': 'Inline Dataset',
+                            'Formatted': 'Inline Dataset',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -517,8 +501,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "DATASET([{'Anderson       '},...], { string15 fname });\n",
-                            'Formatted': "DATASET([{'Anderson       '},...], { string15 fname });\n",
+                            'RawValue': 'DATASET([{'Anderson       '},...], { string15 fname });\n',
+                            'Formatted': 'DATASET([{'Anderson       '},...], { string15 fname });\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -538,6 +522,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclNameList',
+                            'RawValue': '["in"]',
+                            'Formatted': '["in"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -557,22 +557,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'EclName',
-                            'RawValue': 'p1',
-                            'Formatted': 'p1',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '7',
                             'Formatted': '7',
@@ -603,6 +587,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclNameList',
+                            'RawValue': '["p1"]',
+                            'Formatted': '["p1"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1035,16 +1035,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'Label',
-                            'RawValue': "Index Read\n'...::DG_FetchIndex1'",
-                            'Formatted': "Index Read\n'...::DG_FetchIndex1'",
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
+                            'RawValue': 'Index Read\n'...::DG_FetchIndex1'',
+                            'Formatted': 'Index Read\n'...::DG_FetchIndex1'',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1075,8 +1067,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "INDEX({ string25 lname, string15 fname }, RECORD\n  string tfn;\n  string2 state;\n  unsigned8 blobfield;\n  big_endian unsigned integer8 __filepos;\n END, '~regress::multi::DG_FetchIndex1');\nFILTER(lname != LEFT.fname);\n",
-                            'Formatted': "INDEX({ string25 lname, string15 fname }, RECORD\n  string tfn;\n  string2 state;\n  unsigned8 blobfield;\n  big_endian unsigned integer8 __filepos;\n END, '~regress::multi::DG_FetchIndex1');\nFILTER(lname != LEFT.fname);\n",
+                            'RawValue': 'INDEX({ string25 lname, string15 fname }, RECORD\n  string tfn;\n  string2 state;\n  unsigned8 blobfield;\n  big_endian unsigned integer8 __filepos;\n END, '~regress::multi::DG_FetchIndex1');\nFILTER(lname != LEFT.fname);\n',
+                            'Formatted': 'INDEX({ string25 lname, string15 fname }, RECORD\n  string tfn;\n  string2 state;\n  unsigned8 blobfield;\n  big_endian unsigned integer8 __filepos;\n END, '~regress::multi::DG_FetchIndex1');\nFILTER(lname != LEFT.fname);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1104,6 +1096,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1123,14 +1123,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '3',
                             'Formatted': '3',
@@ -1177,6 +1169,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1196,14 +1196,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '4',
                             'Formatted': '4',
@@ -1250,6 +1242,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1269,14 +1269,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '99',
                             'Formatted': '99',
@@ -1331,6 +1323,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1740,14 +1740,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '93',
                             'Formatted': '93',
@@ -1802,6 +1794,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1821,22 +1821,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'EclName',
-                            'RawValue': 'deduped',
-                            'Formatted': 'deduped',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '7',
                             'Formatted': '7',
@@ -1883,6 +1867,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclNameList',
+                            'RawValue': '["deduped"]',
+                            'Formatted': '["deduped"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1935,24 +1935,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'Label',
-                            'RawValue': "Keyed Join\n'~regress::multi::DG_FetchIndex1'",
-                            'Formatted': "Keyed Join\n'~regress::multi::DG_FetchIndex1'",
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'EclName',
-                            'RawValue': 'joinedchildren',
-                            'Formatted': 'joinedchildren',
+                            'RawValue': 'Keyed Join\n'~regress::multi::DG_FetchIndex1'',
+                            'Formatted': 'Keyed Join\n'~regress::multi::DG_FetchIndex1'',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -2020,6 +2004,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclNameList',
+                            'RawValue': '["joinedchildren"]',
+                            'Formatted': '["joinedchildren"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -2096,14 +2096,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '16',
                             'Formatted': '16',
@@ -2126,6 +2118,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }

testing/esp/wudetails/key/indexread2-multiPart(true)_roxie_testcase1.json

@@ -362,55 +362,6 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'w1:graph1:e17_3',
-                'Id': 'e17_3',
-                'ScopeType': 'edge',
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'Label',
-                            'RawValue': 'Child',
-                            'Formatted': 'Child',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'IdSource',
-                            'RawValue': 'a17',
-                            'Formatted': 'a17',
-                            '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': 'w1:graph1:sg1',
                 'Id': 'sg1',
                 'ScopeType': 'subgraph',
@@ -563,6 +514,55 @@ testCase(ScopeFilter={
                 }
             },
             {
+                'ScopeName': 'w1:graph1:sg1:e17_3',
+                'Id': 'e17_3',
+                'ScopeType': 'edge',
+                'Properties': {
+                    'Property': [
+                        {
+                            'Name': 'Label',
+                            'RawValue': 'Child',
+                            'Formatted': 'Child',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'IdSource',
+                            'RawValue': 'a17',
+                            'Formatted': 'a17',
+                            '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': 'w1:graph1:sg1:e18_0',
                 'Id': 'e18_0',
                 'ScopeType': 'edge',
@@ -658,22 +658,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'EclName',
-                            'RawValue': 'in',
-                            'Formatted': 'in',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '133',
                             'Formatted': '133',
@@ -683,8 +667,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "DATASET([{'Anderson       '},...], { string15 fname });\n",
-                            'Formatted': "DATASET([{'Anderson       '},...], { string15 fname });\n",
+                            'RawValue': 'DATASET([{'Anderson       '},...], { string15 fname });\n',
+                            'Formatted': 'DATASET([{'Anderson       '},...], { string15 fname });\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -704,6 +688,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclNameList',
+                            'RawValue': '["in"]',
+                            'Formatted': '["in"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -771,22 +771,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'EclName',
-                            'RawValue': 'p1',
-                            'Formatted': 'p1',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '7',
                             'Formatted': '7',
@@ -817,6 +801,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclNameList',
+                            'RawValue': '["p1"]',
+                            'Formatted': '["p1"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1087,16 +1087,8 @@ testCase(ScopeFilter={
                     'Property': [
                         {
                             'Name': 'Label',
-                            'RawValue': "Index Read\n'...::DG_FetchIndex1'",
-                            'Formatted': "Index Read\n'...::DG_FetchIndex1'",
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
+                            'RawValue': 'Index Read\n'...::DG_FetchIndex1'',
+                            'Formatted': 'Index Read\n'...::DG_FetchIndex1'',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1119,8 +1111,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "INDEX({ string25 lname, string15 fname }, RECORD\n  string tfn;\n  string2 state;\n  unsigned8 blobfield;\n  big_endian unsigned integer8 __filepos;\n END, '~regress::multi::DG_FetchIndex1');\nFILTER(lname != LEFT.fname);\n",
-                            'Formatted': "INDEX({ string25 lname, string15 fname }, RECORD\n  string tfn;\n  string2 state;\n  unsigned8 blobfield;\n  big_endian unsigned integer8 __filepos;\n END, '~regress::multi::DG_FetchIndex1');\nFILTER(lname != LEFT.fname);\n",
+                            'RawValue': 'INDEX({ string25 lname, string15 fname }, RECORD\n  string tfn;\n  string2 state;\n  unsigned8 blobfield;\n  big_endian unsigned integer8 __filepos;\n END, '~regress::multi::DG_FetchIndex1');\nFILTER(lname != LEFT.fname);\n',
+                            'Formatted': 'INDEX({ string25 lname, string15 fname }, RECORD\n  string tfn;\n  string2 state;\n  unsigned8 blobfield;\n  big_endian unsigned integer8 __filepos;\n END, '~regress::multi::DG_FetchIndex1');\nFILTER(lname != LEFT.fname);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1148,6 +1140,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1167,14 +1167,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '3',
                             'Formatted': '3',
@@ -1221,6 +1213,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1240,14 +1240,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '4',
                             'Formatted': '4',
@@ -1294,6 +1286,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1313,14 +1313,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '6',
                             'Formatted': '6',
@@ -1359,6 +1351,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1549,8 +1549,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "OUTPUT(..., , '~spill::1', __compressed__);\n",
-                            'Formatted': "OUTPUT(..., , '~spill::1', __compressed__);\n",
+                            'RawValue': 'OUTPUT(..., , '~spill::1', __compressed__);\n',
+                            'Formatted': 'OUTPUT(..., , '~spill::1', __compressed__);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1759,8 +1759,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "DATASET('~spill::1', RECORD\n  string25 lname;\n  string15 fname;\n  string tfn;\n  string2 state;\n  string100 blobfield{blob};\n... END, THOR, __compressed__, local);\n",
-                            'Formatted': "DATASET('~spill::1', RECORD\n  string25 lname;\n  string15 fname;\n  string tfn;\n  string2 state;\n  string100 blobfield{blob};\n... END, THOR, __compressed__, local);\n",
+                            'RawValue': 'DATASET('~spill::1', RECORD\n  string25 lname;\n  string15 fname;\n  string tfn;\n  string2 state;\n  string100 blobfield{blob};\n... END, THOR, __compressed__, local);\n',
+                            'Formatted': 'DATASET('~spill::1', RECORD\n  string25 lname;\n  string15 fname;\n  string tfn;\n  string2 state;\n  string100 blobfield{blob};\n... END, THOR, __compressed__, local);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1823,22 +1823,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'EclName',
-                            'RawValue': 'deduped',
-                            'Formatted': 'deduped',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '7',
                             'Formatted': '7',
@@ -1885,6 +1869,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclNameList',
+                            'RawValue': '["deduped"]',
+                            'Formatted': '["deduped"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1897,24 +1897,8 @@ testCase(ScopeFilter={
                     'Property': [
                         {
                             'Name': 'Label',
-                            'RawValue': "Keyed Join\n'~regress::multi::DG_FetchIndex1'",
-                            'Formatted': "Keyed Join\n'~regress::multi::DG_FetchIndex1'",
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'EclName',
-                            'RawValue': 'joinedchildren',
-                            'Formatted': 'joinedchildren',
+                            'RawValue': 'Keyed Join\n'~regress::multi::DG_FetchIndex1'',
+                            'Formatted': 'Keyed Join\n'~regress::multi::DG_FetchIndex1'',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1974,6 +1958,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclNameList',
+                            'RawValue': '["joinedchildren"]',
+                            'Formatted': '["joinedchildren"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -2098,14 +2098,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '16',
                             'Formatted': '16',
@@ -2128,6 +2120,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }

testing/esp/wudetails/key/indexread2-multiPart(true)_thor_testcase1.json

@@ -250,55 +250,6 @@ testCase(ScopeFilter={
                 }
             },
             {
-                'ScopeName': 'w1:graph1:e19_3',
-                'Id': 'e19_3',
-                'ScopeType': 'edge',
-                'Properties': {
-                    'Property': [
-                        {
-                            'Name': 'Label',
-                            'RawValue': 'Child',
-                            'Formatted': 'Child',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'IdSource',
-                            'RawValue': 'a19',
-                            'Formatted': 'a19',
-                            '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': 'w1:graph1:sg1',
                 'Id': 'sg1',
                 'ScopeType': 'subgraph',
@@ -470,6 +421,55 @@ testCase(ScopeFilter={
                 }
             },
             {
+                'ScopeName': 'w1:graph1:sg1:e19_3',
+                'Id': 'e19_3',
+                'ScopeType': 'edge',
+                'Properties': {
+                    'Property': [
+                        {
+                            'Name': 'Label',
+                            'RawValue': 'Child',
+                            'Formatted': 'Child',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'IdSource',
+                            'RawValue': 'a19',
+                            'Formatted': 'a19',
+                            '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': 'w1:graph1:sg1:a2',
                 'Id': 'a2',
                 'ScopeType': 'activity',
@@ -508,22 +508,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'EclName',
-                            'RawValue': 'in',
-                            'Formatted': 'in',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '133',
                             'Formatted': '133',
@@ -533,8 +517,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "DATASET([{'Anderson       '},...], { string15 fname });\n",
-                            'Formatted': "DATASET([{'Anderson       '},...], { string15 fname });\n",
+                            'RawValue': 'DATASET([{'Anderson       '},...], { string15 fname });\n',
+                            'Formatted': 'DATASET([{'Anderson       '},...], { string15 fname });\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -554,6 +538,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclNameList',
+                            'RawValue': '["in"]',
+                            'Formatted': '["in"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -597,22 +597,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'EclName',
-                            'RawValue': 'p1',
-                            'Formatted': 'p1',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '7',
                             'Formatted': '7',
@@ -643,6 +627,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclNameList',
+                            'RawValue': '["p1"]',
+                            'Formatted': '["p1"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -995,16 +995,8 @@ testCase(ScopeFilter={
                     'Property': [
                         {
                             'Name': 'Label',
-                            'RawValue': "Index Read\n'...::DG_FetchIndex1'",
-                            'Formatted': "Index Read\n'...::DG_FetchIndex1'",
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
+                            'RawValue': 'Index Read\n'...::DG_FetchIndex1'',
+                            'Formatted': 'Index Read\n'...::DG_FetchIndex1'',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1027,8 +1019,8 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'EclText',
-                            'RawValue': "INDEX({ string25 lname, string15 fname }, RECORD\n  string tfn;\n  string2 state;\n  unsigned8 blobfield;\n  big_endian unsigned integer8 __filepos;\n END, '~regress::multi::DG_FetchIndex1');\nFILTER(lname != LEFT.fname);\n",
-                            'Formatted': "INDEX({ string25 lname, string15 fname }, RECORD\n  string tfn;\n  string2 state;\n  unsigned8 blobfield;\n  big_endian unsigned integer8 __filepos;\n END, '~regress::multi::DG_FetchIndex1');\nFILTER(lname != LEFT.fname);\n",
+                            'RawValue': 'INDEX({ string25 lname, string15 fname }, RECORD\n  string tfn;\n  string2 state;\n  unsigned8 blobfield;\n  big_endian unsigned integer8 __filepos;\n END, '~regress::multi::DG_FetchIndex1');\nFILTER(lname != LEFT.fname);\n',
+                            'Formatted': 'INDEX({ string25 lname, string15 fname }, RECORD\n  string tfn;\n  string2 state;\n  unsigned8 blobfield;\n  big_endian unsigned integer8 __filepos;\n END, '~regress::multi::DG_FetchIndex1');\nFILTER(lname != LEFT.fname);\n',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1056,6 +1048,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1075,14 +1075,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '3',
                             'Formatted': '3',
@@ -1129,6 +1121,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1148,14 +1148,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '15',
                             'Formatted': '15',
@@ -1202,6 +1194,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1221,14 +1221,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '4',
                             'Formatted': '4',
@@ -1283,6 +1275,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1302,14 +1302,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '14',
                             'Formatted': '14',
@@ -1348,6 +1340,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1367,14 +1367,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '6',
                             'Formatted': '6',
@@ -1413,6 +1405,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1756,14 +1756,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '93',
                             'Formatted': '93',
@@ -1818,6 +1810,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1830,24 +1830,8 @@ testCase(ScopeFilter={
                     'Property': [
                         {
                             'Name': 'Label',
-                            'RawValue': "Keyed Join\n'~regress::multi::DG_FetchIndex1'",
-                            'Formatted': "Keyed Join\n'~regress::multi::DG_FetchIndex1'",
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
-                            'Name': 'EclName',
-                            'RawValue': 'joinedchildren',
-                            'Formatted': 'joinedchildren',
+                            'RawValue': 'Keyed Join\n'~regress::multi::DG_FetchIndex1'',
+                            'Formatted': 'Keyed Join\n'~regress::multi::DG_FetchIndex1'',
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
@@ -1907,6 +1891,22 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
+                        },
+                        {
+                            'Name': 'EclNameList',
+                            'RawValue': '["joinedchildren"]',
+                            'Formatted': '["joinedchildren"]',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -1926,14 +1926,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '3',
                             'Formatted': '3',
@@ -1980,6 +1972,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -2072,14 +2072,6 @@ testCase(ScopeFilter={
                             'CreatorType': None
                         },
                         {
-                            'Name': 'Definition',
-                            'RawValue': '{masked}',
-                            'Formatted': '{masked}',
-                            'Measure': None,
-                            'Creator': '{masked}',
-                            'CreatorType': None
-                        },
-                        {
                             'Name': 'Kind',
                             'RawValue': '16',
                             'Formatted': '16',
@@ -2102,6 +2094,14 @@ testCase(ScopeFilter={
                             'Measure': None,
                             'Creator': '{masked}',
                             'CreatorType': None
+                        },
+                        {
+                            'Name': 'DefinitionList',
+                            'RawValue': '{masked}',
+                            'Formatted': '{masked}',
+                            'Measure': None,
+                            'Creator': '{masked}',
+                            'CreatorType': None
                         }
                     ]
                 }
@@ -2166,16 +2166,16 @@ testCase(ScopeFilter={
                         },
                         {
                             'Name': 'NumIndexSeeks',
-                            'RawValue': '11',
-                            'Formatted': '11',
+                            'RawValue': '12',
+                            'Formatted': '12',
                             'Measure': 'cnt',
                             'Creator': '{masked}',
                             'CreatorType': 'thor'
                         },
                         {
                             'Name': 'NumIndexScans',
-                            'RawValue': '107',
-                            'Formatted': '107',
+                            'RawValue': '110',
+                            'Formatted': '110',
                             'Measure': 'cnt',
                             'Creator': '{masked}',
                             'CreatorType': 'thor'

testing/esp/wudetails/wutest.py

@@ -63,9 +63,10 @@ requiredJobs = ( ('childds1',      ('roxie','thor','hthor')),
                  ('sort',          ('roxie','thor','hthor')),
                  ('key',           ('roxie','thor','hthor')),
                  ('dict1',         ('roxie','thor','hthor')),
-                 ('indexread2-multiPart(true)',('roxie', 'thor','hthor') ) )
+                 ('indexread2-multiPart(true)',('roxie', 'thor','hthor')),
+                 ('sets',           ('roxie','thor','hthor')) )
 
-maskValueFields = ('Definition','SizePeakMemory', 'WhenFirstRow', 'TimeElapsed', 'TimeTotalExecute', 'TimeFirstExecute', 'TimeLocalExecute',
+maskValueFields = ('Definition','DefinitionList','SizePeakMemory', 'WhenFirstRow', 'TimeElapsed', 'TimeTotalExecute', 'TimeFirstExecute', 'TimeLocalExecute',
                    'WhenStarted', 'TimeMinLocalExecute', 'TimeMaxLocalExecute', 'TimeAvgLocalExecute', 'SkewMinLocalExecute', 'SkewMaxLocalExecute',
                    'NodeMaxLocalExecute', 'NodeMaxDiskWrites', 'NodeMaxLocalExecute', 'NodeMaxLocalExecute', 'NodeMaxSortElapsed', 'NodeMinDiskWrites',
                    'NodeMinLocalExecute', 'NodeMinLocalExecute', 'NodeMinLocalExecute', 'NodeMinSortElapsed', 'SkewMaxDiskWrites', 'SkewMaxLocalExecute',
@@ -432,6 +433,20 @@ testCases = [
                  scopeOptions(IncludeMatchedScopesInResults='1', IncludeScope='1', IncludeId='1', IncludeScopeType='1'),
                  propertyOptions(IncludeName='1', IncludeRawValue='1', IncludeMeasure='1', IncludeCreator='1', IncludeCreatorType='1')
              ),
+             testCase(
+                 scopeFilter(ScopeTypes={'ScopeType':'workflow'}, MaxDepth='999',),
+                 nestedFilter(Depth='0'),
+                 propertiesToReturn(AllAttributes='1', Properties=[{'Property':'IdDependencyList'}]),
+                 scopeOptions(IncludeMatchedScopesInResults='1', IncludeScope='1', IncludeId='1', IncludeScopeType='1'),
+                 propertyOptions(IncludeName='1', IncludeRawValue='1', IncludeMeasure='1', IncludeCreator='1', IncludeCreatorType='1')
+             ),
+             testCase(
+                 scopeFilter(ScopeTypes={'ScopeType':'workflow'}, MaxDepth='999',),
+                 nestedFilter(Depth='0'),
+                 propertiesToReturn(Properties=[{'Property':'IdDependency'}]),
+                 scopeOptions(IncludeMatchedScopesInResults='1', IncludeScope='1', IncludeId='1', IncludeScopeType='1'),
+                 propertyOptions(IncludeName='1', IncludeRawValue='1', IncludeMeasure='1', IncludeCreator='1', IncludeCreatorType='1')
+             ),
             ]
 
 def ExecTestCase(jobname, wuid, tcase, tcasename):
@@ -541,6 +556,11 @@ for jobname, wuid in wu.items():
             tcasename = 'testcase' + str(index+1)
             success = ExecTestCase(jobname, wuid, t, tcasename)
             stats.addCount(success)
+    elif (jobname in ['sets_thor','sets_roxie', 'sets_hthor']):
+        success = ExecTestCase(jobname, wuid, testCases[30], 'testcase31')
+        stats.addCount(success)
+        success = ExecTestCase(jobname, wuid, testCases[31], 'testcase32')
+        stats.addCount(success)
     else:
         success = ExecTestCase(jobname, wuid, testCases[0], 'testcase1')
         stats.addCount(success)