[incubator-nlpcraft] branch NLPCRAFT-278 updated: WIP.

[sergeykamov]

This is an automated email from the ASF dual-hosted git repository.

sergeykamov pushed a commit to branch NLPCRAFT-278
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git


The following commit(s) were added to refs/heads/NLPCRAFT-278 by this push:
     new ff78bbf  WIP.
ff78bbf is described below

commit ff78bbf996eb701fcab66073114d7f006ba05019
Author: Sergey Kamov <skhdlem...@gmail.com>
AuthorDate: Wed Mar 24 11:36:04 2021 +0300

    WIP.
---
 .../idl/compiler/functions/NCIdlFunctionsCompany.scala       |  6 ++++--
 .../intent/idl/compiler/functions/NCIdlFunctionsStat.scala   |  4 +++-
 .../intent/idl/compiler/functions/NCIdlFunctionsUser.scala   | 12 ++++++++----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git 
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsCompany.scala
 
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsCompany.scala
index cad2b16..9a95032 100644
--- 
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsCompany.scala
+++ 
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsCompany.scala
@@ -44,7 +44,7 @@ class NCIdlFunctionsCompany extends NCIdlFunctions {
         })
 
         test(new NCCompany {
-            override def getId: Long = -1
+            override def getId: Long = 1
             override def getName: String = "name"
             override def getWebsite: Optional[String] = Optional.empty()
             override def getCountry: Optional[String] = Optional.empty()
@@ -71,7 +71,9 @@ class NCIdlFunctionsCompany extends NCIdlFunctions {
             mkTestDesc(s"comp_region() == ${get(comp.getRegion)}"),
             mkTestDesc(s"comp_city() == ${get(comp.getCity)}"),
             mkTestDesc(s"comp_addr() == ${get(comp.getAddress)}"),
-            mkTestDesc(s"comp_postcode() == ${get(comp.getPostalCode)}")
+            mkTestDesc(s"comp_postcode() == ${get(comp.getPostalCode)}"),
+            mkTestDesc(s"comp_id() == ${comp.getId}"),
+            mkTestDesc(s"comp_id() != ${comp.getId + 1}")
         )
     }
 }
diff --git 
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsStat.scala
 
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsStat.scala
index 1d2b607..ce02b8f 100644
--- 
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsStat.scala
+++ 
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsStat.scala
@@ -27,6 +27,8 @@ class NCIdlFunctionsStat extends NCIdlFunctions {
     def test(): Unit =
         test(
             "max(list(1, 2, 3)) == 3",
-            "min(list(1, 2, 3)) == 1"
+            "max(list(1.0, 2.0, 3.0)) == 3.0",
+            "min(list(1, 2, 3)) == 1",
+            "min(list(1.0, 2.0, 3.0)) == 1.0"
         )
 }
diff --git 
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsUser.scala
 
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsUser.scala
index ba08d84..b406519 100644
--- 
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsUser.scala
+++ 
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsUser.scala
@@ -38,20 +38,20 @@ class NCIdlFunctionsUser extends NCIdlFunctions {
                 override def getEmail: Optional[String] = Optional.of("email")
                 override def getAvatarUrl: Optional[String] = 
Optional.of("avatar")
                 override def isAdmin: Boolean = true
-                override def getSignupTimestamp: Long = -1
+                override def getSignupTimestamp: Long = -100
                 override def getMetadata: util.Map[String, AnyRef] =
                     Map("k1" → "v1").map(p ⇒ p._1 → 
p._2.asInstanceOf[AnyRef]).asJava
             }
         )
         test(
             new NCUser {
-                override def getId: Long = -1
+                override def getId: Long = 1
                 override def getFirstName: Optional[String] = Optional.empty()
                 override def getLastName: Optional[String] = Optional.empty()
                 override def getEmail: Optional[String] = Optional.empty()
                 override def getAvatarUrl: Optional[String] = Optional.empty()
                 override def isAdmin: Boolean = false
-                override def getSignupTimestamp: Long = -1
+                override def getSignupTimestamp: Long = 100
                 override def getMetadata: util.Map[String, AnyRef] =
                     Map("k1" → "v1").map(p ⇒ p._1 → 
p._2.asInstanceOf[AnyRef]).asJava
             }
@@ -68,7 +68,11 @@ class NCIdlFunctionsUser extends NCIdlFunctions {
             mkTestDesc(s"user_fname() == ${get(usr.getFirstName)}"),
             mkTestDesc(s"user_lname() == ${get(usr.getLastName)}"),
             mkTestDesc(s"user_email() == ${get(usr.getEmail)}"),
-            mkTestDesc(s"user_admin() == ${usr.isAdmin}")
+            mkTestDesc(s"user_admin() == ${usr.isAdmin}"),
+            mkTestDesc(s"user_signup_tstamp() == ${usr.getSignupTimestamp}"),
+            mkTestDesc(s"user_signup_tstamp() != user_signup_tstamp() + 1"),
+            mkTestDesc(s"user_id() == ${usr.getId}"),
+            mkTestDesc(s"user_id() != ${usr.getId + 1}")
         )
     }
 }