This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-366
in repository
https://gitbox.apache.org/repos/asf/incubator-nlpcraft-java-client.git
The following commit(s) were added to refs/heads/NLPCRAFT-366 by this push:
new 5dcb6a3 WIP.
5dcb6a3 is described below
commit 5dcb6a3b115677be0c8bfb968dd380762feadf31
Author: Sergey Kamov <[email protected]>
AuthorDate: Wed Aug 4 13:14:31 2021 +0300
WIP.
---
.../org/apache/nlpcraft/client/NCModelTest1.java | 122 +++++++++++----------
1 file changed, 62 insertions(+), 60 deletions(-)
diff --git a/src/test/java/org/apache/nlpcraft/client/NCModelTest1.java
b/src/test/java/org/apache/nlpcraft/client/NCModelTest1.java
index 732c92b..0455c1d 100644
--- a/src/test/java/org/apache/nlpcraft/client/NCModelTest1.java
+++ b/src/test/java/org/apache/nlpcraft/client/NCModelTest1.java
@@ -43,16 +43,16 @@ class NCModelTest1 extends NCTestAdapter {
@Test
void testElementSynonyms() throws Exception {
- NCElementSynonymsData s = admCli.getSynonyms(MDL_ID, VAL_ELEM_ID);
+ NCElementSynonymsData data = admCli.getSynonyms(MDL_ID, VAL_ELEM_ID);
- assertTrue(s.getSynonymsCnt() > 0);
- assertTrue(s.getSynonymsExpCnt() > 0);
- assertTrue(s.getSynonymsExpRatePct() > 0);
+ assertTrue(data.getSynonymsCnt() > 0);
+ assertTrue(data.getSynonymsExpCnt() > 0);
+ assertTrue(data.getSynonymsExpRatePct() > 0);
- assertTrue(s.getSynonyms() != null && !s.getSynonyms().isEmpty());
- assertTrue(s.getSynonymsExp() != null &&
!s.getSynonymsExp().isEmpty());
- assertTrue(s.getValues() != null && !s.getValues().isEmpty());
- assertTrue(s.getValuesExp() != null && !s.getValuesExp().isEmpty());
+ assertTrue(data.getSynonyms() != null &&
!data.getSynonyms().isEmpty());
+ assertTrue(data.getSynonymsExp() != null &&
!data.getSynonymsExp().isEmpty());
+ assertTrue(data.getValues() != null && !data.getValues().isEmpty());
+ assertTrue(data.getValuesExp() != null &&
!data.getValuesExp().isEmpty());
}
/**
@@ -60,54 +60,54 @@ class NCModelTest1 extends NCTestAdapter {
*/
@Test
void testModelInfo() throws Exception {
- NCRestSpecModel mdl1 = new NCRestSpecModel();
+ NCRestSpecModel probeMdl = new NCRestSpecModel();
// Checked model values.
- assert mdl1.getElements().stream().anyMatch(p -> p.getValues() != null
&& !p.getValues().isEmpty());
-
- NCModelInfo mdl2 = admCli.getModelInfo(MDL_ID);
-
- assertEquals(mdl1.getId(), mdl2.getId());
- assertEquals(mdl1.getName(), mdl2.getName());
- assertEquals(mdl1.getDescription(), mdl2.getDescription());
- assertEquals(mdl1.getVersion(), mdl2.getVersion());
- assertEquals(mdl1.getOrigin(), mdl2.getOrigin());
- assertEquals(mdl1.getMaxUnknownWords(), mdl2.getMaxUnknownWords());
- assertEquals(mdl1.getMaxFreeWords(), mdl2.getMaxFreeWords());
- assertEquals(mdl1.getMaxSuspiciousWords(),
mdl2.getMaxSuspiciousWords());
- assertEquals(mdl1.getMinWords(), mdl2.getMinWords());
- assertEquals(mdl1.getMaxWords(), mdl2.getMaxWords());
- assertEquals(mdl1.getMinTokens(), mdl2.getMinTokens());
- assertEquals(mdl1.getMaxTokens(), mdl2.getMaxTokens());
- assertEquals(mdl1.getMinNonStopwords(), mdl2.getMinNonStopwords());
- assertEquals(mdl1.isNonEnglishAllowed(), mdl2.isNonEnglishAllowed());
- assertEquals(mdl1.isNotLatinCharsetAllowed(),
mdl2.isNotLatinCharsetAllowed());
- assertEquals(mdl1.isSwearWordsAllowed(), mdl2.isSwearWordsAllowed());
- assertEquals(mdl1.isNoNounsAllowed(), mdl2.isNoNounsAllowed());
- assertEquals(mdl1.isPermutateSynonyms(), mdl2.isPermutateSynonyms());
- assertEquals(mdl1.isDupSynonymsAllowed(), mdl2.isDupSynonymsAllowed());
- assertEquals(mdl1.getMaxTotalSynonyms(), mdl2.getMaxTotalSynonyms());
- assertEquals(mdl1.isNoUserTokensAllowed(),
mdl2.isNoUserTokensAllowed());
- assertEquals(mdl1.isSparse(), mdl2.isSparse());
- assertEquals(mdl1.getMetadata(), mdl2.getMetadata());
- assertEquals(mdl1.getAdditionalStopWords(),
mdl2.getAdditionalStopWords());
- assertEquals(mdl1.getExcludedStopWords(), mdl2.getExcludedStopWords());
- assertEquals(mdl1.getSuspiciousWords(), mdl2.getSuspiciousWords());
- assertEquals(mdl1.getMacros(), mdl2.getMacros());
- assertEquals(mdl1.getEnabledBuiltInTokens(),
mdl2.getEnabledBuiltInTokens());
- assertEquals(mdl1.getAbstractTokens(), mdl2.getAbstractTokens());
- assertEquals(mdl1.getMaxElementSynonyms(),
mdl2.getMaxElementSynonyms());
- assertEquals(mdl1.isMaxSynonymsThresholdError(),
mdl2.isMaxSynonymsThresholdError());
- assertEquals(mdl1.getConversationTimeout(),
mdl2.getConversationTimeout());
- assertEquals(mdl1.getConversationDepth(), mdl2.getConversationDepth());
- assertEquals(mdl1.getRestrictedCombinations(),
mdl2.getRestrictedCombinations());
-
- Set<org.apache.nlpcraft.model.NCElement> elems1 = mdl1.getElements();
- Set<org.apache.nlpcraft.client.NCElement> elems2 = mdl2.getElements();
+ assert probeMdl.getElements().stream().anyMatch(p -> p.getValues() !=
null && !p.getValues().isEmpty());
+
+ NCModelInfo restMdl = admCli.getModelInfo(MDL_ID);
+
+ assertEquals(probeMdl.getId(), restMdl.getId());
+ assertEquals(probeMdl.getName(), restMdl.getName());
+ assertEquals(probeMdl.getDescription(), restMdl.getDescription());
+ assertEquals(probeMdl.getVersion(), restMdl.getVersion());
+ assertEquals(probeMdl.getOrigin(), restMdl.getOrigin());
+ assertEquals(probeMdl.getMaxUnknownWords(),
restMdl.getMaxUnknownWords());
+ assertEquals(probeMdl.getMaxFreeWords(), restMdl.getMaxFreeWords());
+ assertEquals(probeMdl.getMaxSuspiciousWords(),
restMdl.getMaxSuspiciousWords());
+ assertEquals(probeMdl.getMinWords(), restMdl.getMinWords());
+ assertEquals(probeMdl.getMaxWords(), restMdl.getMaxWords());
+ assertEquals(probeMdl.getMinTokens(), restMdl.getMinTokens());
+ assertEquals(probeMdl.getMaxTokens(), restMdl.getMaxTokens());
+ assertEquals(probeMdl.getMinNonStopwords(),
restMdl.getMinNonStopwords());
+ assertEquals(probeMdl.isNonEnglishAllowed(),
restMdl.isNonEnglishAllowed());
+ assertEquals(probeMdl.isNotLatinCharsetAllowed(),
restMdl.isNotLatinCharsetAllowed());
+ assertEquals(probeMdl.isSwearWordsAllowed(),
restMdl.isSwearWordsAllowed());
+ assertEquals(probeMdl.isNoNounsAllowed(), restMdl.isNoNounsAllowed());
+ assertEquals(probeMdl.isPermutateSynonyms(),
restMdl.isPermutateSynonyms());
+ assertEquals(probeMdl.isDupSynonymsAllowed(),
restMdl.isDupSynonymsAllowed());
+ assertEquals(probeMdl.getMaxTotalSynonyms(),
restMdl.getMaxTotalSynonyms());
+ assertEquals(probeMdl.isNoUserTokensAllowed(),
restMdl.isNoUserTokensAllowed());
+ assertEquals(probeMdl.isSparse(), restMdl.isSparse());
+ assertEquals(probeMdl.getMetadata(), restMdl.getMetadata());
+ assertEquals(probeMdl.getAdditionalStopWords(),
restMdl.getAdditionalStopWords());
+ assertEquals(probeMdl.getExcludedStopWords(),
restMdl.getExcludedStopWords());
+ assertEquals(probeMdl.getSuspiciousWords(),
restMdl.getSuspiciousWords());
+ assertEquals(probeMdl.getMacros(), restMdl.getMacros());
+ assertEquals(probeMdl.getEnabledBuiltInTokens(),
restMdl.getEnabledBuiltInTokens());
+ assertEquals(probeMdl.getAbstractTokens(),
restMdl.getAbstractTokens());
+ assertEquals(probeMdl.getMaxElementSynonyms(),
restMdl.getMaxElementSynonyms());
+ assertEquals(probeMdl.isMaxSynonymsThresholdError(),
restMdl.isMaxSynonymsThresholdError());
+ assertEquals(probeMdl.getConversationTimeout(),
restMdl.getConversationTimeout());
+ assertEquals(probeMdl.getConversationDepth(),
restMdl.getConversationDepth());
+ assertEquals(probeMdl.getRestrictedCombinations(),
restMdl.getRestrictedCombinations());
+
+ Set<org.apache.nlpcraft.model.NCElement> elems1 =
probeMdl.getElements();
+ Set<org.apache.nlpcraft.client.NCElement> elems2 =
restMdl.getElements();
assertEquals(elems1.size(), elems2.size());
- int n = elems1.size();
+ int elemsCnt = elems1.size();
List<org.apache.nlpcraft.model.NCElement> elemList1 =
elems1.stream().sorted(Comparator.comparing(org.apache.nlpcraft.model.NCElement::getId)).collect(Collectors.toList());
@@ -115,7 +115,7 @@ class NCModelTest1 extends NCTestAdapter {
List<org.apache.nlpcraft.client.NCElement> elemList2 =
elems2.stream().sorted(Comparator.comparing(org.apache.nlpcraft.client.NCElement::getId)).collect(Collectors.toList());
- for (int i = 0; i < n; i++) {
+ for (int i = 0; i < elemsCnt; i++) {
org.apache.nlpcraft.model.NCElement e1 = elemList1.get(i);
org.apache.nlpcraft.client.NCElement e2 = elemList2.get(i);
@@ -129,17 +129,19 @@ class NCModelTest1 extends NCTestAdapter {
assertEquals(e1.isPermutateSynonyms(), e2.isPermutateSynonyms());
assertEquals(e1.isSparse(), e2.isSparse());
- List<org.apache.nlpcraft.model.NCValue> values1 = e1.getValues();
- List<org.apache.nlpcraft.client.NCValue> values2 = e2.getValues();
+ List<org.apache.nlpcraft.model.NCValue> vals1 = e1.getValues();
+ List<org.apache.nlpcraft.client.NCValue> vals2 = e2.getValues();
- int n1 = values1 == null ? 0 : values1.size();
- int n2 = values2 == null ? 0 : values2.size();
+ int valsCnt1 = vals1 == null ? 0 : vals1.size();
+ int valsCnt2 = vals2 == null ? 0 : vals2.size();
- assertEquals(n1, n2);
+ assertEquals(valsCnt1, valsCnt2);
- for (int j = 0; j < n1; j++) {
- org.apache.nlpcraft.model.NCValue v1 = values1.get(i);
- org.apache.nlpcraft.client.NCValue v2 = values2.get(i);
+ for (int j = 0; j < valsCnt1; j++) {
+ assert vals2 != null;
+
+ org.apache.nlpcraft.model.NCValue v1 = vals1.get(i);
+ org.apache.nlpcraft.client.NCValue v2 = vals2.get(i);
assertEquals(v1.getName(), v2.getName());
