fix some corner case of prebuild entities in luis:test cli (#1148)

Author: feich-ms

packages/lu/src/parser/test/testhelper.ts

@@ -118,9 +118,11 @@ function ParseEntitiyResult(entities: any, result: any) {
         }
       }
     } else {
-      for (const subEntity of entities[name]) {
-        if (typeof subEntity === 'object') {
-          ParseEntitiyResult(subEntity, result)
+      if (typeof entities[name][Symbol.iterator] === 'function') {
+        for (const subEntity of entities[name]) {
+          if (typeof subEntity === 'object') {
+            ParseEntitiyResult(subEntity, result)
+          }
         }
       }
     }

packages/luis/test/commands/luis/test.test.ts

@@ -75,7 +75,7 @@ describe('luis:test cli entity test', () => {
   .nock('https://westus.api.cognitive.microsoft.com', api => api
   .post(uri => uri.includes('apps'))
   .reply(200, {
-    "query":"accept all meetings for christmas party next week.","prediction":{"topIntent":"AcceptEventEntry","intents":{"AcceptEventEntry":{"score":0.948831439},"FindCalendarEntry":{"score":0.0371829346},"None":{"score":0.00728923827},"CreateCalendarEntry":{"score":0.007234955}},"entities":{"Subject":["christmas party"],"FromDate":["next week"],"$instance":{"Subject":[{"type":"Subject","text":"christmas party","startIndex":24,"length":15,"score":0.9657892,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}],"FromDate":[{"type":"FromDate","text":"next week","startIndex":40,"length":9,"score":0.966946542,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}]}}}
+    "query":"accept all meetings for christmas party next week.","prediction":{"topIntent":"AcceptEventEntry","intents":{"AcceptEventEntry":{"score":0.948831439},"FindCalendarEntry":{"score":0.0371829346},"None":{"score":0.00728923827},"CreateCalendarEntry":{"score":0.007234955}},"entities":{"Subject":["christmas party"],"FromDate":["next week"],"ordinalV2": [{"offset": 1, "relativeTo": "current"}], "$instance":{"Subject":[{"type":"Subject","text":"christmas party","startIndex":24,"length":15,"score":0.9657892,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}],"FromDate":[{"type":"FromDate","text":"next week","startIndex":40,"length":9,"score":0.966946542,"modelTypeId":1,"modelType":"Entity Extractor","recognitionSources":["model"]}]}}}
   })
   )
   .nock('https://westus.api.cognitive.microsoft.com', api => api
@@ -127,7 +127,6 @@ describe('luis:test cli entity test', () => {
   })
 })
 
-
 describe('luis:test cli role test', () => {
   before(async function(){
     await fs.ensureDir(path.join(__dirname, './../../../results/'))
@@ -222,8 +221,6 @@ describe('luis:test cli Hierarchical entity test', () => {
   })
 })
 
-
-
 describe('luis:test normal test', () => {
   before(async function(){
     await fs.ensureDir(path.join(__dirname, './../../../results/'))

packages/luis/test/fixtures/testcases/lutest/input/AllEntity.lu

@@ -50,7 +50,7 @@ $ToTime:simple
 
 > # PREBUILT Entity definitions
 
-$PREBUILT:ordinal
+@ PREBUILT ordinalV2
 
 $PREBUILT:personName Roles=Female, Male
 

packages/luis/test/fixtures/testcases/lutest/output/AllEntity.lu

@@ -67,7 +67,7 @@
 
 > # PREBUILT Entity definitions
 
-@ prebuilt ordinal
+@ prebuilt ordinalV2
 
 @ prebuilt personName hasRoles Female,Male