Enable entity boundaries checking in Numbers (#845)

microsoft · Sep 7, 2018 · 33ab0a2 · 33ab0a2
1 parent 49be3e2
commit 33ab0a2
Show file tree

Hide file tree

Showing 34 changed files with 17,692 additions and 14,450 deletions.
diff --git a/.NET/Microsoft.Recognizers.Text.DataDrivenTests/TestBase.cs b/.NET/Microsoft.Recognizers.Text.DataDrivenTests/TestBase.cs
@@ -339,13 +339,13 @@ private void ValidateResults(IEnumerable<string> testResolutionKeys = null)
                 Assert.AreEqual(expected.TypeName, actual.TypeName, GetMessage(TestSpec));
                 Assert.AreEqual(expected.Text, actual.Text, GetMessage(TestSpec));
 
-                // Only NumberWithUnit is supported currently.
+                // Number and NumberWithUnit are supported currently.
                 if (expected.Start != Constants.InvalidIndex)
                 {
                     Assert.AreEqual(expected.Start, actual.Start, GetMessage(TestSpec));
                 }
 
-                // Only NumberWithUnit is supported currently.
+                // Number and NumberWithUnit are supported currently.
                 if (expected.End != Constants.InvalidIndex)
                 {
                     Assert.AreEqual(expected.End, actual.End, GetMessage(TestSpec));

diff --git a/.../java/com/microsoft/recognizers/text/tests/number/NumberRecognizerInitializationTest.java b/.../java/com/microsoft/recognizers/text/tests/number/NumberRecognizerInitializationTest.java
@@ -97,6 +97,8 @@ private void TestNumber(IModel testedModel, IModel controlModel, String source)
 
                     Assert.assertEquals("typeName", expected.typeName, actual.typeName);
                     Assert.assertEquals("text", expected.text, actual.text);
+                    Assert.assertEquals("start", expected.start, actual.start);
+                    Assert.assertEquals("end", expected.end, actual.end);
 
                     Assert.assertEquals("resolution.value", expected.resolution.get(ResolutionKey.Value), actual.resolution.get(ResolutionKey.Value));
                 });

diff --git a/JavaScript/test/runner-number.js b/JavaScript/test/runner-number.js
@@ -23,6 +23,8 @@ module.exports = function getNumberTestRunner(config) {
             var actual = o[0];
             var expected = o[1];
             t.is(actual.text, expected.Text, 'Result.Text');
+            t.is(actual.start, expected.Start, 'Result.Start');
+            t.is(actual.end, expected.End, 'Result.End')
             t.is(actual.typeName, expected.TypeName, 'Result.TypeName');
             t.is(actual.resolution.value, expected.Resolution.value, 'Result.Resolution.value');
         });

diff --git a/Python/tests/test_runner_number.py b/Python/tests/test_runner_number.py
@@ -15,6 +15,8 @@ def test_number_recognizer(culture, model, options, context, source, expected_re
     for actual, expected in zip(results, expected_results):
         assert actual.type_name == expected['TypeName']
         assert actual.text == expected['Text']
+        assert actual.start == expected['Start']
+        assert actual.end == expected['End']
         assert actual.resolution['value'] == expected['Resolution']['value']
 
 def get_results(culture, model, source):