DHFPROD-3581: Renaming EntityModels for tests

Author: rahulvudutala

marklogic-data-hub/src/test/ml-config/databases/final-database.json

@@ -46,15 +46,15 @@
     {
       "scalar-type" : "string",
       "namespace-uri" : "",
-      "localname" : "strNameProp",
+      "localname" : "stringNameProp",
       "collation" : "http://marklogic.com/collation/codepoint",
       "range-value-positions" : false,
       "invalid-values" : "reject"
     },
     {
       "scalar-type" : "string",
       "namespace-uri" : "",
-      "localname" : "srchEntyProp1",
+      "localname" : "searchEntityProp1",
       "collation" : "http://marklogic.com/collation/codepoint",
       "range-value-positions" : false,
       "invalid-values" : "reject"
@@ -77,21 +77,21 @@
     },
     {
       "scalar-type": "int",
-      "path-expression": "//*:instance/NumStringEntity/intProp",
+      "path-expression": "//*:instance/NumericStringEntity/intProp",
       "collation": "",
       "range-value-positions": false,
       "invalid-values": "reject"
     },
     {
       "scalar-type": "string",
-      "path-expression": "//*:instance/NumStringEntity/strCityProp",
+      "path-expression": "//*:instance/NumericStringEntity/stringCityProp",
       "collation": "http://marklogic.com/collation/codepoint",
       "range-value-positions": false,
       "invalid-values": "reject"
     },
     {
       "scalar-type": "string",
-      "path-expression": "//*:instance/EntitiesSearchEntity/srchEntyProp2",
+      "path-expression": "//*:instance/EntitySearchEntity/searchEntityProp2",
       "collation": "http://marklogic.com/collation/codepoint",
       "range-value-positions": false,
       "invalid-values": "reject"

marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/data-services/entitySearch/getMatchingPropertyValuesTest.sjs

@@ -15,8 +15,8 @@ function invokeService(entityTypeId, propertyPath, referenceType, pattern, limit
 
 // Uncomment the tests when DHFPROD-4494 bug is resolved.
 /*function testMatchingValuesStartingWithPattern() {
-  let entityTypeId = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
-  let propertyPath = "numStrEntityProp/strCityProp";
+  let entityTypeId = "http://marklogic.com/EntitySearchEntity-0.0.1/EntitySearchEntity";
+  let propertyPath = "numericStringEntityProp/stringCityProp";
   const result = invokeService(entityTypeId, propertyPath, "path", "doc2", 10);
   return [
     test.assertEqual(2, result.length),
@@ -26,8 +26,8 @@ function invokeService(entityTypeId, propertyPath, referenceType, pattern, limit
 }
 
 function testMatchingValuesWithPatternInBetween() {
-  let entityTypeId = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
-  let propertyPath = "numStrEntityProp/strCityProp";
+  let entityTypeId = "http://marklogic.com/EntitySearchEntity-0.0.1/EntitySearchEntity";
+  let propertyPath = "numericStringEntityProp/stringCityProp";
   const result = invokeService(entityTypeId, propertyPath, "path", "city", 10);
   return [
     test.assertEqual(4, result.length),
@@ -39,8 +39,8 @@ function testMatchingValuesWithPatternInBetween() {
 }
 
 function testMatchingValuesOnRangePathOneLevelNesting() {
-  let entityTypeId = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
-  let propertyPath = "numStrEntityProp/strCityProp";
+  let entityTypeId = "http://marklogic.com/EntitySearchEntity-0.0.1/EntitySearchEntity";
+  let propertyPath = "numericStringEntityProp/stringCityProp";
   const result = invokeService(entityTypeId, propertyPath, "path", "city", 10);
   return [
     test.assertEqual(4, result.length),
@@ -52,8 +52,8 @@ function testMatchingValuesOnRangePathOneLevelNesting() {
 }
 
 function testMatchingValuesOnRangePathNoNesting() {
-  let entityTypeId = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
-  let propertyPath = "srchEntyProp2";
+  let entityTypeId = "http://marklogic.com/EntitySearchEntity-0.0.1/EntitySearchEntity";
+  let propertyPath = "searchEntityProp2";
   const result = invokeService(entityTypeId, propertyPath, "path", "city", 10);
   return [
     test.assertEqual(2, result.length),
@@ -63,17 +63,17 @@ function testMatchingValuesOnRangePathNoNesting() {
 }
 
 function testMatchingValuesWithLimit() {
-  let entityTypeId = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
-  let propertyPath = "numStrEntityProp/strCityProp";
+  let entityTypeId = "http://marklogic.com/EntitySearchEntity-0.0.1/EntitySearchEntity";
+  let propertyPath = "numericStringEntityProp/stringCityProp";
   const result = invokeService(entityTypeId, propertyPath, "path", "city", 3);
   return [
     test.assertEqual(3, result.length)
   ];
 }*/
 
 function testMatchingValuesOnRangeElementIndexes() {
-  let entityTypeId = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
-  let propertyPath = "strNameProp";
+  let entityTypeId = "http://marklogic.com/EntitySearchEntity-0.0.1/EntitySearchEntity";
+  let propertyPath = "stringNameProp";
   const result = invokeService(entityTypeId, propertyPath, "element", "name", 10);
   return [
     test.assertEqual(4, result.length),
@@ -85,7 +85,7 @@ function testMatchingValuesOnRangeElementIndexes() {
 }
 
 function testMatchingValuesOnRangeFieldIndexes() {
-  let entityTypeId = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
+  let entityTypeId = "http://marklogic.com/EntitySearchEntity-0.0.1/EntitySearchEntity";
   let propertyPath = "datahubCreatedInFlow";
   const result = invokeService(entityTypeId, propertyPath, "field", "flow", 10);
   return [

marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/data-services/entitySearch/getMinAndMaxPropertyValuesTest.sjs

@@ -13,8 +13,8 @@ function invokeService(entityTypeId, propertyPath, referenceType) {
 
 // Uncomment the tests when DHFPROD-4494 bug is resolved.
 /*function testMinMaxTwoLevelNesting() {
-  let entityTypeId = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
-  let propertyPath = "numStrEntityProp/numEntProp/intProp";
+  let entityTypeId = "http://marklogic.com/EntitySearchEntity-0.0.1/EntitySearchEntity";
+  let propertyPath = "numStrEntityProp/numericEntityProp/intProp";
   const result = invokeService(entityTypeId, propertyPath, "path");
   return [
     test.assertEqual(11, result.min),
@@ -23,8 +23,8 @@ function invokeService(entityTypeId, propertyPath, referenceType) {
 }
 
 function testMinMaxOneLevelNesting() {
-  let entityTypeId = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
-  let propertyPath = "numStrEntityProp/intProp";
+  let entityTypeId = "http://marklogic.com/EntitySearchEntity-0.0.1/EntitySearchEntity";
+  let propertyPath = "numericStringEntityProp/intProp";
   const result = invokeService(entityTypeId, propertyPath, "path");
   return [
     test.assertEqual(1, result.min),
@@ -33,8 +33,8 @@ function testMinMaxOneLevelNesting() {
 }
 
 function testMinMaxLongProperty() {
-  let entityTypeId = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
-  let propertyPath = "numStrEntityProp/numEntProp/longProp";
+  let entityTypeId = "http://marklogic.com/EntitySearchEntity-0.0.1/EntitySearchEntity";
+  let propertyPath = "numericStringEntityProp/numericEntityProp/longProp";
   const result = invokeService(entityTypeId, propertyPath, "path");
   return [
     test.assertEqual(110, result.min),
@@ -43,7 +43,7 @@ function testMinMaxLongProperty() {
 }*/
 
 function testMinMaxDecimalProperty() {
-  let entityTypeId = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
+  let entityTypeId = "http://marklogic.com/EntitySearchEntity-0.0.1/EntitySearchEntity";
   let propertyPath = "decimalProp";
   const result = invokeService(entityTypeId, propertyPath, "element");
   return [
@@ -53,7 +53,7 @@ function testMinMaxDecimalProperty() {
 }
 
 function testMinMaxDoubleProperty() {
-  let entityTypeId = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
+  let entityTypeId = "http://marklogic.com/EntitySearchEntity-0.0.1/EntitySearchEntity";
   let propertyPath = "doubleProp";
   const result = invokeService(entityTypeId, propertyPath, "element");
   return [
@@ -63,7 +63,7 @@ function testMinMaxDoubleProperty() {
 }
 
 function testMinMaxFloatProperty() {
-  let entityTypeId = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
+  let entityTypeId = "http://marklogic.com/EntitySearchEntity-0.0.1/EntitySearchEntity";
   let propertyPath = "floatProp";
   const result = invokeService(entityTypeId, propertyPath, "element");
   return [